feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ExamineServiceImpl.java

@@ -20,9 +20,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.rongwei.bscommon.sys.utils.JXKHConstant.DatePattern.DATE_PATTERN_YMD;
+
 /**
  * ExamineServiceImpl class
  *
@@ -173,6 +177,7 @@ public class ExamineServiceImpl implements ExamineService {
         List<JtSjbgqd> jtSjbgqdList = new ArrayList<>();
         List<JtZdxmszmn> jtZdxmszmnList = new ArrayList<>();
 //        List<JtXcjhqd> jtXcjhqdList = new ArrayList<>();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DATE_PATTERN_YMD);
         // 遍历列表
         jsonDatas.forEach(data -> {
             String mainid = (String) data.getOrDefault("mainid", "");
@@ -181,8 +186,18 @@ public class ExamineServiceImpl implements ExamineService {
             String xmzsjbm = (String) data.getOrDefault("XMZSJBM", ""); // 项目主数据编码
             String year = (String) data.getOrDefault("YEAR", ""); // 考核年
             String zbztdw = (String) data.getOrDefault("ZBZTDW", ""); // 中标主体单位
-            Date jhkssj = (Date) data.getOrDefault("JHKSSJ", null); //计划开始时间
-            Date jhwcsj = (Date) data.getOrDefault("JHWCSJ", null); // 计划完成时间
+            String jhkssjStr = (String) data.getOrDefault("JHKSSJ", null); //计划开始时间
+            String jhwcsjStr = (String) data.getOrDefault("JHWCSJ", null); // 计划完成时间
+            Date jhkssj = null;
+            Date jhwcsj = null;
+            try {
+                jhkssj = StringUtils.isBlank(jhkssjStr) ? null : simpleDateFormat.parse(jhkssjStr);
+                jhwcsj = StringUtils.isBlank(jhwcsjStr) ? null : simpleDateFormat.parse(jhwcsjStr);
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+
+
             String xmjd = (String) data.getOrDefault("XMJD", ""); // 项目阶段
             String xmjl = (String) data.getOrDefault("XMJL", ""); // 项目经理
             String xmjlid = (String) data.getOrDefault("XMJLID", ""); // 项目经理ID