1

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

@@ -1742,6 +1742,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             }
 
         }
+        cacheComponent.delPrefixKey(Const.ADMIN_CONTRACTINFO);
 
     }
 

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

@@ -30,6 +30,7 @@ import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.util.Const;
 import com.yh.saas.toolkit.workflow.service.IWorkflowService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +75,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     private IWarehousingOrderService warehousingOrderService;
     @Autowired
     private ISourceRelationInfoService sourceRelationInfoService;
-
+    @Autowired
+    private CacheComponent cacheComponent;
     /**
      * 出入库任务新增 编辑
      *
@@ -250,6 +252,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             noticeTaskService.createNoticeTask(staffIds,
                     null, taskInfo);
         }
+        cacheComponent.delPrefixKey(Const.ADMIN_CONTRACTINFO);
         return inOutWarehouseTask.getId();
     }
 
@@ -375,6 +378,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 }
             }
         }
+        cacheComponent.delPrefixKey(Const.ADMIN_CONTRACTINFO);
     }
 
     /**

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

@@ -689,7 +689,8 @@
         from(
         SELECT
         COUNT(w.id)
-        FROM warehouse_base_info w
+        FROM
+        warehouse_base_info w
         LEFT JOIN warehouse_in_out_info wioi ON wioi.base_id = w.id
         AND wioi.delete_flag = 0
         AND wioi.in_out_type = '收购入库'
@@ -712,17 +713,13 @@
         LEFT JOIN expense_info ei ON ei.warehouse_id = w.id and ei.delete_flag = '0'
         AND ei.expenses_type = '2'
         AND ei.expenses_purpose = '3'
+        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") >=
+        DATE_FORMAT(#{startDate},"%Y%m%d"))
+        AND (DATE_FORMAT(ei.create_date,"%Y%m%d") <=
+        DATE_FORMAT(#{endDate},"%Y%m%d"))
         WHERE
         w.comp_id = #{compId}
         AND w.warehouse_type = '1'
-        <if test="startDate != null">
-            AND (DATE_FORMAT(ei.create_date,"%Y%m%d") &gt;=
-            DATE_FORMAT(#{startDate},"%Y%m%d"))
-        </if>
-        <if test="endDate != null">
-            AND (DATE_FORMAT(ei.create_date,"%Y%m%d") &lt;=
-            DATE_FORMAT(#{endDate},"%Y%m%d"))
-        </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(w.warehouse_name) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>