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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index f189121..0e3faa3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -216,11 +216,11 @@ @Override @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { -// AuthUser user = ShiroKit.getUser(); -// Assert.isFalse(Objects.isNull(user), () -> { -// throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); -// }); -// meterStandardApply.setCreateUser(String.valueOf(user.getId())); + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + meterStandardApply.setCreateUser(String.valueOf(user.getId())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index f189121..0e3faa3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -216,11 +216,11 @@ @Override @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { -// AuthUser user = ShiroKit.getUser(); -// Assert.isFalse(Objects.isNull(user), () -> { -// throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); -// }); -// meterStandardApply.setCreateUser(String.valueOf(user.getId())); + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + meterStandardApply.setCreateUser(String.valueOf(user.getId())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index aa109b3..c9b70c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) { MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); if(null != meterStaff){ - meterStaff.setId(record.getId()); BeanUtils.copyProperties(meterStaff, record); } } 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index f189121..0e3faa3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -216,11 +216,11 @@ @Override @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { -// AuthUser user = ShiroKit.getUser(); -// Assert.isFalse(Objects.isNull(user), () -> { -// throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); -// }); -// meterStandardApply.setCreateUser(String.valueOf(user.getId())); + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + meterStandardApply.setCreateUser(String.valueOf(user.getId())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index aa109b3..c9b70c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) { MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); if(null != meterStaff){ - meterStaff.setId(record.getId()); BeanUtils.copyProperties(meterStaff, record); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index 11b9650..d8a027a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -77,7 +77,7 @@ for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); if(null != meterFixedAssets){ - meterFixedAssets.setId(record.getId()); + record.setSupportEquipmentId(record.getId()); BeanUtils.copyProperties(meterFixedAssets, record); DictCodeUtils.convertDictCodeToName(record); } 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index f189121..0e3faa3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -216,11 +216,11 @@ @Override @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { -// AuthUser user = ShiroKit.getUser(); -// Assert.isFalse(Objects.isNull(user), () -> { -// throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); -// }); -// meterStandardApply.setCreateUser(String.valueOf(user.getId())); + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + meterStandardApply.setCreateUser(String.valueOf(user.getId())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index aa109b3..c9b70c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) { MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); if(null != meterStaff){ - meterStaff.setId(record.getId()); BeanUtils.copyProperties(meterStaff, record); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index 11b9650..d8a027a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -77,7 +77,7 @@ for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); if(null != meterFixedAssets){ - meterFixedAssets.setId(record.getId()); + record.setSupportEquipmentId(record.getId()); BeanUtils.copyProperties(meterFixedAssets, record); DictCodeUtils.convertDictCodeToName(record); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 9ea2747..e86887b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardVerifyRegulation record : verifyRegulationPage.getRecords()) { MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString()); if(null != meterFile){ - meterFile.setId(record.getId()); BeanUtils.copyProperties(meterFile, record); DictCodeUtils.convertDictCodeToName(record); } 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index f189121..0e3faa3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -216,11 +216,11 @@ @Override @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { -// AuthUser user = ShiroKit.getUser(); -// Assert.isFalse(Objects.isNull(user), () -> { -// throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); -// }); -// meterStandardApply.setCreateUser(String.valueOf(user.getId())); + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + meterStandardApply.setCreateUser(String.valueOf(user.getId())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index aa109b3..c9b70c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) { MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); if(null != meterStaff){ - meterStaff.setId(record.getId()); BeanUtils.copyProperties(meterStaff, record); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index 11b9650..d8a027a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -77,7 +77,7 @@ for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); if(null != meterFixedAssets){ - meterFixedAssets.setId(record.getId()); + record.setSupportEquipmentId(record.getId()); BeanUtils.copyProperties(meterFixedAssets, record); DictCodeUtils.convertDictCodeToName(record); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 9ea2747..e86887b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardVerifyRegulation record : verifyRegulationPage.getRecords()) { MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString()); if(null != meterFile){ - meterFile.setId(record.getId()); BeanUtils.copyProperties(meterFile, record); DictCodeUtils.convertDictCodeToName(record); } 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 24ce44f..2e79db7 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 @@ -51,4 +51,6 @@ ReturnDTO queryStateChangeLogList(Long id) throws Exception; Page queryEquipment(Page page, EquipmentOrSampleDto request) throws Exception; + + Page remindListPage(Page page, FixedAssetRequest request) throws Exception; } 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 7e16043..faa16bf 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 @@ -86,7 +86,7 @@ @ApiOperation("固定资产详情") @PostMapping("/detail") @ResponseBody - public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { + public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return ReturnUtil.success(iEquipmentFixedAssetsService.getById(idDTO.getId())); } @@ -244,4 +244,12 @@ return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.queryEquipment(page, request))); } + @ApiOperation("设备到期列表") + @PostMapping("/remindListPage") + @ResponseBody + public ReturnDTO> remindListPage(@RequestBody @Valid FixedAssetRequest request) throws Exception { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(iEquipmentFixedAssetsService.remindListPage(page, request))); + } + } 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 69514d7..0d19dcc 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 @@ -29,4 +29,6 @@ List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); + + Page remindListPage(Page page, @Param("fixedAssetRequest")FixedAssetRequest request); } 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 60e0c58..cec8ec4 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -13,10 +13,11 @@ - + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 7b6f165..2e028b4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -59,6 +59,11 @@ @ApiModelProperty(value = "使用部门", dataType = "Long") private Long useDept; /** + * 使用人 + */ + @ApiModelProperty(value = "使用人", dataType = "Long") + private Long usePerson; + /** * 有效日期 */ @ApiModelProperty(value = "有效日期起始", dataType = "String") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java index 700412f..9379ba0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentFixedAssets.java @@ -265,6 +265,13 @@ private Long mesureDept; /** + * 检定部门 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检定部门名称", dataType = "String") + private String mesureDeptName; + + /** * 检定日期 */ @TableField("mesure_date") diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java index fb4d8e9..64e94b8 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentStandardSupportEquipment.java @@ -118,6 +118,13 @@ @TableField(exist = false) @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; + + /** + * 配套设备id(更换申请使用) + */ + @TableField(exist = false) + @ApiModelProperty(value = "配套设备id(更换申请使用)", dataType = "Long", required = false) + private Long supportEquipmentId; /** * 备注 */ 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 deef9f6..33fc81a 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 @@ -367,6 +367,15 @@ return resultPage; } + @Override + public Page remindListPage(Page page, FixedAssetRequest request) throws Exception { + Page meterFixedAssetsPage = meterFixedAssetsMapper.remindListPage(page, request); + for (EquipmentFixedAssets meterFixedAssets : meterFixedAssetsPage.getRecords()) { + DictCodeUtils.convertDictCodeToName(meterFixedAssets); + } + return meterFixedAssetsPage; + } + /** * 转换字典code * diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java index f189121..0e3faa3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardApplyServiceImpl.java @@ -216,11 +216,11 @@ @Override @Transactional public ReturnDTO addStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { -// AuthUser user = ShiroKit.getUser(); -// Assert.isFalse(Objects.isNull(user), () -> { -// throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); -// }); -// meterStandardApply.setCreateUser(String.valueOf(user.getId())); + AuthUser user = ShiroKit.getUser(); + Assert.isFalse(Objects.isNull(user), () -> { + throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED); + }); + meterStandardApply.setCreateUser(String.valueOf(user.getId())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java index aa109b3..c9b70c4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardEquipmentUserServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardEquipmentUser record : equipmentUserPage.getRecords()) { MeterStaff meterStaff = meterStaffMapper.selectStaffInfo(record.getUserId().toString()); if(null != meterStaff){ - meterStaff.setId(record.getId()); BeanUtils.copyProperties(meterStaff, record); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index 11b9650..d8a027a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -77,7 +77,7 @@ for (EquipmentStandardSupportEquipment record : supportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); if(null != meterFixedAssets){ - meterFixedAssets.setId(record.getId()); + record.setSupportEquipmentId(record.getId()); BeanUtils.copyProperties(meterFixedAssets, record); DictCodeUtils.convertDictCodeToName(record); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java index 9ea2747..e86887b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardVerifyRegulationServiceImpl.java @@ -55,7 +55,6 @@ for (EquipmentStandardVerifyRegulation record : verifyRegulationPage.getRecords()) { MeterFile meterFile = meterFileMapper.selectById(record.getVerifyRegulationId().toString()); if(null != meterFile){ - meterFile.setId(record.getId()); BeanUtils.copyProperties(meterFile, record); DictCodeUtils.convertDictCodeToName(record); } 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 24ce44f..2e79db7 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 @@ -51,4 +51,6 @@ ReturnDTO queryStateChangeLogList(Long id) throws Exception; Page queryEquipment(Page page, EquipmentOrSampleDto request) throws Exception; + + Page remindListPage(Page page, FixedAssetRequest request) throws Exception; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java index b4169f4..51897f0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java @@ -1,10 +1,13 @@ package com.casic.missiles.service.listeners.processor; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.service.equipment.IEquipmentStandardApplyEquipmentService; +import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; import com.casic.missiles.mapper.equipment.EquipmentStandardApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardApplyMapper; @@ -15,6 +18,7 @@ import com.casic.missiles.utils.SpringContextUtil; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -25,12 +29,15 @@ */ @Service(ActionStatusBeanEnum.SUPPORT_BEAN_NAME) public class EquipmentSupportEventPostProcessor implements NotifyEventPostProcessor { + + @Resource + private IEquipmentStandardSupportEquipmentService supportEquipmentService; + @Override public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) { String id = notifyEventStatusDTO.getId(); EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); EquipmentStandardApplyEquipmentMapper applyEquipmentMapper = SpringContextUtil.getBean(EquipmentStandardApplyEquipmentMapper.class); - EquipmentStandardSupportMapper supportMapper = SpringContextUtil.getBean(EquipmentStandardSupportMapper.class); List supportEquipments = new ArrayList<>(); // 通过申请id查询申请信息 EquipmentStandardApply standardApply = standardApplyMapper.selectById(id); @@ -38,23 +45,16 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("standard_apply_id", id); List equipmentStandardApplyEquipments = applyEquipmentMapper.selectList(queryWrapper); - // 设备ids - List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); - for (Long equipmentId : equipmentIds) { + for (EquipmentStandardApplyEquipment equipment : equipmentStandardApplyEquipments) { EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); - supportEquipment.setEquipmentId(equipmentId); + supportEquipment.setId(equipment.getSupportEquipmentId()); + supportEquipment.setEquipmentId(equipment.getEquipmentId()); supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); supportEquipments.add(supportEquipment); } - // 通过标准装置id删除原先配套设备 - QueryWrapper supportEquipmentWrapper = new QueryWrapper<>(); - supportEquipmentWrapper.eq("standard_equipment_id", standardApply.getStandardEquipmentId()); - supportMapper.delete(supportEquipmentWrapper); - // 新增配套设备 - for (EquipmentStandardSupportEquipment supportEquipment : supportEquipments) { - if (supportMapper.insert(supportEquipment) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } + // 没有删除配套设备的情况所以用saveOrUpdateBatch + if(!supportEquipmentService.saveOrUpdateBatch(supportEquipments)){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } }