From cb7eb6fa3477e624f7112a2eac632783b96bf4b4 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期一, 15 一月 2024 16:19:35 +0800 Subject: [PATCH] 点检标准 多sheet页导入 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 88 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 7 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java index 6f6b6c6..1776799 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java @@ -1,6 +1,8 @@ package org.jeecg.modules.eam.controller; +import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,6 +10,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.*; +import org.jeecg.modules.eam.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -16,10 +20,6 @@ import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail; -import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan; -import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService; -import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -33,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -54,6 +55,29 @@ @Autowired private IEquipmentMaintenancePlanDetailService equipmentMaintenancePlanDetailService; + + @Autowired + private IDailyMaintenanceOrderService dailyMaintenanceOrderService; + + @Autowired + private IEamEquipmentService equipmentService; + + @Autowired + private IMaintenanceStandardService maintenanceStandardService; + + @Autowired + private IdentityService sysIdentityService; + + @Autowired + private ISysBaseAPI sysBaseApi; + + @Autowired + private IDailyMaintenanceOrderDetailService maintenanceOrderDetailService; + + @Autowired + private IMaintenanceStandardDetailService maintenanceStandardDetailService; + + /*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/ @@ -195,8 +219,53 @@ } @PutMapping("distrbute") public Result<?> distrbute(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) { + LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); equipmentMaintenancePlan.setStatus("distributed"); - equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + //鐢熸垚宸ュ崟 + List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlanDetailService.selectByMainId(equipmentMaintenancePlan.getId()); + for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){ + MaintenanceStandard maintenanceStandard = maintenanceStandardService.getById(equipmentMaintenancePlanDetail.getStandardId()); + String num = sysIdentityService.getNumByTypeAndLength("DailyMaintenanceOrder",4); + DailyMaintenanceOrder dailyMaintenanceOrder = new DailyMaintenanceOrder(); + dailyMaintenanceOrder.setNum(num); + dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId()); + dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime()); + dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime()); + dailyMaintenanceOrder.setStatus("3");//3:鏈紑濮� + dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId()); + dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2); + List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType()); + if(maintenanceStandardDetailList.size()>0){ + dailyMaintenanceOrder.setMaintenanceCycleId(maintenanceStandardDetailList.get(0).getMaintenanceCycleId()); + } + dailyMaintenanceOrder.setMaintenanceOrderUda1(equipmentMaintenancePlan.getId()); + dailyMaintenanceOrder.setMaintenanceOrderUda2(equipmentMaintenancePlanDetail.getId()); + dailyMaintenanceOrder.setDelFlag(CommonConstant.DEL_FLAG_0); + dailyMaintenanceOrder.setPrecisionInspectionStatus(CommonConstant.STATUS_0); + dailyMaintenanceOrder.setStoveExemptStatus(CommonConstant.STATUS_0); + dailyMaintenanceOrder.setConfirmStatus(CommonConstant.STATUS_0); + dailyMaintenanceOrderService.save(dailyMaintenanceOrder); + for(MaintenanceStandardDetail maintenanceStandardDetail:maintenanceStandardDetailList){ + DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail = new DailyMaintenanceOrderDetail(); + dailyMaintenanceOrderDetail.setDailyMaintenanceOrderId(dailyMaintenanceOrder.getId()); + dailyMaintenanceOrderDetail.setMaintenanceStandardDetailId(maintenanceStandardDetail.getId()); + dailyMaintenanceOrderDetail.setMaintenanceStandardId(maintenanceStandard.getId()); + dailyMaintenanceOrderDetail.setMaintenanceProjectId(maintenanceStandardDetail.getMaintenanceProjectId()); + dailyMaintenanceOrderDetail.setDelFlag(0); + maintenanceOrderDetailService.save(dailyMaintenanceOrderDetail); + } + } + equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan); + String msg = "鍗曟嵁鍙蜂负銆�"+equipmentMaintenancePlan.getNum()+"銆戠殑淇濆吇璁″垝宸茬敓鎴愪繚鍏诲伐鍗�"; + MessageDTO messageDTO = new MessageDTO(); + messageDTO.setTitle("鏈夋柊鐨勪繚鍏诲伐鍗�"); + messageDTO.setContent(msg); + messageDTO.setCategory("绯荤粺娑堟伅"); + messageDTO.setFromUser(user.getUsername()); + messageDTO.setToUser("admin"); + if(equipmentMaintenancePlanDetails.size()!=0){ + sysBaseApi.sendSysAnnouncement(messageDTO); + } return Result.OK("鎿嶄綔鎴愬姛"); } @@ -340,9 +409,14 @@ } return Result.error("鏂囦欢瀵煎叆澶辫触锛�"); } - + @GetMapping("/getStandards") + public Result<?> getStandards(@RequestParam(name="ids",required=true) String ids, + @RequestParam(name="maintenanceType",required=true) String maintenanceType + ){ + List<String> equipmentIds = Arrays.asList(ids.split(",")); + return Result.OK(equipmentMaintenancePlanService.getStandards(equipmentIds,maintenanceType)); + } /*--------------------------------瀛愯〃澶勭悊-淇濆吇璁″垝鏄庣粏-end----------------------------------------------*/ - -- Gitblit v1.9.3