面损表增加附件

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/FabricLossReview.java

@@ -39,7 +39,10 @@ public class FabricLossReview {
     //审批人
     private String approvalMan;
 
+    // 状态
     private String status;
+    // 附件
+    private String attachs;
 
     //保存日期
     private String createTimeB;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -142,7 +142,7 @@
                  content ->> '$.number' as number, content ->> '$.contractNo' as contractNo,
                  content ->> '$.cPersonName' as cPersonName,
                  content ->> '$.outboundNumber' as outboundNumber,
-                 content ->> '$.makingPeople' as makingPeople, status
+                 content ->> '$.makingPeople' as makingPeople, status, attachs
         from sy_fabric_loss_report
         where 1=1
         <if test="sy.createTimeB != null and sy.createTimeB !='' and sy.createTimeE != null and sy.createTimeE !=''">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/FabricLossController.java

@@ -86,9 +86,11 @@ public class FabricLossController {
 
 		FabricLoss fabricLoss = null;
 		String status = "";
+		String attachs = "";
 		if (syFabricLossReport != null){
 			fabricLoss = JSON.parseObject(JSON.toJSONString(syFabricLossReport.getContent()), FabricLoss.class);
 			status = syFabricLossReport.getStatus();
+			attachs = syFabricLossReport.getAttachs();
 		}
 		if (fabricLoss == null || update == 1) {
 			fabricLoss = fabricLossService.getFabricLossData(csocode, fabricLoss);
@@ -99,6 +101,7 @@ public class FabricLossController {
 			result.setMessage("计划号有误，获取不到数据");
 		}else{
 			fabricLoss.setStatus(status);
+			fabricLoss.setAttachs(attachs);
 			result.setSuccess(fabricLoss.isSuccess());
 			result.setResult(fabricLoss);
 			result.setMessage(fabricLoss.getMessage());
@@ -153,8 +156,11 @@ public class FabricLossController {
 		if (oConvertUtils.isEmpty(fabricLoss.getCCode())){
 			return ret.error500("无效的计划号，不能保存");
 		}
+		String attachs = fabricLoss.getAttachs();
+
 		fabricLoss = fabricLossService.getFabricLossData(fabricLoss.getCCode(), fabricLoss);
 		fabricLoss.setEdit(1);
+		fabricLoss.setAttachs("");
 
 
 		QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
@@ -164,11 +170,14 @@ public class FabricLossController {
 		if (syFabricLossReportList.size()>0){
 			SyFabricLossReport syFabricLossReport = syFabricLossReportList.get(0);
 			syFabricLossReport.setContent(fabricLossJson);
+			syFabricLossReport.setAttachs(attachs);
 			syFabricLossReportService.updateById(syFabricLossReport);
 		}else{
 			SyFabricLossReport syFabricLossReport = new SyFabricLossReport();
 			syFabricLossReport.setPlanCode(fabricLoss.getCCode());
 			syFabricLossReport.setContent(fabricLossJson);
+			syFabricLossReport.setStatus("保存");
+			syFabricLossReport.setAttachs(attachs);
 			syFabricLossReportService.save(syFabricLossReport);
 		}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FabricLoss.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.report.entity;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -74,7 +75,9 @@ public class FabricLoss {
     String message;
     // 保存标识，1-已保存，0-未保存
     int edit;
-
+    // 状态
     String status;
+    // 附件，多个逗号分割
+    String attachs;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/SyFabricLossReport.java

@@ -109,4 +109,8 @@ public class SyFabricLossReport {
 	@Excel(name = "状态", width = 15)
 	@ApiModelProperty(value = "状态")
 	private String status;
+
+	@Excel(name = "附件", width = 15)
+	@ApiModelProperty(value = "附件")
+	private String attachs;
 }