Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -133,11 +133,13 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
             // 更新个微池个微二维码及企微appid
             FosterwxMobile finalFosterwxMobile = fosterwxMobile;
             Corp corp = corpService.getById(fosterwxMobile.getWorkWxCorpId());
-            fosterwxMobilePoolService.update(new FosterwxMobilePool() {{
-                setCodeUrl(finalFosterwxMobile.getCodeUrl());
-                setWxAppid(corp.getWxCorpid());
-                setUpdateAt(LocalDateTime.now());
-            }}, new QueryWrapper<FosterwxMobilePool>().eq("pool_index", fosterwxMobile.getMobileUnioCode()));
+            if (null != corp) {
+                fosterwxMobilePoolService.update(new FosterwxMobilePool() {{
+                    setCodeUrl(finalFosterwxMobile.getCodeUrl());
+                    setWxAppid(corp.getWxCorpid());
+                    setUpdateAt(LocalDateTime.now());
+                }}, new QueryWrapper<FosterwxMobilePool>().eq("pool_index", fosterwxMobile.getMobileUnioCode()));
+            }
             // 判断开始做任务时间是否设置了
             AjaxResult ajaxResult = null;
             if (null != fosterwxMobile.getTaskStartAt() && oldVO.getTaskStartAt() == null) {
@@ -319,14 +321,14 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         feild.put(22, "workWxCorp|default");
         feild.put(23, "workWxRegisterAt|default");
         List<Map<String, String>> row = new ArrayList<>();
-        VoltaHandle<ArrayList<Map<String,String>>> voltaRes = Analysis.analysis(file, feild);
-        if (voltaRes.getErr() != null){
+        VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, feild);
+        if (voltaRes.getErr() != null) {
             return AjaxResult.error(voltaRes.getErr());
         }
         row = voltaRes.getData();
-        try{
+        try {
             VoltaHandle<Boolean> res = fosterwxMobileService.importData(row, authUser);
-        }catch (Exception e){
+        } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
         return AjaxResult.success(HttpMsg.importSuccess);
@@ -438,8 +440,8 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
         field.put(1, "codeUrl");
         field.put(2, "wxAppid");
         List<Map<String, String>> row;
-        VoltaHandle<ArrayList<Map<String,String>>> voltaRes = Analysis.analysis(file, field);
-        if (voltaRes.getErr() != null){
+        VoltaHandle<ArrayList<Map<String, String>>> voltaRes = Analysis.analysis(file, field);
+        if (voltaRes.getErr() != null) {
             return AjaxResult.error(voltaRes.getErr());
         }
         row = voltaRes.getData();

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileServiceImpl.java

@@ -132,7 +132,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
 
             // 获取企微主题相关信息
             Corp corp = corpService.getOne(new LambdaQueryWrapper<Corp>().eq(Corp::getName, cell.get("workWxCorp")).last("limit 1"));
-            if (null == corp) {
+            if (null == corp && (null != cell.get("workWxCorp") || !cell.get("workWxCorp").isEmpty())) {
                 throw new Exception("第" + (i + 1) + "行," + "无法根据企业微信主体名称找到相关信息");
             }
 
@@ -152,7 +152,7 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
             fosterwxMobile.setWxIdentityCardNo(row.get(i).get("wxIdentityCardNo"));
             fosterwxMobile.setBankCardNo(row.get(i).get("bankCardNo"));
             fosterwxMobile.setBankCardMobileNo(row.get(i).get("bankCardMobileNo"));
-            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty()) {
+            if (row.get(i).get("workWxCorp") != null && !row.get(i).get("workWxCorp").isEmpty() && null != corp) {
                 fosterwxMobile.setWorkWxCorpId(corp.getId());
             }
             if (row.get(i).get("workWxRegisterAt") != null && !row.get(i).get("workWxRegisterAt").isEmpty()) {

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxTaskScheduleServiceImpl.java

@@ -129,7 +129,11 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
             fosterwxTaskSchedule.setTaskId(fosterwxTaskList.getId());
             fosterwxTaskSchedule.setTaskName(fosterwxTaskList.getTaskName());
             fosterwxTaskSchedule.setTaskContent(fosterwxTaskList.getTaskContent());
-            fosterwxTaskSchedule.setTaskStatus(0);
+            if (startDate.isBefore(LocalDate.now())) {
+                fosterwxTaskSchedule.setTaskStatus(2);
+            } else {
+                fosterwxTaskSchedule.setTaskStatus(0);
+            }
             fosterwxTaskSchedule.setTaskSendStatus(0);
             fosterwxTaskSchedule.setSendDate(startDate);
             fosterwxTaskSchedule.setSendTime(null);
@@ -228,7 +232,7 @@ public class FosterwxTaskScheduleServiceImpl extends ServiceImpl<FosterwxTaskSch
                             mobileCode += mobileArry[i] + "、";
                         }
                     } else {
-                        mobileCode +=  code + "、";
+                        mobileCode += code + "、";
                     }
                 }
             }