diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java index cfbb45a..fc06f89 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java @@ -464,8 +464,10 @@ public class RkBillServiceImpl implements IRkBillService updateRecord.setOperator(rkBill.getOperator()); updateRecord.setIsDelivery(rkBill.getIsDelivery()); updateRecord.setWlType(rkBill.getWlType()); + updateRecord.setDemandDeptName(rkBill.getDemandDeptName()); updateRecord.setIsUploadPhoto(rkBill.getIsUploadPhoto()); + // 执行批量更新 rkRecordMapper.updateRecordByBillNo(updateRecord); // ====================== 3. 同步更新 rk_info ====================== @@ -481,6 +483,7 @@ public class RkBillServiceImpl implements IRkBillService updateInfo.setIsDelivery(rkBill.getIsDelivery()); updateInfo.setWlType(rkBill.getWlType()); updateInfo.setIsUploadPhoto(rkBill.getIsUploadPhoto()); + updateInfo.setDemandDeptName(rkBill.getDemandDeptName()); rkInfoMapper.updateInfoByBillNo(updateInfo); diff --git a/src/main/resources/mybatis/wisdom/RkBillMapper.xml b/src/main/resources/mybatis/wisdom/RkBillMapper.xml index f261601..a7a7d3d 100644 --- a/src/main/resources/mybatis/wisdom/RkBillMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkBillMapper.xml @@ -75,6 +75,7 @@ rb.update_by, rb.update_time, rb.is_upload_photo, + rb.demand_dept_name, mt.type_name AS wl_type_name, COALESCE(sit.type_name, sot.type_name) AS operation_type_name, su.nick_name AS operator_name, diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 0f4072a..276ef6f 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -168,7 +168,12 @@ AND ri.is_delete = #{isDelete} - + + AND ri.is_upload_photo = #{isUploadPhoto} + + + AND ri.demand_dept_name = #{demandDeptName} + AND ri.operation_time >= #{startDate} @@ -280,6 +285,12 @@ AND ri.remark LIKE CONCAT('%', #{remark}, '%') + + AND ri.is_upload_photo = #{isUploadPhoto} + + + AND ri.demand_dept_name = #{demandDeptName} + @@ -701,6 +712,9 @@ is_upload_photo = #{isUploadPhoto}, + + demand_dept_name = #{demandDeptName}, + WHERE bill_no = #{billNo} diff --git a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml index 72c7e6f..abdb443 100644 --- a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml @@ -233,6 +233,12 @@ AND rr.is_delete = #{isDelete} + + AND rr.is_upload_photo = #{isUploadPhoto} + + + AND rr.demand_dept_name = #{demandDeptName} + AND ( @@ -703,7 +709,12 @@ AND rr.is_borrowed = #{isBorrowed} - + + AND rr.is_upload_photo = #{isUploadPhoto} + + + AND rr.demand_dept_name = #{demandDeptName} + AND (rr.is_delete = '0' OR rr.is_delete = 0 OR rr.is_delete IS NULL) @@ -851,6 +862,12 @@ AND rr.remark LIKE CONCAT('%', #{remark}, '%') + + AND rr.is_upload_photo = #{isUploadPhoto} + + + AND rr.demand_dept_name = #{demandDeptName} + @@ -944,6 +961,9 @@ is_upload_photo = #{isUploadPhoto}, + + demand_dept_name = #{demandDeptName}, + update_time = NOW()