更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -243,9 +243,9 @@ public class BiInfoController {
         List<ContractManagementInfo> contractManagementInfos = contractManagementInfoService.selectList(contractManagementInfoEntityWrapper);
         if (CollectionUtils.isNotEmpty(contractManagementInfos)) {
             for (int i = 0; i < 10; i++) {
-                if (contractManagementInfos.size() <= i) {
-                    break;
-                }
+//                if (contractManagementInfos.size() <= i) {
+//                    break;
+//                }
                 contractManagementInfoList.add(contractManagementInfos.get(i));
             }
 
@@ -417,6 +417,7 @@ public class BiInfoController {
                         EntityWrapper<WarehouseBaseInfo> warehouseBaseInfoEntityWrapper = new EntityWrapper<WarehouseBaseInfo>();
                         warehouseBaseInfoEntityWrapper.eq("comp_id", companyId);
                         warehouseBaseInfoEntityWrapper.eq("warehouse_name", tranTaskInfo.getSendWarehouse());
+                        warehouseBaseInfoEntityWrapper.eq("delete_flag","0");
                         if (AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null) {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
@@ -429,6 +430,7 @@ public class BiInfoController {
                         EntityWrapper<ContractManagementInfo> contractManagementInfoEntityWrapper = new EntityWrapper<ContractManagementInfo>();
                         contractManagementInfoEntityWrapper.eq("contract_no", tranTaskInfo.getContractNo());
                         contractManagementInfoEntityWrapper.eq("comp_id", companyId);
+                        contractManagementInfoEntityWrapper.eq("delete_flag","0");
                         if (AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null) {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
@@ -449,6 +451,7 @@ public class BiInfoController {
                         EntityWrapper<WarehouseBaseInfo> warehouseBaseInfoEntityWrapper = new EntityWrapper<WarehouseBaseInfo>();
                         warehouseBaseInfoEntityWrapper.eq("comp_id", companyId);
                         warehouseBaseInfoEntityWrapper.eq("warehouse_name", tranTaskInfo.getSendWarehouse());
+                        warehouseBaseInfoEntityWrapper.eq("delete_flag","0");
                         if (AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null) {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
@@ -460,6 +463,7 @@ public class BiInfoController {
                         EntityWrapper<WarehouseBaseInfo> warehouseBaseInfoEntityWrapper1 = new EntityWrapper<WarehouseBaseInfo>();
                         warehouseBaseInfoEntityWrapper1.eq("comp_id", companyId);
                         warehouseBaseInfoEntityWrapper1.eq("warehouse_name", tranTaskInfo.getReceiveWarehouse());
+                        warehouseBaseInfoEntityWrapper1.eq("delete_flag","0");
                         if (AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null) {
                             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
                             //洮南瀚城合营人员查看
@@ -606,6 +610,7 @@ public class BiInfoController {
         EntityWrapper<ContractManagementInfo> contractManagementInfoEntityWrapper = new EntityWrapper<ContractManagementInfo>();
         contractManagementInfoEntityWrapper.eq("delete_flag", "0");
         contractManagementInfoEntityWrapper.eq("comp_id", companyId);
+        contractManagementInfoEntityWrapper.gt("create_date", seachMoth);
         contractManagementInfoEntityWrapper.orderBy("create_date", false);
         if (AuthSecurityUtils.getCurrentUserInfo() != null && AuthSecurityUtils.getCurrentUserInfo().getUserId() != null) {
             String userId = AuthSecurityUtils.getCurrentUserInfo().getUserId();
@@ -639,7 +644,7 @@ public class BiInfoController {
 
                     tranCarInfoList.add(tranCarInfos.get(i));
                 }
-                if (tranCarInfoList.size() > 30) {
+                if (tranCarInfoList.size() > 10) {
                     break;
                 }
 

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

@@ -372,7 +372,7 @@
         and w.in_out_type like "%${type}%"
         <if test="seachMoth != null">
             <if test="seachMoth == 1">
-                AND to_days(w.create_date) = to_days(now())
+                AND w.create_date >= date(now())
             </if>
             <if test="seachMoth == 7">
                 AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(w.create_date)
@@ -400,7 +400,7 @@
         </if>
         <if test="seachMoth != null">
             <if test="seachMoth == 1">
-                AND to_days(a.create_date) = to_days(now())
+                AND a.create_date >= date(now())
             </if>
             <if test="seachMoth == 7">
                 AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(a.create_date)