diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 5e41164..0af53a1 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -53,6 +53,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.id in diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 5e41164..0af53a1 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -53,6 +53,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index a872bf2..3359997 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -48,6 +48,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.create_user = #{request.createUser} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 5e41164..0af53a1 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -53,6 +53,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index a872bf2..3359997 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -48,6 +48,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.create_user = #{request.createUser} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7fa819a..977153d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -3,12 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.dto.equipment.AcceptanceCheckRequest; +import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.EquipmentApplyTypeEnum; import com.casic.missiles.enums.ExportEnum; @@ -19,11 +21,15 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import javassist.expr.NewArray; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -67,6 +73,7 @@ public Page acceptanceCheckList(Page page, AcceptanceCheckRequest request) { boolean searchBusinessKey = true; List businessKeys = new ArrayList<>(); + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 String status = request.getApprovalStatus(); switch (status){ @@ -86,7 +93,9 @@ break; // 未通过 case ApprovalStatusEnum.FAILED: - businessKeys = baseApprovalService.getFailedList(request.getFormId()); + businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; // 已取消 case ApprovalStatusEnum.CANCELED: @@ -112,8 +121,12 @@ Page resultPage = acceptanceCheckMapper.acceptanceCheckList(page, request); for (AcceptanceCheck equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ - // 不是查或草稿箱，赋值对应审批状态 + // 不是全查或草稿箱，赋值对应审批状态 equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -144,6 +157,15 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + Long maxNo = equipmentApplyMapper.selectMaxNo(); + // 生成编号 + String applyNo = NumberGeneratorUtil.getContactNo("sbjxbyysd", maxNo); + equipmentApply.setApplyNo(applyNo); + // 草稿箱状态 + equipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if(StringUtils.isEmpty(equipmentApply.getCreateUser()) && ShiroKit.getUser() != null){ + equipmentApply.setCreateUser(ShiroKit.getUser().getId().toString()); + } // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ // 新增附件列表 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 5e41164..0af53a1 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -53,6 +53,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index a872bf2..3359997 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -48,6 +48,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.create_user = #{request.createUser} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7fa819a..977153d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -3,12 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.dto.equipment.AcceptanceCheckRequest; +import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.EquipmentApplyTypeEnum; import com.casic.missiles.enums.ExportEnum; @@ -19,11 +21,15 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import javassist.expr.NewArray; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -67,6 +73,7 @@ public Page acceptanceCheckList(Page page, AcceptanceCheckRequest request) { boolean searchBusinessKey = true; List businessKeys = new ArrayList<>(); + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 String status = request.getApprovalStatus(); switch (status){ @@ -86,7 +93,9 @@ break; // 未通过 case ApprovalStatusEnum.FAILED: - businessKeys = baseApprovalService.getFailedList(request.getFormId()); + businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; // 已取消 case ApprovalStatusEnum.CANCELED: @@ -112,8 +121,12 @@ Page resultPage = acceptanceCheckMapper.acceptanceCheckList(page, request); for (AcceptanceCheck equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ - // 不是查或草稿箱，赋值对应审批状态 + // 不是全查或草稿箱，赋值对应审批状态 equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -144,6 +157,15 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + Long maxNo = equipmentApplyMapper.selectMaxNo(); + // 生成编号 + String applyNo = NumberGeneratorUtil.getContactNo("sbjxbyysd", maxNo); + equipmentApply.setApplyNo(applyNo); + // 草稿箱状态 + equipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if(StringUtils.isEmpty(equipmentApply.getCreateUser()) && ShiroKit.getUser() != null){ + equipmentApply.setCreateUser(ShiroKit.getUser().getId().toString()); + } // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ // 新增附件列表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 40fd4d9..5f08d09 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -73,6 +73,7 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (status){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -87,6 +88,8 @@ break; case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); @@ -110,6 +113,10 @@ for (EquipmentApply equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // todo 如果查全部，怎么设置审批状态 if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -197,13 +204,21 @@ @Override public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { - // 删除表单对应流程实例 - ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ - //本地删除 - if(equipmentApplyMapper.deleteById(request.getId())>0){ - return ReturnUtil.success(); + int flag = 0; + // 审批操作-删除 + if(StringUtils.isNotEmpty(request.getTaskId())){ + // 删除表单对应流程实例 + ReturnDTO returnDTO = approvalOperateService.delete(request); + if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + //本地删除 + flag = equipmentApplyMapper.deleteById(request.getId()); } + }else{ + // 草稿箱等非审批操作删除 + flag = equipmentApplyMapper.deleteById(request.getId()); + } + if(flag>0){ + return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 5e41164..0af53a1 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -53,6 +53,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index a872bf2..3359997 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -48,6 +48,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.create_user = #{request.createUser} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7fa819a..977153d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -3,12 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.dto.equipment.AcceptanceCheckRequest; +import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.EquipmentApplyTypeEnum; import com.casic.missiles.enums.ExportEnum; @@ -19,11 +21,15 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import javassist.expr.NewArray; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -67,6 +73,7 @@ public Page acceptanceCheckList(Page page, AcceptanceCheckRequest request) { boolean searchBusinessKey = true; List businessKeys = new ArrayList<>(); + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 String status = request.getApprovalStatus(); switch (status){ @@ -86,7 +93,9 @@ break; // 未通过 case ApprovalStatusEnum.FAILED: - businessKeys = baseApprovalService.getFailedList(request.getFormId()); + businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; // 已取消 case ApprovalStatusEnum.CANCELED: @@ -112,8 +121,12 @@ Page resultPage = acceptanceCheckMapper.acceptanceCheckList(page, request); for (AcceptanceCheck equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ - // 不是查或草稿箱，赋值对应审批状态 + // 不是全查或草稿箱，赋值对应审批状态 equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -144,6 +157,15 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + Long maxNo = equipmentApplyMapper.selectMaxNo(); + // 生成编号 + String applyNo = NumberGeneratorUtil.getContactNo("sbjxbyysd", maxNo); + equipmentApply.setApplyNo(applyNo); + // 草稿箱状态 + equipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if(StringUtils.isEmpty(equipmentApply.getCreateUser()) && ShiroKit.getUser() != null){ + equipmentApply.setCreateUser(ShiroKit.getUser().getId().toString()); + } // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ // 新增附件列表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 40fd4d9..5f08d09 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -73,6 +73,7 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (status){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -87,6 +88,8 @@ break; case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); @@ -110,6 +113,10 @@ for (EquipmentApply equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // todo 如果查全部，怎么设置审批状态 if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -197,13 +204,21 @@ @Override public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { - // 删除表单对应流程实例 - ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ - //本地删除 - if(equipmentApplyMapper.deleteById(request.getId())>0){ - return ReturnUtil.success(); + int flag = 0; + // 审批操作-删除 + if(StringUtils.isNotEmpty(request.getTaskId())){ + // 删除表单对应流程实例 + ReturnDTO returnDTO = approvalOperateService.delete(request); + if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + //本地删除 + flag = equipmentApplyMapper.deleteById(request.getId()); } + }else{ + // 草稿箱等非审批操作删除 + flag = equipmentApplyMapper.deleteById(request.getId()); + } + if(flag>0){ + return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index 6e30931..4fe93a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.equipment.IEquipmentStandardApplyService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -83,6 +84,7 @@ List businessKeys = new ArrayList<>(); boolean searchBusinessKey = true; String status = request.getApprovalStatus(); + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 switch (request.getApprovalStatus()){ case ApprovalStatusEnum.TO_BE_APPROVED: @@ -100,6 +102,8 @@ break; case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); @@ -121,6 +125,10 @@ for (EquipmentStandardApply item: resultPage.getRecords()) { if(searchBusinessKey){ item.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(item.getId().toString())){ + item.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ item.setTaskId(taskMap.get(item.getId().toString())); @@ -232,12 +240,21 @@ @Override public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { - ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ - //本地删除 - if(meterStandardApplyMapper.deleteById(request.getId())>0){ - return ReturnUtil.success(); + int flag = 0; + // 审批操作-删除 + if(StringUtils.isNotEmpty(request.getTaskId())){ + // 删除表单对应流程实例 + ReturnDTO returnDTO = approvalOperateService.delete(request); + if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + //本地删除 + flag = meterStandardApplyMapper.deleteById(request.getId()); } + }else{ + // 草稿箱等非审批操作删除 + flag = meterStandardApplyMapper.deleteById(request.getId()); + } + if(flag>0){ + return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java index e13d0da..5c2f7b8 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentApplyController.java @@ -157,10 +157,10 @@ return equipmentApplyService.updateProcessResult(request); } - @RequestMapping("/test") + /*@RequestMapping("/test") @ResponseBody public void test(String id){ repositoryService.deleteDeployment(id,true); - } + }*/ } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml index 3b95614..6442123 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentAcceptanceCheckMapper.xml @@ -37,6 +37,9 @@ and ea.overhaul_person = #{request.overhaulPerson} + + and ea.approval_status = #{request.approvalStatus} + and DATE_FORMAT( ea.time, '%Y-%m-%d' ) >= #{request.checkStartDate} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index 44601b2..4acdce0 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -40,6 +40,9 @@ and msa.apply_person = #{request.applyPerson} + + and msa.approval_status = #{request.approvalStatus} + and DATE_FORMAT( msa.time, '%Y-%m-%d' ) >= #{request.startTime} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 5e41164..0af53a1 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -53,6 +53,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index a872bf2..3359997 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -48,6 +48,9 @@ and msa.approval_status = #{request.applyStatus} + + and ea.approval_status = #{request.approvalStatus} + and msa.create_user = #{request.createUser} diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 7fa819a..977153d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -3,12 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.AcceptanceCheck; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.dto.equipment.AcceptanceCheckRequest; +import com.casic.missiles.dto.meter.TraceSupplierApprovalListResponse; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.EquipmentApplyTypeEnum; import com.casic.missiles.enums.ExportEnum; @@ -19,11 +21,15 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.meter.MeterTraceSupplier; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentAcceptanceCheckService; import com.casic.missiles.utils.DictCodeUtils; +import com.casic.missiles.utils.NumberGeneratorUtil; +import javassist.expr.NewArray; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -67,6 +73,7 @@ public Page acceptanceCheckList(Page page, AcceptanceCheckRequest request) { boolean searchBusinessKey = true; List businessKeys = new ArrayList<>(); + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 String status = request.getApprovalStatus(); switch (status){ @@ -86,7 +93,9 @@ break; // 未通过 case ApprovalStatusEnum.FAILED: - businessKeys = baseApprovalService.getFailedList(request.getFormId()); + businessKeys = baseApprovalService.getFailedList(request.getFormId()); //未通过-拒绝 + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; // 已取消 case ApprovalStatusEnum.CANCELED: @@ -112,8 +121,12 @@ Page resultPage = acceptanceCheckMapper.acceptanceCheckList(page, request); for (AcceptanceCheck equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ - // 不是查或草稿箱，赋值对应审批状态 + // 不是全查或草稿箱，赋值对应审批状态 equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // 待审批状态-赋值taskId if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -144,6 +157,15 @@ @Override public ReturnDTO addAcceptanceCheck(EquipmentApply equipmentApply) { + Long maxNo = equipmentApplyMapper.selectMaxNo(); + // 生成编号 + String applyNo = NumberGeneratorUtil.getContactNo("sbjxbyysd", maxNo); + equipmentApply.setApplyNo(applyNo); + // 草稿箱状态 + equipmentApply.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if(StringUtils.isEmpty(equipmentApply.getCreateUser()) && ShiroKit.getUser() != null){ + equipmentApply.setCreateUser(ShiroKit.getUser().getId().toString()); + } // 新增基本信息 if(equipmentApplyMapper.insert(equipmentApply)>0){ // 新增附件列表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index 40fd4d9..5f08d09 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -73,6 +73,7 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (status){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -87,6 +88,8 @@ break; case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); @@ -110,6 +113,10 @@ for (EquipmentApply equipmentApply : resultPage.getRecords()) { if(searchBusinessKey){ equipmentApply.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(equipmentApply.getId().toString())){ + equipmentApply.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } // todo 如果查全部，怎么设置审批状态 if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ @@ -197,13 +204,21 @@ @Override public ReturnDTO deleteEquipmentApply(ApprovalDeleteRequest request) { - // 删除表单对应流程实例 - ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ - //本地删除 - if(equipmentApplyMapper.deleteById(request.getId())>0){ - return ReturnUtil.success(); + int flag = 0; + // 审批操作-删除 + if(StringUtils.isNotEmpty(request.getTaskId())){ + // 删除表单对应流程实例 + ReturnDTO returnDTO = approvalOperateService.delete(request); + if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + //本地删除 + flag = equipmentApplyMapper.deleteById(request.getId()); } + }else{ + // 草稿箱等非审批操作删除 + flag = equipmentApplyMapper.deleteById(request.getId()); + } + if(flag>0){ + return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index 6e30931..4fe93a6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -28,6 +28,7 @@ import com.casic.missiles.service.equipment.IEquipmentStandardApplyService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -83,6 +84,7 @@ List businessKeys = new ArrayList<>(); boolean searchBusinessKey = true; String status = request.getApprovalStatus(); + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 switch (request.getApprovalStatus()){ case ApprovalStatusEnum.TO_BE_APPROVED: @@ -100,6 +102,8 @@ break; case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); @@ -121,6 +125,10 @@ for (EquipmentStandardApply item: resultPage.getRecords()) { if(searchBusinessKey){ item.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(item.getId().toString())){ + item.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ item.setTaskId(taskMap.get(item.getId().toString())); @@ -232,12 +240,21 @@ @Override public ReturnDTO approvalDelete(ApprovalDeleteRequest request) { - ReturnDTO returnDTO = approvalOperateService.delete(request); - if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ - //本地删除 - if(meterStandardApplyMapper.deleteById(request.getId())>0){ - return ReturnUtil.success(); + int flag = 0; + // 审批操作-删除 + if(StringUtils.isNotEmpty(request.getTaskId())){ + // 删除表单对应流程实例 + ReturnDTO returnDTO = approvalOperateService.delete(request); + if(ResponseData.DEFAULT_SUCCESS_CODE == returnDTO.getCode()){ + //本地删除 + flag = meterStandardApplyMapper.deleteById(request.getId()); } + }else{ + // 草稿箱等非审批操作删除 + flag = meterStandardApplyMapper.deleteById(request.getId()); + } + if(flag>0){ + return ReturnUtil.success(); } return ReturnUtil.failed("删除失败"); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 502a0e8..42102df 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -49,6 +49,7 @@ boolean searchBusinessKey = true; String status = request.getApprovalStatus(); Map taskMap = new HashMap<>(); // businessKey-taskId, 待审批列表用 + List rejectBusinessKey = new ArrayList<>();// 未通过-驳回 switch (request.getApprovalStatus()){ case ApprovalStatusEnum.TO_BE_APPROVED: List toBeApprovedList = baseApprovalService.getToBeApprovedList(request.getFormId()); @@ -65,6 +66,8 @@ break; case ApprovalStatusEnum.FAILED: businessKeys = baseApprovalService.getFailedList(request.getFormId()); + rejectBusinessKey = baseApprovalService.getFailedRejectList(request.getFormId()); //未通过-驳回 + businessKeys.addAll(rejectBusinessKey); break; case ApprovalStatusEnum.CANCELED: businessKeys = baseApprovalService.getCanceledList(request.getFormId()); @@ -86,6 +89,10 @@ for (StateManageResponse item: resultPage.getRecords()) { if(searchBusinessKey){ item.setApprovalStatus(status); + // 未通过-驳回状态 + if(status.equals(ApprovalStatusEnum.FAILED) && rejectBusinessKey.contains(item.getId().toString())){ + item.setApprovalStatus(ApprovalStatusEnum.FAILED_REJECT); + } } if(ApprovalStatusEnum.TO_BE_APPROVED.equals(status)){ item.setTaskId(taskMap.get(item.getId().toString()));