Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

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

@@ -15,10 +15,13 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceThreeAcceptance;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceThreeAcceptanceService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,6 +61,9 @@

    @Autowired
   private IDailyMaintenanceOrderService dailyMaintenanceOrderService;

    @Autowired
    private IEamEquipmentService equipmentService;
   
   /**
    * 分页列表查询
@@ -95,19 +101,40 @@
      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
      String userId = sysUser.getId();
      String maintenanceOrderId = maintenanceThreeAcceptance.getMaintenanceOrderId();
      String equipmentId = maintenanceThreeAcceptance.getEquipmentId();
      int maintenanceCycle = Integer.parseInt(maintenanceThreeAcceptance.getMaintenanceCycle());
      List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances = maintenanceThreeAcceptance.getMaintenanceThreeAcceptances();
      String checkStatus = "1";//三级保养验收状态（1通过，2未通过）
      for (MaintenanceThreeAcceptance threeAcceptance : maintenanceThreeAcceptances) {
         threeAcceptance.setMaintenanceOrderId(maintenanceOrderId);
//         threeAcceptance.setId("");
         maintenanceThreeAcceptanceService.saveOrUpdate(threeAcceptance);

         String firstInspect = threeAcceptance.getFirstInspect();
         String secondInspect = threeAcceptance.getSecondInspect();
         if("2".equals(firstInspect) || "2".equals(secondInspect)){
            checkStatus = "2";
         }

      }
      DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(maintenanceOrderId);
      maintenanceOrder.setInspectUser(sysUser.getRealname());
      maintenanceOrder.setNotPassReason(maintenanceThreeAcceptance.getNotPassReason());
      maintenanceOrder.setCheckStatus(checkStatus);
      maintenanceOrder.setInspectDate(new Date());
//      maintenanceOrder.setStatus("8");
      dailyMaintenanceOrderService.updateById(maintenanceOrder);

      if("1".equals(checkStatus)){
         Equipment equipment = equipmentService.getById(equipmentId);
         Date dayAfter = DateUtils.getYearAfter(new Date(), maintenanceCycle);
         equipment.setNextThirdMaintenanceTime(dayAfter);
         equipment.setThirdMaintenanceTime(new Date());
         equipmentService.updateById(equipment);
      }

      return Result.OK("添加成功！");
   }
	

   /**
    *  编辑
    *