2024年10月10日16:15:32

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryDetailNotRD.java

@@ -20,6 +20,11 @@ public class FeeSummaryDetailNotRD {
 
 	@ExcelProperty(value = "结算单位")
 	private String corpName;
+	/**
+	 * 业务类型
+	 */
+	@ExcelProperty(value = "业务类型")
+	private String businessType;
 	@ExcelProperty(value = "业务编号")
 	private String billNo;
 	@ExcelProperty(value = "船名")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryDetailRD.java

@@ -26,6 +26,11 @@ public class FeeSummaryDetailRD {
 	private String mblNo;
 	@ExcelProperty(value = "ETD")
 	private String etdDate;
+	/**
+	 * 业务类型
+	 */
+	@ExcelProperty(value = "业务类型")
+	private String businessType;
 	@ExcelProperty(value = "应收美金")
 	private BigDecimal amountUsd;
 	@ExcelProperty(value = "应收人民币")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FeeSummaryQ.java

@@ -1,5 +1,6 @@
 package org.springblade.los.statisticAnalysis;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
 /**
@@ -67,4 +68,7 @@ public class FeeSummaryQ {
 	 */
 	private String teamId;
 
+	private String billNo;
+	private String mblNo;
+
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FinanceProfitDtoList.java

@@ -36,13 +36,13 @@ public class FinanceProfitDtoList {
 	 * hblno
 	 */
 	@ExcelProperty(value = "hblno")
-	private String hBlNo;
+	private String hblNo;
 
 	/**
 	 * mblno
 	 */
 	@ExcelProperty(value = "mblno")
-	private String mBlNo;
+	private String mblNo;
 
 	/**
 	 * 往来单位Id

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

@@ -350,6 +350,7 @@
         </if>
         acc.bill_no billNo,
         acc.mblno mblNo,
+        acc.business_type businessType,
         CASE
         acc.business_type
         WHEN 'SI' THEN
@@ -374,6 +375,12 @@
         <if test='fee.tenantId != null and fee.tenantId != ""'>
             and acc.tenant_id = #{fee.tenantId}
         </if>
+        <if test="fee.billNo != null and fee.billNo != ''">
+            and acc.bill_no like concat('%', #{fee.billNo}, '%')
+        </if>
+        <if test="fee.mblNo != null and fee.mblNo != ''">
+            and acc.mblno like concat('%', #{fee.mblNo}, '%')
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -445,6 +452,7 @@
         </if>
         acc.bill_no billNo,
         acc.mblno mblNo,
+        acc.business_type businessType,
         CASE
         acc.business_type
         WHEN 'SI' THEN
@@ -469,6 +477,12 @@
         <if test='fee.tenantId != null and fee.tenantId != ""'>
             and acc.tenant_id = #{fee.tenantId}
         </if>
+        <if test="fee.billNo != null and fee.billNo != ''">
+            and acc.bill_no like concat('%', #{fee.billNo}, '%')
+        </if>
+        <if test="fee.mblNo != null and fee.mblNo != ''">
+            and acc.mblno like concat('%', #{fee.mblNo}, '%')
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -542,6 +556,7 @@
             acc.vessel_en_name vesselName,
             acc.voyage_no voyageNo,
             acc.mblno mblNo,
+            acc.business_type businessType,
             CASE
             acc.business_type
             WHEN 'SI' THEN
@@ -567,6 +582,12 @@
         <if test='fee.tenantId != null and fee.tenantId != ""'>
             and acc.tenant_id = #{fee.tenantId}
         </if>
+        <if test="fee.billNo != null and fee.billNo != ''">
+            and acc.bill_no like concat('%', #{fee.billNo}, '%')
+        </if>
+        <if test="fee.mblNo != null and fee.mblNo != ''">
+            and acc.mblno like concat('%', #{fee.mblNo}, '%')
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>
@@ -638,6 +659,7 @@
         acc.vessel_en_name vesselName,
         acc.voyage_no voyageNo,
         acc.mblno mblNo,
+        acc.business_type businessType,
         CASE
         acc.business_type
         WHEN 'SI' THEN
@@ -663,6 +685,12 @@
         <if test='fee.tenantId != null and fee.tenantId != ""'>
             and acc.tenant_id = #{fee.tenantId}
         </if>
+        <if test="fee.billNo != null and fee.billNo != ''">
+            and acc.bill_no like concat('%', #{fee.billNo}, '%')
+        </if>
+        <if test="fee.mblNo != null and fee.mblNo != ''">
+            and acc.mblno like concat('%', #{fee.mblNo}, '%')
+        </if>
         <if test='fee.branchId != null and fee.branchId != ""'>
             and acc.branch_id = #{fee.branchId}
         </if>

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -129,8 +129,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 						FinanceProfitDtoList financeProfit1 = new FinanceProfitDtoList();
 						financeProfit1.setBillType(i.getBusinessType());
 						financeProfit1.setBillNo(i.getBillNo());
-						financeProfit1.setHBlNo(i.getHblno());
-						financeProfit1.setMBlNo(i.getMblno());
+						financeProfit1.setHblNo(i.getHblno());
+						financeProfit1.setMblNo(i.getMblno());
 						financeProfit1.setCorpName(i.getCorpCnName());
 						financeProfit1.setSalesman(i.getOperatorName());
 						financeProfit1.setPod(i.getPodCnName());
@@ -806,8 +806,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 						FinanceProfitDtoList financeProfit1 = new FinanceProfitDtoList();
 						financeProfit1.setBillType(i.getBusinessType());
 						financeProfit1.setBillNo(i.getBillNo());
-						financeProfit1.setHBlNo(i.getHblno());
-						financeProfit1.setMBlNo(i.getMblno());
+						financeProfit1.setHblNo(i.getHblno());
+						financeProfit1.setMblNo(i.getMblno());
 						financeProfit1.setCorpName(i.getCorpCnName());
 						financeProfit1.setSalesman(i.getOperatorName());
 						financeProfit1.setPod(i.getPodCnName());
@@ -1010,8 +1010,8 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 						FinanceProfitDtoList financeProfit1 = new FinanceProfitDtoList();
 						financeProfit1.setBillType(i.getBusinessType());
 						financeProfit1.setBillNo(i.getBillNo());
-						financeProfit1.setHBlNo(i.getHblno());
-						financeProfit1.setMBlNo(i.getMblno());
+						financeProfit1.setHblNo(i.getHblno());
+						financeProfit1.setMblNo(i.getMblno());
 						financeProfit1.setCorpName(i.getCorpCnName());
 						financeProfit1.setSalesman(i.getOperatorName());
 						financeProfit1.setPod(i.getPodCnName());
@@ -1512,12 +1512,17 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getBusinessType, "SE"));
 		List<Long> billId = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-		List<DispatchVehicles> dispatchVehiclesList = dispatchVehiclesMapper.selectList(new LambdaQueryWrapper<DispatchVehicles>()
-			.eq(DispatchVehicles::getIsDeleted, 0)
-			.eq(DispatchVehicles::getTenantId, AuthUtil.getTenantId())
-			.eq(DispatchVehicles::getWhetherReturn, "0")
-			.in(DispatchVehicles::getPid, billId));
-		if (dispatchVehiclesList.isEmpty()) {
+		List<DispatchVehicles> dispatchVehiclesList = new ArrayList<>();
+		if (!billId.isEmpty()){
+			dispatchVehiclesList = dispatchVehiclesMapper.selectList(new LambdaQueryWrapper<DispatchVehicles>()
+				.eq(DispatchVehicles::getIsDeleted, 0)
+				.eq(DispatchVehicles::getTenantId, AuthUtil.getTenantId())
+				.eq(DispatchVehicles::getWhetherReturn, "0")
+				.in(DispatchVehicles::getPid, billId));
+			if (dispatchVehiclesList.isEmpty()) {
+				return R.data(mapList);
+			}
+		}else{
 			return R.data(mapList);
 		}
 		Date date = new Date();
@@ -1553,20 +1558,25 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(Bills::getBusinessType, "SE"));
 		List<Long> billId = billsList.stream().map(Bills::getId).collect(Collectors.toList());
-		List<DispatchVehicles> dispatchVehiclesList = dispatchVehiclesMapper.selectList(new LambdaQueryWrapper<DispatchVehicles>()
-			.eq(DispatchVehicles::getIsDeleted, 0)
-			.eq(DispatchVehicles::getTenantId, AuthUtil.getTenantId())
-			.eq(DispatchVehicles::getWhetherReturn, "1")
-			.in(DispatchVehicles::getPid, billId));
-		if (dispatchVehiclesList.isEmpty()) {
+		List<DispatchVehicles> dispatchVehiclesList = new ArrayList<>();
+		if (!billId.isEmpty()) {
+			dispatchVehiclesList = dispatchVehiclesMapper.selectList(new LambdaQueryWrapper<DispatchVehicles>()
+				.eq(DispatchVehicles::getIsDeleted, 0)
+				.eq(DispatchVehicles::getTenantId, AuthUtil.getTenantId())
+				.eq(DispatchVehicles::getWhetherReturn, "1")
+				.in(DispatchVehicles::getPid, billId));
+			if (dispatchVehiclesList.isEmpty()) {
+				return R.data(mapList);
+			}
+		}else{
 			return R.data(mapList);
 		}
 		Date date = new Date();
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
 		for (DispatchVehicles item : dispatchVehiclesList) {
 			if (ObjectUtils.isNotNull(item.getReturnDate())) {
-				Bills bills = billsList.stream().filter(e-> e.getId().equals(item.getPid())).findFirst().orElse(null);
-				if (bills != null){
+				Bills bills = billsList.stream().filter(e -> e.getId().equals(item.getPid())).findFirst().orElse(null);
+				if (bills != null) {
 					Calendar calendar = Calendar.getInstance();
 					calendar.setTime(item.getReturnDate());
 					calendar.add(Calendar.DAY_OF_MONTH, 5);

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.xml

@@ -49,8 +49,8 @@
     select
         seb.business_type AS billType,
         seb.bill_no AS billNo,
-        seb.hblno AS hBlNo,
-        seb.mblno AS mBlNo,
+        seb.hblno AS hblNo,
+        seb.mblno AS mblNo,
         seb.corp_cn_name AS corpName,
         <if test="data.examineDate != null and data.examineDate != ''">
             seb.approved_date AS statisticsDate,
@@ -88,11 +88,11 @@
         <if test="data.billNo != null and data.billNo != ''">
             and seb.bill_no like concat('%', #{data.billNo}, '%')
         </if>
-        <if test="data.hBlNo != null and data.hBlNo != ''">
-            and seb.hblNo like concat('%', #{data.hBlNo}, '%')
+        <if test="data.hblNo != null and data.hblNo != ''">
+            and seb.hblNo like concat('%', #{data.hblNo}, '%')
         </if>
-        <if test="data.mBlNo != null and data.mBlNo != ''">
-            and seb.mblNo like concat('%', #{data.mBlNo}, '%')
+        <if test="data.mblNo != null and data.mblNo != ''">
+            and seb.mblNo like concat('%', #{data.mblNo}, '%')
         </if>
         <if test='data.corpId != null'>
             and seb.corp_id = #{data.corpId}
@@ -152,8 +152,8 @@
         select
         seb.business_type AS billType,
         seb.bill_no AS billNo,
-        seb.hblno AS hBlNo,
-        seb.mblno AS mBlNo,
+        seb.hblno AS hblNo,
+        seb.mblno AS mblNo,
         seb.corp_cn_name AS corpName,
         <if test="data.examineDate != null and data.examineDate != ''">
             seb.approved_date AS statisticsDate,
@@ -191,11 +191,11 @@
         <if test="data.billNo != null and data.billNo != ''">
             and seb.bill_no like concat('%', #{data.billNo}, '%')
         </if>
-        <if test="data.hBlNo != null and data.hBlNo != ''">
-            and seb.hblNo like concat('%', #{data.hBlNo}, '%')
+        <if test="data.hblNo != null and data.hblNo != ''">
+            and seb.hblNo like concat('%', #{data.hblNo}, '%')
         </if>
-        <if test="data.mBlNo != null and data.mBlNo != ''">
-            and seb.mblNo like concat('%', #{data.mBlNo}, '%')
+        <if test="data.mblNo != null and data.mblNo != ''">
+            and seb.mblNo like concat('%', #{data.mblNo}, '%')
         </if>
         <if test='data.corpId != null'>
             and seb.corp_id = #{data.corpId}