优化

“linengliang”

2023-11-27 bdcf57bd9679e916b378f1384d875dff6579033e

 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("删除成功!");
@@ -849,9 +851,33 @@
                                         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){
        equipmentService.save(equipment);
        List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
        for(Equipment equipment1:equipmentList){
           equipment1.setId(equipment1.getShowId());
           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));
       List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
       for(Equipment equipment1:equipmentList){
          equipment1.setLineId(equipment.getId());
       }
       equipmentService.updateBatchById(equipmentList);
       return Result.OK("编辑成功");
    }


}