diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 3e9be1f..e9d25d5 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -32,6 +32,7 @@ @Component public class ProcessUpdateStateListener implements ExecutionListener { + private static final long serialVersionUID = -1748257184303139934L; @Resource private RepositoryService repositoryService; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 3e9be1f..e9d25d5 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -32,6 +32,7 @@ @Component public class ProcessUpdateStateListener implements ExecutionListener { + private static final long serialVersionUID = -1748257184303139934L; @Resource private RepositoryService repositoryService; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 655d8e0..f87e1f8 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -15,7 +15,7 @@ List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); + int queryVerifiedNum(@Param("businessKeys")List ids,@Param("uid")String uid); int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 3e9be1f..e9d25d5 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -32,6 +32,7 @@ @Component public class ProcessUpdateStateListener implements ExecutionListener { + private static final long serialVersionUID = -1748257184303139934L; @Resource private RepositoryService repositoryService; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 655d8e0..f87e1f8 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -15,7 +15,7 @@ List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); + int queryVerifiedNum(@Param("businessKeys")List ids,@Param("uid")String uid); int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml index 0c588de..d321998 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml @@ -66,9 +66,9 @@ 1 = 1 AND eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} - + and eae.apply_id in - + #{id} @@ -76,7 +76,7 @@ SELECT - * + count( 0 ) AS `count` FROM equipment_apply ea LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id @@ -86,9 +86,9 @@ AND eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} - + and eae.apply_id in - + #{id} 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 20d6666..71678ff 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 @@ -162,6 +162,9 @@ EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId()); // 通过申请标准装置id获取标准装置详细信息 EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId()); + if(ObjectUtil.isEmpty(standardEquipment)){ + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST); + } DictCodeUtils.convertDictCodeToName(standardEquipment); result.setMeterStandardEquipment(standardEquipment); QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 3e9be1f..e9d25d5 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -32,6 +32,7 @@ @Component public class ProcessUpdateStateListener implements ExecutionListener { + private static final long serialVersionUID = -1748257184303139934L; @Resource private RepositoryService repositoryService; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java index 655d8e0..f87e1f8 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentWorkbenchMapper.java @@ -15,7 +15,7 @@ List standardTrend(@Param("startTime")String startTime, @Param("endTime")String endTime); - int queryVerifiedNum(@Param("ids")List ids,@Param("uid")String uid); + int queryVerifiedNum(@Param("businessKeys")List ids,@Param("uid")String uid); int queryOvertimeNum(@Param("businessKeys")List businessKeys, @Param("uid")String uid); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml index 0c588de..d321998 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentWorkbenchMapper.xml @@ -66,9 +66,9 @@ 1 = 1 AND eae.equipment_id IS NOT NULL AND efa.use_person = #{uid} - + and eae.apply_id in - + #{id} @@ -76,7 +76,7 @@ SELECT - * + count( 0 ) AS `count` FROM equipment_apply ea LEFT JOIN equipment_apply_equipment eae on ea.id = eae.apply_id @@ -86,9 +86,9 @@ AND eae.equipment_id IS NOT NULL AND ea.time > DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ) AND efa.use_person = #{uid} - + and eae.apply_id in - + #{id} 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 20d6666..71678ff 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 @@ -162,6 +162,9 @@ EquipmentStandardApply result = meterStandardApplyMapper.selectById(idDTO.getId()); // 通过申请标准装置id获取标准装置详细信息 EquipmentStandardEquipment standardEquipment = meterStandardEquipmentMapper.selectById(result.getStandardEquipmentId()); + if(ObjectUtil.isEmpty(standardEquipment)){ + throw new BusinessException(BusinessExceptionEnum.STANDARD_EQUIPMENT_ID_EXIST); + } DictCodeUtils.convertDictCodeToName(standardEquipment); result.setMeterStandardEquipment(standardEquipment); QueryWrapper wrapper = new QueryWrapper<>(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java index 85e7c50..8493995 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentWorkbenchServiceImpl.java @@ -182,8 +182,13 @@ }); // 待检定数量 List businessKeys = getPassedList(getProcDefId(ApplyFromIdEnum.DEVICE_FIX_APPROVAL)); - response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys,user.getId().toString())); - response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys,user.getId().toString())); + if(businessKeys.size()==0){ + response.setVerifiedNum(0); + response.setOvertimeNum(0); + }else { + response.setVerifiedNum(equipmentWorkbenchMapper.queryVerifiedNum(businessKeys, String.valueOf(user.getId()))); + response.setOvertimeNum(equipmentWorkbenchMapper.queryOvertimeNum(businessKeys, String.valueOf(user.getId()))); + } return ReturnUtil.success(response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index b012add..418298f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -861,7 +861,7 @@ listener.setEvent((ExecutionListener.EVENTNAME_START)); // 监听器类型 listener.setImplementationType(ImplementationType.IMPLEMENTATION_TYPE_CLASS); - listener.setImplementation("com.casic.missiles.controller.flowable.ProcessUpdateStateListener"); + listener.setImplementation("com.casic.missiles.listeners.flowable.ProcessUpdateStateListener"); listeners.add(listener); endEvent.setExecutionListeners(listeners); return endEvent;