diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 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 e7c492b..49ee4d6 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 @@ -1,5 +1,6 @@ package com.casic.missiles.listeners.flowable; +import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; @@ -9,10 +10,12 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; 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.system.SystemFlowFormMapper; 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.system.SystemFlowForm; import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; @@ -21,14 +24,18 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Slf4j @Component public class ProcessUpdateStateListener implements ExecutionListener { + @Override + @Transactional public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); @@ -69,12 +76,27 @@ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + EquipmentStateChangeLogMapper stateChangeLogMapper = SpringContextUtil.getBean(EquipmentStateChangeLogMapper.class); + EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); + // 获取申请关联的设备id QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", id); List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 修改对应该设备的管理状态 updateWrapper.in("id",equipmentIds).set("manager_state",state); + UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); + // 修改状态变更记录结束时间 + logUpdateWrapper.in("id",equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); + stateChangeLogMapper.update(null,logUpdateWrapper); + // 获取当前申请的信息 + EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); + // 新增状态变更记录 + for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) { + EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id),Long.parseLong(equipment.getEquipmentId()),state, DateUtils.format(new Date()),null,Long.parseLong(equipmentApply.getApplyPerson())); + stateChangeLogMapper.insert(stateChangeLog); + } if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 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 e7c492b..49ee4d6 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 @@ -1,5 +1,6 @@ package com.casic.missiles.listeners.flowable; +import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; @@ -9,10 +10,12 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; 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.system.SystemFlowFormMapper; 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.system.SystemFlowForm; import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; @@ -21,14 +24,18 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Slf4j @Component public class ProcessUpdateStateListener implements ExecutionListener { + @Override + @Transactional public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); @@ -69,12 +76,27 @@ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + EquipmentStateChangeLogMapper stateChangeLogMapper = SpringContextUtil.getBean(EquipmentStateChangeLogMapper.class); + EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); + // 获取申请关联的设备id QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", id); List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 修改对应该设备的管理状态 updateWrapper.in("id",equipmentIds).set("manager_state",state); + UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); + // 修改状态变更记录结束时间 + logUpdateWrapper.in("id",equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); + stateChangeLogMapper.update(null,logUpdateWrapper); + // 获取当前申请的信息 + EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); + // 新增状态变更记录 + for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) { + EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id),Long.parseLong(equipment.getEquipmentId()),state, DateUtils.format(new Date()),null,Long.parseLong(equipmentApply.getApplyPerson())); + stateChangeLogMapper.insert(stateChangeLog); + } if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java new file mode 100644 index 0000000..a92fe66 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentStateChangeLogMapper extends BaseMapper { + + List queryStateChangeLogList(@Param("id") Long id); +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 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 e7c492b..49ee4d6 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 @@ -1,5 +1,6 @@ package com.casic.missiles.listeners.flowable; +import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; @@ -9,10 +10,12 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; 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.system.SystemFlowFormMapper; 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.system.SystemFlowForm; import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; @@ -21,14 +24,18 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Slf4j @Component public class ProcessUpdateStateListener implements ExecutionListener { + @Override + @Transactional public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); @@ -69,12 +76,27 @@ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + EquipmentStateChangeLogMapper stateChangeLogMapper = SpringContextUtil.getBean(EquipmentStateChangeLogMapper.class); + EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); + // 获取申请关联的设备id QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", id); List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 修改对应该设备的管理状态 updateWrapper.in("id",equipmentIds).set("manager_state",state); + UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); + // 修改状态变更记录结束时间 + logUpdateWrapper.in("id",equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); + stateChangeLogMapper.update(null,logUpdateWrapper); + // 获取当前申请的信息 + EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); + // 新增状态变更记录 + for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) { + EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id),Long.parseLong(equipment.getEquipmentId()),state, DateUtils.format(new Date()),null,Long.parseLong(equipmentApply.getApplyPerson())); + stateChangeLogMapper.insert(stateChangeLog); + } if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java new file mode 100644 index 0000000..a92fe66 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentStateChangeLogMapper extends BaseMapper { + + List queryStateChangeLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java new file mode 100644 index 0000000..38565c7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentUseLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentUseLogMapper extends BaseMapper { + + List queryUseLogList(@Param("id") Long id); +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 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 e7c492b..49ee4d6 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 @@ -1,5 +1,6 @@ package com.casic.missiles.listeners.flowable; +import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; @@ -9,10 +10,12 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; 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.system.SystemFlowFormMapper; 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.system.SystemFlowForm; import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; @@ -21,14 +24,18 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Slf4j @Component public class ProcessUpdateStateListener implements ExecutionListener { + @Override + @Transactional public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); @@ -69,12 +76,27 @@ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + EquipmentStateChangeLogMapper stateChangeLogMapper = SpringContextUtil.getBean(EquipmentStateChangeLogMapper.class); + EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); + // 获取申请关联的设备id QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", id); List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 修改对应该设备的管理状态 updateWrapper.in("id",equipmentIds).set("manager_state",state); + UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); + // 修改状态变更记录结束时间 + logUpdateWrapper.in("id",equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); + stateChangeLogMapper.update(null,logUpdateWrapper); + // 获取当前申请的信息 + EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); + // 新增状态变更记录 + for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) { + EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id),Long.parseLong(equipment.getEquipmentId()),state, DateUtils.format(new Date()),null,Long.parseLong(equipmentApply.getApplyPerson())); + stateChangeLogMapper.insert(stateChangeLog); + } if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java new file mode 100644 index 0000000..a92fe66 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentStateChangeLogMapper extends BaseMapper { + + List queryStateChangeLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java new file mode 100644 index 0000000..38565c7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentUseLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentUseLogMapper extends BaseMapper { + + List queryUseLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml new file mode 100644 index 0000000..164ae31 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 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 e7c492b..49ee4d6 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 @@ -1,5 +1,6 @@ package com.casic.missiles.listeners.flowable; +import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; @@ -9,10 +10,12 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; 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.system.SystemFlowFormMapper; 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.system.SystemFlowForm; import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; @@ -21,14 +24,18 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Slf4j @Component public class ProcessUpdateStateListener implements ExecutionListener { + @Override + @Transactional public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); @@ -69,12 +76,27 @@ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + EquipmentStateChangeLogMapper stateChangeLogMapper = SpringContextUtil.getBean(EquipmentStateChangeLogMapper.class); + EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); + // 获取申请关联的设备id QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", id); List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 修改对应该设备的管理状态 updateWrapper.in("id",equipmentIds).set("manager_state",state); + UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); + // 修改状态变更记录结束时间 + logUpdateWrapper.in("id",equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); + stateChangeLogMapper.update(null,logUpdateWrapper); + // 获取当前申请的信息 + EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); + // 新增状态变更记录 + for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) { + EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id),Long.parseLong(equipment.getEquipmentId()),state, DateUtils.format(new Date()),null,Long.parseLong(equipmentApply.getApplyPerson())); + stateChangeLogMapper.insert(stateChangeLog); + } if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java new file mode 100644 index 0000000..a92fe66 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentStateChangeLogMapper extends BaseMapper { + + List queryStateChangeLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java new file mode 100644 index 0000000..38565c7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentUseLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentUseLogMapper extends BaseMapper { + + List queryUseLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml new file mode 100644 index 0000000..164ae31 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java index 3a664b4..9499a7e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/EquipmentFixedAssetsController.java @@ -10,8 +10,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.equipment.FixedAssetRequest; import com.casic.missiles.enums.ExportEnum; -import com.casic.missiles.model.equipment.EquipmentExcelData; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.*; import com.casic.missiles.dto.equipment.StandardSupportEquipmentExcelData; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.utils.DictCodeUtils; @@ -209,4 +208,24 @@ return iEquipmentFixedAssetsService.queryListByDept(idDTO.getId()); } + /** + * 通过设备id查询出使用记录 + */ + @ApiOperation("通过设备id查询出使用记录") + @PostMapping("/queryUseLogList") + @ResponseBody + public ReturnDTO queryUseLogLis(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryUseLogList(idDTO.getId()); + } + + /** + * 通过设备id查询出状态变更记录 + */ + @ApiOperation("通过设备id查询出状态变更记录") + @PostMapping("/queryStateChangeLogList") + @ResponseBody + public ReturnDTO queryStateChangeLogList(@RequestBody @Valid IdDTO idDTO) throws Exception { + return iEquipmentFixedAssetsService.queryStateChangeLogList(idDTO.getId()); + } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 9b49201..e9aacdf 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -1,16 +1,21 @@ package com.casic.missiles.enums; public interface EquipmentApplyProcessEnum { - // 待领用 - String WAIT_COLLECTING = "4"; - // 已领用 - String ALREADY_COLLECTING = "5"; // 待借用 String WAIT_BORROWED = "1"; // 已借用 String ALREADY_BORROWED = "2"; // 已归还 String ALREADY_RETURN = "3"; + // 待领用 + String WAIT_COLLECTING = "4"; + // 已领用 + String ALREADY_COLLECTING = "5"; + // 借用 + String BORROWED = "6"; + // 领用 + String COLLECT = "7"; + // 在用(启封) String USE = "1"; // 闲置 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 e7c492b..49ee4d6 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 @@ -1,5 +1,6 @@ package com.casic.missiles.listeners.flowable; +import com.alibaba.excel.util.DateUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.enums.ApplyFromIdEnum; @@ -9,10 +10,12 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; 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.system.SystemFlowFormMapper; 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.system.SystemFlowForm; import com.casic.missiles.utils.SpringContextUtil; import lombok.extern.slf4j.Slf4j; @@ -21,14 +24,18 @@ import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.repository.ProcessDefinition; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @Slf4j @Component public class ProcessUpdateStateListener implements ExecutionListener { + @Override + @Transactional public void notify(DelegateExecution execution) { RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class); SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class); @@ -69,12 +76,27 @@ private void updateEquipmentState(String id, String state) { EquipmentApplyEquipmentMapper equipmentMapper = SpringContextUtil.getBean(EquipmentApplyEquipmentMapper.class); MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + EquipmentStateChangeLogMapper stateChangeLogMapper = SpringContextUtil.getBean(EquipmentStateChangeLogMapper.class); + EquipmentApplyMapper equipmentApplyMapper = SpringContextUtil.getBean(EquipmentApplyMapper.class); + // 获取申请关联的设备id QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("apply_id", id); List equipmentApplyEquipments = equipmentMapper.selectList(wrapper); List equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList()); UpdateWrapper updateWrapper = new UpdateWrapper<>(); + // 修改对应该设备的管理状态 updateWrapper.in("id",equipmentIds).set("manager_state",state); + UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); + // 修改状态变更记录结束时间 + logUpdateWrapper.in("id",equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); + stateChangeLogMapper.update(null,logUpdateWrapper); + // 获取当前申请的信息 + EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); + // 新增状态变更记录 + for (EquipmentApplyEquipment equipment : equipmentApplyEquipments) { + EquipmentStateChangeLog stateChangeLog = new EquipmentStateChangeLog(Long.parseLong(id),Long.parseLong(equipment.getEquipmentId()),state, DateUtils.format(new Date()),null,Long.parseLong(equipmentApply.getApplyPerson())); + stateChangeLogMapper.insert(stateChangeLog); + } if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java new file mode 100644 index 0000000..a92fe66 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStateChangeLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentStateChangeLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentStateChangeLogMapper extends BaseMapper { + + List queryStateChangeLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java new file mode 100644 index 0000000..38565c7 --- /dev/null +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentUseLogMapper.java @@ -0,0 +1,12 @@ +package com.casic.missiles.mapper.equipment; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.model.equipment.EquipmentUseLog; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface EquipmentUseLogMapper extends BaseMapper { + + List queryUseLogList(@Param("id") Long id); +} diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml new file mode 100644 index 0000000..164ae31 --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateChangeLogMapper.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id} + SELECT + escl.id, + escl.apply_id, + escl.equipment_id, + escl.apply_person, + su.`name` AS apply_person_name, + escl.manager_state, + DATE_FORMAT( escl.start_date, '%Y-%m-%d' ) AS start_date, + DATE_FORMAT( escl.end_date, '%Y-%m-%d' ) AS end_date + FROM + equipment_state_change_log escl + LEFT JOIN sys_user su ON escl.apply_person = su.id + where escl.equipment_id = #{id} + + + diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml new file mode 100644 index 0000000..622a8db --- /dev/null +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentUseLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + 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 355c002..5df18b9 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterStaffMapper.xml @@ -92,6 +92,7 @@ t.technology_job, t.administration_job, t.dept_id, + sd.FULL_NAME as dept_name, (select `certificate_no` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as verifier_certificate_no, (select `valid_date` from meter_certificate where staff_id = t.id ORDER BY create_time limit 1) as certificate_date, t.major, @@ -99,7 +100,7 @@ t.remark, t.minio_file_name FROM - meter_staff t where t.id =#{id} + meter_staff t LEFT JOIN sys_dept sd on t.dept_id = sd.ID where t.id =#{id}