检验方案添加附件能拼接预览&一览表回写

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderitemreport/vo/BoilerTaskOrderItemReportSaveReqVO.java

@@ -155,8 +155,7 @@ public class BoilerTaskOrderItemReportSaveReqVO {
     @Schema(description = "出具报告url", example = "https://www.iocoder.cn")
     private String issueUrl;
 
-    @Schema(description = "是否上报(0=否,1=是)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否上报(0=否,1=是)不能为空")
+    @Schema(description = "是否上报(0=否,1=是)")
     private Boolean isReported;
 
     @Schema(description = "未知", example = "1852")
@@ -177,8 +176,7 @@ public class BoilerTaskOrderItemReportSaveReqVO {
     @Schema(description = "整改视频")
     private String rectificationVideo;
 
-    @Schema(description = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)不能为空")
+    @Schema(description = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private Integer rectificationStatus;
 
     @Schema(description = "签名url", example = "https://www.iocoder.cn")
@@ -205,8 +203,7 @@ public class BoilerTaskOrderItemReportSaveReqVO {
     @Schema(description = "是否手动上传")
     private Boolean isManual;
 
-    @Schema(description = "是否办结上报(0=否,1=是)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否办结上报(0=否,1=是)不能为空")
+    @Schema(description = "是否办结上报(0=否,1=是)")
     private Boolean isCloseReported;
 
     @Schema(description = "意见通知书url", example = "https://www.iocoder.cn")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorderreport/vo/BoilerTaskOrderReportSaveReqVO.java

@@ -155,8 +155,7 @@ public class BoilerTaskOrderReportSaveReqVO {
     @Schema(description = "出具报告url", example = "https://www.iocoder.cn")
     private String issueUrl;
 
-    @Schema(description = "是否上报(0=否,1=是)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否上报(0=否,1=是)不能为空")
+    @Schema(description = "是否上报(0=否,1=是)")
     private Boolean isReported;
 
     @Schema(description = "审批流id", example = "9126")
@@ -177,8 +176,7 @@ public class BoilerTaskOrderReportSaveReqVO {
     @Schema(description = "整改视频")
     private String rectificationVideo;
 
-    @Schema(description = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @NotNull(message = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)不能为空")
+    @Schema(description = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private Integer rectificationStatus;
 
     @Schema(description = "签名url", example = "https://www.iocoder.cn")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorderitemreport/vo/PipeTaskOrderItemReportSaveReqVO.java

@@ -155,8 +155,7 @@ public class PipeTaskOrderItemReportSaveReqVO {
     @Schema(description = "出具报告url", example = "https://www.iocoder.cn")
     private String issueUrl;
 
-    @Schema(description = "是否上报(0=否,1=是)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否上报(0=否,1=是)不能为空")
+    @Schema(description = "是否上报(0=否,1=是)")
     private Boolean isReported;
 
     @Schema(description = "未知", example = "8439")
@@ -177,8 +176,7 @@ public class PipeTaskOrderItemReportSaveReqVO {
     @Schema(description = "整改视频")
     private String rectificationVideo;
 
-    @Schema(description = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)不能为空")
+    @Schema(description = "整改状态 (0=待确认,1=待整改,2=已提交,3=材料有误,4=整改通过)")
     private Integer rectificationStatus;
 
     @Schema(description = "签名url", example = "https://www.iocoder.cn")
@@ -205,8 +203,7 @@ public class PipeTaskOrderItemReportSaveReqVO {
     @Schema(description = "是否手动上传")
     private Boolean isManual;
 
-    @Schema(description = "是否办结上报(0=否,1=是)", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否办结上报(0=否,1=是)不能为空")
+    @Schema(description = "是否办结上报(0=否,1=是)")
     private Boolean isCloseReported;
 
     @Schema(description = "意见通知书url", example = "https://www.iocoder.cn")

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12116_202400RecordOFData.java

@@ -101,16 +101,22 @@ public class QC12116_202400RecordOFData implements IDynamicOFData {
                     //一览表生成时先删除所有值，防止设备不对
                     //dynamicTbValService.deleteDynamicTbValByRefId(refId);
 
+                    //只需第一次初始化的数据
+                    if (firstInsDO == null) {
+
+                        result.put("securityDept_edit",equipPipeDO.getDepartment());
+                        result.put("securityMan_edit",equipPipeDO.getSecurityMan());
+                        result.put("contact_edit",equipPipeDO.getContact());
+                        result.put("contactPhone_edit",equipPipeDO.getContactPhone());
+
+                    }
+
                     //设备信息
                     result.put("projectNo",equipPipeDO.getProjectNo());
                     result.put("unitName",equipPipeDO.getUnitName());
                     result.put("unitAddress",equipPipeDO.getUnitAddress());
                     result.put("pipeAddress",equipPipeDO.getPipeAddress());
-                    result.put("securityMan",equipPipeDO.getSecurityMan());
                     result.put("relationDeptName",equipPipeDO.getRelationDeptName());
-                    result.put("securityDept",equipPipeDO.getDepartment());
-                    result.put("contact",equipPipeDO.getContact());
-                    result.put("contactPhone",equipPipeDO.getContactPhone());
                     result.put("projectName",equipPipeDO.getProjectName());
                     result.put("certificateNo",equipPipeDO.getCertificateNo());
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3843,6 +3843,33 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
                     }
                 }
             }
+            //一览表回写设备信息逻辑
+            PipeTaskOrderItemReportDO updateReportDO = taskOrderItemReportMapper.selectById(orderItemEnterVO.getId());
+            if (updateReportDO != null) {
+                DynamicTbDO dynamicTbDO = dynamicTbMapper.selectById(updateReportDO.getTemplateId());
+                if (dynamicTbDO != null && dynamicTbDO.getTbCode().contains("QC12116")){
+                    if (updateReportDO.getOrderItemId() != null){
+                        PipeTaskOrderItemDO pipeTaskOrderItemDO = pipeTaskOrderItemMapper.selectById(updateReportDO.getOrderItemId());
+                        if (pipeTaskOrderItemDO != null){
+                            EquipPipeDO updatePipeDO = new EquipPipeDO();
+                            updatePipeDO.setId(pipeTaskOrderItemDO.getEquipId());
+                            if (jsonObject.containsKey("securityMan_edit")) {
+                                updatePipeDO.setSecurityMan(jsonObject.getString("securityMan_edit"));
+                            }
+                            if (jsonObject.containsKey("securityDept_edit")) {
+                                updatePipeDO.setDepartment(jsonObject.getString("securityDept_edit"));
+                            }
+                            if (jsonObject.containsKey("contact_edit")) {
+                                updatePipeDO.setContact(jsonObject.getString("contact_edit"));
+                            }
+                            if (jsonObject.containsKey("contactPhone_edit")) {
+                                updatePipeDO.setContactPhone(jsonObject.getString("contactPhone_edit"));
+                            }
+                            equipPipeMapper.updateById(updatePipeDO);
+                        }
+                    }
+                }
+            }
         }
         if (StringUtils.isNotBlank(orderItemEnterVO.getPrepareUrl())) {
             taskOrderItemReportDO.setPrepareUrl(orderItemEnterVO.getPrepareUrl());