Просмотр исходного кода

1.用箱计划消息通知增加跳转地址
2.业务利润统计,列表,导出接口业务员数据问题修改

纪新园 3 дней назад
Родитель
Сommit
1da0f5b26c

+ 2 - 1
blade-service/blade-los/src/main/java/org/springblade/los/box/mapper/UseBoxPlanItemMapper.xml

@@ -67,7 +67,7 @@
         <if test="data.endDate !=null and data.endDate != ''">
             AND plan.end_date &lt;= #{data.endDate}
         </if>
-        ORDER BY plan.level
+        ORDER BY item.create_time DESC
     </select>
     <select id="exportUseBoxPlanItem" resultType="org.springblade.los.box.excel.UseBoxPlanItemExcel">
         SELECT
@@ -110,6 +110,7 @@
         <if test="data.endDate !=null and data.endDate != ''">
             AND plan.end_date &lt;= #{data.endDate}
         </if>
+        ORDER BY item.create_time DESC
     </select>
 
 </mapper>

+ 1 - 1
blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/UseBoxPlanServiceImpl.java

@@ -184,7 +184,7 @@ public class UseBoxPlanServiceImpl extends ServiceImpl<UseBoxPlanMapper, UseBoxP
 					sendMessage.setTenantId(AuthUtil.getTenantId());
 					sendMessage.setCreateUser(null);
 					sendMessage.setCreateTime(new Date());
-					// todo sendMessage.setUrl("");
+					sendMessage.setUrl("/iosBasicData/boxPlan/boxPlan/index");
 					sendMessage.setPageLabel("用箱计划");
 					sendMessage.setPageStatus("this.$store.getters.domSaleStatus");
 					sendMessage.setMessageBody("您有新的用箱计划,请及时待处理!分公司:" + detail.getBranchName() + ";等级:" + detail.getLevel() +

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

@@ -220,7 +220,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			);
 		}
 		for (FinanceProfitDtoList item : financeProfitList) {
-			if ("SEA,SIA,AEA,AIA".contains(item.getBusinessType()) && !financeProfitDataList.isEmpty()) {
+			if (("SEA".equals(item.getBusinessType()) || "SIA".equals(item.getBusinessType())
+				|| "AEA".equals(item.getBusinessType()) || "AIA".equals(item.getBusinessType()))
+				&& !financeProfitDataList.isEmpty()) {
 				FinanceProfit profit = financeProfitDataList.stream().filter(e -> e.getMblno().equals(item.getMblNo())).findFirst().orElse(null);
 				if (profit != null) {
 					item.setSalesman(profit.getSrcCnName());
@@ -943,7 +945,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			);
 		}
 		for (FinanceProfitDtoList item : financeProfitList) {
-			if ("SEA,SIA,AEA,AIA".contains(item.getBusinessType()) && !financeProfitDataList.isEmpty()) {
+			if (("SEA".equals(item.getBusinessType()) || "SIA".equals(item.getBusinessType())
+				|| "AEA".equals(item.getBusinessType()) || "AIA".equals(item.getBusinessType()))
+				&& !financeProfitDataList.isEmpty()) {
 				FinanceProfit profit = financeProfitDataList.stream().filter(e -> e.getMblno().equals(item.getMblNo())).findFirst().orElse(null);
 				if (profit != null) {
 					item.setSalesman(profit.getSrcCnName());