修改报检新增接口 调整装备字段

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

@@ -87,7 +87,7 @@
             idx_biz_jg_use_info ibjui
             left join idx_biz_jg_register_info ibjri on ibjui.record = ibjri.record
             left join idx_biz_jg_construction_info ibjci on ibjci.record = ibjri.record
-            left join idx_biz_jg_factory_info ibjfi on ibjci.record = ibjri.record
+            left join idx_biz_jg_factory_info ibjfi on ibjfi.record = ibjri.record
             left join idx_biz_jg_other_info ibjoi on ibjui.record = ibjoi.record
             left join amos_tzs_biz.tz_equipment_category tec on ibjri.equ_category = tec.code
             left join amos_tzs_biz.tz_equipment_category tec1 on ibjri.equ_list = tec1.code

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

@@ -121,19 +121,23 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationService.getBaseMapper().selectOne(wa);
 
             //检验检测结果方式
-            model.setResultType(jyjcOpeningApplication.getResultType());
+            if (jyjcOpeningApplication != null) {
+                model.setResultType(jyjcOpeningApplication.getResultType());
+            }
 
             model.setApplicationNo(UUID.randomUUID().toString());
             model.setApplicationDate(new Date());
             model = this.createWithModel(model);
             //保存报检装备监管码
             if (null != model.getEquip() && model.getEquip().size() > 0) {
-                List<Map<String, Object>> equip = model.getEquip();
-                List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
-                for (String s : jgm) {
+                List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class);
+                for (JyjcInspectionApplicationEquipModel equip : equips) {
                     JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
+                    equipInfo.setEquDefine(equip.getEquDefine());
+                    equipInfo.setEquList(equip.getEquList());
+                    equipInfo.setEquipUnicode(equip.getSuperVisonryCode());
+                    equipInfo.setEquCategory(equip.getEquCategoryName());
                     equipInfo.setApplicationSeq(model.getSequenceNbr());
-                    equipInfo.setEquipUnicode(s);
                     jyjcInspectionApplicationEquipService.save(equipInfo);
                 }
             }
@@ -152,18 +156,27 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 }
             }
         } else {
+            LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.HAVE_PROCESSED.getCode());
+            JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationService.getBaseMapper().selectOne(wa);
 
+            //检验检测结果方式
+            if (jyjcOpeningApplication != null) {
+                model.setResultType(jyjcOpeningApplication.getResultType());
+            }
             //更新报检装备监管码
             jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             if (model.getEquip().size() > 0) {
                // List<Map<String, Object>> equip = model.getEquip();
                // List<String> jgm = equip.stream().map(e -> e.get("equipUnicode").toString()).collect(Collectors.toList());
-                List<JyjcInspectionApplicationEquip> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquip.class);
-
-
-                for (JyjcInspectionApplicationEquip equip : equips) {
-                    equip.setApplicationSeq(model.getSequenceNbr());
-                    jyjcInspectionApplicationEquipService.save(equip);
+                List<JyjcInspectionApplicationEquipModel> equips = JSONObject.parseArray(JSON.toJSONString(model.getEquip()), JyjcInspectionApplicationEquipModel.class);
+                for (JyjcInspectionApplicationEquipModel equip : equips) {
+                    JyjcInspectionApplicationEquip equipInfo = new JyjcInspectionApplicationEquip();
+                    equipInfo.setEquDefine(equip.getEquDefine());
+                    equipInfo.setEquList(equip.getEquList());
+                    equipInfo.setEquipUnicode(equip.getSuperVisonryCode());
+                    equipInfo.setEquCategory(equip.getEquCategoryName());
+                    equipInfo.setApplicationSeq(model.getSequenceNbr());
+                    jyjcInspectionApplicationEquipService.save(equipInfo);
                 }
             }