备品备件问题需求开发 bug修复，细节优化

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/WlSpareEquipment.java

@@ -128,5 +128,14 @@ public class WlSpareEquipment extends BaseEntity implements Serializable {
 
     @TableField(exist = false)
     private Integer pageSize;
+
+    @TableField(exist = false)
+    private String equipmentClassificationCode;
+
+    @TableField(exist = false)
+    private String industryCode;
+
+    @TableField(exist = false)
+    private String code; // 装备定义code筛选字段
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WlSpareEquipmentController.java

@@ -4,23 +4,29 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.equipmanage.common.entity.EquipmentCategory;
 import com.yeejoin.equipmanage.common.entity.WlSpareEquipment;
 import com.yeejoin.equipmanage.common.entity.vo.WlSpareEquipmentExportVo;
 import com.yeejoin.equipmanage.common.enums.SingleEnum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.mapper.WlSpareEquipmentMapper;
+import com.yeejoin.equipmanage.service.IEquipmentCategoryService;
 import com.yeejoin.equipmanage.service.WlSpareEquipmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.util.UriUtils;
@@ -33,7 +39,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @Api(tags = "设备平台备品备件管理api")
@@ -46,6 +54,12 @@ public class WlSpareEquipmentController extends BaseController {
     @Autowired
     WlSpareEquipmentMapper wlSpareEquipmentMapper;
 
+    @Autowired
+    IEquipmentCategoryService equipmentCategoryService;
+
+    @Value("${equipment.hierarchy}")
+    private String hierarchy;
+
     @RequestMapping(value = "/saveOrUpdateSpareEquipment", method = RequestMethod.POST)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "新增/编辑", notes = "新增/编辑")
@@ -75,8 +89,49 @@ public class WlSpareEquipmentController extends BaseController {
     @RequestMapping(value = "/listByPage", method = RequestMethod.POST)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "列表分页查询", notes = "列表分页查询")
-    public ResponseModel<Page<WlSpareEquipment>> listByPage(@RequestBody WlSpareEquipment wlSpareEquipment) {
-        Page<WlSpareEquipment> wlSpareEquipmentPage = wlSpareEquipmentService.listByPage(wlSpareEquipment, new Page<>(wlSpareEquipment.getPageNum(), wlSpareEquipment.getPageSize()));
+    public ResponseModel listByPage(@RequestBody WlSpareEquipment wlSpareEquipment) {
+        String[] result = hierarchy.split(",");
+        Map<Integer, Integer> map = new HashMap<>();
+        for (int i = 0; i < result.length; i++) {
+            map.put(i, Integer.valueOf(result[i]));
+        }
+        if (StringUtil.isNotEmpty(wlSpareEquipment.getEquipmentClassificationCode())) {
+            QueryWrapper<EquipmentCategory> equipmentCategoryQueryWrapper = new QueryWrapper<>();
+            equipmentCategoryQueryWrapper.eq("code", wlSpareEquipment.getEquipmentClassificationCode());
+            equipmentCategoryQueryWrapper.eq("industry_code", wlSpareEquipment.getIndustryCode());
+            List<EquipmentCategory> equipmentCategoryList = equipmentCategoryService.list(equipmentCategoryQueryWrapper);
+            if (CollectionUtils.isEmpty(equipmentCategoryList)) {
+                throw new RuntimeException("装备定义code有误");
+            }
+            EquipmentCategory equipmentCategory = equipmentCategoryList.get(0);
+            int inhierarchy = 1;
+            int flag = 0;
+            for (int i = 0; i < result.length + 1; i++) {
+                //进来先判断是否默认就是空，如果为空第一层
+                if (equipmentCategory.getParentId() == null) {
+                    //判断是否是最下面的子节点
+                    if (i >= 4) {
+                        inhierarchy = 8;
+                    } else {
+                        inhierarchy = map.get(i);
+                    }
+                    flag = i;
+                    break;
+                } else {
+                    //查找到循环几次为空
+                    equipmentCategory = equipmentCategoryService.getById(equipmentCategory.getParentId());
+                }
+            }
+            if (flag == 0) {
+                String classificationCode = wlSpareEquipment.getEquipmentClassificationCode().replaceAll("0+$", "");
+                return CommonResponseUtil.success(wlSpareEquipmentService.listByPage(wlSpareEquipment, new Page<>(wlSpareEquipment.getPageNum(), wlSpareEquipment.getPageSize()), inhierarchy, classificationCode));
+            } else {
+                String classificationCode = wlSpareEquipment.getEquipmentClassificationCode().replaceAll("0+$", "");
+                return CommonResponseUtil.success(wlSpareEquipmentService.listByPage(wlSpareEquipment, new Page<>(wlSpareEquipment.getPageNum(), wlSpareEquipment.getPageSize()), inhierarchy, classificationCode.length() % 2 == 0 ? classificationCode : classificationCode + "0"));
+            }
+        }
+
+        Page<WlSpareEquipment> wlSpareEquipmentPage = wlSpareEquipmentService.listByPage(wlSpareEquipment, new Page<>(wlSpareEquipment.getPageNum(), wlSpareEquipment.getPageSize()), 0, null);
         return CommonResponseUtil.success(wlSpareEquipmentPage);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/WlSpareEquipmentMapper.java

@@ -7,6 +7,9 @@ import org.apache.ibatis.annotations.Param;
 
 public interface WlSpareEquipmentMapper extends BaseMapper<WlSpareEquipment> {
 
-    Page<WlSpareEquipment> listByPage(@Param("page") Page page, @Param("dto") WlSpareEquipment dto);
+    Page<WlSpareEquipment> listByPage(@Param("page") Page page,
+                                      @Param("dto") WlSpareEquipment dto,
+                                      @Param("hierarchy") int hierarchy,
+                                      @Param("codeHead") String codeHead);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/WlSpareEquipmentService.java

@@ -22,7 +22,7 @@ public interface WlSpareEquipmentService {
 
     WlSpareEquipment getById(Long id);
 
-    Page<WlSpareEquipment> listByPage(WlSpareEquipment dto, Page page);
+    Page<WlSpareEquipment> listByPage(WlSpareEquipment dto, Page page, int hierarchy, String codeHead);
 
     void saveImportBatch(List<WlSpareEquipmentExportVo> list, ReginParams reginParams);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlSpareEquipmentServiceImpl.java

@@ -71,6 +71,8 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
     public WlSpareEquipment saveOrUpdateSpareEquipment(WlSpareEquipment wlSpareEquipment, ReginParams reginParams) {
         wlSpareEquipment.setBizOrgName(reginParams.getPersonIdentity().getCompanyName());
         wlSpareEquipment.setBizOrgCode(reginParams.getPersonIdentity().getCompanyBizOrgCode());
+        WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(wlSpareEquipment.getWarehouseStructureId());
+        wlSpareEquipment.setWarehouseStructureCode(warehouseStructure.getCode());
         if (ObjectUtils.isEmpty(wlSpareEquipment.getId())) {
             wlSpareEquipmentMapper.insert(wlSpareEquipment);
         } else {
@@ -80,8 +82,6 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
                     .eq(UploadFile::getObjectId, wlSpareEquipment.getId());
             iUploadFileService.remove(queryWrapper);
         }
-        WarehouseStructure warehouseStructure = warehouseStructureMapper.selectById(wlSpareEquipment.getWarehouseStructureId());
-        wlSpareEquipment.setWarehouseStructureCode(warehouseStructure.getCode());
         saveUploadFile(wlSpareEquipment);
         return wlSpareEquipment;
     }
@@ -146,8 +146,8 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
     }
 
     @Override
-    public Page<WlSpareEquipment> listByPage(WlSpareEquipment dto, Page page) {
-        return wlSpareEquipmentMapper.listByPage(page, dto);
+    public Page<WlSpareEquipment> listByPage(WlSpareEquipment dto, Page page, int hierarchy, String codeHead) {
+        return wlSpareEquipmentMapper.listByPage(page, dto, hierarchy, codeHead);
     }
 
     @Override

amos-boot-system-equip/src/main/resources/mapper/WlSpareEquipmentMapper.xml

@@ -15,8 +15,17 @@
         <if test="dto.name != null and dto.name != ''">
             AND `name` LIKE CONCAT('%', #{dto.name}, '%')
         </if>
-        <if test="dto.position != null and dto.position != ''">
-            AND `position` LIKE concat(#{dto.position}, '%')
+        <if test="dto.code != null and dto.code != ''">
+            AND `equip_model_code` LIKE concat('%', #{dto.code}, '%')
+        </if>
+        <if test="codeHead != null and codeHead != ''">
+            AND LEFT (equip_model_code, #{hierarchy}) = #{codeHead}
+        </if>
+        <if test="dto.manufacturerId != null">
+            AND manufacturer_id = #{dto.manufacturerId}
+        </if>
+        <if test="dto.warehouseStructureId != null">
+            AND warehouse_structure_id = #{dto.warehouseStructureId}
         </if>
     </where>
     ORDER BY create_date DESC