feature 解决日期不显示的问题

comCustomer-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ExportServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 
@@ -195,10 +196,11 @@ public class ExportServiceImpl implements ExportService {
         Workbook wb = new Workbook(classPathResource.getInputStream());
         WorkbookDesigner designer = new WorkbookDesigner();
         designer.setWorkbook(wb);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         designer.setDataSource("COMNO", comCustomerDo.getComno());
         designer.setDataSource("CUSTOMERNAME", comCustomerDo.getCustomername());
-        designer.setDataSource("COMDATE", comCustomerDo.getComdate());
-        designer.setDataSource("TAKEEFFECTDATE", comCustomerDo.getTakeeffectdate());
+        designer.setDataSource("COMDATE", comCustomerDo.getComdate()==null?"":simpleDateFormat.format(comCustomerDo.getComdate()));
+        designer.setDataSource("TAKEEFFECTDATE", comCustomerDo.getTakeeffectdate()==null?"":simpleDateFormat.format(comCustomerDo.getTakeeffectdate()));
         designer.setDataSource("COMMSG", comCustomerDo.getCommsg());
         designer.setDataSource("CONFIRMCONTENT", comCustomerDo.getConfirmcontent());
         designer.setDataSource("COMPUTECOSTRMB", comCustomerDo.getComputecostrmb());
@@ -211,7 +213,7 @@ public class ExportServiceImpl implements ExportService {
         WFApproveDto wfApproveDto = wfConsentSpYj.stream().filter(info -> info.getTaskCode().equals(TASK_CODE.get(0))).findFirst().orElse(new WFApproveDto());
         designer.setDataSource("TJR", wfApproveDto.getApproveUser());
         wfApproveDto = wfConsentSpYj.stream().filter(info -> info.getTaskCode().equals(TASK_CODE.get(1))).findFirst().orElse(new WFApproveDto());
-        designer.setDataSource("SHR", wfApproveDto.getApproveUser());
+        designer.setDataSource("SHR", wfApproveDto.getApproveUser()+"     "+wfApproveDto.getApproveDate());
         //财务预估损失节点
         wfApproveDto = wfConsentSpYj.stream().filter(info -> info.getTaskCode().equals(TASK_CODE.get(2))).findFirst().orElse(new WFApproveDto());
         designer.setDataSource("SSSPR", wfApproveDto.getApproveUser());