From c127accdddb76d11847f41b5685f5ef5e9e988d7 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 13 三月 2024 09:14:42 +0800 Subject: [PATCH] 设备管理问题修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml | 40 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml | 2 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java | 2 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 202 +++++++++++++---- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderService.java | 4 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java | 23 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java | 12 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java | 91 ++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java | 10 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 36 ++- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 146 +++++++++++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 22 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderMapper.java | 4 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java | 41 +- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderDetailService.java | 7 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java | 3 17 files changed, 555 insertions(+), 95 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java index 384511c..4a8bed4 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java @@ -11,9 +11,11 @@ import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.vo.LoginUser; @@ -21,6 +23,8 @@ import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.service.*; import org.jeecg.modules.eam.vo.InspectionStandardImportVo; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.service.*; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +33,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -64,6 +69,19 @@ @Autowired private IInspectionCycleService inspectionCycleService; + + @Autowired + private ISysBaseAPI sysBaseApi; + @Autowired + private ISysUserService sysUserService; + @Resource + private ISysRoleService sysRoleService; + @Resource + private ISysDictService sysDictService; + @Resource + private ISysDictItemService sysDictItemService; + @Resource + private ISysUserRoleService sysUserRoleService; /** * 鍒嗛〉鍒楄〃鏌ヨ * @@ -142,6 +160,8 @@ isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId()); dailyInspectionStandardDetailService.save(isd); } + //娑堟伅鎻愰啋 + this.inspectionStandardAlert(dailyInspectionStandard.getApprovalStatus(),dailyInspectionStandard.getNum()); return Result.OK("娣诲姞鎴愬姛锛�"); } @@ -179,6 +199,8 @@ isd.setInspectionCycleId(dailyInspectionStandardDetail.getInspectionCycleId()); dailyInspectionStandardDetailService.save(isd); } + //娑堟伅鎻愰啋 + this.inspectionStandardAlert(dailyInspectionStandard.getApprovalStatus(),dailyInspectionStandard.getNum()); return Result.OK("缂栬緫鎴愬姛!"); } @@ -570,12 +592,81 @@ } boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard); if (b){ + if(!"5".equals(approvalStatus)){//宸茬紪鍒� + this.inspectionStandardAlert(approvalStatus,dailyInspectionStandard.getNum()); + } + return Result.OK("瀹℃牳鎴愬姛!"); }else{ return Result.error("瀹℃牳澶辫触!"); } } + /** + *鐐规鏍囧噯绛惧娴佺▼娑堟伅鎻愰啋 + * qsw 2024-3-11 + */ + void inspectionStandardAlert(String approvalStatus,String standardNum){ + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false); + SysDictItem sysDictItem = null; + String roleDictItem = ""; + if("1".equals(approvalStatus)){//宸茬紪鍒� + roleDictItem = "鐐规鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + }else if("2".equals(approvalStatus)){//椹冲洖缂栧埗 + roleDictItem = "鐐规鏍囧噯缂栧埗"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯缂栧埗") + .eq("dict_id",sysDict.getId()),false); + }else if("3".equals(approvalStatus)){//宸插鏍� + roleDictItem = "鐐规鏍囧噯瀹℃壒"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯瀹℃壒") + .eq("dict_id",sysDict.getId()),false); + }else if("4".equals(approvalStatus)){//椹冲洖瀹℃牳 + roleDictItem = "鐐规鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","鐐规鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + } +// else if("5".equals(approvalStatus)){//閫氳繃 +// roleDictItem = "鐐规鏍囧噯瀹℃壒"; +// sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() +// .eq("item_text","鐐规鏍囧噯瀹℃壒") +// .eq("dict_id",sysDict.getId()),false); +// } + String roleCode = sysDictItem.getItemValue(); + SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false); + List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId())); + for(SysUserRole sysUserRole:sysUserRoles){ + SysUser user = sysUserService.getById(sysUserRole.getUserId()); + String msg = ""; + if("1".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯缂栧埗鎴愬姛锛岃鍒拌嚜涓荤淮鎶ょ偣妫�鏍囧噯椤甸潰瀹℃牳锛�"; + }else if("2".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯宸查┏鍥烇紝璇峰埌鑷富缁存姢鐐规鏍囧噯椤甸潰鏌ョ湅锛�"; + }else if("3".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯瀹℃牳閫氳繃锛岃鍒拌嚜涓荤淮鎶ょ偣妫�鏍囧噯椤甸潰瀹℃壒锛�"; + }else if("4".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑鑷富缁存姢鐐规鏍囧噯宸查┏鍥烇紝璇峰埌鑷富缁存姢鐐规鏍囧噯椤甸潰鏌ョ湅锛�"; + } +// else if("5".equals(approvalStatus)){ +// msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+standardNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘璁ら�氳繃锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒"; +// } + MessageDTO messageDTO = new MessageDTO(); + messageDTO.setTitle("鑷富缁存姢鐐规鏍囧噯绛惧娑堟伅鎻愰啋锛�"); + messageDTO.setContent(msg); + messageDTO.setCategory(roleDictItem); + messageDTO.setFromUser("鑷富缁存姢鐐规鏍囧噯绛惧娑堟伅鎻愰啋鎻愰啋灏忓姪鎵�"); + messageDTO.setToUser(user.getUsername()); + sysBaseApi.sendSysAnnouncement(messageDTO); + } + } + /** * 鎵归噺 绛惧娴佺▼ diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java index f1f3bd7..f3d82b7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java @@ -158,12 +158,16 @@ String id = (String) record.get("id"); String equipmentId = (String) record.get("equipmentId"); String maintenanceStandardId = (String) record.get("maintenanceStandardId"); - List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId); - record.put("maintenanceCycles", maintenanceCycles); +// List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId); +// record.put("maintenanceCycles", maintenanceCycles); - List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id); - record.put("dailyMaintenanceDetails", dailyMaintenanceDetails); +// List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id); +// record.put("dailyMaintenanceDetails", dailyMaintenanceDetails); + List<Map<String, Object>> operationUserDetails = dailyMaintenanceOrderService.getOperationUser(id); + record.put("operationUserDetails", operationUserDetails); + List<Map<String, Object>> repairUserDetails = dailyMaintenanceOrderService.getRepairUser(id); + record.put("repairUserDetails", repairUserDetails); //缁熻宸ユ椂瀹氶 // BigDecimal workingHourQuota = new BigDecimal(0); // for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){ @@ -203,16 +207,20 @@ for (FinishTransferOrder finishTransferOrder : finishTransferOrders) { String operateUser = finishTransferOrder.getOperateUser(); // record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1()); - record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1())); +// record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1())); + record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser)); String repairUser = finishTransferOrder.getRepairUser(); // record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2()); - record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2())); +// record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2())); + record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser)); String repairDirectorUser = finishTransferOrder.getRepairDirectorUser(); // record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()); - record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3())); +// record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3())); + record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser)); String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser(); // record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()); - record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4())); +// record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4())); + record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser)); } } @@ -230,10 +238,10 @@ List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords(); for (Map<String, Object> record : records) { String id = (String) record.get("id"); - String equipmentId = (String) record.get("equipmentId"); - String maintenanceStandardId = (String) record.get("maintenanceStandardId"); - List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId); - record.put("maintenanceCycles", maintenanceCycles); +// String equipmentId = (String) record.get("equipmentId"); +// String maintenanceStandardId = (String) record.get("maintenanceStandardId"); +// List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId); +// record.put("maintenanceCycles", maintenanceCycles); List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id); //缁熻宸ユ椂瀹氶 @@ -654,6 +662,7 @@ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails(); for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) { + maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId()); dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail); } @@ -685,6 +694,7 @@ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails(); for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) { + maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId()); dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail); } @@ -778,10 +788,12 @@ String orderId = dailyMaintenanceOrder.getId(); String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3(); String confirmStatus = dailyMaintenanceOrder.getConfirmStatus(); + Date maintenanceDate = dailyMaintenanceOrder.getMaintenanceDate(); DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId); String equipmentId = maintenanceOrder.getEquipmentId(); String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3(); + maintenanceOrder.setMaintenanceDate(maintenanceDate); if(StringUtils.isBlank(orderUda3)){ maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java index 15e1c5a..ab2d9f9 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java @@ -181,7 +181,7 @@ } /** - * 鑾峰彇鏃ュ父鐐规宸ュ崟鏄庣粏 + * 浜屼繚宸ュ崟鏄庣粏 * 2023-4-25 qsw */ @GetMapping(value = "/getDailyMaintenanceOrderDetailList") @@ -216,4 +216,25 @@ return Result.ok(dailyMaintenanceOrderDetailList); } + /** + * 涓変繚宸ュ崟鏄庣粏 + * 2023-4-25 qsw + */ + @GetMapping(value = "/get3MaintenanceOrderDetailList") + @PermissionData + public Result<?> get3MaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) { + IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.get3MaintenanceOrderDetailList(pageNo, pageSize, params); + for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) { + String dailyMaintenanceOrderId = (String)record.get("dailyMaintenanceOrderId"); + DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(dailyMaintenanceOrderId); + if("4".equals(dailyMaintenanceOrder.getStatus())){ + record.put("disabled",false); + }else{ + record.put("disabled",true); + } + } + return Result.ok(dailyMaintenanceOrderDetailList); + } + + } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java index 15fe908..9b4ca57 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java @@ -132,32 +132,32 @@ List<Map<String, Object>> records = inspectionOrderList.getRecords(); for (Map<String, Object> record : records) { String id = (String)record.get("id"); - String equipmentId = (String)record.get("equipmentId"); - String status = (String)record.get("status"); - String inspectionStandardId = (String)record.get("inspectionStandardId"); - List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId); - record.put("inspectionCycles",inspectionCycles); +// String equipmentId = (String)record.get("equipmentId"); +// String status = (String)record.get("status"); +// String inspectionStandardId = (String)record.get("inspectionStandardId"); +// List<InspectionCycleVo> inspectionCycles = inspectionOrderService.getInspectionCycleByEqId(inspectionStandardId); +// record.put("inspectionCycles",inspectionCycles); List<Map<String, Object>> inspectionOrderDetails = inspectionOrderService.getInspectionOrderDetailByOrderId(id); record.put("inspectionOrderDetails",inspectionOrderDetails); - List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery() - .eq(InspectionOrderDetail::getInspectionOrderId, id) - .eq(InspectionOrderDetail::getJudgmentResult, "fail") - .eq(InspectionOrderDetail::getDelFlag, 0).list(); +// List<InspectionOrderDetail> failCount = inspectionOrderDetailService.lambdaQuery() +// .eq(InspectionOrderDetail::getInspectionOrderId, id) +// .eq(InspectionOrderDetail::getJudgmentResult, "fail") +// .eq(InspectionOrderDetail::getDelFlag, 0).list(); +// +// List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery() +// .eq(InspectionOrderDetail::getInspectionOrderId, id) +// .eq(InspectionOrderDetail::getJudgmentResult,"pass") +// .eq(InspectionOrderDetail::getDelFlag, 0).list(); +// record.put("result","姝e父:"+passCount.size()+"锛�"+"寮傚父:"+failCount.size()); - List<InspectionOrderDetail> passCount = inspectionOrderDetailService.lambdaQuery() - .eq(InspectionOrderDetail::getInspectionOrderId, id) - .eq(InspectionOrderDetail::getJudgmentResult,"pass") - .eq(InspectionOrderDetail::getDelFlag, 0).list(); - record.put("result","姝e父:"+passCount.size()+"锛�"+"寮傚父:"+failCount.size()); - - if("5".equals(status) ){ - record.put("distable",true); - }else{ - record.put("distable",false); - } +// if("5".equals(status) ){ +// record.put("distable",true); +// }else{ +// record.put("distable",false); +// } } return Result.ok(inspectionOrderList); } @@ -570,6 +570,7 @@ } } inspectionOrder.setActualEndTime(new Date()); + inspectionOrder.setInspectionOrderUda2(sysUser.getRealname()); boolean b = inspectionOrderService.updateById(inspectionOrder); if (!b) { return Result.error("鎶ュ伐澶辫触!"); diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java index 5efd33a..5024a02 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java @@ -13,6 +13,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xwpf.usermodel.*; import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.constant.CommonConstant; @@ -23,6 +24,8 @@ import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.model.MaintenanceCycleVo; import org.jeecg.modules.eam.service.*; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.service.*; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -32,6 +35,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -96,6 +100,16 @@ // private IUploadService uploadService; @Autowired private ISysBaseAPI sysBaseApi; + @Autowired + private ISysUserService sysUserService; + @Resource + private ISysRoleService sysRoleService; + @Resource + private ISysDictService sysDictService; + @Resource + private ISysDictItemService sysDictItemService; + @Resource + private ISysUserRoleService sysUserRoleService; /** * 鍒嗛〉鍒楄〃鏌ヨ @@ -196,6 +210,11 @@ maintenanceStandardDetail.setPhoto(maintenanceStandardDetail.getPhoto()); maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail); } + if("2".equals(maintenanceType)){ + this.maintenance2StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum()); + }else{ + this.maintenance3StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum()); + } return Result.OK("娣诲姞鎴愬姛锛�"); } @@ -228,6 +247,11 @@ } maintenanceStandardDetail.setMaintenanceStandardId(maintenanceStandard.getId()); maintenanceStandardDetailService.saveOrUpdate(maintenanceStandardDetail); + } + if("2".equals(maintenanceStandard.getMaintenanceType())){ + this.maintenance2StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum()); + }else{ + this.maintenance3StandardAlert(maintenanceStandard.getApprovalStatus(),maintenanceStandard.getNum()); } return Result.OK("缂栬緫鎴愬姛!"); } @@ -704,11 +728,133 @@ } boolean b = maintenanceStandardService.updateById(maintenanceStandard); if (b){ + //绛惧娴佺▼娑堟伅閫氱煡 + if(!"5".equals(approvalStatus)){//宸茬紪鍒� + if("2".equals(maintenanceStandard.getMaintenanceType())){ + this.maintenance2StandardAlert(approvalStatus,maintenanceStandard.getNum()); + }else{ + this.maintenance3StandardAlert(approvalStatus,maintenanceStandard.getNum()); + } + } return Result.OK("瀹℃牳鎴愬姛!"); }else{ return Result.error("瀹℃牳澶辫触!"); } } + + /** + *浜岀骇淇濆吇鏍囧噯绛惧娴佺▼娑堟伅鎻愰啋 + * qsw 2024-3-11 + */ + void maintenance2StandardAlert(String approvalStatus,String standardNum){ + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false); + SysDictItem sysDictItem = null; + String roleDictItem = ""; + if("1".equals(approvalStatus)){//宸茬紪鍒� + roleDictItem = "浜岀骇淇濆吇鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","浜岀骇淇濆吇鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + }else if("2".equals(approvalStatus)){//椹冲洖缂栧埗 + roleDictItem = "浜岀骇淇濆吇鏍囧噯缂栧埗"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","浜岀骇淇濆吇鏍囧噯缂栧埗") + .eq("dict_id",sysDict.getId()),false); + }else if("3".equals(approvalStatus)){//宸插鏍� + roleDictItem = "浜岀骇淇濆吇鏍囧噯瀹℃壒"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","浜岀骇淇濆吇鏍囧噯瀹℃壒") + .eq("dict_id",sysDict.getId()),false); + }else if("4".equals(approvalStatus)){//椹冲洖瀹℃牳 + roleDictItem = "浜岀骇淇濆吇鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","浜岀骇淇濆吇鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + } + String roleCode = sysDictItem.getItemValue(); + SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false); + List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId())); + for(SysUserRole sysUserRole:sysUserRoles){ + SysUser user = sysUserService.getById(sysUserRole.getUserId()); + String msg = ""; + if("1".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑浜岀骇淇濆吇鏍囧噯缂栧埗鎴愬姛锛岃鍒颁簩绾т繚鍏绘爣鍑嗛〉闈㈠鏍革紒"; + }else if("2".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑浜岀骇淇濆吇鏍囧噯宸查┏鍥烇紝璇峰埌浜岀骇淇濆吇鏍囧噯椤甸潰鏌ョ湅锛�"; + }else if("3".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑浜岀骇淇濆吇鏍囧噯瀹℃牳閫氳繃锛岃鍒颁簩绾т繚鍏绘爣鍑嗛〉闈㈠鎵癸紒"; + }else if("4".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑浜岀骇淇濆吇鏍囧噯宸查┏鍥烇紝璇峰埌浜岀骇淇濆吇鏍囧噯椤甸潰鏌ョ湅锛�"; + } + MessageDTO messageDTO = new MessageDTO(); + messageDTO.setTitle("浜岀骇淇濆吇鏍囧噯绛惧娑堟伅鎻愰啋锛�"); + messageDTO.setContent(msg); + messageDTO.setCategory(roleDictItem); + messageDTO.setFromUser("浜岀骇淇濆吇鏍囧噯绛惧娑堟伅鎻愰啋鎻愰啋灏忓姪鎵�"); + messageDTO.setToUser(user.getUsername()); + sysBaseApi.sendSysAnnouncement(messageDTO); + } + } + + /** + *涓夌骇淇濆吇鏍囧噯绛惧娴佺▼娑堟伅鎻愰啋 + * qsw 2024-3-11 + */ + void maintenance3StandardAlert(String approvalStatus,String standardNum){ + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false); + SysDictItem sysDictItem = null; + String roleDictItem = ""; + if("1".equals(approvalStatus)){//宸茬紪鍒� + roleDictItem = "涓夌骇淇濆吇鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","涓夌骇淇濆吇鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + }else if("2".equals(approvalStatus)){//椹冲洖缂栧埗 + roleDictItem = "涓夌骇淇濆吇鏍囧噯缂栧埗"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","涓夌骇淇濆吇鏍囧噯缂栧埗") + .eq("dict_id",sysDict.getId()),false); + }else if("3".equals(approvalStatus)){//宸插鏍� + roleDictItem = "涓夌骇淇濆吇鏍囧噯瀹℃壒"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","涓夌骇淇濆吇鏍囧噯瀹℃壒") + .eq("dict_id",sysDict.getId()),false); + }else if("4".equals(approvalStatus)){//椹冲洖瀹℃牳 + roleDictItem = "涓夌骇淇濆吇鏍囧噯瀹℃牳"; + sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>() + .eq("item_text","涓夌骇淇濆吇鏍囧噯瀹℃牳") + .eq("dict_id",sysDict.getId()),false); + } + String roleCode = sysDictItem.getItemValue(); + SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false); + List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId())); + for(SysUserRole sysUserRole:sysUserRoles){ + SysUser user = sysUserService.getById(sysUserRole.getUserId()); + String msg = ""; + if("1".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑涓夌骇淇濆吇鏍囧噯缂栧埗鎴愬姛锛岃鍒颁笁绾т繚鍏绘爣鍑嗛〉闈㈠鏍革紒"; + }else if("2".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑涓夌骇淇濆吇鏍囧噯宸查┏鍥烇紝璇峰埌涓夌骇淇濆吇鏍囧噯椤甸潰鏌ョ湅锛�"; + }else if("3".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑涓夌骇淇濆吇鏍囧噯瀹℃牳閫氳繃锛岃鍒颁笁绾т繚鍏绘爣鍑嗛〉闈㈠鎵癸紒"; + }else if("4".equals(approvalStatus)){ + msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗐��"+standardNum+"銆戠殑涓夌骇淇濆吇鏍囧噯宸查┏鍥烇紝璇峰埌涓夌骇淇濆吇鏍囧噯椤甸潰鏌ョ湅锛�"; + } + MessageDTO messageDTO = new MessageDTO(); + messageDTO.setTitle("涓夌骇淇濆吇鏍囧噯绛惧娑堟伅鎻愰啋锛�"); + messageDTO.setContent(msg); + messageDTO.setCategory(roleDictItem); + messageDTO.setFromUser("涓夌骇淇濆吇鏍囧噯绛惧娑堟伅鎻愰啋鎻愰啋灏忓姪鎵�"); + messageDTO.setToUser(user.getUsername()); + sysBaseApi.sendSysAnnouncement(messageDTO); + } + } + + // 鑾峰彇鍚堝苟鍗曞厓鏍肩殑鍊� private String getMergedCellValue(XWPFTableCell cell) { // 瀵逛簬鍚堝苟鍗曞厓鏍硷紝鑾峰彇绗竴涓钀界殑鏂囨湰浣滀负鍚堝苟鍗曞厓鏍肩殑鍊� diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java index b629944..bdb4a17 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java @@ -117,6 +117,11 @@ @ApiModelProperty(value = "澶囨敞") private String remark; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "淇濆吇鏃ユ湡") + private Date maintenanceDate; + @ApiModelProperty(value = "浜屼繚绉讳氦鍗曠‘璁ょ姸鎬侊紙0鏈‘璁わ紝1鎿嶄綔鍛樼‘璁わ紝2椹冲洖鎿嶄綔鍛橈紝3缁翠慨纭锛�4椹冲洖缁翠慨鍛橈紝5缁翠慨瀹や富浠荤‘璁わ紝6椹冲洖缁翠慨瀹や富浠伙紝7璁惧妫�楠屽憳纭锛�") private String confirmStatus; diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java index 3ab9a47..39175d6 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/DailyInspectionOrderJob.java @@ -189,7 +189,8 @@ } - }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){ +// }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.FRIDAY){ + }else if("week".equals(inspectionCycle.getCycleUnit()) && dayOfWeek == DayOfWeek.MONDAY){ //淇濆瓨鐐规宸ュ崟涓昏〃鏁版嵁 InspectionOrder inspectionOrder = new InspectionOrder(); inspectionOrder.setNum(identityService.getNumByTypeAndLength("DailylnspectionOrder",4)); diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java index 87fe12b..96006a7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderDetailMapper.java @@ -18,4 +18,6 @@ IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params,String sql); + IPage<Map<String, Object>> get3MaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params); + } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderMapper.java index a2279a3..c1230c5 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderMapper.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyMaintenanceOrderMapper.java @@ -22,6 +22,10 @@ //鏃ュ父淇濆吇宸ュ崟缂栬緫鏃讹紝鍥炴樉淇濆吇椤圭洰 锛堟墜鍔ㄧ敓鎴愭棩甯镐繚鍏诲伐鍗曪級 List<Map<String, Object>> getDailyMaintenanceOrderDetailByOrderId(@Param("dailyMaintenanceOrderId")String dailyMaintenanceOrderId); + List<Map<String, Object>> getOperationUser(@Param("dailyMaintenanceOrderId")String dailyMaintenanceOrderId); + + List<Map<String, Object>> getRepairUser(@Param("dailyMaintenanceOrderId")String dailyMaintenanceOrderId); + IPage<Map<String, Object>> getDailyMaintenanceOrderList(IPage<Map> pageData, @Param("params") Map<String,Object> params); IPage<Map<String, Object>> getDailyMaintenanceOrder3List(IPage<Map> pageData, @Param("params") Map<String,Object> params); diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml index 8330d25..243797d 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml @@ -18,6 +18,42 @@ t5.name as maintenanceSpecialtyName, t1.daily_maintenance_order_id as dailyMaintenanceOrderId, t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1, + t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2, + t7.item_text as maintenanceRole + FROM + mom_eam_daily_maintenance_order_detail t1 + LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id + LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method + LEFT JOIN mom_eam_maintenance_specialty t5 ON t3.maintenance_specialty_id = t5.id + LEFT JOIN mom_eam_maintenance_cycle t6 ON t2.maintenance_cycle_id = t6.id + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t2.maintenance_role + WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 + <if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''"> + and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId} + </if> + <if test="sql != '' and sql != null"> + ${sql} + </if> + ORDER BY t1.create_time desc + </select> + + <select id="get3MaintenanceOrderDetailList" parameterType="Map" resultType="Map"> + SELECT + t1.id, + t2.location, + t2.photo, + t1.maintenance_standard_detail_id as maintenanceStandardDetailId, + t3.name as maintenanceProjectNum, + t3.standard, + t3.working_hour_quota as workingHourQuota, + t4.item_text as maintenanceMethodName, + t3.maintenance_tool as maintenanceTool, + t3.maintenance_require as maintenanceRequire, + t6.name as maintenanceCycleName, + t5.name as maintenanceSpecialtyName, + t1.daily_maintenance_order_id as dailyMaintenanceOrderId, + t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1, t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2 FROM mom_eam_daily_maintenance_order_detail t1 @@ -26,12 +62,10 @@ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method LEFT JOIN mom_eam_maintenance_specialty t5 ON t3.maintenance_specialty_id = t5.id LEFT JOIN mom_eam_maintenance_cycle t6 ON t2.maintenance_cycle_id = t6.id + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t2.maintenance_role WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 <if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''"> and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId} - </if> - <if test="sql != '' and sql != null"> - ${sql} </if> ORDER BY t1.create_time desc </select> diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml index e86c3f0..c12f8ec 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml @@ -76,7 +76,7 @@ t1.plan_end_time as planEndTime, t1.actual_start_time as actualStartTime, t1.actual_end_time as actualEndTime, - t1.maintenance_user_id as maintenanceUserId, + t1.maintenance_date as maintenanceDate, t9.item_text as assignModeName, t1.create_by as createBy, t1.create_time as createTime, @@ -106,64 +106,84 @@ <if test="params.num != null and params.num != ''"> and t1.num like concat('%',#{params.num},'%') </if> + <if test="params.equipmentNum != null and params.equipmentNum != ''"> + and t3.num like concat('%',#{params.equipmentNum},'%') + </if> + <if test="params.useDepartId != null and params.useDepartId != ''"> + and t3.use_id = #{params.useDepartId} + </if> + <if test="params.status != null and params.status != ''"> + and t1.status = #{params.status} + </if> + <if test="params.confirmStatus != null and params.confirmStatus != ''"> + and t1.confirm_status = #{params.confirmStatus} + </if> + <if test="params.teamId != null and params.teamId != ''"> + and t3.team_id = #{params.teamId} + </if> + <if test="params.finishStartTime != null"> + and t1.actual_end_time >= #{params.finishStartTime} + </if> + <if test="params.finishEndTime != null"> + and t1.actual_end_time <= #{params.finishEndTime} + </if> ORDER BY t1.create_time desc </select> <select id="getDailyMaintenanceOrder3List" parameterType="Map" resultType="Map"> SELECT - t1.id, - t1.status, - t5.item_text as statusName, - t1.num, - t1.num as technologyStatusVerificationBill, - t4.id as maintenanceCycleId, - t4.maintenance_type as maintenanceType, - t10.item_text as maintenanceTypeName, - t4.cycle as maintenanceCycle, - t4.name as maintenanceCycleName, - t3.id as equipmentId, - t3.num as equipmentNum, - t3.name as equipmentName, - t3.model as equipmentModel, - t3.specification, - t3.technology_status as technologyStatus, - t3.precision_parameters as precisionParameters, - t11.id as equipmentCategoryId, - t11.name as equipmentCategoryName, - t2.id as maintenanceStandardId, - t2.num as maintenanceStandardNum, - t2.assign_mode assignMode, - t3.team_id teamId, - t3.use_id as useId, - t6.depart_name as departName, - t7.name as teamName, - DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime, - DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime, - CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime, - t1.plan_start_time as planStartTime, - t1.plan_end_time as planEndTime, - t1.actual_start_time as actualStartTime, - t1.actual_end_time as actualEndTime, - t1.maintenance_user_id as maintenanceUserId, - t9.item_text as assignModeName, - t1.create_by as createBy, - t1.create_time as createTime, - t1.remark, - t1.description, - t1.precision_inspection_status as precisionInspectionStatus, - t1.stove_exempt_status as stoveExemptStatus, - t1.inspect_user as inspectUser, - t1.inspect_date as inspectDate, - t12.item_text as checkStatusName, - t1.not_pass_reason as notPassReason, - t1.maintenance_order_uda5 as receipts, - t13.num as receiptsNum, - t14.item_text as receiptsName, - t1.maintenance_order_uda4 as receipts2, - t15.num as receiptsNum2, - t16.item_text as receiptsName2 + t1.id, + t1.status, + t5.item_text as statusName, + t1.num, + t1.num as technologyStatusVerificationBill, + t4.id as maintenanceCycleId, + t4.maintenance_type as maintenanceType, + t10.item_text as maintenanceTypeName, + t4.cycle as maintenanceCycle, + t4.name as maintenanceCycleName, + t3.id as equipmentId, + t3.num as equipmentNum, + t3.name as equipmentName, + t3.model as equipmentModel, + t3.specification, + t3.technology_status as technologyStatus, + t3.precision_parameters as precisionParameters, + t11.id as equipmentCategoryId, + t11.name as equipmentCategoryName, + t2.id as maintenanceStandardId, + t2.num as maintenanceStandardNum, + t2.assign_mode assignMode, + t3.team_id teamId, + t3.use_id as useId, + t6.depart_name as departName, + t7.name as teamName, + DATEADD(DAY,-30,t1.plan_start_time) as yellowWarningTime, + DATEADD(DAY,-7,t1.plan_start_time) as redWarningTime, + CONVERT(varchar(100), GETDATE(), 20) AS currentDateTime, + t1.plan_start_time as planStartTime, + t1.plan_end_time as planEndTime, + t1.actual_start_time as actualStartTime, + t1.actual_end_time as actualEndTime, + t9.item_text as assignModeName, + t1.create_by as createBy, + t1.create_time as createTime, + t1.remark, + t1.description, + t1.precision_inspection_status as precisionInspectionStatus, + t1.stove_exempt_status as stoveExemptStatus, + t1.inspect_user as inspectUser, + t1.inspect_date as inspectDate, + t12.item_text as checkStatusName, + t1.not_pass_reason as notPassReason, + t1.maintenance_order_uda5 as receipts, + t13.num as receiptsNum, + t14.item_text as receiptsName, + t1.maintenance_order_uda4 as receipts2, + t15.num as receiptsNum2, + t16.item_text as receiptsName2 FROM - mom_eam_daily_maintenance_order t1 + mom_eam_daily_maintenance_order t1 LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id left join mom_eam_equipment t3 on t1.equipment_id = t3.id left join mom_eam_equipment_category t11 on t3.equipment_category_id = t11.id @@ -181,6 +201,24 @@ WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType} <if test="params.num != null and params.num != ''"> and t1.num like concat('%',#{params.num},'%') + </if> + <if test="params.equipmentNum != null and params.equipmentNum != ''"> + and t3.num like concat('%',#{params.equipmentNum},'%') + </if> + <if test="params.useDepartId != null and params.useDepartId != ''"> + and t3.use_id = #{params.useDepartId} + </if> + <if test="params.status != null and params.status != ''"> + and t1.status = #{params.status} + </if> + <if test="params.teamId != null and params.teamId != ''"> + and t3.team_id = #{params.teamId} + </if> + <if test="params.finishStartTime != null"> + and t1.actual_end_time >= #{params.finishStartTime} + </if> + <if test="params.finishEndTime != null"> + and t1.actual_end_time <= #{params.finishEndTime} </if> ORDER BY t1.create_time desc </select> @@ -213,4 +251,62 @@ and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId} </if> </select> + + <select id="getRepairUser" parameterType="Map" resultType="map"> + SELECT + tt.id, + t1.id AS maintenanceStandardDetailId, + t2.id AS maintenanceStandardId, + t1.location, + t1.photo, + t1.maintenance_project_id AS maintenanceProjectId, + case t1.maintenance_role when 'operator' then '鎿嶄綔浜哄憳淇濆吇鍐呭' else '缁翠慨浜哄憳淇濆吇鍐呭' end as maintenanceRole, + t3.num AS maintenanceProjectNum, + t3.name as maintenanceProjectName, + t3.standard, + t4.item_text AS maintenanceMethod, + t3.maintenance_tool AS maintenanceTool, + t3.working_hour_quota AS workingHourQuota, + tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1, + tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2 + FROM + mom_eam_daily_maintenance_order_detail tt + LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id + LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id + LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method + WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'maintenance' + <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''"> + and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId} + </if> + </select> + + <select id="getOperationUser" parameterType="Map" resultType="map"> + SELECT + tt.id, + t1.id AS maintenanceStandardDetailId, + t2.id AS maintenanceStandardId, + t1.location, + t1.photo, + t1.maintenance_project_id AS maintenanceProjectId, + case t1.maintenance_role when 'operator' then '鎿嶄綔浜哄憳淇濆吇鍐呭' else '缁翠慨浜哄憳淇濆吇鍐呭' end as maintenanceRole, + t3.num AS maintenanceProjectNum, + t3.name as maintenanceProjectName, + t3.standard, + t4.item_text AS maintenanceMethod, + t3.maintenance_tool AS maintenanceTool, + t3.working_hour_quota AS workingHourQuota, + tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1, + tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2 + FROM + mom_eam_daily_maintenance_order_detail tt + LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id + LEFT JOIN mom_eam_maintenance_standard t2 ON tt.maintenance_standard_id = t2.id + LEFT JOIN mom_eam_maintenance_project t3 ON tt.maintenance_project_id = t3.id + LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t3.maintenance_method + WHERE t1.del_flag = '0' AND t2.del_flag = '0' AND t3.del_flag = '0' AND t2.type = 'daily' and t1.maintenance_role = 'operator' + <if test="dailyMaintenanceOrderId != null and dailyMaintenanceOrderId != ''"> + and tt.daily_maintenance_order_id = #{dailyMaintenanceOrderId} + </if> + </select> </mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml index 56b1404..6f7d0c0 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml @@ -33,8 +33,7 @@ t7.name as teamName, t4.assign_mode as assignMode, t8.item_text as assignModeName, - t1.inspection_user_id as inspectionUserId, - t9.realname as inspectionUserName, + t1.inspection_order_uda2 as inspectionUserName, t1.actual_end_time as actualEndTime, t1.actual_start_time as actualStartTime, t1.inspection_order_uda1 AS repairConfirmPerson, @@ -48,7 +47,6 @@ left join sys_depart t6 on t2.use_id = t6.id left join mom_base_team t7 on t2.team_id = t7.id left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t8 on t8.item_value = t4.assign_mode - left join sys_user t9 on t1.inspection_user_id = t9.id WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 <!-- <if test="params.dailyInspectionStandardId != null and params.dailyInspectionStandardId != ''">--> <!-- and t1.daily_inspection_standard_id = #{params.dailyInspectionStandardId}--> @@ -56,6 +54,24 @@ <if test="params.num != null and params.num != ''"> and t1.num like concat('%',#{params.num},'%') </if> + <if test="params.equipmentNum != null and params.equipmentNum != ''"> + and t2.num like concat('%',#{params.equipmentNum},'%') + </if> + <if test="params.useDepartId != null and params.useDepartId != ''"> + and t2.use_id = #{params.useDepartId} + </if> + <if test="params.status != null and params.status != ''"> + and t1.status = #{params.status} + </if> + <if test="params.teamId != null and params.teamId != ''"> + and t2.team_id = #{params.teamId} + </if> + <if test="params.inspectionStartTime != null"> + and t1.actual_end_time >= #{params.inspectionStartTime} + </if> + <if test="params.inspectionEndTime != null"> + and t1.actual_end_time <= #{params.inspectionEndTime} + </if> ORDER BY t1.create_time desc </select> diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml index e96a4d0..9684ed6 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml @@ -18,7 +18,7 @@ t3.id as maintenanceCycleId, t3.NAME AS maintenanceCycleName, t5.NAME AS maintenanceSpecialtyName, - t7.item_value as maintenanceRole + t7.item_text as maintenanceRole FROM mom_eam_maintenance_standard_detail t1 LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderDetailService.java index b0086b7..99d0916 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderDetailService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderDetailService.java @@ -15,8 +15,13 @@ public interface IDailyMaintenanceOrderDetailService extends IService<DailyMaintenanceOrderDetail> { /** - *鑾峰彇鏃ュ父淇濆吇宸ュ崟鏄庣粏 + *浜岀骇淇濆吇宸ュ崟鏄庣粏 */ IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params); + /** + *涓夌骇淇濆吇宸ュ崟鏄庣粏 + */ + IPage<Map<String, Object>> get3MaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params); + } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderService.java index e10a2dc..4ade3ee 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IDailyMaintenanceOrderService.java @@ -32,6 +32,10 @@ //鏃ュ父淇濆吇宸ュ崟缂栬緫鏃讹紝鍥炴樉淇濆吇椤圭洰 锛堟墜鍔ㄧ敓鎴愭棩甯镐繚鍏诲伐鍗曪級 List<Map<String, Object>> getDailyMaintenanceDetailByOrderId(String dailyMaintenanceOrderId); + List<Map<String, Object>> getOperationUser(String dailyMaintenanceOrderId); + + List<Map<String, Object>> getRepairUser(String dailyMaintenanceOrderId); + /** * 鏃ュ父淇濆吇宸ュ崟 鑾峰彇璁惧鍙扮珯宸茬粦瀹氱殑瀵硅薄閮ㄩ棬 * qsw 2023-7-11 diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java index c82ba82..f8f3c12 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java @@ -22,10 +22,22 @@ @Service public class DailyMaintenanceOrderDetailServiceImpl extends ServiceImpl<DailyMaintenanceOrderDetailMapper, DailyMaintenanceOrderDetail> implements IDailyMaintenanceOrderDetailService { + /** + *浜岀骇淇濆吇宸ュ崟鏄庣粏 + */ @Override public IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) { IPage<Map> pageData = new Page<Map>(pageNo, pageSize); String sql = QueryGenerator.installAuthJdbc(MaintenanceStandardDetail.class); return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params,sql); } + + /** + *涓夌骇淇濆吇宸ュ崟鏄庣粏 + */ + @Override + public IPage<Map<String, Object>> get3MaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) { + IPage<Map> pageData = new Page<Map>(pageNo, pageSize); + return super.getBaseMapper().get3MaintenanceOrderDetailList(pageData,params); + } } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java index 4bac73c..4db2428 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java @@ -50,6 +50,16 @@ return this.baseMapper.getDailyMaintenanceOrderDetailByOrderId(dailyMaintenanceOrderId); } + @Override + public List<Map<String, Object>> getOperationUser(String dailyMaintenanceOrderId) { + return this.baseMapper.getOperationUser(dailyMaintenanceOrderId); + } + + @Override + public List<Map<String, Object>> getRepairUser(String dailyMaintenanceOrderId) { + return this.baseMapper.getRepairUser(dailyMaintenanceOrderId); + } + /** * 鏃ュ父淇濆吇宸ュ崟 鑾峰彇璁惧鍙扮珯宸茬粦瀹氱殑瀵硅薄閮ㄩ棬 * qsw 2023-7-11 -- Gitblit v1.9.3