lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentDisposalController.java
@@ -11,6 +11,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.eam.entity.Equipment; import org.jeecg.modules.eam.entity.EquipmentScrapDetail; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -512,6 +514,15 @@ @PostMapping(value = "/approve") public Result<String> approve(@RequestBody EquipmentDisposal equipmentDisposal) { equipmentDisposalService.updateById(equipmentDisposal); //审批通过后更新设备状态 if("Approved".equals(equipmentDisposal.getAuditStatus())){ List<EquipmentDisposalDetail> equipmentDisposalDetailList = equipmentDisposalDetailService.selectByMainId(equipmentDisposal.getId()); for(EquipmentDisposalDetail equipmentDisposalDetail : equipmentDisposalDetailList){ Equipment equipment = equipmentService.getById(equipmentDisposalDetail.getEquipmentId()); equipment.setEquipmentStatus("5"); equipmentService.updateById(equipment); } } return Result.OK("操作成功！"); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentScrapController.java
@@ -13,7 +13,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.eam.entity.EquipmentSeal; import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.vo.EquipmentDisposalPage; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -25,8 +26,6 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.entity.EquipmentScrapDetail; import org.jeecg.modules.eam.entity.EquipmentScrap; import org.jeecg.modules.eam.vo.EquipmentScrapPage; import org.jeecg.modules.eam.service.IEquipmentScrapService; import org.jeecg.modules.eam.service.IEquipmentScrapDetailService; @@ -60,6 +59,8 @@ private IEquipmentScrapService equipmentScrapService; @Autowired private IEquipmentScrapDetailService equipmentScrapDetailService; @Autowired private IEamEquipmentService equipmentService; /** * 分页列表查询 @@ -421,6 +422,15 @@ @PostMapping(value = "/approve") public Result<String> approve(@RequestBody EquipmentScrap equipmentScrap) { equipmentScrapService.updateById(equipmentScrap); //审批通过后更新设备状态 if("Approved".equals(equipmentScrap.getAuditStatus())){ List<EquipmentScrapDetail> equipmentSealDetailList = equipmentScrapDetailService.selectByMainId(equipmentScrap.getId()); for(EquipmentScrapDetail equipmentScrapDetail : equipmentSealDetailList){ Equipment equipment = equipmentService.getById(equipmentScrapDetail.getEquipmentId()); equipment.setEquipmentStatus("3"); equipmentService.updateById(equipment); } } return Result.OK("操作成功！"); } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentSealController.java
@@ -8,6 +8,8 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.eam.entity.Equipment; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.vo.EquipmentDisposalPage; import org.jeecg.modules.eam.vo.EquipmentSealPage; //import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness; @@ -64,6 +66,9 @@ @Autowired private IEquipmentSealDetailService equipmentSealDetailService; @Autowired private IEamEquipmentService equipmentService; // @Autowired // private IFlowMyBusinessService flowMyBusinessService; @@ -520,6 +525,15 @@ @PostMapping(value = "/approve") public Result<String> approve(@RequestBody EquipmentSeal equipmentSeal) { equipmentSealService.updateById(equipmentSeal); //审批通过后更新设备状态 if("Approved".equals(equipmentSeal.getAuditStatus())){ List<EquipmentSealDetail> equipmentSealDetailList = equipmentSealDetailService.selectByMainId(equipmentSeal.getId()); for(EquipmentSealDetail equipmentSealDetail : equipmentSealDetailList){ Equipment equipment = equipmentService.getById(equipmentSealDetail.getEquipmentId()); equipment.setEquipmentStatus("2"); equipmentService.updateById(equipment); } } return Result.OK("操作成功！"); }
@@ -13,7 +13,8 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.eam.entity.EquipmentSeal; import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.vo.EquipmentDisposalPage; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -25,8 +26,6 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.eam.entity.EquipmentUnsealDetail; import org.jeecg.modules.eam.entity.EquipmentUnseal; import org.jeecg.modules.eam.vo.EquipmentUnsealPage; import org.jeecg.modules.eam.service.IEquipmentUnsealService; import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService; @@ -60,6 +59,8 @@ private IEquipmentUnsealService equipmentUnsealService; @Autowired private IEquipmentUnsealDetailService equipmentUnsealDetailService; @Autowired private IEamEquipmentService equipmentService; /** * 分页列表查询 @@ -391,6 +392,15 @@ @PostMapping(value = "/approve") public Result<String> approve(@RequestBody EquipmentUnseal equipmentUnseal) { equipmentUnsealService.updateById(equipmentUnseal); //审批通过后更新设备状态 if("Approved".equals(equipmentUnseal.getAuditStatus())){ List<EquipmentUnsealDetail> equipmentUnsealDetailList = equipmentUnsealDetailService.selectByMainId(equipmentUnseal.getId()); for(EquipmentUnsealDetail equipmentUnsealDetail : equipmentUnsealDetailList){ Equipment equipment = equipmentService.getById(equipmentUnsealDetail.getEquipmentId()); equipment.setEquipmentStatus("1"); equipmentService.updateById(equipment); } } return Result.OK("操作成功！"); }
@@ -17,7 +17,7 @@ public interface ProjectMaintenanceOrderMapper extends BaseMapper<ProjectMaintenanceOrder> { @Select("select t1.id as value,t1.name as text, t1.name as title from mom_base_supplier t1 where t1.del_flag = '0' GROUP by t1.name ORDER BY t1.create_time desc") @Select("select t1.id as value,t1.name as text, t1.name as title from mom_base_supplier t1 where t1.del_flag = '0' ORDER BY t1.create_time desc") List<SupplierVo> getSupplier(); @Select("select t1.id as value,t1.name as text, t1.name as title from mom_base_team t1 where t1.del_flag = '0' ORDER BY t1.create_time desc")
