代码提交

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/domain/BackCsDeviceDetails.java

@@ -31,6 +31,12 @@ public class BackCsDeviceDetails {
     @ApiModelProperty(value = "类目")
     private String category;
 
+    @ApiModelProperty(value = "工具类目")
+    private String toolTypeId;
+
+    @ApiModelProperty(value = "装备类目")
+    private String categoryEquipment;
+
     @ApiModelProperty(value = "名称")
     private String typeName;
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/mapper/BackChangeMapper.java

@@ -140,4 +140,5 @@ public interface BackChangeMapper {
      * @return
      */
     int updateToolInfoRepairNum(BackCsDeviceDetails csDeviceDetails);
+
 }

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java

@@ -50,7 +50,10 @@ public class BackChangeServiceImpl implements BackChangeService {
             }
             Long thisLoginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
             dto.setCompanyId(thisLoginUserDeptId);
+
+
             return mapper.getDevDetailsInfo(dto);
+
         } catch (Exception e) {
             log.error(e.getMessage());
             return new ArrayList<>();

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/service/DevChangeServiceImpl.java

@@ -210,13 +210,9 @@ public class DevChangeServiceImpl implements DevChangeService {
         try {
             Long thisLoginUserDeptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
             dto.setCompanyId(thisLoginUserDeptId);
-            if("1".equals(dto.getDevType())){
+
-                return mapper.getDevDetailsInfoEquipment(dto);
+            return mapper.getDevDetailsInfo(dto);
-            } else if ("2".equals(dto.getDevType())) {
+
-                return mapper.getDevDetailsInfoTool(dto);
-            }else {
-                return mapper.getDevDetailsInfo(dto);
-            }
         } catch (Exception e) {
             log.error(e.getMessage());
             return new ArrayList<>();

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/scrap/domain/ToBeScrap.java

@@ -29,6 +29,7 @@ public class ToBeScrap {
      */
     private String type;
 
+
     /**
      * 类型id
      */

bonus-modules/bonus-material-mall/src/main/resources/bootstrap-material_mall_local.yml

@@ -6,20 +6,23 @@ server:
 spring:
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:18848
+        server-addr: 127.0.0.1:8848
-        namespace: 37661b6d-55f6-4d12-b2ed-e6ff49e6bb9a
+        namespace: material_mall
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:18848
+        server-addr: 127.0.0.1:8848
-        namespace: 37661b6d-55f6-4d12-b2ed-e6ff49e6bb9a
+        namespace: material_mall
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 
+
 #加密组件
 jasypt:
   encryptor:

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml

@@ -173,6 +173,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="proCode!=null and proCode!=''">
                 AND cd.pro_code = #{proCode}
             </if>
+            <if test="devType!=null and devType!=''">
+                AND cdc.dev_type = #{devType}
+            </if>
+
         </where>
         GROUP BY mdi.code
 
@@ -197,6 +201,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id
         <where>
             tl.manage_mode = '0' AND cdc.del_flag = '0'
+            <if test="devType!=null and devType!=''">
+                AND cdc.dev_type = #{devType}
+            </if>
+
             <if test="typeName!=null and typeName!=''">
                 AND tt1.type_name like concat('%',#{typeName},'%')
             </if>
@@ -236,6 +244,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN tool_type tt4 ON tt3.parent_id = tt4.type_id
         <where>
             tl.manage_mode = '1' AND cdc.del_flag = '0'
+            <if test="devType!=null and devType!=''">
+                AND cdc.dev_type = #{devType}
+            </if>
+
             <if test="typeName!=null and typeName!=''">
                 AND tt1.type_name like concat('%',#{typeName},'%')
             </if>
@@ -404,4 +416,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cd.create_time
         DESC
     </select>
+
 </mapper>

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/DevChangeMapper.xml

@@ -336,6 +336,10 @@
             <if test="companyId!=null">
                 AND mdi.on_company = #{companyId}
             </if>
+            <if test='devType == "2"'>
+                AND 1=0
+            </if>
+
         </where>
 
         UNION ALL
@@ -352,6 +356,7 @@
         tl.type_id AS typeId,
         tl.id AS id
         FROM tool_ledger tl
+
         LEFT JOIN tool_type tt ON tl.type_id = tt.type_id
         LEFT JOIN tool_type tt1 ON tt.parent_id = tt1.type_id
         LEFT JOIN tool_type tt2 ON tt1.parent_id = tt2.type_id
@@ -377,6 +382,9 @@
             <if test="companyId!=null">
                 AND tl.company_id = #{companyId}
             </if>
+            <if test='devType == "1"'>
+                AND 1=0
+            </if>
         </where>
     </select>
 

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/repair/RepairMapper.xml

@@ -163,6 +163,9 @@
         <if test="code != null and code!=''">
             AND tl.tool_code like concat('%',#{code},'%')
         </if>
+        <if test='devType == "1"'>
+            AND 1=0
+        </if>
 
         UNION
 
@@ -193,6 +196,9 @@
         <if test="code != null and code!=''">
             AND mdi.`code` like concat('%',#{code},'%')
         </if>
+        <if test='devType == "2"'>
+            AND 1=0
+        </if>
     </select>
     <select id="getMonthMaxOrderByDate" resultType="java.lang.Integer">
         select COUNT(*)

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/scrap/ScrapMapper.xml

@@ -33,6 +33,9 @@
         <if test="code != null and code!=''">
             AND tl.tool_code like concat('%',#{code},'%')
         </if>
+        <if test='devType == "1"'>
+            AND 1=0
+        </if>
 
         UNION
 
@@ -64,6 +67,9 @@
         <if test="code != null and code!=''">
             AND mdi.`code` like concat('%',#{code},'%')
         </if>
+        <if test='devType == "2"'>
+            AND 1=0
+        </if>
     </select>
 
     <select id="getScrapApplyList" resultType="com.bonus.material.scrap.domain.ToBeScrap">