问题项修改

qushaowei

2024-01-12 286375a43369462cd75147271949cf819916912f

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,11 +13,8 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.FinishTransferOrder;
import org.jeecg.modules.eam.entity.PrecisionInspection;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IPrecisionInspectionService;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -43,6 +41,18 @@

   @Autowired
   private IDailyMaintenanceOrderService dailyMaintenanceOrderService;

   @Autowired
   private IPrecisionInspectionDetailService precisionInspectionDetailService;

   @Autowired
   private IPrecisionParametersService precisionParametersService;

   @Autowired
   private IEamEquipmentService equipmentService;

   @Autowired
   private IPrecisionParametersTemplateDetailService precisionParametersTemplateDetailService;
   
   /**
    * 分页列表查询
@@ -168,13 +178,31 @@
        return super.importExcel(request, response, PrecisionInspection.class);
    }

   /**
    * 日常点检
    * qsw 2023-4-26
    */

   @GetMapping("getPrecisionInspectionList")
   public Result<?> getPrecisionInspectionList(@RequestParam(name = "maintenanceOrderId", required = true) String maintenanceOrderId) {
      List<Map<String, Object>> precisionInspectionList = precisionInspectionService.getPrecisionInspectionList(maintenanceOrderId);
      for (Map<String, Object> map : precisionInspectionList) {
         String id = (String) map.get("id");
         List<PrecisionInspectionDetail> precisionInspectionDetails = precisionInspectionDetailService.lambdaQuery()
               .eq(PrecisionInspectionDetail::getPrecisionInspectionId, id)
               .eq(PrecisionInspectionDetail::getDelFlag, "0").list();
         for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetails) {
            String precisionParametersId = precisionInspectionDetail.getPrecisionParametersId();
            PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
            precisionInspectionDetail.setPrecisionParametersName(precisionParameters.getName());

            List<PrecisionParametersTemplateDetail> list = precisionParametersTemplateDetailService.lambdaQuery()
                  .eq(PrecisionParametersTemplateDetail::getPrecisionParametersId, precisionParametersId)
                  .eq(PrecisionParametersTemplateDetail::getDelFlag, "0").list();
            if(list.size()>0){
               precisionInspectionDetail.setTolerance(list.get(0).getTolerance());
            }

         }

         map.put("precisionInspectionDetails",precisionInspectionDetails);
      }
      return Result.ok(precisionInspectionList);
   }

@@ -187,50 +215,58 @@
      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
      String userId = sysUser.getId();

      String receipts = precisionInspection.getReceipts();//精度检验单单据id
      PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
      DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
      String maintenanceOrderUda4 = maintenanceOrder.getMaintenanceOrderUda4();
      Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
      String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();

         if ("0".equals(precisionInspectionStatus)){
      if ("0".equals(precisionInspectionStatus)){
         List<PrecisionInspectionDetail> precisionInspectionDetailList = precisionInspection.getPrecisionInspectionDetailList();
         for (PrecisionInspectionDetail precisionInspectionDetail : precisionInspectionDetailList) {
            precisionInspectionDetailService.updateById(precisionInspectionDetail);
         }
         preInspection.setPrecisionInspectionUser(userId);
         precisionInspectionService.updateById(preInspection);

         maintenanceOrder.setPrecisionInspectionStatus("1");
         dailyMaintenanceOrderService.updateById(maintenanceOrder);
      }else if("1".equals(precisionInspectionStatus)){
         preInspection.setRepairDirectorUser(userId);
         precisionInspectionService.updateById(preInspection);

         maintenanceOrder.setPrecisionInspectionStatus("2");
         dailyMaintenanceOrderService.updateById(maintenanceOrder);
      }else if("2".equals(precisionInspectionStatus)){
      }

      if("2".equals(precisionInspectionStatus)){
         preInspection.setEachTolerance(precisionInspection.getEachTolerance());
         preInspection.setPartTolerance(precisionInspection.getPartTolerance());
         preInspection.setEquipmentInspectorUser(userId);
         precisionInspectionService.updateById(preInspection);

         maintenanceOrder.setPrecisionInspectionStatus("3");
         dailyMaintenanceOrderService.updateById(maintenanceOrder);
      } else if("3".equals(precisionInspectionStatus)){
         preInspection.setSparePart(precisionInspection.getSparePart());
         preInspection.setProcessPass(precisionInspection.getProcessPass());
         preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
         preInspection.setSparePart(precisionInspection.getSparePart());
         preInspection.setUseUnitDirectorUser(userId);
         precisionInspectionService.updateById(preInspection);

         maintenanceOrder.setPrecisionInspectionStatus("4");
         dailyMaintenanceOrderService.updateById(maintenanceOrder);
      }else if("4".equals(precisionInspectionStatus)){
         preInspection.setEquipmentInspectorSignUser(userId);
         preInspection.setJudgmentResult(precisionInspection.getJudgmentResult());
         precisionInspectionService.updateById(preInspection);

         maintenanceOrder.setPrecisionInspectionStatus("5");
         maintenanceOrder.setStatus("8");
         dailyMaintenanceOrderService.updateById(maintenanceOrder);
//         maintenanceOrder.setStatus("8");
         //更新设备技术状态
         equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
      }


      if(StringUtils.isBlank(maintenanceOrderUda4)){
         maintenanceOrder.setMaintenanceOrderUda4(receipts);
      }
      dailyMaintenanceOrderService.updateById(maintenanceOrder);
      preInspection.setRemark(precisionInspection.getRemark());
      precisionInspectionService.updateById(preInspection);
      equipmentService.updateById(equipment);
      return Result.OK("审批成功!");
   }