diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) 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 85119ec..3e63a5a 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 @@ -1,10 +1,13 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -197,6 +200,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())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); @@ -206,14 +214,14 @@ boolean fileListResult = true; boolean equipmentListResult = true; Long id = meterStandardApply.getId(); - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { applyEquipment.setStandardApplyId(id); } // 新增对应附件表 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); } - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } @@ -231,10 +239,14 @@ @Override @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -297,22 +309,35 @@ @Override @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - //发起人审批通过 - Task task = taskService.createTaskQuery() - .processInstanceId(meterStandardApply.getProcessId()) - .active() - .singleResult(); - taskService.complete(task.getId()); - //更新状态为审批中 - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + //发起人审批通过 + Task task = taskService.createTaskQuery() + .processInstanceId(meterStandardApply.getProcessId()) + .active() + .singleResult(); + taskService.complete(task.getId()); + //更新状态为审批中 + runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private void remove(Long id){ + QueryWrapper fileWrapper = new QueryWrapper<>(); + fileWrapper.eq("standard_apply_id",id); + meterStandardApplyFileService.remove(fileWrapper); + QueryWrapper equipmentWrapper = new QueryWrapper<>(); + equipmentWrapper.eq("standard_apply_id",id); + standardApplyEquipmentService.remove(equipmentWrapper); + } + private String getApplyNoPrefix(String applyType){ switch (applyType){ case StandardApplyTypeEnum.REPLACE_APPLY: diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) 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 85119ec..3e63a5a 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 @@ -1,10 +1,13 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -197,6 +200,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())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); @@ -206,14 +214,14 @@ boolean fileListResult = true; boolean equipmentListResult = true; Long id = meterStandardApply.getId(); - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { applyEquipment.setStandardApplyId(id); } // 新增对应附件表 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); } - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } @@ -231,10 +239,14 @@ @Override @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -297,22 +309,35 @@ @Override @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - //发起人审批通过 - Task task = taskService.createTaskQuery() - .processInstanceId(meterStandardApply.getProcessId()) - .active() - .singleResult(); - taskService.complete(task.getId()); - //更新状态为审批中 - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + //发起人审批通过 + Task task = taskService.createTaskQuery() + .processInstanceId(meterStandardApply.getProcessId()) + .active() + .singleResult(); + taskService.complete(task.getId()); + //更新状态为审批中 + runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private void remove(Long id){ + QueryWrapper fileWrapper = new QueryWrapper<>(); + fileWrapper.eq("standard_apply_id",id); + meterStandardApplyFileService.remove(fileWrapper); + QueryWrapper equipmentWrapper = new QueryWrapper<>(); + equipmentWrapper.eq("standard_apply_id",id); + standardApplyEquipmentService.remove(equipmentWrapper); + } + private String getApplyNoPrefix(String applyType){ switch (applyType){ case StandardApplyTypeEnum.REPLACE_APPLY: 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 e87d77e..d034d87 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 @@ -71,10 +71,9 @@ } for (EquipmentStandardSupportEquipment record : meterStandardSupportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); - if (meterFixedAssets != null) { - BeanUtils.copyProperties(meterFixedAssets, record); - DictCodeUtils.convertDictCodeToName(record); - } + meterFixedAssets.setId(record.getId()); + BeanUtils.copyProperties(meterFixedAssets, record); + DictCodeUtils.convertDictCodeToName(record); } } return meterStandardSupportEquipmentPage; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) 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 85119ec..3e63a5a 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 @@ -1,10 +1,13 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -197,6 +200,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())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); @@ -206,14 +214,14 @@ boolean fileListResult = true; boolean equipmentListResult = true; Long id = meterStandardApply.getId(); - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { applyEquipment.setStandardApplyId(id); } // 新增对应附件表 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); } - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } @@ -231,10 +239,14 @@ @Override @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -297,22 +309,35 @@ @Override @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - //发起人审批通过 - Task task = taskService.createTaskQuery() - .processInstanceId(meterStandardApply.getProcessId()) - .active() - .singleResult(); - taskService.complete(task.getId()); - //更新状态为审批中 - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + //发起人审批通过 + Task task = taskService.createTaskQuery() + .processInstanceId(meterStandardApply.getProcessId()) + .active() + .singleResult(); + taskService.complete(task.getId()); + //更新状态为审批中 + runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private void remove(Long id){ + QueryWrapper fileWrapper = new QueryWrapper<>(); + fileWrapper.eq("standard_apply_id",id); + meterStandardApplyFileService.remove(fileWrapper); + QueryWrapper equipmentWrapper = new QueryWrapper<>(); + equipmentWrapper.eq("standard_apply_id",id); + standardApplyEquipmentService.remove(equipmentWrapper); + } + private String getApplyNoPrefix(String applyType){ switch (applyType){ case StandardApplyTypeEnum.REPLACE_APPLY: 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 e87d77e..d034d87 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 @@ -71,10 +71,9 @@ } for (EquipmentStandardSupportEquipment record : meterStandardSupportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); - if (meterFixedAssets != null) { - BeanUtils.copyProperties(meterFixedAssets, record); - DictCodeUtils.convertDictCodeToName(record); - } + meterFixedAssets.setId(record.getId()); + BeanUtils.copyProperties(meterFixedAssets, record); + DictCodeUtils.convertDictCodeToName(record); } } return meterStandardSupportEquipmentPage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index a95919c..7c3f9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -96,8 +96,8 @@ } @Override - public MeterPrice selectStaffInfo(IdDTO idDto) { - MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + public MeterPrice queryPriceInfo(IdDTO idDto) { + MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId()); meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) 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 85119ec..3e63a5a 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 @@ -1,10 +1,13 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -197,6 +200,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())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); @@ -206,14 +214,14 @@ boolean fileListResult = true; boolean equipmentListResult = true; Long id = meterStandardApply.getId(); - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { applyEquipment.setStandardApplyId(id); } // 新增对应附件表 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); } - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } @@ -231,10 +239,14 @@ @Override @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -297,22 +309,35 @@ @Override @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - //发起人审批通过 - Task task = taskService.createTaskQuery() - .processInstanceId(meterStandardApply.getProcessId()) - .active() - .singleResult(); - taskService.complete(task.getId()); - //更新状态为审批中 - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + //发起人审批通过 + Task task = taskService.createTaskQuery() + .processInstanceId(meterStandardApply.getProcessId()) + .active() + .singleResult(); + taskService.complete(task.getId()); + //更新状态为审批中 + runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private void remove(Long id){ + QueryWrapper fileWrapper = new QueryWrapper<>(); + fileWrapper.eq("standard_apply_id",id); + meterStandardApplyFileService.remove(fileWrapper); + QueryWrapper equipmentWrapper = new QueryWrapper<>(); + equipmentWrapper.eq("standard_apply_id",id); + standardApplyEquipmentService.remove(equipmentWrapper); + } + private String getApplyNoPrefix(String applyType){ switch (applyType){ case StandardApplyTypeEnum.REPLACE_APPLY: 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 e87d77e..d034d87 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 @@ -71,10 +71,9 @@ } for (EquipmentStandardSupportEquipment record : meterStandardSupportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); - if (meterFixedAssets != null) { - BeanUtils.copyProperties(meterFixedAssets, record); - DictCodeUtils.convertDictCodeToName(record); - } + meterFixedAssets.setId(record.getId()); + BeanUtils.copyProperties(meterFixedAssets, record); + DictCodeUtils.convertDictCodeToName(record); } } return meterStandardSupportEquipmentPage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index a95919c..7c3f9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -96,8 +96,8 @@ } @Override - public MeterPrice selectStaffInfo(IdDTO idDto) { - MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + public MeterPrice queryPriceInfo(IdDTO idDto) { + MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId()); meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 49852e1..7c4a1a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -22,11 +22,13 @@ import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.model.meter.MeterCertificate; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IDeptService; +import com.casic.missiles.service.meter.IMeterTrainStaffService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.service.meter.MeterStaffService; import com.casic.missiles.utils.ExportUtils; @@ -83,6 +85,9 @@ @Resource private IBaseExportService iBaseExportService; + @Resource + private IMeterTrainStaffService trainStaffService; + @Override public Page selectStaffList(Page page,MeterStaffRequest meterStaffRequest) { Page meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest); @@ -320,4 +325,20 @@ return supplementList(meterStaffMapper.selectStaffList(meterStaffRequest)); } + @Override + public Page staffCultivateLog(Page page, IdDTO idDto) { + return meterStaffMapper.staffCultivateLog(page, idDto.getId()); + } + + @Override + @Transactional + public ReturnDTO updateStaffCultivateLog(List list) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id",list.get(0).getStaffId()); + if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) 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 85119ec..3e63a5a 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 @@ -1,10 +1,13 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -197,6 +200,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())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); @@ -206,14 +214,14 @@ boolean fileListResult = true; boolean equipmentListResult = true; Long id = meterStandardApply.getId(); - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { applyEquipment.setStandardApplyId(id); } // 新增对应附件表 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); } - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } @@ -231,10 +239,14 @@ @Override @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -297,22 +309,35 @@ @Override @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - //发起人审批通过 - Task task = taskService.createTaskQuery() - .processInstanceId(meterStandardApply.getProcessId()) - .active() - .singleResult(); - taskService.complete(task.getId()); - //更新状态为审批中 - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + //发起人审批通过 + Task task = taskService.createTaskQuery() + .processInstanceId(meterStandardApply.getProcessId()) + .active() + .singleResult(); + taskService.complete(task.getId()); + //更新状态为审批中 + runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private void remove(Long id){ + QueryWrapper fileWrapper = new QueryWrapper<>(); + fileWrapper.eq("standard_apply_id",id); + meterStandardApplyFileService.remove(fileWrapper); + QueryWrapper equipmentWrapper = new QueryWrapper<>(); + equipmentWrapper.eq("standard_apply_id",id); + standardApplyEquipmentService.remove(equipmentWrapper); + } + private String getApplyNoPrefix(String applyType){ switch (applyType){ case StandardApplyTypeEnum.REPLACE_APPLY: 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 e87d77e..d034d87 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 @@ -71,10 +71,9 @@ } for (EquipmentStandardSupportEquipment record : meterStandardSupportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); - if (meterFixedAssets != null) { - BeanUtils.copyProperties(meterFixedAssets, record); - DictCodeUtils.convertDictCodeToName(record); - } + meterFixedAssets.setId(record.getId()); + BeanUtils.copyProperties(meterFixedAssets, record); + DictCodeUtils.convertDictCodeToName(record); } } return meterStandardSupportEquipmentPage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index a95919c..7c3f9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -96,8 +96,8 @@ } @Override - public MeterPrice selectStaffInfo(IdDTO idDto) { - MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + public MeterPrice queryPriceInfo(IdDTO idDto) { + MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId()); meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 49852e1..7c4a1a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -22,11 +22,13 @@ import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.model.meter.MeterCertificate; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IDeptService; +import com.casic.missiles.service.meter.IMeterTrainStaffService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.service.meter.MeterStaffService; import com.casic.missiles.utils.ExportUtils; @@ -83,6 +85,9 @@ @Resource private IBaseExportService iBaseExportService; + @Resource + private IMeterTrainStaffService trainStaffService; + @Override public Page selectStaffList(Page page,MeterStaffRequest meterStaffRequest) { Page meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest); @@ -320,4 +325,20 @@ return supplementList(meterStaffMapper.selectStaffList(meterStaffRequest)); } + @Override + public Page staffCultivateLog(Page page, IdDTO idDto) { + return meterStaffMapper.staffCultivateLog(page, idDto.getId()); + } + + @Override + @Transactional + public ReturnDTO updateStaffCultivateLog(List list) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id",list.get(0).getStaffId()); + if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 1a8f12c..175b914 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -19,7 +19,7 @@ ReturnDTO addMeterPrice(MeterPrice meterPrice); - MeterPrice selectStaffInfo(IdDTO idDto); + MeterPrice queryPriceInfo(IdDTO idDto); ReturnDTO updatePriceInfo(MeterPrice meterPrice); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java index 94c825b..176e110 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterPriceController.java @@ -76,8 +76,8 @@ @ApiOperation("价格详细信息") @PostMapping("/queryPriceInfo") @ResponseBody - public ReturnDTO selectStaffInfo(@RequestBody IdDTO idDto) { - MeterPrice meterPrice = meterPriceService.selectStaffInfo(idDto); + public ReturnDTO queryPriceInfo(@RequestBody IdDTO idDto) { + MeterPrice meterPrice = meterPriceService.queryPriceInfo(idDto); return ReturnUtil.success(meterPrice); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java index 9c43740..f9eca51 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterStaffController.java @@ -2,6 +2,7 @@ import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -10,6 +11,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.service.meter.MeterStaffService; import io.swagger.annotations.Api; @@ -33,7 +35,7 @@ @Api(tags = "计量人员表接口") @RestController @RequestMapping("/staff") -public class MeterStaffController { +public class MeterStaffController extends ExportController { @Resource private MeterStaffService meterStaffService; @@ -50,6 +52,7 @@ Page list = meterStaffService.selectStaffList(page,meterStaffRequest); return ReturnUtil.success(list); } + /** * 计量人员新增 * @return @@ -151,4 +154,28 @@ List list = meterStaffService.selectStaffListByDept(meterStaffRequest); return ReturnUtil.success(list); } + + /** + * 计量工作培训记录 + * @return + */ + @ApiOperation("计量工作培训记录") + @PostMapping("/staffCultivateLog") + @ResponseBody + public ReturnDTO staffCultivateLog(@RequestBody IdDTO idDto) { + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(meterStaffService.staffCultivateLog(page,idDto))); + } + + /** + * 计量工作培训记录编辑 + * @return + */ + @ApiOperation("计量工作培训记录编辑") + @PostMapping("/updateStaffCultivateLog") + @ResponseBody + public ReturnDTO updateStaffCultivateLog(@RequestBody List list) { + return meterStaffService.updateStaffCultivateLog(list); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index fc2ae98..dbd054b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -12,16 +12,11 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessCertificateReportMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyEquipmentMapper; -import com.casic.missiles.mapper.equipment.EquipmentApplyMapper; -import com.casic.missiles.mapper.equipment.EquipmentStateChangeLogMapper; +import com.casic.missiles.mapper.equipment.*; import com.casic.missiles.mapper.system.SystemFlowFormMapper; import com.casic.missiles.model.business.BusinessCertificateReport; import com.casic.missiles.mapper.workbench.WorkbenchApprovalMessageMapper; -import com.casic.missiles.model.equipment.EquipmentApply; -import com.casic.missiles.model.equipment.EquipmentApplyEquipment; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; -import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.model.system.SystemFlowForm; import com.casic.missiles.model.workbench.WorkbenchApprovalMessage; import com.casic.missiles.modular.system.dao.UserMapper; @@ -36,6 +31,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; @@ -69,6 +65,9 @@ case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE); break; + case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL: + changeSupportingEquipment(id); + break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE); @@ -102,6 +101,44 @@ sendMessageAndSocket(execution, systemFlowForm); } + /** + * 审批通过后修改标准装置配套设备 + * @param id + */ + private void changeSupportingEquipment(String id) { + 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); + // 通过申请id查询出申请设备列表 + 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) { + EquipmentStandardSupportEquipment supportEquipment = new EquipmentStandardSupportEquipment(); + supportEquipment.setEquipmentId(equipmentId); + 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); + } + } + } + /** + * 审批通过后修改设备借用/领用状态 + * @param id + */ private void updateEquipmentApplyState(String id, String state) { EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); @@ -110,7 +147,11 @@ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } } - + /** + * 审批通过后修改设备管理状态 + * 新增状态变更记录表 + * @param id + */ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); @@ -145,6 +186,11 @@ } } + /** + * 审批通过后修改标准装置业务状态 + * @param id + * @param state + */ private void updateStandardState(String id, String state) { MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java index 1650d41..2d02a10 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterPriceMapper.java @@ -19,5 +19,5 @@ List queryPriceList(@Param("request") MeterPriceRequest meterPriceRequest); - MeterPrice selectStaffInfo(@Param("id")Long id); + MeterPrice queryPriceInfo(@Param("id")Long id); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java index a4f7ba4..ed6ef05 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/meter/MeterStaffMapper.java @@ -6,6 +6,7 @@ import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.dto.meter.MeterWorkbenchResponse; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,4 +31,6 @@ void addStaffList(@Param("list") List list); List meterStaffStatistic(@Param("startTime")String startTime, @Param("endTime")String endTime); + + Page staffCultivateLog(Page page, @Param("id")Long id); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml index 0b88955..c5dd424 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardApplyMapper.xml @@ -15,16 +15,16 @@ mse.standard_no, mse.standard_name, sd1.simple_name as construction_standard_unit_name, - su.name as standard_owner, + 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 + FROM equipment_standard_apply msa LEFT JOIN equipment_standard_equipment mse ON msa.standard_equipment_id = mse.id - LEFT JOIN sys_user su ON su.id = mse.standard_owner + 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 diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 2bcd703..ca129e3 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -65,7 +65,7 @@ - where mp.id = #{id} diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml index 5df18b9..2684a0d 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -83,8 +83,6 @@ t.sex, t.birthday, t.certificate_company, - t.verifier_certificate_no, - t.certificate_date, t.work_date, t.main_examiner, t.special_operator, @@ -122,4 +120,20 @@ + 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 203dbdf..564f0a1 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 @@ -80,8 +80,8 @@ * 使用部门 */ @TableField(exist = false) - @ApiModelProperty(value = "使用部门", dataType = "String", required = false) - private String useDept; + @ApiModelProperty(value = "使用部门", dataType = "Integer", required = false) + private Integer useDept; /** * 使用部门名称 @@ -109,14 +109,14 @@ */ @TableField(exist = false) @DictCodeField(message = "检定结果不合法", cacheName = MeterDictCode.MESURE_RESULT) - @ApiModelProperty(value = "有效日期", dataType = "Integer", required = false) - private Integer mesureResult; + @ApiModelProperty(value = "检定结果", dataType = "String", required = false) + private String mesureResult; /** * 检定结果名称 */ @TableField(exist = false) - @ApiModelProperty(value = "有效日期", dataType = "String", required = false) + @ApiModelProperty(value = "检定结果名称", dataType = "String", required = false) private String mesureResultName; /** * 备注 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java index 20ce80d..da20fee 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterTrainStaff.java @@ -38,7 +38,7 @@ /** * 培训计划表id */ - @ApiModelProperty(hidden = true) + @ApiModelProperty(value = "培训计划表id", dataType = "Long") @TableField("plan_id") private Long planId; @@ -85,6 +85,27 @@ private String remark; /** + * 培训时间 + */ + @ApiModelProperty(value = "培训时间", dataType = "String") + @TableField(exist = false) + private String trainTime; + + /** + * 培训名称 + */ + @ApiModelProperty(value = "培训名称", dataType = "String") + @TableField(exist = false) + private String planName; + + /** + * 计划编号 + */ + @ApiModelProperty(value = "计划编号", dataType = "String") + @TableField(exist = false) + private String planNo; + + /** * 删除标记 */ @ApiModelProperty(hidden = true) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java index 037eaae..d81a488 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyAcceptanceCheckServiceImpl.java @@ -209,10 +209,10 @@ @Transactional public ReturnDTO updateAcceptanceCheckInfo(EquipmentApply equipmentApply) { // 编辑验收报验单基本信息 - int updateFlg = equipmentApplyMapper.updateById(equipmentApply); + int updateFlag = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlag>0 && updateBatchFlag){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -248,8 +248,8 @@ // 编辑验收报验单基本信息 int updateFlg = equipmentApplyMapper.updateById(equipmentApply); // 编辑检修设备列表 - boolean saveOrUpdateBatch = equipmentApplyEquipmentService.saveOrUpdateBatch(equipmentApply.getEquipmentList()); - if(updateFlg>0 && saveOrUpdateBatch){ + boolean updateBatchFlag= equipmentApplyEquipmentService.updateBatchById(equipmentApply.getEquipmentList()); + if(updateFlg>0 && updateBatchFlag){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java index fecbc9a..38ad4e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentApplyServiceImpl.java @@ -265,12 +265,11 @@ QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id",equipmentApply.getId()); equipmentService.remove(wrapper); - equipmentApply.getEquipmentList().forEach(bean->{ - bean.setApplyId(equipmentApply.getId().toString()); - }); + for (EquipmentApplyEquipment equipment : equipmentApply.getEquipmentList()) { + equipment.setApplyId(equipmentApply.getId().toString()); + } // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -379,8 +378,7 @@ bean.setApplyId(equipmentApply.getId().toString()); }); // 新增最终确定的设备list - boolean saveOrUpdateBatchFlg = equipmentService.saveBatch(equipmentApply.getEquipmentList()); - if(saveOrUpdateBatchFlg){ + if(equipmentService.saveBatch(equipmentApply.getEquipmentList())){ //发起人审批通过 Task task = taskService.createTaskQuery() .processInstanceId(equipmentApply.getProcessId()) 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 85119ec..3e63a5a 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 @@ -1,10 +1,13 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; @@ -197,6 +200,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())); Long maxNo = meterStandardApplyMapper.selectMaxNo(); String applyNo = NumberGeneratorUtil.getContactNo(getApplyNoPrefix(meterStandardApply.getApplyType()), maxNo); meterStandardApply.setApplyNo(applyNo); @@ -206,14 +214,14 @@ boolean fileListResult = true; boolean equipmentListResult = true; Long id = meterStandardApply.getId(); - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ for (EquipmentStandardApplyEquipment applyEquipment : meterStandardApply.getApplyEquipmentList()) { applyEquipment.setStandardApplyId(id); } // 新增对应附件表 equipmentListResult = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); } - if(CollectionUtils.isEmpty(meterStandardApply.getApplyEquipmentList())){ + if(!CollectionUtils.isEmpty(meterStandardApply.getFileList())){ for (EquipmentStandardApplyFile applyFile : meterStandardApply.getFileList()) { applyFile.setStandardApplyId(id); } @@ -231,10 +239,14 @@ @Override @Transactional public ReturnDTO updateStandardEquipmentApply(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -297,22 +309,35 @@ @Override @Transactional public ReturnDTO failUpdate(EquipmentStandardApply meterStandardApply) { - boolean fileSaveOrUpdateFlag = meterStandardApplyFileService.saveOrUpdateBatch(meterStandardApply.getFileList()); - boolean equipmentSaveOrUpdateFlag = standardApplyEquipmentService.saveOrUpdateBatch(meterStandardApply.getApplyEquipmentList()); - if(fileSaveOrUpdateFlag && equipmentSaveOrUpdateFlag){ - //发起人审批通过 - Task task = taskService.createTaskQuery() - .processInstanceId(meterStandardApply.getProcessId()) - .active() - .singleResult(); - taskService.complete(task.getId()); - //更新状态为审批中 - runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); - return ReturnUtil.success(); + if(meterStandardApplyMapper.updateById(meterStandardApply)>0){ + remove(meterStandardApply.getId()); + boolean fileSaveFlag = meterStandardApplyFileService.saveBatch(meterStandardApply.getFileList()); + boolean equipmentFlag = standardApplyEquipmentService.saveBatch(meterStandardApply.getApplyEquipmentList()); + if(fileSaveFlag && equipmentFlag){ + //发起人审批通过 + Task task = taskService.createTaskQuery() + .processInstanceId(meterStandardApply.getProcessId()) + .active() + .singleResult(); + taskService.complete(task.getId()); + //更新状态为审批中 + runtimeService.updateBusinessStatus(task.getProcessInstanceId(), ApprovalStatusEnum.IN_APPROVED); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + private void remove(Long id){ + QueryWrapper fileWrapper = new QueryWrapper<>(); + fileWrapper.eq("standard_apply_id",id); + meterStandardApplyFileService.remove(fileWrapper); + QueryWrapper equipmentWrapper = new QueryWrapper<>(); + equipmentWrapper.eq("standard_apply_id",id); + standardApplyEquipmentService.remove(equipmentWrapper); + } + private String getApplyNoPrefix(String applyType){ switch (applyType){ case StandardApplyTypeEnum.REPLACE_APPLY: 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 e87d77e..d034d87 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 @@ -71,10 +71,9 @@ } for (EquipmentStandardSupportEquipment record : meterStandardSupportEquipmentPage.getRecords()) { EquipmentFixedAssets meterFixedAssets = existMap.get(record.getEquipmentId()); - if (meterFixedAssets != null) { - BeanUtils.copyProperties(meterFixedAssets, record); - DictCodeUtils.convertDictCodeToName(record); - } + meterFixedAssets.setId(record.getId()); + BeanUtils.copyProperties(meterFixedAssets, record); + DictCodeUtils.convertDictCodeToName(record); } } return meterStandardSupportEquipmentPage; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index a95919c..7c3f9cf 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -96,8 +96,8 @@ } @Override - public MeterPrice selectStaffInfo(IdDTO idDto) { - MeterPrice meterPrice = meterPriceMapper.selectStaffInfo(idDto.getId()); + public MeterPrice queryPriceInfo(IdDTO idDto) { + MeterPrice meterPrice = meterPriceMapper.queryPriceInfo(idDto.getId()); meterPrice.setCheckType(dictService.getDictNameByCode(MeterDictEnum.CHECK_TYPE,meterPrice.getCheckType())); meterPrice.setDirectorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.DIRECTOR_DISCOUNT_PERMISSION,meterPrice.getDirectorDiscountPermission())); meterPrice.setOperatorDiscountPermission(dictService.getDictNameByCode(MeterDictEnum.OPERATOR_DISCOUNT_PERMISSION,meterPrice.getOperatorDiscountPermission())); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java index 49852e1..7c4a1a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterStaffServiceImpl.java @@ -22,11 +22,13 @@ import com.casic.missiles.mapper.sys.UserInfoMapper; import com.casic.missiles.model.meter.MeterCertificate; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import com.casic.missiles.modular.system.dao.DeptMapper; import com.casic.missiles.modular.system.model.Dept; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IDeptService; +import com.casic.missiles.service.meter.IMeterTrainStaffService; import com.casic.missiles.service.meter.MeterCertificateService; import com.casic.missiles.service.meter.MeterStaffService; import com.casic.missiles.utils.ExportUtils; @@ -83,6 +85,9 @@ @Resource private IBaseExportService iBaseExportService; + @Resource + private IMeterTrainStaffService trainStaffService; + @Override public Page selectStaffList(Page page,MeterStaffRequest meterStaffRequest) { Page meterStaffPage = meterStaffMapper.selectStaffList(page, meterStaffRequest); @@ -320,4 +325,20 @@ return supplementList(meterStaffMapper.selectStaffList(meterStaffRequest)); } + @Override + public Page staffCultivateLog(Page page, IdDTO idDto) { + return meterStaffMapper.staffCultivateLog(page, idDto.getId()); + } + + @Override + @Transactional + public ReturnDTO updateStaffCultivateLog(List list) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("staff_id",list.get(0).getStaffId()); + if(trainStaffService.remove(wrapper) && trainStaffService.saveBatch(list)){ + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java index 1a8f12c..175b914 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterPriceService.java @@ -19,7 +19,7 @@ ReturnDTO addMeterPrice(MeterPrice meterPrice); - MeterPrice selectStaffInfo(IdDTO idDto); + MeterPrice queryPriceInfo(IdDTO idDto); ReturnDTO updatePriceInfo(MeterPrice meterPrice); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java index 6c4acc8..cf83a54 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/meter/MeterStaffService.java @@ -7,6 +7,7 @@ import com.casic.missiles.dto.meter.MeterStaffImport; import com.casic.missiles.dto.meter.MeterStaffRequest; import com.casic.missiles.model.meter.MeterStaff; +import com.casic.missiles.model.meter.MeterTrainStaff; import com.casic.missiles.model.system.UserInfo; import javax.servlet.http.HttpServletResponse; @@ -38,4 +39,8 @@ ReturnDTO dataCheck(List list); List selectStaffListByDept(MeterStaffRequest meterStaffRequest); + + Page staffCultivateLog(Page page, IdDTO idDto); + + ReturnDTO updateStaffCultivateLog(List list); }