1.增加是否有是否存在不符合项

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionResult.java

@@ -201,4 +201,11 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField(value = "supervisory_code")
     private String supervisoryCode;
+
+
+    /**
+     * 是否存在不符合项
+     */
+    @TableField(value = "is_exist_nc")
+    private Boolean isExistNc;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionResultModel.java

 package com.yeejoin.amos.boot.module.jyjc.api.model;
 
-import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +8,6 @@ import lombok.EqualsAndHashCode;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -129,7 +127,7 @@ public class JyjcInspectionResultModel extends BaseModel {
     private String useUnitCreditCode;
 
     @ApiModelProperty(value = "检验结果技术参数")
-    private Map<String,Object> resultParamModelMap;
+    private Map<String, Object> resultParamModelMap;
 
     @ApiModelProperty(value = "附件类型(特种设备检验报告:1,监检证书:2)")
     private String attachmentType;
@@ -168,4 +166,9 @@ public class JyjcInspectionResultModel extends BaseModel {
      * 身份标识（前端行内权限按钮控制用）
      */
     private String identity;
+
+    /**
+     * 是否存在不符合项
+     */
+    private Boolean isExistNc;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionResultMapper.xml

@@ -161,6 +161,6 @@
                 </otherwise>
             </choose>
         </where>
-        ORDER BY res.application_date DESC
+        ORDER BY res.sequence_nbr DESC
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -625,6 +625,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setEquDefine(applicationEquipModels.get(i).getEquDefine());
             resultModel.setEquCategory(applicationEquipModels.get(i).getEquCategory());
             resultModel.setEquList(applicationEquipModels.get(i).getEquList());
+            resultModel.setIsExistNc(false);
             resultModels.add(resultModel);
         }
         inspectionResultService.saveOrUpdateBatch(resultModels);