bug

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -601,7 +601,7 @@
       tt.task_status AS taskStatus,
       sd.`name` AS taskName,
       tta.agreement_id AS agreementId,
-      GROUP_CONCAT( DISTINCT bad.type_id ) AS typeId,
+      GROUP_CONCAT( DISTINCT mt2.type_id ) AS typeId,
       GROUP_CONCAT(bad.id) as badId,
       GROUP_CONCAT( mt2.type_name, '' ) AS typeName
     FROM

sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectInfoMapper.xml

@@ -141,7 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByName" resultType="com.bonus.sgzb.base.domain.BmProjectInfo">
         select * from bm_project_info
         where
-        1 = 1
+        del_flag = '0' and status = '0'
         <if test="proName != null and proName != ''">and pro_name = #{proName}</if>
     </select>
 

sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmProjectLotMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByName" resultType="com.bonus.sgzb.base.domain.BmProjectLot">
         select * from bm_project_lot
         where
-        1 = 1
+        del_flag = '0' and status = '0'
         <if test="lotName != null and lotName != ''">and lot_name = #{lotName}</if>
     </select>
 

sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitInfoMapper.xml

@@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByName" resultType="com.bonus.sgzb.base.domain.BmUnitInfo">
         select * from bm_unit_info
         where
-        1 = 1
+        del_flag = '0' and status = '0'
         <if test="unitName != null and unitName != '' ">and unit_name = #{unitName}</if>
     </select>
 

sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysDicMapper.xml

@@ -66,7 +66,7 @@
     <select id="selectByName" resultType="com.bonus.sgzb.base.api.domain.SysDic">
             select * from sys_dic
             where
-            1 = 1
+            status != 2
             <if test="name != null and name != ''">and name = #{name}</if>
     </select>
 

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

@@ -126,7 +126,7 @@ public class BackApplyInfo extends BaseEntity {
     @ApiModelProperty(value = "协议编号")
     private String agreementCode;
 
-    @Excel(name = "退料状态" , readConverterExp = "37=待退料审核,38=退料已审核,39=退料核查中,40=退料完成")
+    @Excel(name = "退料状态" , readConverterExp = "37=待退料审核,38=退料已审核,39=退料核查中,40=退料完成,101 = 退料审核驳回")
     @ApiModelProperty(value = "任务状态")
     private String taskStatus;
 

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

@@ -649,7 +649,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tta.agreement_id as agreementId,
         GROUP_CONCAT(bai.company_id) as companyId,
         GROUP_CONCAT(bad.id) as badId,
-        GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
+        GROUP_CONCAT(DISTINCT mt2.type_id) as typeId,
         GROUP_CONCAT(mt2.type_name) AS typeName,
         GROUP_CONCAT(bad.status) AS status
         FROM
@@ -692,6 +692,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <![CDATA[AND DATE_FORMAT( bai.back_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>
         </if>
         GROUP BY bai.id, us.user_name, bai.phone, bpl.lot_name, bui.unit_name, bagi.plan_start_time
+        <if test="typeId != null and typeId != ''">
+            HAVING FIND_IN_SET(#{typeId}, typeId) > 0
+        </if>
         ORDER BY bai.create_time desc
     </select>