修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -467,6 +467,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         //公司id
         pageView.put("compId", identityAuthenticationInfo.getCompId());
         pageView.put("authenticationStatusKey", identityAuthenticationInfo.getAuthenticationStatusKey());
+        pageView.put("searchKeyWord", identityAuthenticationInfo.getSearchKeyWord());
         List<IdentityAuthenticationInfo> dataList = this.baseMapper.getIdentityInfoByCondition(pageView);
         return dataList;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -314,7 +314,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             for (InOutWarehouseTask inOutWarehouseTaska : dataList) {
 
                 //定义累计退库量
-                String stockReturnCount = "";
+                String stockReturnCount = "0";
 
                 //查询退库量
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/InOutWarehouseTaskMapper.xml

@@ -55,16 +55,16 @@
         and delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND task_status_key = '1'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '1'
             </if>
             <if test="searchType == 2">
-                AND task_status_key = '3'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '3'
             </if>
             <if test="searchType == 3">
-                AND task_status_key = '5'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '5'
             </if>
             <if test="searchType == 4">
-                AND task_status_key = '7'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
@@ -95,7 +95,8 @@
         b.weight as weightIn,
         a.predict_date as predictDate,
         a.publisher as publisher,
-        IFNULL(b.task_status,a.task_status) as taskStatus,
+--         IFNULL(b.task_status,a.task_status) as taskStatus,
+        case when b.task_status = '已完成' then '已完成' else a.task_status end as taskStatus,
         a.establish_date as establishDate,
         a.relevance_id as relevanceId,
         a.task_type_key as taskTypeKey,
@@ -120,16 +121,16 @@
         </if>
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '1'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '1'
             </if>
             <if test="searchType == 2">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '3'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '3'
             </if>
             <if test="searchType == 3">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '5'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '5'
             </if>
             <if test="searchType == 4">
-                AND IFNULL(b.task_status_key,a.task_status_key) = '7'
+                AND case when b.task_status_key = '7' then '7' else a.task_status_key end = '7'
             </if>
         </if>
         ORDER BY a.task_status DESC , a.establish_date DESC

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -18,7 +18,7 @@
                 AND w.in_out_flag = '2'
             </if>
         </if>
-        <if test="pcFlag != null and pcFlag != ''and pcFlag == '1'">
+        <if test="pcFlag != null and pcFlag != ''">
             <if test="pcFlag == 1">
                 AND w.base_id = #{baseId}
                 and w.position_id = #{positionId}