修改

“linengliang”

2023-12-13 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d

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

@@ -6,6 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -151,7 +152,7 @@
      if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
         queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
      }

      queryWrapper.isNull("line_id");
      queryWrapper.eq("status","1");
      queryWrapper.eq("del_flag",0);
      queryWrapper.orderByDesc("create_time");
@@ -332,6 +333,7 @@
   @DeleteMapping(value = "/delete")
   public Result<String> delete(@RequestParam(name="id",required=true) String id) {
      Equipment equipment = equipmentService.getById(id);
      equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",id).set("line_id",null).set("is_meta",null));
      equipment.setDelFlag(1);
      equipmentService.updateById(equipment);
      return Result.OK("删除成功!");
@@ -571,6 +573,8 @@
                String manageId = equipmentImportVo.getManageId();
                String constructorId = equipmentImportVo.getConstructorId();
                String teamId = equipmentImportVo.getTeamId();
                String propertyStatus = equipmentImportVo.getPropertyStatus();
                String abc = equipmentImportVo.getEquipmentImportanceId();
                     if(StringUtils.isBlank(equipmentImportVo.getNum())){
                   exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:统一编码缺失,请填写必填项后再导入;";
                   exceptionNum++;
@@ -680,16 +684,16 @@
//                   exceptionNum++;
//                }
                else{
                   SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
                   if(ObjectUtils.isNull(useId)){
                   SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()).eq("del_flag",0),false);
                   if(ObjectUtils.isNotNull(use)){
                      equipment.setUseId(use.getId());
                   }else {
                      exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该使用部门,请维护部门数据后再导入;";
                      exceptionNum++;
                      continue;
                   }
                   Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
                   Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()));
                   Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
                   Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
                   if(ObjectUtils.isNotNull(area)){
                      equipment.setFactoryModelId(area.getId());
                   }else if(ObjectUtils.isNotNull(area1)) {
@@ -699,7 +703,7 @@
                      exceptionNum++;
                      continue;
                   }
                   SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()));
                   SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
                   if(ObjectUtils.isNotNull(manage)){
                      equipment.setManageId(manage.getId());
                   }else{
@@ -707,7 +711,9 @@
                      exceptionNum++;
                      continue;
                   }
                   EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentCategoryName.trim()),false);
                   EquipmentCategory equipmentCategory = equipmentCategoryService
                         .getOne(new QueryWrapper<EquipmentCategory>()
                               .eq("name",equipmentCategoryName.trim()).eq("del_flag",0),false);
                   if(ObjectUtils.isNotNull(equipmentCategory)){
                      equipment.setEquipmentCategoryId(equipmentCategory.getId());
                   }
@@ -716,8 +722,8 @@
                      exceptionNum++;
                      continue;
                   }
                   Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
                   Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()),false);
                   Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()).eq("del_flag",0),false);
                   Team team1 = teamService.getOne(new QueryWrapper<Team>().eq("num",teamId.trim()).eq("del_flag",0),false);
                   if(ObjectUtils.isNotNull(team)){
                      equipment.setTeamId(team.getId());
                   }else if(ObjectUtils.isNotNull(team1)) {
@@ -739,19 +745,20 @@
                         equipment.setConstructorId(constructor.getId());
                      }
                   }
                         if(equipmentImportVo.getPropertyStatus().equals("warranty")){
                         if(StringUtils.isNotBlank(propertyStatus)&&propertyStatus.equals("warranty")){
                      if(
                            ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
                            ||ObjectUtils.isNull(equipmentImportVo.getWarrantyEnd())
                      ){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备处于质保期，质保信息缺失，请先维护质保开始时间或结束时间;";
                         exceptionNum++;
                         continue;
                      }

                   }else{
                      Equipment oriEquipment = equipmentService
                            .getOne(new QueryWrapper<Equipment>()
                                  .eq("num",equipmentImportVo.getNum()),false);
                                  .eq("num",equipmentImportVo.getNum()).eq("del_flag",0),false);
                      if(ObjectUtils.isNull(oriEquipment)){
                         equipment.setNum(equipmentImportVo.getNum())
                               .setName(equipmentImportVo.getName())
@@ -781,6 +788,8 @@
                               .setPropertyStatus(equipmentImportVo.getPropertyStatus())
                               .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                               .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                               .setIsLineEquip("no")
                               .setIsLine("no")
                               .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
                               .setGpo(equipmentImportVo.getGpo());
                         if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
@@ -797,16 +806,18 @@
                               &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
                               &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
                         ){
                            if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
                              equipment.setCheckPeriod(365*3+"");
                            if(StringUtils.isNotBlank(abc)){
                              if(abc.equals("A")){
                                 equipment.setCheckPeriod(365*3+"");
                              }
                              if(
                                    abc.equals("B")
                                          ||abc.equals("C")
                                          ||abc.equals("D")
                              ){
                                 equipment.setCheckPeriod(365*4+"");
                              }
                           }
                            if(
                                  equipmentImportVo.getEquipmentImportanceId().equals("B")
                                 ||equipmentImportVo.getEquipmentImportanceId().equals("C")
                                 ||equipmentImportVo.getEquipmentImportanceId().equals("D")
                           ){
                               equipment.setCheckPeriod(365*4+"");
                            }
                         }
                         equipmentService.save(equipment);
                      }else {
@@ -844,9 +855,45 @@
                                         HttpServletRequest req) {
       QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
       Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
       IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
       IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId(),standardDetail.getType());
       return Result.OK(pageList);
    }
    @PostMapping("addLine")
    @Transactional(rollbackFor = {Exception.class})
    public Result<?> addLine(@RequestBody Equipment equipment){
        equipment.setIsLineEquip("no");
        equipment.setIsLine("yes");
        equipmentService.save(equipment);
        List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
        for(Equipment equipment1:equipmentList){
           equipment1.setId(equipment1.getShowId());
           equipment1.setIsLineEquip("yes");
           equipment1.setLineId(equipment.getId());
       }
        equipmentService.updateBatchById(equipmentList);
        return Result.OK("添加成功");
    }
    @PutMapping("editLine")
    @Transactional(rollbackFor = {Exception.class})
    public Result<?> editLine(@RequestBody Equipment equipment){
       equipmentService.updateById(equipment);
       equipmentService.update(new UpdateWrapper<Equipment>()
             .eq("line_id",equipment.getId())
             .set("line_id",null)
             .set("is_meta",null)
             .set("is_line_equip","no"));
       List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
       for(Equipment equipment1:equipmentList){
          equipment1.setLineId(equipment.getId());
          String id = equipment1.getId();
          if(StringUtils.isBlank(id)){
             equipment1.setId(equipment1.getShowId());
          }
          equipment1.setIsLineEquip("yes");
       }
       equipmentService.updateBatchById(equipmentList);
       return Result.OK("编辑成功");
    }


}