fix(jg):处理车用气瓶和安装告知错误数据

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgInstallationByWorkFlowController.java

@@ -7,10 +7,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServ
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -88,4 +85,17 @@ public class JgInstallationByWorkFlowController {
         jgInstallationNoticeServiceImpl.accept(jgInstallationNoticeDto, op);
         return ResponseHelper.buildResponse(null);
     }
+
+    /**
+     * 处理安装告知流程结束，业务未结束单子问题
+     * @param applyNo 申请单号
+     * @return s
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handleNoticeWrongData")
+    @ApiOperation(httpMethod = "POST", value = "处理安装告知流程结束，业务未结束单子问题", notes = "处理安装告知流程结束，业务未结束单子问题")
+    public ResponseModel<Object> handleNoticeWrongData(@RequestParam("applyNo") String applyNo) {
+        jgInstallationNoticeServiceImpl.handleNoticeWrongData(applyNo);
+        return ResponseHelper.buildResponse("ok");
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgVehicleInformationController.java

@@ -248,4 +248,19 @@ public class JgVehicleInformationController extends BaseController {
     public ResponseModel<Object> saveOrUpdateHisData(@RequestBody JSONObject map) {
         return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.saveOrUpdateHisData(map));
     }
+
+    /**
+     * 处理车用气瓶流程结束，业务未结束单子问题
+     * @param applyNo 申请单号
+     * @param equDefineCode 设备品种code
+     * @return s
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handleVehicleWrongData")
+    @ApiOperation(httpMethod = "POST", value = "处理车用气瓶流程结束，业务未结束单子问题", notes = "处理车用气瓶流程结束，业务未结束单子问题")
+    public ResponseModel<Object> handleVehicleWrongData(@RequestParam("applyNo") String applyNo,
+                                                        @RequestParam("equDefineCode") String equDefineCode) {
+        jgVehicleInformationServiceImpl.handleVehicleWrongData(applyNo, equDefineCode);
+        return ResponseHelper.buildResponse("ok");
+    }
 }

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -212,6 +212,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     List<String> useInnerCodeList = new ArrayList<>();// 单位内部编号集合
     List<String> equCodeList = new ArrayList<>();// 设备代码集合
     List<String> factoryNumList = new ArrayList<>();
+    private static final int MAX_UPLOAD = 2000; // 最大上传条数
     // 出厂编码集合
     @Autowired
     RestHighLevelClient restHighLevelClient;
@@ -1058,7 +1059,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             // 根据96333码检查唯一性
             LambdaQueryWrapper<IdxBizJgOtherInfo> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(IdxBizJgOtherInfo::getCode96333, equipmentInfoForm.get(CODE96333));
-            wrapper.notIn(IdxBizJgOtherInfo::getClaimStatus, "待认领", "已拒领", "草稿");
+            wrapper.notIn(IdxBizJgOtherInfo::getClaimStatus, "待认领,已拒领,草稿");
             wrapper.ne(!ObjectUtils.isEmpty(equipmentInfoForm.get(OTHERINFO_SEQ)), IdxBizJgOtherInfo::getSequenceNbr, equipmentInfoForm.get(OTHERINFO_SEQ));
             Integer count = otherInfoMapper.selectCount(wrapper);
             if (count > 0) {
@@ -4139,6 +4140,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                             if (!checkMsg.isEmpty()) {
                                 resultError.add(checkMsg);
                             }
+                            // 限制最大上传数量
+                            if (aircraftList.size() > MAX_UPLOAD) {
+                                resultError.add("每次最多允许上传 " + MAX_UPLOAD + " 条数据，请分批上传！");
+                                throw new BadRequest(resultError.stream().filter(s -> !s.isEmpty()).collect(Collectors.joining("<br/>")));
+                            }
                         }
 
                         @Override

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/JgVehicleInformationServiceImpl.java

@@ -2533,4 +2533,17 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     public boolean countUseTimesForInvalid(Object code) {
         return jgVehicleInformationMapper.countUseTimesForInvalid(code) <= 0;
     }
+
+    public void handleVehicleWrongData(String applyNo, String equDefineCode) {
+        JgVehicleInformation vehicleInformation = jgVehicleInformationMapper.selectOne(new LambdaQueryWrapper<JgVehicleInformation>()
+                .in(JgVehicleInformation::getApplyNo, applyNo)
+                .eq(JgVehicleInformation::getIsDelete, 0)
+                .ne(JgVehicleInformation::getStatus, "已作废"));
+        WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+        workflowResultDto.setNextExecutorRoleIds(vehicleInformation.getNextExecuteIds());
+        workflowResultDto.setNextTaskCode("已完成");
+        workflowResultDto.setNextTaskId(vehicleInformation.getNextTaskId());
+        workflowResultDto.setNextExecutorUserIds(vehicleInformation.getNextExecuteUserIds());
+        this.updateData(vehicleInformation.getSequenceNbr(), "0", workflowResultDto, Boolean.FALSE, equDefineCode);
+    }
 }
\ No newline at end of file