lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

localizer
ljw 2025-09-16 18:42:07 +08:00
parent b656167084 4fea7a5217
commit 9182cf665b
11 changed files with 154 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizProjectController.java
View File

@ -4,6 +4,7 @@ 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.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.pojo.entity.BizProjectEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizProjectResult;
import com.njzscloud.supervisory.biz.service.BizProjectService;
@ -68,4 +69,16 @@ public class BizProjectController {
return R.success(bizProjectService.paging(pageParam, bizProjectEntity));
}
/**
* 审核
*
* @param id Id
*/
@GetMapping("/audit")
public R<?> audit(@RequestParam Long id,
@RequestParam AuditStatus auditStatus,
@RequestParam(required = false, defaultValue = "") String auditMemo) {
bizProjectService.audit(id, auditStatus, auditMemo);
return R.success();
}
}

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizProjectEntity.java
View File

@ -2,6 +2,7 @@ package com.njzscloud.supervisory.biz.pojo.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -109,7 +110,7 @@ public class BizProjectEntity {
/**
* 审核状态; 字典代码：audit_status
*/
private String auditStatus;
private AuditStatus auditStatus;
/**
* 审核备注

11
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchBizProjectResult.java
View File

@ -2,6 +2,7 @@ package com.njzscloud.supervisory.biz.pojo.result;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@ -128,4 +129,14 @@ public class SearchBizProjectResult {
*/
private LocalDateTime modifyTime;
/**
* 审核状态; 字典代码：audit_status
*/
private AuditStatus auditStatus;
/**
* 审核备注
*/
private String auditMemo;
}

24
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizProjectService.java
View File

@ -1,10 +1,13 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.supervisory.biz.contant.AuditStatus;
import com.njzscloud.supervisory.biz.mapper.BizProjectMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizProjectEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizProjectResult;
@ -25,7 +28,7 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
* 新增
*/
public void add(BizProjectEntity bizProjectEntity) {
this.save(bizProjectEntity);
this.save(bizProjectEntity.setAuditStatus(AuditStatus.DaiShenHe));
}
/**
@ -57,4 +60,23 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<BizProjectEntity>query(bizProjectEntity)));
}
@Transactional(rollbackFor = Exception.class)
public void audit(Long id, AuditStatus auditStatus, String auditMemo) {
Assert.isTrue(auditStatus == AuditStatus.TongGuo || auditStatus == AuditStatus.BoHui, "错误的审核状态");
BizProjectEntity oldData = getById(id);
if (oldData == null) {
throw Exceptions.exception("未找到要审核的数据");
}
if (oldData.getAuditStatus() != AuditStatus.DaiShenHe) {
throw Exceptions.exception("当前状态不能审核");
}
boolean updated = update(Wrappers.<BizProjectEntity>lambdaUpdate()
.set(BizProjectEntity::getAuditStatus, auditStatus)
.set(BizProjectEntity::getAuditMemo, auditStatus == AuditStatus.TongGuo ? "" : auditMemo)
.eq(BizProjectEntity::getId, id)
.eq(BizProjectEntity::getAuditStatus, AuditStatus.DaiShenHe));
if (!updated) {
throw Exceptions.exception("数据状态已改变，无法审核");
}
}
}

12
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/OrderInfoController.java
View File

@ -9,6 +9,7 @@ import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.order.contant.OrderCategory;
import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
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.service.OrderInfoService;
@ -172,6 +173,17 @@ public class OrderInfoController {
return R.success();
}
/**
* 过磅单
*
* @param orderId 订单Id
*/
@GetMapping("/obtain_weigh_bill")
public R<?> obtainWeighBill(@RequestParam("orderId") Long orderId) {
ObtainWeighBillResult obtainWeighBill = orderInfoService.obtainWeighBill(orderId);
return R.success(obtainWeighBill);
}
/**
* 车辆进场
*/

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/mapper/OrderInfoMapper.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
import com.njzscloud.supervisory.order.pojo.result.ObtainWeighBillResult;
import com.njzscloud.supervisory.order.pojo.result.OrderPagingResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -19,4 +20,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfoEntity> {
OrderPagingResult detail(@Param("ew") QueryWrapper<OrderPagingResult> ew);
OrderPagingResult pendingOrder(@Param("ew") QueryWrapper<Object> ew);
ObtainWeighBillResult obtainWeighBill(@Param("orderId") Long orderId);
}

67
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/ObtainWeighBillResult.java 100644
View File

@ -0,0 +1,67 @@
package com.njzscloud.supervisory.order.pojo.result;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ObtainWeighBillResult {
/**
* 订单编号
*/
private String sn;
/**
* 车牌号
*/
private String licensePlate;
private String unit;
/**
* 昵称
*/
private String nickname;
/**
* 毛重 单位：千克
*/
private Integer roughWeight;
/**
* 皮重 单位：千克
*/
private Integer tareWeight;
/**
* 净重
*/
private Integer settleWeight;
/**
* 产品名称
*/
private String goodsName;
/**
* 司机姓名
*/
private String driverName;
/**
* 项目名称
*/
private String projectName;
/**
* 看料员名称
*/
private String checkerName;
/**
* 进场时间
*/
private String inTime;
/**
* 出场时间
*/
private String outTime;
}

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java
View File

@ -28,6 +28,7 @@ public class OrderPagingResult {
* 手机号
*/
private String phone;
private String companyName;
// endregion
// region 订单信息
/**
@ -39,6 +40,7 @@ public class OrderPagingResult {
* 订单编号
*/
private String sn;
private String projectName;
/**
* 站点 Id
@ -79,6 +81,7 @@ public class OrderPagingResult {
* 审核备注
*/
private String auditMemo;
private String checkerName;
/**
* 订单类型; 字典代码：order_category

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -31,6 +31,7 @@ import com.njzscloud.supervisory.order.mapper.OrderInfoMapper;
import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
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 lombok.RequiredArgsConstructor;
@ -468,4 +469,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
.setOrderDetail(this.detail(orderCertificateParam.getOrderId()))
.setCertificateQrcode(qrcode);
}
public ObtainWeighBillResult obtainWeighBill(Long orderId) {
return baseMapper.obtainWeighBill(orderId);
}
}

3
njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml
View File

@ -5,6 +5,7 @@
<resultMap id="SearchBizProjectResultMap" autoMapping="true" type="com.njzscloud.supervisory.biz.pojo.result.SearchBizProjectResult">
<result property="contract" column="contract" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
<result property="auditStatus" column="audit_status" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
</resultMap>
<select id="paging" resultMap="SearchBizProjectResultMap">
@ -30,6 +31,8 @@
a.create_time,
a.modify_time,
a.deleted,
a.audit_status,
a.audit_memo,
b.company_name other_company_name,
c.company_name,
c.id company_id

13
njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -102,7 +102,10 @@
g.contacts trans_contacts,
g.phone trans_phone,
h.nickname,
h.phone
h.phone,
j.company_name,
k.nickname checker_name,
l.project_name
FROM order_info a
LEFT JOIN order_cargo_place b ON b.id = a.cargo_place_id
LEFT JOIN order_goods c ON c.id = a.goods_id
@ -112,6 +115,9 @@
LEFT JOIN biz_company g ON g.id = a.trans_company_id
LEFT JOIN sys_user h ON h.id = a.user_id
LEFT JOIN goods_category i ON i.id = c.goods_category_id
LEFT JOIN biz_company j ON j.user_id = a.user_id
LEFT JOIN sys_user k ON k.id = a.checker_id
LEFT JOIN biz_project l ON l.id = a.project_id
</sql>
<resultMap id="OrderPagingResultMap" autoMapping="true" type="com.njzscloud.supervisory.order.pojo.result.OrderPagingResult">
@ -146,4 +152,9 @@
</if>
LIMIT 1
</select>
<select id="obtainWeighBill"
resultType="com.njzscloud.supervisory.order.pojo.result.ObtainWeighBillResult">
<include refid="base_select"/>
WHERE a.id = #{orderId}
</select>
</mapper>