diff --git a/src/main/java/com/zg/project/wisdom/domain/RkBill.java b/src/main/java/com/zg/project/wisdom/domain/RkBill.java index 2b92099..c5d61ea 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkBill.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkBill.java @@ -131,6 +131,12 @@ public class RkBill extends BaseEntity { /** 备注 */ @Excel(name = "备注") private String remark; + /** 是否上传照片(0否 1是) */ + @Excel(name = "是否上传照片", readConverterExp = "0=否,1=是") + private Integer isUploadPhoto; + /** 需求方(部门/单位) */ + @Excel(name = "需求方") + private String demandDeptName; // ================= getter / setter ================= @@ -217,7 +223,20 @@ public class RkBill extends BaseEntity { public String getRemark() { return remark; } public void setRemark(String remark) { this.remark = remark; } + public Integer getIsUploadPhoto() { + return isUploadPhoto; + } + public void setIsUploadPhoto(Integer isUploadPhoto) { + this.isUploadPhoto = isUploadPhoto; + } + public String getDemandDeptName() { + return demandDeptName; + } + + public void setDemandDeptName(String demandDeptName) { + this.demandDeptName = demandDeptName; + } @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -247,6 +266,8 @@ public class RkBill extends BaseEntity { .append("startDate", startDate) .append("endDate", endDate) .append("remark", remark) + .append("isUploadPhoto", isUploadPhoto) + .append("demandDeptName", demandDeptName) .toString(); } } diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java index 08be7b5..a241385 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java @@ -256,6 +256,12 @@ public class RkInfo extends BaseEntity private String scene; private String sceneName; + /** 是否上传照片(0否 1是) */ + @Excel(name = "是否上传照片", readConverterExp = "0=否,1=是") + private Integer isUploadPhoto; + /** 需求方(部门/单位) */ + @Excel(name = "需求方") + private String demandDeptName; public void setId(Long id) { @@ -820,7 +826,20 @@ public class RkInfo extends BaseEntity { return sceneName; } + public Integer getIsUploadPhoto() { + return isUploadPhoto; + } + public void setIsUploadPhoto(Integer isUploadPhoto) { + this.isUploadPhoto = isUploadPhoto; + } + public String getDemandDeptName() { + return demandDeptName; + } + + public void setDemandDeptName(String demandDeptName) { + this.demandDeptName = demandDeptName; + } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -886,6 +905,8 @@ public class RkInfo extends BaseEntity .append("endDate", endDate) .append("totalAmount", totalAmount) .append("scene", getScene()) + .append("isUploadPhoto",isUploadPhoto) + .append("demandDeptName", demandDeptName) .toString(); } } diff --git a/src/main/java/com/zg/project/wisdom/domain/RkRecord.java b/src/main/java/com/zg/project/wisdom/domain/RkRecord.java index a594aa1..20a1bd2 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkRecord.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkRecord.java @@ -268,6 +268,15 @@ public class RkRecord extends BaseEntity @Excel(name = "备注") private String remark; + /** 是否上传照片(0否 1是) */ + @Excel(name = "是否上传照片", readConverterExp = "0=否,1=是") + private Integer isUploadPhoto; + + /** 需求方(部门/单位) */ + @Excel(name = "需求方") + private String demandDeptName; + + public void setId(Long id) { this.id = id; @@ -837,6 +846,20 @@ public class RkRecord extends BaseEntity public void setRemark(String remark) { this.remark = remark; } + public Integer getIsUploadPhoto() { + return isUploadPhoto; + } + + public void setIsUploadPhoto(Integer isUploadPhoto) { + this.isUploadPhoto = isUploadPhoto; + } + public String getDemandDeptName() { + return demandDeptName; + } + + public void setDemandDeptName(String demandDeptName) { + this.demandDeptName = demandDeptName; + } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -904,6 +927,8 @@ public class RkRecord extends BaseEntity .append("startDate", startDate) .append("endDate", endDate) .append("rkInfoId", getRkInfoId()) - .toString(); + .append("isUploadPhoto", isUploadPhoto) + .append("demandDeptName", demandDeptName) + .toString(); } } 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 5fb4abe..cfbb45a 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 @@ -165,7 +165,7 @@ public class RkBillServiceImpl implements IRkBillService info.setScene(scene); info.setCreateTime(now); info.setCreateBy(userId); - + info.setIsUploadPhoto(bill.getIsUploadPhoto()); rkInfoMapper.insertRkInfo(info); // rk_record @@ -262,7 +262,7 @@ public class RkBillServiceImpl implements IRkBillService // ⑤ 关联明细 record.setRkInfoId(info.getId()); record.setRdid(info.getId()); - + record.setIsUploadPhoto(bill.getIsUploadPhoto()); return record; } /** @@ -464,6 +464,8 @@ public class RkBillServiceImpl implements IRkBillService updateRecord.setOperator(rkBill.getOperator()); updateRecord.setIsDelivery(rkBill.getIsDelivery()); updateRecord.setWlType(rkBill.getWlType()); + updateRecord.setIsUploadPhoto(rkBill.getIsUploadPhoto()); + // 执行批量更新 rkRecordMapper.updateRecordByBillNo(updateRecord); // ====================== 3. 同步更新 rk_info ====================== @@ -478,7 +480,7 @@ public class RkBillServiceImpl implements IRkBillService updateInfo.setOperator(rkBill.getOperator()); updateInfo.setIsDelivery(rkBill.getIsDelivery()); updateInfo.setWlType(rkBill.getWlType()); - + updateInfo.setIsUploadPhoto(rkBill.getIsUploadPhoto()); rkInfoMapper.updateInfoByBillNo(updateInfo); diff --git a/src/main/resources/mybatis/wisdom/RkBillMapper.xml b/src/main/resources/mybatis/wisdom/RkBillMapper.xml index 15aae72..f261601 100644 --- a/src/main/resources/mybatis/wisdom/RkBillMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkBillMapper.xml @@ -44,6 +44,8 @@ + + @@ -72,7 +74,7 @@ rb.create_time, rb.update_by, rb.update_time, - + rb.is_upload_photo, mt.type_name AS wl_type_name, COALESCE(sit.type_name, sot.type_name) AS operation_type_name, su.nick_name AS operator_name, @@ -199,7 +201,9 @@ create_time, update_by, update_time, - is_delete + is_delete, + is_upload_photo, + demand_dept_name FROM rk_bill WHERE bill_no = #{billNo} AND (is_delete = '0' OR is_delete IS NULL) @@ -229,7 +233,9 @@ remark, create_by, create_time, - is_delete + is_delete, + is_upload_photo, + demand_dept_name ) VALUES ( #{billNo}, #{bizType}, @@ -248,7 +254,9 @@ #{remark}, #{createBy}, #{createTime}, - #{isDelete} + #{isDelete}, + #{isUploadPhoto}, + #{demandDeptName} ) @@ -272,6 +280,8 @@ remark = #{remark}, is_delivery = #{isDelivery}, is_delete = #{isDelete}, + is_upload_photo = #{isUploadPhoto}, + demand_dept_name = #{demandDeptName}, WHERE id = #{id} diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 4c71e6c..0f4072a 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -68,6 +68,8 @@ + + @@ -275,6 +277,9 @@ AND ri.operation_time <= #{endDate} + + AND ri.remark LIKE CONCAT('%', #{remark}, '%') + @@ -309,7 +314,7 @@ is_delivery, fycde_1, fycde_2, is_update, - create_by, create_time, is_delete,scene + create_by, create_time, is_delete,scene,is_upload_photo,demand_dept_name ) VALUES ( #{operationType}, #{bizType}, #{wlType}, #{cangku}, #{operationTime}, #{operator}, @@ -327,7 +332,7 @@ #{isDelivery}, #{fycde1}, #{fycde2}, #{isUpdate}, - #{createBy}, #{createTime}, #{isDelete},#{scene} + #{createBy}, #{createTime}, #{isDelete},#{scene},#{isUploadPhoto},#{demandDeptName} ) @@ -383,7 +388,9 @@ update_by = #{updateBy}, update_time = #{updateTime}, is_delete = #{isDelete}, - scene = #{scene} + scene = #{scene}, + is_upload_photo = #{isUploadPhoto}, + demand_dept_name = #{demandDeptName}, WHERE id = #{id} @@ -691,6 +698,9 @@ is_delivery = #{isDelivery}, + + is_upload_photo = #{isUploadPhoto}, + WHERE bill_no = #{billNo} diff --git a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml index 3730654..72c7e6f 100644 --- a/src/main/resources/mybatis/wisdom/RkRecordMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkRecordMapper.xml @@ -86,6 +86,8 @@ + + @@ -404,7 +406,9 @@ create_time, update_by, update_time, - is_delete + is_delete, + is_upload_photo, + demand_dept_name ) VALUES ( @@ -471,7 +475,9 @@ #{createTime}, #{updateBy}, #{updateTime}, - #{isDelete} + #{isDelete}, + #{isUploadPhoto}, + #{demandDeptName} ) @@ -542,6 +548,8 @@ update_by = #{updateBy}, update_time = #{updateTime}, is_delete = #{isDelete}, + is_upload_photo = #{isUploadPhoto}, + demand_dept_name = #{demandDeptName}, WHERE id = #{id} @@ -840,6 +848,9 @@ AND rr.operation_time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) + + AND rr.remark LIKE CONCAT('%', #{remark}, '%') + @@ -930,7 +941,9 @@ is_delivery = #{isDelivery}, - + + is_upload_photo = #{isUploadPhoto}, + update_time = NOW()