diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java index 033f40a..fad3f38 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -7,7 +7,6 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -32,7 +31,7 @@ private Long id; /** - * 消息提醒的用户id + * 消息提醒的用户id（sys_user表id） */ @ApiModelProperty(value = "消息提醒的用户id", dataType = "Long") @TableField("remind_id") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java index 033f40a..fad3f38 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -7,7 +7,6 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -32,7 +31,7 @@ private Long id; /** - * 消息提醒的用户id + * 消息提醒的用户id（sys_user表id） */ @ApiModelProperty(value = "消息提醒的用户id", dataType = "Long") @TableField("remind_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 50dd5f6..0bef63e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,21 +12,30 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.dto.business.dispatch.*; -import com.casic.missiles.enums.*; +import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.*; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.meter.MeterOrganizeMapper; +import com.casic.missiles.mapper.meter.MeterStaffMapper; +import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.*; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,13 +59,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; - private WorkbenchRemindMessageMapper remindMessageMapper; - private CustomerSampleMapper customerSampleMapper; private final BusinessCertificateReportMapper certificateReportMapper; private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; private final IBaseExportService iBaseExportService; + private final MeterOrganizeMapper meterOrganizeMapper; + private final MeterStaffMapper meterStaffMapper; + private final UserInfoMapper userInfoMapper; /** * 终止、回退、收入、归还、催办按钮 @@ -299,14 +310,31 @@ */ public WorkbenchRemindMessage initWorkbenchRemindMessage(BusinessLabExecutiveInfo labExecutiveInfo) { WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(); - remindMessage.setRemindId(labExecutiveInfo.getMeasurePersonId()); remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId()); remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode()); //检测人不为空，且检测状态不为待分配消息催办到我的检测 if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) { + MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("account",meterStaff.getAccount()); + UserInfo userInfo = userInfoMapper.selectOne(wrapper); + if(ObjectUtil.isEmpty(userInfo)){ + throw new BusinessException(BusinessExceptionEnum.NOT_FOUND_USER_INFO); + } + remindMessage.setRemindId(userInfo.getId()); remindMessage.setMessageTopic("我的检测"); } else { remindMessage.setMessageTopic("部门检测"); + //催办给部门组长(计量组织表负责人) + Long directorId = null; + if(Objects.nonNull(labExecutiveInfo.getMeasureDeptId())){ + directorId = meterOrganizeMapper.selectDeptDirectorByDeptId(labExecutiveInfo.getMeasureDeptId()); + } + if(Objects.nonNull(directorId)){ + remindMessage.setRemindId(directorId); + }else{ + throw new BusinessException(BusinessExceptionEnum.UNABLE_TO_URGE); + } } CustomerSampleInfo customerSampleInfo = customerSampleMapper.selectById(labExecutiveInfo.getSampleId()); if (null != customerSampleInfo) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java index 033f40a..fad3f38 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -7,7 +7,6 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -32,7 +31,7 @@ private Long id; /** - * 消息提醒的用户id + * 消息提醒的用户id（sys_user表id） */ @ApiModelProperty(value = "消息提醒的用户id", dataType = "Long") @TableField("remind_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 50dd5f6..0bef63e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,21 +12,30 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.dto.business.dispatch.*; -import com.casic.missiles.enums.*; +import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.*; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.meter.MeterOrganizeMapper; +import com.casic.missiles.mapper.meter.MeterStaffMapper; +import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.*; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,13 +59,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; - private WorkbenchRemindMessageMapper remindMessageMapper; - private CustomerSampleMapper customerSampleMapper; private final BusinessCertificateReportMapper certificateReportMapper; private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; private final IBaseExportService iBaseExportService; + private final MeterOrganizeMapper meterOrganizeMapper; + private final MeterStaffMapper meterStaffMapper; + private final UserInfoMapper userInfoMapper; /** * 终止、回退、收入、归还、催办按钮 @@ -299,14 +310,31 @@ */ public WorkbenchRemindMessage initWorkbenchRemindMessage(BusinessLabExecutiveInfo labExecutiveInfo) { WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(); - remindMessage.setRemindId(labExecutiveInfo.getMeasurePersonId()); remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId()); remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode()); //检测人不为空，且检测状态不为待分配消息催办到我的检测 if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) { + MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("account",meterStaff.getAccount()); + UserInfo userInfo = userInfoMapper.selectOne(wrapper); + if(ObjectUtil.isEmpty(userInfo)){ + throw new BusinessException(BusinessExceptionEnum.NOT_FOUND_USER_INFO); + } + remindMessage.setRemindId(userInfo.getId()); remindMessage.setMessageTopic("我的检测"); } else { remindMessage.setMessageTopic("部门检测"); + //催办给部门组长(计量组织表负责人) + Long directorId = null; + if(Objects.nonNull(labExecutiveInfo.getMeasureDeptId())){ + directorId = meterOrganizeMapper.selectDeptDirectorByDeptId(labExecutiveInfo.getMeasureDeptId()); + } + if(Objects.nonNull(directorId)){ + remindMessage.setRemindId(directorId); + }else{ + throw new BusinessException(BusinessExceptionEnum.UNABLE_TO_URGE); + } } CustomerSampleInfo customerSampleInfo = customerSampleMapper.selectById(labExecutiveInfo.getSampleId()); if (null != customerSampleInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index 0301a48..8ea78f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import antlr.ASdebug.IASDebugStream; import cn.hutool.core.lang.Assert; import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,12 +15,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.meter.MeterDictEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; @@ -29,8 +27,6 @@ import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.BusinessLabExecutiveInfo; -import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.page.PageQuery; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -41,7 +37,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -398,6 +393,14 @@ } @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterFixedAssetsMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + + @Override public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception { List resultList; if(!CollectionUtils.isEmpty(request.getIds())){ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java index 033f40a..fad3f38 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -7,7 +7,6 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -32,7 +31,7 @@ private Long id; /** - * 消息提醒的用户id + * 消息提醒的用户id（sys_user表id） */ @ApiModelProperty(value = "消息提醒的用户id", dataType = "Long") @TableField("remind_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 50dd5f6..0bef63e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,21 +12,30 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.dto.business.dispatch.*; -import com.casic.missiles.enums.*; +import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.*; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.meter.MeterOrganizeMapper; +import com.casic.missiles.mapper.meter.MeterStaffMapper; +import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.*; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,13 +59,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; - private WorkbenchRemindMessageMapper remindMessageMapper; - private CustomerSampleMapper customerSampleMapper; private final BusinessCertificateReportMapper certificateReportMapper; private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; private final IBaseExportService iBaseExportService; + private final MeterOrganizeMapper meterOrganizeMapper; + private final MeterStaffMapper meterStaffMapper; + private final UserInfoMapper userInfoMapper; /** * 终止、回退、收入、归还、催办按钮 @@ -299,14 +310,31 @@ */ public WorkbenchRemindMessage initWorkbenchRemindMessage(BusinessLabExecutiveInfo labExecutiveInfo) { WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(); - remindMessage.setRemindId(labExecutiveInfo.getMeasurePersonId()); remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId()); remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode()); //检测人不为空，且检测状态不为待分配消息催办到我的检测 if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) { + MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("account",meterStaff.getAccount()); + UserInfo userInfo = userInfoMapper.selectOne(wrapper); + if(ObjectUtil.isEmpty(userInfo)){ + throw new BusinessException(BusinessExceptionEnum.NOT_FOUND_USER_INFO); + } + remindMessage.setRemindId(userInfo.getId()); remindMessage.setMessageTopic("我的检测"); } else { remindMessage.setMessageTopic("部门检测"); + //催办给部门组长(计量组织表负责人) + Long directorId = null; + if(Objects.nonNull(labExecutiveInfo.getMeasureDeptId())){ + directorId = meterOrganizeMapper.selectDeptDirectorByDeptId(labExecutiveInfo.getMeasureDeptId()); + } + if(Objects.nonNull(directorId)){ + remindMessage.setRemindId(directorId); + }else{ + throw new BusinessException(BusinessExceptionEnum.UNABLE_TO_URGE); + } } CustomerSampleInfo customerSampleInfo = customerSampleMapper.selectById(labExecutiveInfo.getSampleId()); if (null != customerSampleInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index 0301a48..8ea78f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import antlr.ASdebug.IASDebugStream; import cn.hutool.core.lang.Assert; import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,12 +15,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.meter.MeterDictEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; @@ -29,8 +27,6 @@ import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.BusinessLabExecutiveInfo; -import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.page.PageQuery; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -41,7 +37,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -398,6 +393,14 @@ } @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterFixedAssetsMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + + @Override public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception { List resultList; if(!CollectionUtils.isEmpty(request.getIds())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index bf54c8a..cc7ac21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; @@ -246,6 +247,14 @@ return resultPage; } + @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterStandardEquipmentMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + /** * 删除：提醒时间=当前时间+30[配置值：推迟时间]天 * todo： 新增、更新标准装置时，设置默认提醒时间（有效时间+30[配置值：提醒时间]天） diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java index 033f40a..fad3f38 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -7,7 +7,6 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -32,7 +31,7 @@ private Long id; /** - * 消息提醒的用户id + * 消息提醒的用户id（sys_user表id） */ @ApiModelProperty(value = "消息提醒的用户id", dataType = "Long") @TableField("remind_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 50dd5f6..0bef63e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,21 +12,30 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.dto.business.dispatch.*; -import com.casic.missiles.enums.*; +import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.*; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.meter.MeterOrganizeMapper; +import com.casic.missiles.mapper.meter.MeterStaffMapper; +import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.*; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,13 +59,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; - private WorkbenchRemindMessageMapper remindMessageMapper; - private CustomerSampleMapper customerSampleMapper; private final BusinessCertificateReportMapper certificateReportMapper; private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; private final IBaseExportService iBaseExportService; + private final MeterOrganizeMapper meterOrganizeMapper; + private final MeterStaffMapper meterStaffMapper; + private final UserInfoMapper userInfoMapper; /** * 终止、回退、收入、归还、催办按钮 @@ -299,14 +310,31 @@ */ public WorkbenchRemindMessage initWorkbenchRemindMessage(BusinessLabExecutiveInfo labExecutiveInfo) { WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(); - remindMessage.setRemindId(labExecutiveInfo.getMeasurePersonId()); remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId()); remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode()); //检测人不为空，且检测状态不为待分配消息催办到我的检测 if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) { + MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("account",meterStaff.getAccount()); + UserInfo userInfo = userInfoMapper.selectOne(wrapper); + if(ObjectUtil.isEmpty(userInfo)){ + throw new BusinessException(BusinessExceptionEnum.NOT_FOUND_USER_INFO); + } + remindMessage.setRemindId(userInfo.getId()); remindMessage.setMessageTopic("我的检测"); } else { remindMessage.setMessageTopic("部门检测"); + //催办给部门组长(计量组织表负责人) + Long directorId = null; + if(Objects.nonNull(labExecutiveInfo.getMeasureDeptId())){ + directorId = meterOrganizeMapper.selectDeptDirectorByDeptId(labExecutiveInfo.getMeasureDeptId()); + } + if(Objects.nonNull(directorId)){ + remindMessage.setRemindId(directorId); + }else{ + throw new BusinessException(BusinessExceptionEnum.UNABLE_TO_URGE); + } } CustomerSampleInfo customerSampleInfo = customerSampleMapper.selectById(labExecutiveInfo.getSampleId()); if (null != customerSampleInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index 0301a48..8ea78f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import antlr.ASdebug.IASDebugStream; import cn.hutool.core.lang.Assert; import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,12 +15,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.meter.MeterDictEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; @@ -29,8 +27,6 @@ import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.BusinessLabExecutiveInfo; -import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.page.PageQuery; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -41,7 +37,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -398,6 +393,14 @@ } @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterFixedAssetsMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + + @Override public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception { List resultList; if(!CollectionUtils.isEmpty(request.getIds())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index bf54c8a..cc7ac21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; @@ -246,6 +247,14 @@ return resultPage; } + @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterStandardEquipmentMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + /** * 删除：提醒时间=当前时间+30[配置值：推迟时间]天 * todo： 新增、更新标准装置时，设置默认提醒时间（有效时间+30[配置值：提醒时间]天） diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java index 96cd592..a55f8c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.equipment.EquipmentStateChangeLog; import com.casic.missiles.model.equipment.EquipmentUseLog; @@ -57,6 +57,8 @@ Page remindListPage(Page page, FixedAssetRequest request) throws Exception; + RemindQuantityDTO remindQuantity(); + void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception; ReturnDTO remindWorker(IdDTO idDTO); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 0d98c0a..1ad4d5a 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -1,6 +1,5 @@ package com.casic.missiles.controller.equipment; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; @@ -8,16 +7,16 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; -import com.casic.missiles.dto.equipment.EquipmentApplyRequest; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; +import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOrder; -import com.casic.missiles.model.equipment.*; -import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentExcelData; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.EquipmentUseLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,11 +48,9 @@ @RequestMapping("/meter/assets") public class EquipmentFixedAssetsController extends ExportController { - /** - * 固定资产service - */ @Autowired private IEquipmentFixedAssetsService iEquipmentFixedAssetsService; + /** * 固定资产列表 */ @@ -258,6 +255,13 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); } + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(iEquipmentFixedAssetsService.remindQuantity()); + } + /** * 设备到期列表导出 */ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java index f8076ca..6fd3c58 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardEquipmentController.java @@ -7,7 +7,7 @@ import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.equipment.FixedAssetRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -112,7 +112,6 @@ } } - @ApiOperation("到期提醒列表（分页）") @PostMapping("/remindListPage") @ResponseBody @@ -121,6 +120,14 @@ DictCodeUtils.validDictCode(request); return ReturnUtil.success(super.packForBT(meterStandardEquipmentService.remindListPage(page, request))); } + + @ApiOperation("到期提醒数量") + @GetMapping("/remindQuantity") + @ResponseBody + public ReturnDTO remindQuantity() { + return ReturnUtil.success(meterStandardEquipmentService.remindQuantity()); + } + /** * 导出到期提醒列表 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 9241b34..a132505 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -79,7 +79,8 @@ OUTSOURCE_CERTIFICATE_NO_FILES(2427, "无导入数据Excel文件或无证书文件或证书文件格式有误"), OUTSOURCE_CERTIFICATE_NO_DATA(2428, "Excel文件无数据"), OUTSOURCE_CERTIFICATE_NO_DATA_ITEM(2429, "Excel文件中缺少必要数据项数据"), - OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"); + OUTSOURCE_CERTIFICATE_INCORRECT_DATA_ITEM(2430, "Excel文件中检测单位编号或样品编号或证书附件不正确"), + UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"); private Integer code; private String message; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java index 6024663..8fa9927 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/MeterFixedAssetsMapper.java @@ -34,4 +34,6 @@ Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); List remindList(@Param("fixedAssetRequest")FixedAssetRequest request); + + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java index 65f64aa..f1dd0fb 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardEquipmentMapper.java @@ -28,5 +28,6 @@ List remindListPage(@Param("request") StandardEquipmentRequest request); + Integer selectRemindQuantity(); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java index e071ed1..64da96c 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterOrganizeMapper.java @@ -21,4 +21,6 @@ Long selectMaxOrganizeNo(); List selectListByLabCapacity(@Param("list") List list); + + Long selectDeptDirectorByDeptId(@Param("deptId") Long deptId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index bb93eb3..1670281 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -200,6 +200,23 @@ and mfa.use_person = #{fixedAssetRequest.usePerson} + + and mfa.id in + + #{id} + + ORDER BY mfa.create_time DESC + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml index 7cb96f9..a52bcf9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardEquipmentMapper.xml @@ -67,16 +67,23 @@ LEFT JOIN sys_user su ON su.id = mse.standard_owner LEFT JOIN meter_organize mo on mo.dept_id = mse.standard_laboratory WHERE mse.is_del = 0 - and CURRENT_TIMESTAMP >= mse.remind_time + AND CURRENT_TIMESTAMP >= mse.remind_time - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) >= #{request.validStartTime} - and DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} + AND DATE_FORMAT( mse.remind_time, '%Y-%m-%d' ) <= #{request.validEndTime} ORDER BY mse.remind_time DESC - + diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml index 31b5039..56398ae 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterOrganizeMapper.xml @@ -14,4 +14,12 @@ lab_capacity LIKE concat('%',#{item},'%') + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java new file mode 100644 index 0000000..2c9551f --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/RemindQuantityDTO.java @@ -0,0 +1,17 @@ +package com.casic.missiles.dto.equipment; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description: + * @Author: wangpeng + * @Date: 2023/4/14 14:55 + */ +@ApiModel +@Data +public class RemindQuantityDTO { + @ApiModelProperty(value = "数量", dataType = "Integer") + private Integer remindQuantity; +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java index 520b559..5630860 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessLabExecutiveInfo.java @@ -43,7 +43,7 @@ private Long measureDeptId; /** - * 检定人id + * 检定人id（meter_staff表id） */ @TableField("measure_person_id") private Long measurePersonId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java index 033f40a..fad3f38 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/workbench/WorkbenchRemindMessage.java @@ -7,7 +7,6 @@ import com.casic.missiles.constants.MeterDictCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -32,7 +31,7 @@ private Long id; /** - * 消息提醒的用户id + * 消息提醒的用户id（sys_user表id） */ @ApiModelProperty(value = "消息提醒的用户id", dataType = "Long") @TableField("remind_id") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 50dd5f6..0bef63e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,21 +12,30 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.dto.business.dispatch.*; -import com.casic.missiles.enums.*; +import com.casic.missiles.dto.business.labExecutive.HandOutLabExecutiveDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.*; +import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; +import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; +import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.customer.CustomerSampleMapper; +import com.casic.missiles.mapper.meter.MeterOrganizeMapper; +import com.casic.missiles.mapper.meter.MeterStaffMapper; +import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.*; +import com.casic.missiles.model.business.BusinessCertificateReport; +import com.casic.missiles.model.business.BusinessLabExecutiveInfo; +import com.casic.missiles.model.business.BusinessOrderSampleRelation; import com.casic.missiles.model.customer.CustomerSampleInfo; +import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.utils.DictCodeUtils; @@ -49,13 +59,14 @@ @AllArgsConstructor public class IBusinessDispatchServiceImpl extends ServiceImpl implements IBusinessDispatchService, SampleStatusEnum, CurrentSegmentEnum, MeasureTypeEnum { private final BusinessOrderSampleRelationMapper orderSampleRelationMapper; - private WorkbenchRemindMessageMapper remindMessageMapper; - private CustomerSampleMapper customerSampleMapper; private final BusinessCertificateReportMapper certificateReportMapper; private final BusinessLabExecutiveInfoMapper labExecutiveInfoMapper; private final IBaseExportService iBaseExportService; + private final MeterOrganizeMapper meterOrganizeMapper; + private final MeterStaffMapper meterStaffMapper; + private final UserInfoMapper userInfoMapper; /** * 终止、回退、收入、归还、催办按钮 @@ -299,14 +310,31 @@ */ public WorkbenchRemindMessage initWorkbenchRemindMessage(BusinessLabExecutiveInfo labExecutiveInfo) { WorkbenchRemindMessage remindMessage = new WorkbenchRemindMessage(); - remindMessage.setRemindId(labExecutiveInfo.getMeasurePersonId()); remindMessage.setRemindDeptId(labExecutiveInfo.getMeasureDeptId()); remindMessage.setMessageType(MessageTypeEnum.OVERTIME_MEASURE.getCode()); //检测人不为空，且检测状态不为待分配消息催办到我的检测 if (!Objects.isNull(labExecutiveInfo.getMeasurePersonId()) && !MeasureStatusEnum.TO_ALLOCATE.equals(labExecutiveInfo.getMeasureStatus())) { + MeterStaff meterStaff = meterStaffMapper.selectById(labExecutiveInfo.getMeasurePersonId()); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("account",meterStaff.getAccount()); + UserInfo userInfo = userInfoMapper.selectOne(wrapper); + if(ObjectUtil.isEmpty(userInfo)){ + throw new BusinessException(BusinessExceptionEnum.NOT_FOUND_USER_INFO); + } + remindMessage.setRemindId(userInfo.getId()); remindMessage.setMessageTopic("我的检测"); } else { remindMessage.setMessageTopic("部门检测"); + //催办给部门组长(计量组织表负责人) + Long directorId = null; + if(Objects.nonNull(labExecutiveInfo.getMeasureDeptId())){ + directorId = meterOrganizeMapper.selectDeptDirectorByDeptId(labExecutiveInfo.getMeasureDeptId()); + } + if(Objects.nonNull(directorId)){ + remindMessage.setRemindId(directorId); + }else{ + throw new BusinessException(BusinessExceptionEnum.UNABLE_TO_URGE); + } } CustomerSampleInfo customerSampleInfo = customerSampleMapper.selectById(labExecutiveInfo.getSampleId()); if (null != customerSampleInfo) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java index 0301a48..8ea78f8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentFixedAssetsServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.service.Impl.equipment; -import antlr.ASdebug.IASDebugStream; import cn.hutool.core.lang.Assert; import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,12 +15,11 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.dto.equipment.StandardEquipmentApplyRequest; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.meter.MeterDictEnum; -import com.casic.missiles.enums.system.ApprovalStatusEnum; import com.casic.missiles.enums.workbench.MessageTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; @@ -29,8 +27,6 @@ import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; import com.casic.missiles.mapper.equipment.EquipmentUseLogMapper; import com.casic.missiles.mapper.workbench.WorkbenchRemindMessageMapper; -import com.casic.missiles.model.business.BusinessLabExecutiveInfo; -import com.casic.missiles.model.business.BusinessOrder; import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.page.PageQuery; import com.casic.missiles.model.workbench.WorkbenchRemindMessage; @@ -41,7 +37,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -398,6 +393,14 @@ } @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterFixedAssetsMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + + @Override public void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception { List resultList; if(!CollectionUtils.isEmpty(request.getIds())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java index bf54c8a..cc7ac21 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; @@ -246,6 +247,14 @@ return resultPage; } + @Override + public RemindQuantityDTO remindQuantity() { + Integer remindQuantity = meterStandardEquipmentMapper.selectRemindQuantity(); + RemindQuantityDTO result = new RemindQuantityDTO(); + result.setRemindQuantity(remindQuantity); + return result; + } + /** * 删除：提醒时间=当前时间+30[配置值：推迟时间]天 * todo： 新增、更新标准装置时，设置默认提醒时间（有效时间+30[配置值：提醒时间]天） diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java index 96cd592..a55f8c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentFixedAssetsService.java @@ -6,7 +6,7 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; -import com.casic.missiles.model.business.BusinessOrder; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.equipment.EquipmentStateChangeLog; import com.casic.missiles.model.equipment.EquipmentUseLog; @@ -57,6 +57,8 @@ Page remindListPage(Page page, FixedAssetRequest request) throws Exception; + RemindQuantityDTO remindQuantity(); + void exportList(FixedAssetRequest request, HttpServletResponse response) throws Exception; ReturnDTO remindWorker(IdDTO idDTO); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardEquipmentService.java index 5e3aa8e..c6009c7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardEquipmentService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardEquipmentService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.equipment.RemindQuantityDTO; import com.casic.missiles.dto.equipment.StandardEquipmentRequest; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; @@ -34,6 +35,8 @@ Page remindListPage(Page page, StandardEquipmentRequest request) throws Exception; + RemindQuantityDTO remindQuantity(); + ReturnDTO deleteRemind(Long id); ReturnDTO remind(Long id);