diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8baf835..8cd70b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -9,6 +9,8 @@ SELECT msa.id, + meae.id AS apply_equipment_id, + mfa.id AS equipment_id, msa.apply_no, msa.apply_type, mfa.equipment_no, diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8baf835..8cd70b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -9,6 +9,8 @@ SELECT msa.id, + meae.id AS apply_equipment_id, + mfa.id AS equipment_id, msa.apply_no, msa.apply_type, mfa.equipment_no, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index f416437..557e1be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -73,6 +73,18 @@ private String applyTypeName; /** + * 设备id + */ + @ApiModelProperty(value = "设备id", dataType = "String") + private String equipmentId; + + /** + * 设备申请关联id + */ + @ApiModelProperty(value = "设备申请关联id", dataType = "Long") + private Long applyEquipmentId; + + /** * 设备编号 */ @ApiModelProperty(value = "(状态管理)设备编号", dataType = "String") @@ -162,14 +174,14 @@ /** * 财务净值 */ - @ApiModelProperty(value = "财务净值", dataType = "String") - private String financialValue; + @ApiModelProperty(value = "财务净值", dataType = "Double") + private Double financialValue; /** * 资产原值 */ - @ApiModelProperty(value = "资产原值", dataType = "String") - private String assetOriginValue; + @ApiModelProperty(value = "资产原值", dataType = "Double") + private Double assetOriginValue; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8baf835..8cd70b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -9,6 +9,8 @@ SELECT msa.id, + meae.id AS apply_equipment_id, + mfa.id AS equipment_id, msa.apply_no, msa.apply_type, mfa.equipment_no, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index f416437..557e1be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -73,6 +73,18 @@ private String applyTypeName; /** + * 设备id + */ + @ApiModelProperty(value = "设备id", dataType = "String") + private String equipmentId; + + /** + * 设备申请关联id + */ + @ApiModelProperty(value = "设备申请关联id", dataType = "Long") + private Long applyEquipmentId; + + /** * 设备编号 */ @ApiModelProperty(value = "(状态管理)设备编号", dataType = "String") @@ -162,14 +174,14 @@ /** * 财务净值 */ - @ApiModelProperty(value = "财务净值", dataType = "String") - private String financialValue; + @ApiModelProperty(value = "财务净值", dataType = "Double") + private Double financialValue; /** * 资产原值 */ - @ApiModelProperty(value = "资产原值", dataType = "String") - private String assetOriginValue; + @ApiModelProperty(value = "资产原值", dataType = "Double") + private Double assetOriginValue; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java index b9d320a..36ebf34 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java @@ -153,4 +153,14 @@ @TableField(exist = false) @ApiModelProperty(value = "设备名称", dataType = "String") private String equipmentName; + + public EquipmentApplyEquipment() { + } + + public EquipmentApplyEquipment(Long id, String equipmentId, Double financialValue, Double assetOriginValue) { + this.id = id; + this.equipmentId = equipmentId; + this.financialValue = financialValue; + this.assetOriginValue = assetOriginValue; + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8baf835..8cd70b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -9,6 +9,8 @@ SELECT msa.id, + meae.id AS apply_equipment_id, + mfa.id AS equipment_id, msa.apply_no, msa.apply_type, mfa.equipment_no, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index f416437..557e1be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -73,6 +73,18 @@ private String applyTypeName; /** + * 设备id + */ + @ApiModelProperty(value = "设备id", dataType = "String") + private String equipmentId; + + /** + * 设备申请关联id + */ + @ApiModelProperty(value = "设备申请关联id", dataType = "Long") + private Long applyEquipmentId; + + /** * 设备编号 */ @ApiModelProperty(value = "(状态管理)设备编号", dataType = "String") @@ -162,14 +174,14 @@ /** * 财务净值 */ - @ApiModelProperty(value = "财务净值", dataType = "String") - private String financialValue; + @ApiModelProperty(value = "财务净值", dataType = "Double") + private Double financialValue; /** * 资产原值 */ - @ApiModelProperty(value = "资产原值", dataType = "String") - private String assetOriginValue; + @ApiModelProperty(value = "资产原值", dataType = "Double") + private Double assetOriginValue; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java index b9d320a..36ebf34 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java @@ -153,4 +153,14 @@ @TableField(exist = false) @ApiModelProperty(value = "设备名称", dataType = "String") private String equipmentName; + + public EquipmentApplyEquipment() { + } + + public EquipmentApplyEquipment(Long id, String equipmentId, Double financialValue, Double assetOriginValue) { + this.id = id; + this.equipmentId = equipmentId; + this.financialValue = financialValue; + this.assetOriginValue = assetOriginValue; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 047f173..481cf64 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -2,21 +2,31 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.StateManageRequest; import com.casic.missiles.dto.equipment.StateManageResponse; import com.casic.missiles.dto.flowable.AllApproveDTO; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.enums.ApprovalStatusEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyFileMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.equipment.EquipmentStateManageMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentStateManageService; import com.casic.missiles.utils.DictCodeUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -29,6 +39,9 @@ public class EquipmentStateManageServiceImpl implements IEquipmentStateManageService { @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Resource private EquipmentStateManageMapper stateManageMapper; @Resource @@ -40,6 +53,9 @@ @Resource private IBaseApprovalService baseApprovalService; + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + @Override public Page stateManageList(Page page, StateManageRequest request) throws Exception { Page resultPage; @@ -137,4 +153,16 @@ } iBaseExportService.exportExcel(response, StateManageResponse.class,resultList, ExportEnum.STATE_MANAGE_APPLY.getSheetName()); } + + @Override + public ReturnDTO updateEquipmentApply(StateManageResponse response) { + EquipmentApply equipmentApply = new EquipmentApply(); + BeanUtils.copyProperties(response, equipmentApply); + if(equipmentApplyMapper.updateById(equipmentApply)>0){ + EquipmentApplyEquipment equipment = new EquipmentApplyEquipment(response.getApplyEquipmentId(),response.getEquipmentId(),response.getFinancialValue(),response.getAssetOriginValue()); + if(equipmentMapper.updateById(equipment)>0)return ReturnUtil.success(); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java index be54567..958b32c 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStateManageController.java @@ -124,11 +124,11 @@ @ApiOperation("状态管理申请编辑") @PostMapping("/updateStateManageInfo") @ResponseBody - public ReturnDTO updateStateManageInfo(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { + public ReturnDTO updateStateManageInfo(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { if(bindingResult.hasErrors()){ throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.updateEquipmentApply(equipmentApply); + return stateManageService.updateEquipmentApply(stateManageResponse); } /** diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java index 44d6ea7..9728204 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateManageMapper.java @@ -14,4 +14,5 @@ List stateManageList(@Param("request") StateManageRequest request); StateManageResponse selectById(@Param("id") Long id); + } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8baf835..8cd70b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -9,6 +9,8 @@ SELECT msa.id, + meae.id AS apply_equipment_id, + mfa.id AS equipment_id, msa.apply_no, msa.apply_type, mfa.equipment_no, diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java index f416437..557e1be 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/StateManageResponse.java @@ -73,6 +73,18 @@ private String applyTypeName; /** + * 设备id + */ + @ApiModelProperty(value = "设备id", dataType = "String") + private String equipmentId; + + /** + * 设备申请关联id + */ + @ApiModelProperty(value = "设备申请关联id", dataType = "Long") + private Long applyEquipmentId; + + /** * 设备编号 */ @ApiModelProperty(value = "(状态管理)设备编号", dataType = "String") @@ -162,14 +174,14 @@ /** * 财务净值 */ - @ApiModelProperty(value = "财务净值", dataType = "String") - private String financialValue; + @ApiModelProperty(value = "财务净值", dataType = "Double") + private Double financialValue; /** * 资产原值 */ - @ApiModelProperty(value = "资产原值", dataType = "String") - private String assetOriginValue; + @ApiModelProperty(value = "资产原值", dataType = "Double") + private Double assetOriginValue; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java index b9d320a..36ebf34 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentApplyEquipment.java @@ -153,4 +153,14 @@ @TableField(exist = false) @ApiModelProperty(value = "设备名称", dataType = "String") private String equipmentName; + + public EquipmentApplyEquipment() { + } + + public EquipmentApplyEquipment(Long id, String equipmentId, Double financialValue, Double assetOriginValue) { + this.id = id; + this.equipmentId = equipmentId; + this.financialValue = financialValue; + this.assetOriginValue = assetOriginValue; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 047f173..481cf64 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -2,21 +2,31 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.service.IBaseExportService; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.StateManageRequest; import com.casic.missiles.dto.equipment.StateManageResponse; import com.casic.missiles.dto.flowable.AllApproveDTO; import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.enums.ApprovalStatusEnum; +import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; import com.casic.missiles.mapper.equipment.EquipmentApplyFileMapper; +import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; import com.casic.missiles.mapper.equipment.EquipmentStateManageMapper; +import com.casic.missiles.model.equipment.EquipmentApply; +import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.equipment.IEquipmentStateManageService; import com.casic.missiles.utils.DictCodeUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -29,6 +39,9 @@ public class EquipmentStateManageServiceImpl implements IEquipmentStateManageService { @Resource + private EquipmentApplyMapper equipmentApplyMapper; + + @Resource private EquipmentStateManageMapper stateManageMapper; @Resource @@ -40,6 +53,9 @@ @Resource private IBaseApprovalService baseApprovalService; + @Resource + private EquipmentApplyEquipmentMapper equipmentMapper; + @Override public Page stateManageList(Page page, StateManageRequest request) throws Exception { Page resultPage; @@ -137,4 +153,16 @@ } iBaseExportService.exportExcel(response, StateManageResponse.class,resultList, ExportEnum.STATE_MANAGE_APPLY.getSheetName()); } + + @Override + public ReturnDTO updateEquipmentApply(StateManageResponse response) { + EquipmentApply equipmentApply = new EquipmentApply(); + BeanUtils.copyProperties(response, equipmentApply); + if(equipmentApplyMapper.updateById(equipmentApply)>0){ + EquipmentApplyEquipment equipment = new EquipmentApplyEquipment(response.getApplyEquipmentId(),response.getEquipmentId(),response.getFinancialValue(),response.getAssetOriginValue()); + if(equipmentMapper.updateById(equipment)>0)return ReturnUtil.success(); + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStateManageService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStateManageService.java index 7eeeefa..54a80f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStateManageService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStateManageService.java @@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.StateManageRequest; import com.casic.missiles.dto.equipment.StateManageResponse; +import com.casic.missiles.model.equipment.EquipmentApply; import javax.servlet.http.HttpServletResponse; @@ -14,4 +16,6 @@ StateManageResponse selectStateManageInfo(IdDTO idDto) throws Exception; void exportStateManageList(StateManageRequest request, HttpServletResponse response) throws Exception; + + ReturnDTO updateEquipmentApply(StateManageResponse stateManageResponse); }