需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -18,8 +18,10 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
+import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.remoting.RemoteAccessException;
 import org.springframework.stereotype.Service;
@@ -152,10 +154,17 @@ public class PolicyOrderLogic {
     @Transactional(rollbackFor = Exception.class)
     public void importData(List<Object> objects) {
 
+        Integer index = 0;
         for (Object o : objects) {
             List<Object> row = (List<Object>) o;
 
+            ++index;
 
+            String errPrefix = "第" + (index) + "行";
+
+            if (StringUtils.isAnyBlank((String) row.get(1), (String) row.get(6))) {
+                throw new RemoteServiceException(errPrefix + "黄色区域为必填项");
+            }
             PolicyOrder policyOrder = policyOrderService.lambdaQuery()
                     .eq(PolicyOrder::getWebsitId, (String) row.get(1))
                     .eq(PolicyOrder::getWorkerIdcard, (String) row.get(6))

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -381,12 +381,10 @@ public class UserLogic {
             }
 
 
-            try {
-
 
                 if (!StringUtil.isEmpty(company)) {
                     userWait.setCompany(company);
-                    userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+
                     userWait.setPolicyEndTime(DateUtil.offsetSecond(DateUtil.endOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")), -1));
 
                     if (userWait.getPolicyEndTime().before(new Date()))
@@ -404,8 +402,17 @@ public class UserLogic {
                     userWaitPolicy.setCompany(company);
                     userWaitPolicy.setPolicyName(policy_name);
                     userWaitPolicy.setPolicyOrder(policy_order);
-                    userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
-                    userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
+
+
+                    try {
+                        userWait.setPolicyStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                        userWaitPolicy.setStartTime(DateUtil.parse(policy_start_time, "yyyy-MM-dd"));
+                        userWaitPolicy.setEndTime(this.getEndOfDay(DateUtil.parse(policy_end_time, "yyyy-MM-dd")));
+
+                    }catch (Exception e){
+                        throw new RemoteServiceException(errPrefix + "时间格式错误");
+                    }
+
 
                     userWaitPolicies.add(userWaitPolicy);
                 } else {
@@ -429,19 +436,22 @@ public class UserLogic {
 
                 userWait.setName(name);
                 userWait.setIdcard(idcard);
-                userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy-MM-dd"));
-                userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy-MM-dd"));
+
                 userWait.setCompanyWechatId(adminUser.getCompanyWechatId());
                 userWait.setCompanyWechatName(adminUser.getCompanyName());
                 userWait.setBankAccount(brank);
                 userWait.setWorkerNumber(workerNumber);
 
+            try {
+                userWait.setIdCardStartTime(DateUtil.parse(idcardStartTime, "yyyy-MM-dd"));
+                userWait.setIdCardEndTime(DateUtil.parse(idcardEndTime, "yyyy-MM-dd"));
                 if (!StringUtil.isEmpty(hightNumber)) {
                     userWait.setNumber(hightNumber);
                     userWait.setStartTime(DateUtil.parse(hightStartTime, "yyyy-MM-dd"));
                     userWait.setEndTime(DateUtil.parse(hightEndTime, "yyyy-MM-dd"));
                     userWait.setHightExamineTime(DateUtil.parse(hightExamineTime, "yyyy-MM-dd"));
                 }
+
             }catch (Exception e){
                 throw new RemoteServiceException(errPrefix + "时间格式错误");
             }