Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

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

@@ -13,10 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
import org.jeecg.modules.eam.service.IPrecisionInspectionService;
import org.jeecg.modules.eam.service.IPrecisionParametersService;
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;
@@ -49,6 +46,9 @@

   @Autowired
   private IPrecisionParametersService precisionParametersService;

   @Autowired
   private IEamEquipmentService equipmentService;
   
   /**
    * 分页列表查询
@@ -205,6 +205,7 @@

      PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
      DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
      Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
      String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();

      if ("0".equals(precisionInspectionStatus)){
@@ -238,12 +239,14 @@

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

      preInspection.setRemark(precisionInspection.getRemark());
      dailyMaintenanceOrderService.updateById(maintenanceOrder);
      precisionInspectionService.updateById(preInspection);

      equipmentService.updateById(equipment);
      return Result.OK("审批成功!");
   }