localizer
lzq
parent
bfa6bfd7a8
commit
b5874c78a7
|
|
@ -99,4 +99,14 @@ public class BizDriverController {
|
|||
return R.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤销司机
|
||||
*
|
||||
* @param id Id
|
||||
*/
|
||||
@PostMapping("/cancel")
|
||||
public R<?> cancel(@RequestParam Long id) {
|
||||
bizDriverService.cancel(id);
|
||||
return R.success();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,4 +89,15 @@ public class BizProjectController {
|
|||
bizProjectService.audit(id, auditStatus, auditMemo);
|
||||
return R.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤销项目
|
||||
*
|
||||
* @param id Id
|
||||
*/
|
||||
@PostMapping("/cancel")
|
||||
public R<?> cancel(@RequestParam Long id) {
|
||||
bizProjectService.cancel(id);
|
||||
return R.success();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,4 +106,15 @@ public class BizTruckController {
|
|||
public R<PageResult<BizTruckEntity>> dispensabilityList(PageParam pageParam, @RequestParam(required = false) String keywords) {
|
||||
return R.success(bizTruckService.dispensabilityList(pageParam, keywords));
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤销
|
||||
*
|
||||
* @param id Id
|
||||
*/
|
||||
@GetMapping("/cancel")
|
||||
public R<?> cancel(@RequestParam Long id) {
|
||||
bizTruckService.cancel(id);
|
||||
return R.success();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,6 +53,11 @@ public class BizProjectEntity {
|
|||
*/
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> contract;
|
||||
/**
|
||||
* 合同有效期; json
|
||||
*/
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> contractDate;
|
||||
|
||||
/**
|
||||
* 项目所在地省; 代码
|
||||
|
|
|
|||
|
|
@ -43,7 +43,8 @@ public class BizTruckEntity {
|
|||
/**
|
||||
* 行驶证图片
|
||||
*/
|
||||
private String truckLicense;
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> truckLicense;
|
||||
|
||||
/**
|
||||
* 车架号
|
||||
|
|
@ -53,7 +54,8 @@ public class BizTruckEntity {
|
|||
/**
|
||||
* 合格证图片
|
||||
*/
|
||||
private String qualification;
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> qualification;
|
||||
|
||||
/**
|
||||
* 最大载重; 单位：千克
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
package com.njzscloud.supervisory.biz.pojo.result;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
|
||||
import com.njzscloud.supervisory.biz.constant.AuditStatus;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
|
@ -56,7 +58,11 @@ public class SearchBizProjectResult {
|
|||
* 合同图片; json
|
||||
*/
|
||||
private List<String> contract;
|
||||
|
||||
/**
|
||||
* 合同有效期; json
|
||||
*/
|
||||
@TableField(typeHandler = JsonTypeHandler.class)
|
||||
private List<String> contractDate;
|
||||
/**
|
||||
* 项目所在地省; 代码
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -154,4 +154,15 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
|
|||
throw Exceptions.exception("数据状态已改变，无法审核");
|
||||
}
|
||||
}
|
||||
|
||||
public void cancel(Long id) {
|
||||
BizDriverEntity oldData = getById(id);
|
||||
if (oldData == null) {
|
||||
throw Exceptions.exception("未找到要撤销的数据");
|
||||
}
|
||||
update(Wrappers.<BizDriverEntity>lambdaUpdate()
|
||||
.set(BizDriverEntity::getAuditStatus, AuditStatus.YiCheXiao)
|
||||
.eq(BizDriverEntity::getId, id)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.njzscloud.supervisory.biz.service;
|
|||
|
||||
import cn.hutool.core.lang.Assert;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
|
@ -62,9 +63,18 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
|
|||
* 分页查询
|
||||
*/
|
||||
public PageResult<SearchBizProjectResult> paging(PageParam pageParam, BizProjectEntity bizProjectEntity) {
|
||||
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<BizProjectEntity>query()
|
||||
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
|
||||
));
|
||||
UserDetail userDetail = SecurityUtil.loginUser();
|
||||
BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values());
|
||||
QueryWrapper<BizProjectEntity> ew = Wrappers.<BizProjectEntity>query()
|
||||
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName());
|
||||
|
||||
if (bizObj != null && bizObj.isTrans()) {
|
||||
ew.eq("a.user_id", userDetail.getUserId());
|
||||
} else if (bizObj != null && bizObj.isWaste()) {
|
||||
ew.eq("a.other_user_id", userDetail.getUserId());
|
||||
}
|
||||
|
||||
return PageResult.of(baseMapper.paging(pageParam.toPage(), ew));
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
|
|
@ -98,4 +108,15 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
|
|||
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
|
||||
));
|
||||
}
|
||||
|
||||
public void cancel(Long id) {
|
||||
BizProjectEntity oldData = getById(id);
|
||||
if (oldData == null) {
|
||||
throw Exceptions.exception("未找到要撤销的数据");
|
||||
}
|
||||
update(Wrappers.<BizProjectEntity>lambdaUpdate()
|
||||
.set(BizProjectEntity::getAuditStatus, AuditStatus.YiCheXiao)
|
||||
.eq(BizProjectEntity::getId, id)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,4 +142,16 @@ public class BizTruckService extends ServiceImpl<BizTruckMapper, BizTruckEntity>
|
|||
throw Exceptions.exception("数据状态已改变，无法审核");
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void cancel(Long id) {
|
||||
BizTruckEntity oldData = getById(id);
|
||||
if (oldData == null) {
|
||||
throw Exceptions.exception("未找到要撤销的数据");
|
||||
}
|
||||
update(Wrappers.<BizTruckEntity>lambdaUpdate()
|
||||
.set(BizTruckEntity::getAuditStatus, AuditStatus.YiCheXiao)
|
||||
.eq(BizTruckEntity::getId, id)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import com.njzscloud.supervisory.order.pojo.param.*;
|
|||
import com.njzscloud.supervisory.order.pojo.result.ObtainWeighBillResult;
|
||||
import com.njzscloud.supervisory.order.pojo.result.OrderCertificateResult;
|
||||
import com.njzscloud.supervisory.order.pojo.result.OrderPagingResult;
|
||||
import com.njzscloud.supervisory.order.pojo.result.TrainBillResult;
|
||||
import com.njzscloud.supervisory.order.service.OrderInfoService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -85,6 +86,14 @@ public class OrderInfoController {
|
|||
return R.success(orderInfoService.certificate(orderCertificateParam));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询联单
|
||||
*/
|
||||
@GetMapping("/train_bill")
|
||||
public R<TrainBillResult> trainBill(@RequestParam("orderId") Long orderId) {
|
||||
return R.success(orderInfoService.trainBill(orderId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -76,11 +76,23 @@ public class OrderInfoEntity {
|
|||
* 审核状态; 字典代码：audit_status
|
||||
*/
|
||||
private AuditStatus auditStatus;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private LocalDateTime auditTime;
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
private String auditMemo;
|
||||
/**
|
||||
* 区审核人
|
||||
*/
|
||||
private Long quAuditUserId;
|
||||
|
||||
/**
|
||||
* 市审核人
|
||||
*/
|
||||
private Long shiAuditUserId;
|
||||
/**
|
||||
* 目标站点 Id
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.njzscloud.supervisory.order.pojo.result;
|
||||
|
||||
import com.njzscloud.supervisory.biz.constant.AuditStatus;
|
||||
import com.njzscloud.supervisory.biz.constant.BizObj;
|
||||
import com.njzscloud.supervisory.goods.contant.MoneyStrategy;
|
||||
import com.njzscloud.supervisory.order.contant.*;
|
||||
import lombok.Getter;
|
||||
|
|
@ -23,12 +24,17 @@ public class OrderPagingResult {
|
|||
* 昵称
|
||||
*/
|
||||
private String nickname;
|
||||
|
||||
/**
|
||||
* 车辆类型
|
||||
*/
|
||||
private String truckCategory;
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
private String userPhone;
|
||||
private String companyName;
|
||||
private String uscc;
|
||||
private BizObj bizObj;
|
||||
// endregion
|
||||
// region 订单信息
|
||||
/**
|
||||
|
|
@ -47,9 +53,6 @@ public class OrderPagingResult {
|
|||
*/
|
||||
private Long stationId;
|
||||
|
||||
private String stationName;
|
||||
|
||||
|
||||
/**
|
||||
* 车道
|
||||
*/
|
||||
|
|
@ -89,6 +92,37 @@ public class OrderPagingResult {
|
|||
*/
|
||||
private AuditStatus auditStatus;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private LocalDateTime auditTime;
|
||||
/**
|
||||
* 区审核人
|
||||
*/
|
||||
private Long quAuditUserId;
|
||||
|
||||
/**
|
||||
* 市审核人
|
||||
*/
|
||||
private Long shiAuditUserId;
|
||||
/**
|
||||
* 区审核人
|
||||
*/
|
||||
private String quAuditUserName;
|
||||
|
||||
/**
|
||||
* 市审核人
|
||||
*/
|
||||
private String shiAuditUserName;
|
||||
/**
|
||||
* 期望运输时间
|
||||
*/
|
||||
private String expectTime;
|
||||
|
||||
/**
|
||||
* 预估量
|
||||
*/
|
||||
private String estimatedQuantity;
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
|
|
@ -441,4 +475,14 @@ public class OrderPagingResult {
|
|||
private String transContacts;
|
||||
private String transPhone;
|
||||
// endregion
|
||||
// region 站点信息
|
||||
/**
|
||||
* 站点名称
|
||||
*/
|
||||
private String stationName;
|
||||
private String stationAddress;
|
||||
private String stationUscc;
|
||||
private String stationContacts;
|
||||
private String stationPhone;
|
||||
// endregion
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,485 @@
|
|||
package com.njzscloud.supervisory.order.pojo.result;
|
||||
|
||||
import com.njzscloud.supervisory.biz.constant.AuditStatus;
|
||||
import com.njzscloud.supervisory.biz.constant.BizObj;
|
||||
import com.njzscloud.supervisory.goods.contant.MoneyStrategy;
|
||||
import com.njzscloud.supervisory.order.contant.*;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ToString
|
||||
@Accessors(chain = true)
|
||||
public class TrainBillResult {
|
||||
// region 用户信息
|
||||
/**
|
||||
* 昵称
|
||||
*/
|
||||
private String nickname;
|
||||
private BizObj bizObj;
|
||||
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
private String userPhone;
|
||||
private String companyName;
|
||||
private String uscc;
|
||||
// endregion
|
||||
// region 订单信息
|
||||
/**
|
||||
* 订单 Id
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 订单编号
|
||||
*/
|
||||
private String sn;
|
||||
private String projectName;
|
||||
|
||||
/**
|
||||
* 站点 Id
|
||||
*/
|
||||
private Long stationId;
|
||||
|
||||
/**
|
||||
* 车道
|
||||
*/
|
||||
private String lane;
|
||||
|
||||
/**
|
||||
* 项目 Id
|
||||
*/
|
||||
private Long projectId;
|
||||
|
||||
/**
|
||||
* 装货地址 Id
|
||||
*/
|
||||
private Long cargoPlaceId;
|
||||
|
||||
/**
|
||||
* 清运公司 Id
|
||||
*/
|
||||
private Long transCompanyId;
|
||||
|
||||
/**
|
||||
* 下单人 Id; sys_user.id
|
||||
*/
|
||||
private Long userId;
|
||||
/**
|
||||
* 联系人
|
||||
*/
|
||||
private String contacts;
|
||||
|
||||
/**
|
||||
* 联系方式
|
||||
*/
|
||||
private String phone;
|
||||
|
||||
/**
|
||||
* 审核状态; 字典代码：audit_status
|
||||
*/
|
||||
private AuditStatus auditStatus;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private LocalDateTime auditTime;
|
||||
/**
|
||||
* 区审核人
|
||||
*/
|
||||
private Long quAuditUserId;
|
||||
|
||||
/**
|
||||
* 市审核人
|
||||
*/
|
||||
private Long shiAuditUserId;
|
||||
/**
|
||||
* 区审核人
|
||||
*/
|
||||
private String quAuditUserName;
|
||||
|
||||
/**
|
||||
* 市审核人
|
||||
*/
|
||||
private String shiAuditUserName;
|
||||
/**
|
||||
* 期望运输时间
|
||||
*/
|
||||
private String expectTime;
|
||||
|
||||
/**
|
||||
* 预估量
|
||||
*/
|
||||
private String estimatedQuantity;
|
||||
/**
|
||||
* 审核备注
|
||||
*/
|
||||
private String auditMemo;
|
||||
private String checkerName;
|
||||
|
||||
/**
|
||||
* 订单类型; 字典代码：order_category
|
||||
*/
|
||||
private OrderCategory orderCategory;
|
||||
|
||||
/**
|
||||
* 订单状态; 字典代码：order_status
|
||||
*/
|
||||
private OrderStatus orderStatus;
|
||||
|
||||
/**
|
||||
* 看料员 Id; sys_user.id
|
||||
*/
|
||||
private Long checkerId;
|
||||
|
||||
/**
|
||||
* 看料状态; 字典代码：check_status
|
||||
*/
|
||||
private CheckStatus checkStatus;
|
||||
|
||||
/**
|
||||
* 车辆 Id
|
||||
*/
|
||||
private Long truckId;
|
||||
|
||||
/**
|
||||
* 司机 Id
|
||||
*/
|
||||
private Long driverId;
|
||||
|
||||
/**
|
||||
* 产品 Id; order_goods.id
|
||||
*/
|
||||
private Long goodsId;
|
||||
|
||||
/**
|
||||
* 优惠金额; 有正负
|
||||
*/
|
||||
private BigDecimal discountMoney;
|
||||
|
||||
/**
|
||||
* 手动修正金额; 有正负
|
||||
*/
|
||||
private BigDecimal reviseMoney;
|
||||
|
||||
/**
|
||||
* 结算金额; 正
|
||||
*/
|
||||
private BigDecimal settleMoney;
|
||||
|
||||
/**
|
||||
* 付款方资金账户 Id
|
||||
*/
|
||||
private Long payer;
|
||||
|
||||
/**
|
||||
* 支付方类型; 字典代码：payer_category
|
||||
*/
|
||||
private PayerCategory payerCategory;
|
||||
|
||||
/**
|
||||
* 支付状态; 字典代码：payment_status
|
||||
*/
|
||||
private PaymentStatus paymentStatus;
|
||||
|
||||
/**
|
||||
* 支付时间
|
||||
*/
|
||||
private LocalDateTime paymentTime;
|
||||
|
||||
/**
|
||||
* 客户备注
|
||||
*/
|
||||
private String customerMemo;
|
||||
|
||||
/**
|
||||
* 看料员备注
|
||||
*/
|
||||
private String checkerMemo;
|
||||
|
||||
/**
|
||||
* 装车照片
|
||||
*/
|
||||
private List<String> cargoPhoto;
|
||||
|
||||
/**
|
||||
* 看料照片
|
||||
*/
|
||||
private List<String> checkPhoto;
|
||||
/**
|
||||
* 现场照片
|
||||
*/
|
||||
private List<String> sitePhotos;
|
||||
/**
|
||||
* 进出场信息
|
||||
*/
|
||||
private Long carInOutId;
|
||||
|
||||
// endregion
|
||||
|
||||
// region 产品信息
|
||||
/**
|
||||
* 产品类型 Id
|
||||
*/
|
||||
private Long goodsCategoryId;
|
||||
|
||||
/**
|
||||
* 产品 Id
|
||||
*/
|
||||
private Long originGoodsId;
|
||||
private String categoryName;
|
||||
|
||||
/**
|
||||
* 产品名称
|
||||
*/
|
||||
private String goodsName;
|
||||
|
||||
/**
|
||||
* 单价; 单位：元
|
||||
*/
|
||||
private BigDecimal unitPrice;
|
||||
|
||||
/**
|
||||
* 单位; 字典代码：unit
|
||||
*/
|
||||
private String unit;
|
||||
|
||||
/**
|
||||
* 计费策略; 字典代码：money_strategy
|
||||
*/
|
||||
private MoneyStrategy moneyStrategy;
|
||||
|
||||
/**
|
||||
* 计费配置 Id
|
||||
*/
|
||||
private Long moneyConfigId;
|
||||
|
||||
/**
|
||||
* 图片
|
||||
*/
|
||||
private String picture;
|
||||
|
||||
/**
|
||||
* 税率
|
||||
*/
|
||||
private BigDecimal taxRate;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private Integer quantity;
|
||||
|
||||
/**
|
||||
* 总金额; 单位：元
|
||||
*/
|
||||
private BigDecimal totalMoney;
|
||||
private LocalDateTime createTime;
|
||||
// endregion
|
||||
|
||||
// region 装货地址
|
||||
|
||||
/**
|
||||
* 省; 代码
|
||||
*/
|
||||
private String province;
|
||||
|
||||
/**
|
||||
* 市; 代码
|
||||
*/
|
||||
private String city;
|
||||
|
||||
/**
|
||||
* 区县; 代码
|
||||
*/
|
||||
private String area;
|
||||
|
||||
/**
|
||||
* 乡镇街道; 代码
|
||||
*/
|
||||
private String town;
|
||||
|
||||
/**
|
||||
* 省; 名称
|
||||
*/
|
||||
private String provinceName;
|
||||
|
||||
/**
|
||||
* 市; 名称
|
||||
*/
|
||||
private String cityName;
|
||||
|
||||
/**
|
||||
* 区县; 名称
|
||||
*/
|
||||
private String areaName;
|
||||
|
||||
/**
|
||||
* 乡镇街道; 名称
|
||||
*/
|
||||
private String townName;
|
||||
|
||||
/**
|
||||
* 详细地址
|
||||
*/
|
||||
private String address;
|
||||
|
||||
/**
|
||||
* 经度
|
||||
*/
|
||||
private Double lng;
|
||||
|
||||
/**
|
||||
* 纬度
|
||||
*/
|
||||
private Double lat;
|
||||
// endregion
|
||||
|
||||
// region 进出场信息
|
||||
|
||||
/**
|
||||
* 毛重; 单位：千克
|
||||
*/
|
||||
private Integer roughWeight;
|
||||
|
||||
/**
|
||||
* 皮重; 单位：千克
|
||||
*/
|
||||
private Integer tareWeight;
|
||||
|
||||
/**
|
||||
* 净重
|
||||
*/
|
||||
private Integer settleWeight;
|
||||
|
||||
/**
|
||||
* 进场车头照片
|
||||
*/
|
||||
private String inFrontPhoto;
|
||||
|
||||
/**
|
||||
* 进场车斗照片
|
||||
*/
|
||||
private String inBodyPhoto;
|
||||
|
||||
/**
|
||||
* 出场车头照片
|
||||
*/
|
||||
private String outFrontPhoto;
|
||||
|
||||
/**
|
||||
* 出场车斗照片
|
||||
*/
|
||||
private String outBodyPhoto;
|
||||
|
||||
/**
|
||||
* 进场时间
|
||||
*/
|
||||
private LocalDateTime inTime;
|
||||
|
||||
/**
|
||||
* 出场时间
|
||||
*/
|
||||
private LocalDateTime outTime;
|
||||
// endregion
|
||||
|
||||
// region 车辆信息
|
||||
/**
|
||||
* 车牌号
|
||||
*/
|
||||
private String licensePlate;
|
||||
|
||||
/**
|
||||
* 行驶证
|
||||
*/
|
||||
private String truckLicense;
|
||||
|
||||
/**
|
||||
* 车辆识别号
|
||||
*/
|
||||
private String vnCode;
|
||||
|
||||
/**
|
||||
* 车辆资质
|
||||
*/
|
||||
private String qualification;
|
||||
|
||||
/**
|
||||
* 载重; 单位：吨
|
||||
*/
|
||||
private Integer carryingCapacity;
|
||||
|
||||
/**
|
||||
* 空重; 单位：吨
|
||||
*/
|
||||
private Integer historyTareWeight;
|
||||
|
||||
// endregion
|
||||
|
||||
// region 司机信息
|
||||
/**
|
||||
* 司机姓名
|
||||
*/
|
||||
private String driverName;
|
||||
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
private String driverPhone;
|
||||
|
||||
/**
|
||||
* 驾驶证
|
||||
*/
|
||||
private String drivingLicence;
|
||||
|
||||
/**
|
||||
* 驾驶证开始时间
|
||||
*/
|
||||
private LocalDate licenceStartTime;
|
||||
|
||||
/**
|
||||
* 驾驶证结束时间
|
||||
*/
|
||||
private LocalDate licenceEndTime;
|
||||
// endregion
|
||||
|
||||
// region 企业信息
|
||||
private String transUscc;
|
||||
private String transCompanyName;
|
||||
private String transBusinessLicense;
|
||||
private LocalDate transLicenseStartTime;
|
||||
private LocalDate transLicenseEndTime;
|
||||
private String transLegalRepresentative;
|
||||
private String transProvince;
|
||||
private String transCity;
|
||||
private String transArea;
|
||||
private String transTown;
|
||||
private String transProvinceName;
|
||||
private String transCityName;
|
||||
private String transAreaName;
|
||||
private String transTownName;
|
||||
private String transAddress;
|
||||
private Double transLng;
|
||||
private Double transLat;
|
||||
private String transContacts;
|
||||
private String transPhone;
|
||||
// endregion
|
||||
// region 站点信息
|
||||
/**
|
||||
* 站点名称
|
||||
*/
|
||||
private String stationName;
|
||||
private String stationAddress;
|
||||
private String stationUscc;
|
||||
private String stationContacts;
|
||||
private String stationPhone;
|
||||
// endregion
|
||||
}
|
||||
|
|
@ -34,6 +34,7 @@ import com.njzscloud.supervisory.order.pojo.param.*;
|
|||
import com.njzscloud.supervisory.order.pojo.result.ObtainWeighBillResult;
|
||||
import com.njzscloud.supervisory.order.pojo.result.OrderCertificateResult;
|
||||
import com.njzscloud.supervisory.order.pojo.result.OrderPagingResult;
|
||||
import com.njzscloud.supervisory.order.pojo.result.TrainBillResult;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
|
@ -489,4 +490,9 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
|
|||
public ObtainWeighBillResult obtainWeighBill(Long orderId) {
|
||||
return baseMapper.obtainWeighBill(orderId);
|
||||
}
|
||||
|
||||
public TrainBillResult trainBill(Long orderId) {
|
||||
OrderPagingResult orderDetail = detail(orderId);
|
||||
return BeanUtil.copyProperties(orderDetail, TrainBillResult.class);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import com.njzscloud.common.core.ex.Exceptions;
|
|||
import com.njzscloud.common.core.utils.R;
|
||||
import com.njzscloud.common.mp.support.PageParam;
|
||||
import com.njzscloud.common.mp.support.PageResult;
|
||||
import com.njzscloud.common.security.util.SecurityUtil;
|
||||
import com.njzscloud.supervisory.sys.user.pojo.entity.UserEntity;
|
||||
import com.njzscloud.supervisory.sys.user.pojo.param.*;
|
||||
import com.njzscloud.supervisory.sys.user.pojo.result.UserDetailResult;
|
||||
import com.njzscloud.supervisory.sys.user.service.UserService;
|
||||
|
|
@ -43,6 +45,18 @@ public class UserController {
|
|||
return R.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@PostMapping("/modify_info")
|
||||
public R<?> modifyInfo(@RequestBody UserModifyParam userModifyParam) {
|
||||
userService.updateById(new UserEntity()
|
||||
.setId(SecurityUtil.currentUserId())
|
||||
.setAvatar(userModifyParam.getAvatar())
|
||||
.setNickname(userModifyParam.getNickname()));
|
||||
return R.success();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -13,6 +13,11 @@
|
|||
a.user_id,
|
||||
a.audit_status,
|
||||
a.audit_memo,
|
||||
a.audit_time,
|
||||
a.qu_audit_user_id,
|
||||
a.shi_audit_user_id,
|
||||
n.nickname qu_audit_user_name,
|
||||
o.nickname shi_audit_user_name,
|
||||
a.order_category,
|
||||
a.order_status,
|
||||
a.checker_id,
|
||||
|
|
@ -35,6 +40,8 @@
|
|||
a.modifier_id,
|
||||
a.create_time,
|
||||
a.modify_time,
|
||||
a.expect_time,
|
||||
a.estimated_quantity,
|
||||
a.deleted,
|
||||
a.cargo_place_id,
|
||||
a.car_in_out_id,
|
||||
|
|
@ -77,6 +84,7 @@
|
|||
e.qualification,
|
||||
e.carrying_capacity,
|
||||
e.tare_weight history_tare_weight,
|
||||
e.truck_category,
|
||||
f.driver_name,
|
||||
f.phone driver_phone,
|
||||
f.driving_licence,
|
||||
|
|
@ -102,11 +110,17 @@
|
|||
g.contacts trans_contacts,
|
||||
g.phone trans_phone,
|
||||
h.nickname,
|
||||
h.biz_obj,
|
||||
h.phone user_phone,
|
||||
j.company_name,
|
||||
j.uscc,
|
||||
k.nickname checker_name,
|
||||
l.project_name,
|
||||
m.company_name station_name,
|
||||
m.address station_address,
|
||||
m.uscc station_uscc,
|
||||
m.contacts station_contacts,
|
||||
m.phone station_phone,
|
||||
a.contacts,
|
||||
a.phone
|
||||
FROM order_info a
|
||||
|
|
@ -122,6 +136,8 @@
|
|||
LEFT JOIN sys_user k ON k.id = a.checker_id
|
||||
LEFT JOIN biz_project l ON l.id = a.project_id
|
||||
LEFT JOIN biz_company m ON m.id = a.station_id AND m.station = 1
|
||||
LEFT JOIN sys_user n ON n.id = a.qu_audit_user_id
|
||||
LEFT JOIN sys_user o ON o.id = a.shi_audit_user_id
|
||||
</sql>
|
||||
|
||||
<resultMap id="OrderPagingResultMap" autoMapping="true" type="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
"avatar": "data:image/png;base64,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",
|
||||
"version": "4.9.4",
|
||||
"createdTime": "2023-4-13 11:53:52",
|
||||
"updatedTime": "2025-9-19 11:31:22",
|
||||
"updatedTime": "2025-9-20 14:03:24",
|
||||
"dbConns": [],
|
||||
"profile": {
|
||||
"default": {
|
||||
|
|
@ -10195,6 +10195,57 @@
|
|||
"extProps": {},
|
||||
"id": "82373BA9-825C-4EBF-ACAF-F520D59A2467"
|
||||
},
|
||||
{
|
||||
"defKey": "audit_time",
|
||||
"defName": "审核时间",
|
||||
"comment": "",
|
||||
"type": "DATETIME",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"baseType": "A098BA98-4957-43EE-9F06-1CDC26D370E0",
|
||||
"extProps": {},
|
||||
"id": "55084BD5-8707-43C4-A6C7-BE7D92774E2C"
|
||||
},
|
||||
{
|
||||
"defKey": "qu_audit_user_id",
|
||||
"defName": "区审核人",
|
||||
"comment": "",
|
||||
"type": "BIGINT",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0",
|
||||
"extProps": {},
|
||||
"id": "839495CB-A9A3-4E0C-AF7C-9E367EFA2E43"
|
||||
},
|
||||
{
|
||||
"defKey": "shi_audit_user_id",
|
||||
"defName": "市审核人",
|
||||
"comment": "",
|
||||
"type": "BIGINT",
|
||||
"len": "",
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"baseType": "9B6B9E10-DB11-4409-878B-5868A19CD9B0",
|
||||
"extProps": {},
|
||||
"id": "CFA4F8C9-5386-4A66-9DF3-D531C1937DE1"
|
||||
},
|
||||
{
|
||||
"defKey": "target_station_id",
|
||||
"defName": "对方站点 Id",
|
||||
|
|
@ -15714,6 +15765,23 @@
|
|||
"id": "F45EC638-AF8C-4481-A351-E5D7E3E51682",
|
||||
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231"
|
||||
},
|
||||
{
|
||||
"defKey": "contract_date",
|
||||
"defName": "合同有效期",
|
||||
"comment": "",
|
||||
"type": "VARCHAR",
|
||||
"len": 255,
|
||||
"scale": "",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"autoIncrement": false,
|
||||
"defaultValue": "",
|
||||
"hideInGraph": false,
|
||||
"refDict": "",
|
||||
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
|
||||
"extProps": {},
|
||||
"id": "C1B9D7B0-D3ED-442B-A18A-D9FE9EBFF120"
|
||||
},
|
||||
{
|
||||
"defKey": "province",
|
||||
"defName": "项目所在地省",
|
||||
|
|
|
|||
Loading…
Reference in New Issue