sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java

@@ -153,9 +153,4 @@ public class Constants
      */
     public static final String privateKey = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=";
 
-    /** 机具设备分公司*/
-    public static final String JJ = "机具设备分公司";
-    /** 调试分公司*/
-    public static final String TS = "调试分公司";
-
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/StorageStatus.java

@@ -203,9 +203,4 @@ public class StorageStatus {
     @ApiModelProperty(value = "装备管理方式名称")
     private String manageTypeName;
 
-    /** 1.机具仓储 2.调试仓储 */
-    private String maType;
-
-    private String maTypeName;
-
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/StorageStatusServiceImpl.java

@@ -1,8 +1,10 @@
 package com.bonus.sgzb.material.service.impl;
 
-import com.bonus.sgzb.common.core.constant.Constants;
+import com.bonus.sgzb.material.domain.ProjUsingRecord;
 import com.bonus.sgzb.material.domain.StorageStatus;
+import com.bonus.sgzb.material.mapper.ProjUsingRecordMapper;
 import com.bonus.sgzb.material.mapper.StorageStatusMapper;
+import com.bonus.sgzb.material.service.ProjUsingRecordService;
 import com.bonus.sgzb.material.service.StorageStatusService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,12 +24,6 @@ public class StorageStatusServiceImpl implements StorageStatusService {
 
     @Override
     public List<StorageStatus> getStorageStatusList(StorageStatus bean) {
-        if (bean.getMaType() != null && ("1").equals(bean.getMaType())) {
-            bean.setMaTypeName(Constants.JJ);
-        }
-        if (bean.getMaType() != null && ("2").equals(bean.getMaType())) {
-            bean.setMaTypeName(Constants.TS);
-        }
         return storageStatusMapper.getStorageStatusList(bean);
     }
 }

sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml

@@ -86,12 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                   and tt.task_status !=107 and tt.task_status !=106
                             GROUP BY mt.type_id) AS subquery4 ON subquery4.type_id = mt.type_id
                  LEFT JOIN ma_type mt2 on mt2.type_id = mt.parent_id
-                 LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE mt.`level` = 4
         and mt.del_flag = '0'
-        <if test="maTypeName!=null and maTypeName != ''">
-            AND sd.dept_name = #{maTypeName}
-        </if>
         <if test="typeName != null and typeName != ''">
             and mt2.type_name like concat('%',#{typeName},'%')
         </if>