Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -20,8 +20,8 @@
         tzjia.accept_date,
         tzjia.inspection_charge_phone,
         tui.name as  inspectionChargePerson,
-        tbei1.use_unit AS applicationUnitName,
-        tbei.use_unit AS inspectionUnitName,
+        tbei.use_unit AS applicationUnitName,
+        tbei1.use_unit AS inspectionUnitName,
         tzjia.status,
         cdd2.NAME AS statusName,
         tzjia.next_execute_ids as nextExecuteIds,
@@ -32,7 +32,7 @@
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
         LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
         LEFT JOIN tzs_user_info tui ON tui.sequence_nbr = tzjia.inspection_charge_person
-        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify
+        LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify and cdd.type = 'BJSBZL'
         LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
         LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
         LEFT JOIN cb_data_dictionary cdd3 ON cdd3.code = tzjia.inspection_type

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -132,14 +133,14 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 model.setStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
 
-            LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.HAVE_PROCESSED.getCode());
-            JyjcOpeningApplication jyjcOpeningApplication = jyjcOpeningApplicationService.getBaseMapper().selectOne(wa);
-
+            LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
+            List<JyjcOpeningApplication> jyjcOpeningApplications = jyjcOpeningApplicationService.getBaseMapper().selectList(wa);
+            if (CollectionUtils.isNotEmpty(jyjcOpeningApplications)){
                 //检验检测结果方式
-            if (jyjcOpeningApplication != null) {
-                model.setResultType(jyjcOpeningApplication.getResultType());
+                if (jyjcOpeningApplications.get(0).getResultType()!= null) {
+                    model.setResultType(jyjcOpeningApplications.get(0).getResultType());
+                }
             }
-
             List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
 
             model.setApplicationNo(codes.get(0));
@@ -171,7 +172,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             }
 
 
-
+            jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             //保存报检装备监管码
             for (JyjcInspectionApplicationEquip equipInfo : equipInfos) {
                 equipInfo.setApplicationSeq(model.getSequenceNbr());
@@ -191,13 +192,15 @@ 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);
-
+            LambdaQueryWrapper<JyjcOpeningApplication> wa = new LambdaQueryWrapper<JyjcOpeningApplication>().eq(JyjcOpeningApplication::getUnitCode, model.getInspectionUnitCode()).eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getCode());
+            List<JyjcOpeningApplication> jyjcOpeningApplications = jyjcOpeningApplicationService.getBaseMapper().selectList(wa);
+            if (CollectionUtils.isNotEmpty(jyjcOpeningApplications)){
                 //检验检测结果方式
-            if (jyjcOpeningApplication != null) {
-                model.setResultType(jyjcOpeningApplication.getResultType());
+                if (jyjcOpeningApplications.get(0).getResultType()!= null) {
+                    model.setResultType(jyjcOpeningApplications.get(0).getResultType());
                 }
+            }
+
             //更新报检装备监管码
             jyjcInspectionApplicationEquipService.getBaseMapper().deleteByApplicationSeq(model.getSequenceNbr());
             if (model.getEquip().size() > 0) {
@@ -370,7 +373,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             resultModel.setApplicationUnitCode(inspectionApplicationModel.getApplicationUnitCode());
             resultModel.setResultStatus(ResultStatusEnum.NO_RESULT.getCode());
             resultModel.setApplicationDate(inspectionApplicationModel.getApplicationDate());
-            resultModel.setResultType(inspectionApplicationModel.getResultType());
+        //    resultModel.setResultType(inspectionApplicationModel.getResultType());
+            resultModel.setResultType("input");
             resultModel.setInspectionType(inspectionApplicationModel.getInspectionType());
             // 解析设备
             resultModel.setBizType(inspectionApplicationModel.getBizType());