Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

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

@@ -13,7 +13,8 @@
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.eam.entity.EquipmentSeal;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.vo.EquipmentDisposalPage;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -25,8 +26,6 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EquipmentScrapDetail;
import org.jeecg.modules.eam.entity.EquipmentScrap;
import org.jeecg.modules.eam.vo.EquipmentScrapPage;
import org.jeecg.modules.eam.service.IEquipmentScrapService;
import org.jeecg.modules.eam.service.IEquipmentScrapDetailService;
@@ -60,6 +59,8 @@
   private IEquipmentScrapService equipmentScrapService;
   @Autowired
   private IEquipmentScrapDetailService equipmentScrapDetailService;
    @Autowired
    private IEamEquipmentService equipmentService;
   
   /**
    * 分页列表查询
@@ -421,6 +422,15 @@
    @PostMapping(value = "/approve")
    public Result<String> approve(@RequestBody EquipmentScrap equipmentScrap) {
       equipmentScrapService.updateById(equipmentScrap);
       //审批通过后更新设备状态
       if("Approved".equals(equipmentScrap.getAuditStatus())){
          List<EquipmentScrapDetail> equipmentSealDetailList = equipmentScrapDetailService.selectByMainId(equipmentScrap.getId());
          for(EquipmentScrapDetail equipmentScrapDetail : equipmentSealDetailList){
             Equipment equipment = equipmentService.getById(equipmentScrapDetail.getEquipmentId());
             equipment.setEquipmentStatus("3");
             equipmentService.updateById(equipment);
          }
       }
       return Result.OK("操作成功！");
    }
}