From 70a391a8b8013d56383e876a0b2a10ceafdd22c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 六月 2024 10:54:19 +0800
Subject: [PATCH] 提交一把

---
 server/service/src/main/java/com/doumee/core/utils/Constants.java                |    4 ++--
 server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
index bafd848..968d2fc 100644
--- a/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
+++ b/server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -517,8 +517,8 @@
             header1.setHeight((short) 500);
             header1.createCell(0).setCellValue(Constants.equalsInteger(data.getSolutionType(), Constants.ZERO)?"鎶曚繚浼佷笟":"琚繚闄╀汉");
             header1.createCell(1).setCellValue("淇濋櫓鏂规");
-            header1.createCell(2).setCellValue(Constants.getApplyTimeTitle(0,data));
-            header1.createCell(3).setCellValue(Constants.getApplyTimeTitle(1,data));
+            header1.createCell(2).setCellValue(Constants.getApplyTimeTitle(1,data));
+            header1.createCell(3).setCellValue(Constants.getApplyTimeTitle(0,data));
             header1.createCell(4).setCellValue("鍦ㄤ繚/鎶曚繚浜烘暟");
             header1.createCell(5).setCellValue("鎬昏垂鐢紙鍏冿級");
             for (int i = 0; i < 6; i++) {
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 0f6451b..fa573fd 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -116,9 +116,9 @@
             }
         }else{
             if(Constants.equalsInteger(model.getSolutionType(),Constants.ONE)){
-                return  Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥姝㈡湡":"鏈熸湜淇濋櫓鐢熸晥姝㈡湡";
+                return  Constants.equalsInteger(model.getUnionApplyTbdStatus(),Constants.THREE)?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡";
             }else{
-                return  Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"鏈熸湜淇濋櫓鐢熸晥姝㈡湡";
+                return  Constants.equalsInteger(model.getStatus(), InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())?"淇濋櫓鐢熸晥姝㈡湡":"棰勮鐢熸晥姝㈡湡";
             }
         }
 

--
Gitblit v1.9.3