diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index da80480..550a898 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -67,7 +67,7 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index da80480..550a898 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -67,7 +67,7 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); 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 958b32c..2fd1d05 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 @@ -150,14 +150,14 @@ @ApiOperation("审批未通过驳回后-编辑") @PostMapping("/failUpdate") @ResponseBody - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { - Assert.isFalse(Objects.isNull(equipmentApply.getId()), () -> { + public ReturnDTO failUpdate(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(stateManageResponse.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.failUpdate(equipmentApply); + return stateManageService.failUpdate(stateManageResponse); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index da80480..550a898 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -67,7 +67,7 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); 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 958b32c..2fd1d05 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 @@ -150,14 +150,14 @@ @ApiOperation("审批未通过驳回后-编辑") @PostMapping("/failUpdate") @ResponseBody - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { - Assert.isFalse(Objects.isNull(equipmentApply.getId()), () -> { + public ReturnDTO failUpdate(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(stateManageResponse.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.failUpdate(equipmentApply); + return stateManageService.failUpdate(stateManageResponse); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java index 7d7b170..7d318c2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java @@ -3,11 +3,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.EquipmentWorkbenchResponse; -import com.casic.missiles.dto.meter.MeterWorkbenchRequest; -import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.equipment.IEquipmentWorkbenchService; -import com.casic.missiles.service.meter.MeterWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -37,6 +34,8 @@ /** * 本月统计数据 + * 测量设备:(闲置设备,封存设备)/标准装置:(暂停装置,撤销装置)/设备借用/设备领用 通过审批通过的时间查询当月的设备状态数量 + * 测量设备:(在用设备)/标准装置:(在用装置) 查询设备中管理状态为在用的设备数量 * @return */ @ApiOperation("本月统计数据") @@ -48,6 +47,7 @@ /** * 设备台账检定提醒 + * 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天) * @return */ @ApiOperation("设备台账检定提醒") @@ -59,6 +59,7 @@ /** * 设备检定趋势 + * 未来一年内每月需要鉴定的设备 * @return */ @ApiOperation("设备检定趋势") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index da80480..550a898 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -67,7 +67,7 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); 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 958b32c..2fd1d05 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 @@ -150,14 +150,14 @@ @ApiOperation("审批未通过驳回后-编辑") @PostMapping("/failUpdate") @ResponseBody - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { - Assert.isFalse(Objects.isNull(equipmentApply.getId()), () -> { + public ReturnDTO failUpdate(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(stateManageResponse.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.failUpdate(equipmentApply); + return stateManageService.failUpdate(stateManageResponse); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java index 7d7b170..7d318c2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java @@ -3,11 +3,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.EquipmentWorkbenchResponse; -import com.casic.missiles.dto.meter.MeterWorkbenchRequest; -import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.equipment.IEquipmentWorkbenchService; -import com.casic.missiles.service.meter.MeterWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -37,6 +34,8 @@ /** * 本月统计数据 + * 测量设备:(闲置设备,封存设备)/标准装置:(暂停装置,撤销装置)/设备借用/设备领用 通过审批通过的时间查询当月的设备状态数量 + * 测量设备:(在用设备)/标准装置:(在用装置) 查询设备中管理状态为在用的设备数量 * @return */ @ApiOperation("本月统计数据") @@ -48,6 +47,7 @@ /** * 设备台账检定提醒 + * 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天) * @return */ @ApiOperation("设备台账检定提醒") @@ -59,6 +59,7 @@ /** * 设备检定趋势 + * 未来一年内每月需要鉴定的设备 * @return */ @ApiOperation("设备检定趋势") 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 959c152..69514d7 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 @@ -5,6 +5,7 @@ import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,4 +27,6 @@ Page queryEquipment(Page page, @Param("request")EquipmentOrSampleDto request); List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); + + List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index da80480..550a898 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -67,7 +67,7 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); 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 958b32c..2fd1d05 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 @@ -150,14 +150,14 @@ @ApiOperation("审批未通过驳回后-编辑") @PostMapping("/failUpdate") @ResponseBody - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { - Assert.isFalse(Objects.isNull(equipmentApply.getId()), () -> { + public ReturnDTO failUpdate(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(stateManageResponse.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.failUpdate(equipmentApply); + return stateManageService.failUpdate(stateManageResponse); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java index 7d7b170..7d318c2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java @@ -3,11 +3,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.EquipmentWorkbenchResponse; -import com.casic.missiles.dto.meter.MeterWorkbenchRequest; -import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.equipment.IEquipmentWorkbenchService; -import com.casic.missiles.service.meter.MeterWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -37,6 +34,8 @@ /** * 本月统计数据 + * 测量设备:(闲置设备,封存设备)/标准装置:(暂停装置,撤销装置)/设备借用/设备领用 通过审批通过的时间查询当月的设备状态数量 + * 测量设备:(在用设备)/标准装置:(在用装置) 查询设备中管理状态为在用的设备数量 * @return */ @ApiOperation("本月统计数据") @@ -48,6 +47,7 @@ /** * 设备台账检定提醒 + * 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天) * @return */ @ApiOperation("设备台账检定提醒") @@ -59,6 +59,7 @@ /** * 设备检定趋势 + * 未来一年内每月需要鉴定的设备 * @return */ @ApiOperation("设备检定趋势") 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 959c152..69514d7 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 @@ -5,6 +5,7 @@ import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,4 +27,6 @@ Page queryEquipment(Page page, @Param("request")EquipmentOrSampleDto request); List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); + + List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java index 87c680f..806060b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java @@ -19,4 +19,6 @@ List standardEquipmentList(@Param("request") StandardEquipmentApplyRequest request); Long selectMaxNo(); + + EquipmentStandardApply selectApplyInfo(@Param("id") Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java index da80480..550a898 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentStandardApplyController.java @@ -67,7 +67,7 @@ @ApiOperation("标准装置申请详细信息") @PostMapping("/standardEquipmentApplyInfo") @ResponseBody - public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ + public ReturnDTO standardEquipmentInfo(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); 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 958b32c..2fd1d05 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 @@ -150,14 +150,14 @@ @ApiOperation("审批未通过驳回后-编辑") @PostMapping("/failUpdate") @ResponseBody - public ReturnDTO failUpdate(@RequestBody @Valid EquipmentApply equipmentApply, BindingResult bindingResult) { - Assert.isFalse(Objects.isNull(equipmentApply.getId()), () -> { + public ReturnDTO failUpdate(@RequestBody @Valid StateManageResponse stateManageResponse, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(stateManageResponse.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); if (bindingResult.hasErrors()) { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); } - return meterEquipmentApplyService.failUpdate(equipmentApply); + return stateManageService.failUpdate(stateManageResponse); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java index 7d7b170..7d318c2 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentWorkbenchController.java @@ -3,11 +3,8 @@ import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.EquipmentWorkbenchResponse; -import com.casic.missiles.dto.meter.MeterWorkbenchRequest; -import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.equipment.IEquipmentWorkbenchService; -import com.casic.missiles.service.meter.MeterWorkbenchService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -37,6 +34,8 @@ /** * 本月统计数据 + * 测量设备:(闲置设备,封存设备)/标准装置:(暂停装置,撤销装置)/设备借用/设备领用 通过审批通过的时间查询当月的设备状态数量 + * 测量设备:(在用设备)/标准装置:(在用装置) 查询设备中管理状态为在用的设备数量 * @return */ @ApiOperation("本月统计数据") @@ -48,6 +47,7 @@ /** * 设备台账检定提醒 + * 查询管理状态不是报废，上次检定日期距离和当前时间相差的月份>=检定周期-1(提前30天) * @return */ @ApiOperation("设备台账检定提醒") @@ -59,6 +59,7 @@ /** * 设备检定趋势 + * 未来一年内每月需要鉴定的设备 * @return */ @ApiOperation("设备检定趋势") 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 959c152..69514d7 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 @@ -5,6 +5,7 @@ import com.casic.missiles.dto.equipment.EquipmentOrSampleDto; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,4 +27,6 @@ Page queryEquipment(Page page, @Param("request")EquipmentOrSampleDto request); List listPage(@Param("fixedAssetRequest")FixedAssetRequest fixedAssetRequest); + + List queryEquipmentInfo(@Param("oldEquipmentIds") List oldEquipmentIds); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java index 87c680f..806060b 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardApplyMapper.java @@ -19,4 +19,6 @@ List standardEquipmentList(@Param("request") StandardEquipmentApplyRequest request); Long selectMaxNo(); + + EquipmentStandardApply selectApplyInfo(@Param("id") Long id); } 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 c25f789..60e0c58 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -86,6 +86,21 @@ ORDER BY mfa.create_time DESC + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - + + - + + and msa.id = #{id} + + SELECT msa.id, msa.apply_no, @@ -14,21 +18,29 @@ msa.standard_equipment_id, mse.standard_no, mse.standard_name, - sd1.simple_name as construction_standard_unit_name, - mf.name as standard_owner, - su1.name as create_user, - su1.dept_id, - sd.simple_name as apply_dept, - DATE_FORMAT(msa.create_time,'%Y-%m-%d %H:%i') as create_time, - msa.approval_status - FROM + mo.organize_name AS construction_standard_unit_name, + mf.NAME AS standard_owner, + DATE_FORMAT( msa.apply_time, '%Y-%m-%d %H:%i:%s' ) AS apply_time, + msa.approval_status, + msa.apply_person, + su.`NAME` AS apply_person_name, + msa.apply_unit, + sd.SIMPLE_NAME AS apply_unit_name, + msa.apply_name, + msa.process_id + FROM equipment_standard_apply msa - LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner - LEFT JOIN sys_user su1 ON su1.id = msa.create_user - LEFT JOIN sys_dept sd on su1.DEPT_ID = sd.ID - LEFT JOIN sys_dept sd1 on mse.construction_standard_unit_name = sd1.ID - where msa.is_del = 0 + LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id + LEFT JOIN meter_staff mf ON mf.id = mse.standard_owner + LEFT JOIN meter_organize mo ON mo.dept_id = mse.standard_laboratory + LEFT JOIN sys_user su ON msa.apply_person = su.id + LEFT JOIN sys_dept sd ON msa.apply_unit = sd.id + WHERE + msa.is_del = 0 + + + SELECT DATE_FORMAT( DATE_ADD( mesure_date, INTERVAL mesure_cycle MONTH ), '%Y-%m' ) AS `date`, @@ -44,7 +44,7 @@ GROUP BY manager_state - +