1.决策分析查询日期修改

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1283,6 +1283,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setActualEta(bills.getActualEta());
 				item.setActualEtd(bills.getActualEtd());
 				item.setBillDate(bills.getBillDate());
+				item.setBusinessDate(bill.getBillDate());
 				item.setVesselId(bills.getVesselId());
 				item.setVesselCnName(bills.getVesselCnName());
 				item.setVesselEnName(bills.getVesselEnName());
@@ -1561,6 +1562,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					List<FinAccBills> finAccBills = finAccBillsList.stream().filter(e -> e.getId().equals(item.getAccBillId())).collect(Collectors.toList());
 					for (FinAccBills data : finAccBills) {
 						data.setBillDate(item.getBillDate());
+						data.setBusinessDate(item.getBillDate());
 						data.setBookingAgentId(item.getBookingAgentId());
 						data.setBookingAgentCnName(item.getBookingAgentCnName());
 						data.setBookingAgentEnName(item.getBookingAgentEnName());
@@ -5632,6 +5634,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						item.setEtd(bill.getEtd());
 						item.setEta(bill.getEta());
 						item.setBillDate(bill.getBillDate());
+						item.setBusinessDate(bill.getBillDate());
 						item.setVesselId(bill.getVesselId());
 						item.setVesselCnName(bill.getVesselCnName());
 						item.setVesselEnName(bill.getVesselEnName());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -659,10 +659,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.account_date &gt;= #{fee.etdStart}
+                and acc.business_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.account_date &lt;= #{fee.etdEnd}
+                and acc.business_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -775,10 +775,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.account_date &gt;= #{fee.etdStart}
+                and acc.business_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.account_date &lt;= #{fee.etdEnd}
+                and acc.business_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -866,10 +866,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.account_date &gt;= #{fee.etdStart}
+                and acc.business_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.account_date &lt;= #{fee.etdEnd}
+                and acc.business_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>
@@ -946,10 +946,10 @@
         </if>
         <if test='fee.isBusinessDate != null and fee.isBusinessDate != "" and fee.isBusinessDate == "1"'>
             <if test='fee.etdStart != null and fee.etdStart != ""'>
-                and acc.account_date &gt;= #{fee.etdStart}
+                and acc.business_date &gt;= #{fee.etdStart}
             </if>
             <if test='fee.etdEnd != null and fee.etdEnd != ""'>
-                and acc.account_date &lt;= #{fee.etdEnd}
+                and acc.business_date &lt;= #{fee.etdEnd}
             </if>
         </if>
         <if test='fee.isToExamineDate != null and fee.isToExamineDate != "" and fee.isToExamineDate == "1"'>