1.A032自测bug修改

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -124,6 +125,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     CodeUtil codeUtil;
 
+    @Autowired
+    private Sequence sequence;
+
     /**
      * @param auditPassDate   通过时间
      * @param exportParamsMap 参数map
@@ -240,6 +244,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private void updateOrCreateInspectionDetection(JSONObject map) {
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
         BeanUtil.copyProperties(map, inspectionDetectionInfo);
+
         if(map.get("jySeq") != null){
             // 更新逻辑
             InspectionDetectionInfo inspectionDetectionInfoDb = inspectionDetectionInfoMapper.selectById(map.get("jySeq").toString());
@@ -247,9 +252,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             inspectionDetectionInfoMapper.updateById(inspectionDetectionInfo);
         } else {
             // 插入逻辑
-            if(inspectionDetectionInfo.getInspectType() != null && inspectionDetectionInfo.getInspectStaffCode() != null){
+            if(inspectionDetectionInfo.getInspectType() != null && inspectionDetectionInfo.getInspectConclusion() != null){
+                inspectionDetectionInfo.setRecord(map.get("equipId").toString());
                 inspectionDetectionInfo.setRecDate(new Date());
-                inspectionDetectionInfo.setSequenceNbr(null);
+                inspectionDetectionInfo.setSequenceNbr(sequence.nextId() + "");
                 inspectionDetectionInfoMapper.insert(inspectionDetectionInfo);
             }
         }
@@ -907,11 +913,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private List<String> getInspectInfoByEquDefine(String equList, String equCategory, String equDefine){
         List<String> permissionInspectTypes = new ArrayList<>();
         // 使用登记时：需要《首次检验》类型检验信息的设备种类、设备类别、设备品种
-        String[] FIRST_INSPECT_EQULIST = {"3000", "4170"};
+        String[] FIRST_INSPECT_EQULIST = {"5000"};
         String[] FIRST_INSPECT_EQUCATEGORY = {"4400", "4900","4A00"};
         String[] FIRST_INSPECT_EQUDEFINE = {"4170"};
         // 使用登记时：需要《安装监督验》类型检验信息的设备种类、设备类别、设备品种
-        String[] AZJDJY_INSPECT_EQULIST = {"6000","9000","8000","1000"};
+        String[] AZJDJY_INSPECT_EQULIST = {"3000", "6000","9000","8000","1000"};
         String[] AZJDJY_INSPECT_EQUCATEGORY = {"4800","4300","4700","4D00","2100","2400"};
         String[] AZJDJY_INSPECT_EQUDEFINE = {"4110","4130","4140","4150","4190","4220","4210","4260","4270","4290"};
         // 使用登记时：需要《首次检验》或者《安装监督验检验》信息的设备种类、设备类别、设备品种

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -1020,7 +1020,7 @@
 												<w:sz-cs w:val="36"/>
 												<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
 											</w:rPr>
-                                            <#if equDefineCode?? && equDefineCode == '23T0' || equDefineCode == '2200'>
+                                            <#if equDefineCode?? && (equDefineCode == '23T0' || equDefineCode == '2200')>
                                             <w:t>使用单位地址：</w:t>
                                             <#else>
                                             <w:t>设备使用地点：</w:t>