ccjgmwz 3 gadi atpakaļ
vecāks
revīzija
878640efc0

BIN
templates/excel.xlsx


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

@@ -83,7 +83,7 @@ public class BiInfoController {
                 contractManagementInfoEntityWrapper .and("YEAR(create_date)='"+seachMoth+"'");
             }
             else{
-                contractManagementInfoEntityWrapper .and("(YEAR(create_date)+\"-\"+MONTH(create_date))='"+seachMoth+"'");
+                contractManagementInfoEntityWrapper .like("create_date",seachMoth+"%");
             }
         }
 
@@ -470,6 +470,9 @@ public class BiInfoController {
         Double payTotal = 0.00;
         for (int i = 0; i < contractManagementInfos.size(); i++) {
             ContractManagementInfo contractManagementInfo = contractManagementInfos.get(i);
+            if ("2".equals(contractManagementInfo.getContractType())) {
+                continue;
+            }
             sumTotal = sumTotal + contractManagementInfo.getWeight();
             moneyTotal = moneyTotal + contractManagementInfo.getTotalContractPrice();
             //定义出库量