2023年1月13 18:12

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/excel/SalesCommissionExcel.java

@@ -37,9 +37,8 @@ public class SalesCommissionExcel implements Serializable {
 	/**
 	 * 制单日期
 	 */
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
 	@ExcelProperty(value = "制单日期")
-	private Date careteTime;
+	private String careteTime;
 
 	/**
 	 * 尺寸

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.xml

@@ -120,7 +120,6 @@
             </if>
         </where>
         GROUP BY FC.Corpid
-        HAVING SUM(IFNULL( IFNULL( BC.amount, 0 ) - IFNULL( FS.settlementAmount, 0 ), 0 )) >= 100
     </select>
 
     <select id="SelChargeItem" resultType="org.springblade.finance.vojo.Acc">
@@ -166,7 +165,7 @@
         LEFT JOIN finance_items FI ON FI.pid = FS.id
         <where>
             FS.tenant_id = #{acc.tenantId}
-            AND FS.is_deleted = 0n
+            AND FS.is_deleted = 0
             AND FI.is_deleted = 0
             AND FS.finance_status = '结算完成'
             <if test='acc.billType != null and acc.billType != "" and acc.billType == "申请"'>