培训/演练任务完成判断逻辑修正

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -653,7 +653,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         List<Long> list = coreDrillPlanMapper.selectIdByParentId(planId);
         int isExecute = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
                         .in(CoreDrillTask::getPlanId, list)
-                        .eq(CoreDrillTask::getStatus, DrillDoStatus.DONE.getCode()))
+                        .in(CoreDrillTask::getStatus, DrillDoStatus.DONE.getCode(),DrillDoStatus.WAIT_COMMENT.getCode()))
                 .intValue();
         //计划下没有已完成：删除所有任务数据和子计划，计划状态回到草稿状态。
         if (isExecute < 1/* || EduTrainingPlanCycleEnum.NONE.getCode().equals(plan.getPlanCycle())*/) {

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -152,7 +152,7 @@
     <select id="checkHasTaskIsDoneByPlanParentId" resultType="java.lang.Integer">
         select 1
         from core_drill_task
-        where status in (3, 4)
+        where status in (2,3)
           and plan_id in
               (select id from core_drill_plan where deleted = 0 and parent_id = #{planId})
         limit 1

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -174,7 +174,7 @@
     <select id="checkHasTaskIsDoneByPlanParentId" resultType="java.lang.Integer">
         select 1
         from core_edu_training_task
-        where status in (2, 3)
+        where status in (2)
           and plan_id in
               (select id from core_edu_training_plan where deleted = 0 and parent_id = #{planId})
         limit 1

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/controller/SmsController.java

@@ -51,7 +51,7 @@ public class SmsController extends BaseController {
         smsService.sendSmsTodo(orgId,type,content,time);
     }
 
-    @PostMapping("/api/sms/sendReminderSms")
+    @PostMapping("/sendReminderSms")
     List<ReminderScheduleMsgVo> sendReminderSms(@RequestBody List<ReminderScheduleMsgDto> msgDto){
 
         return smsService.sendReminderSms(msgDto);

soc-modules/soc-modules-sms/src/main/java/com/xunmei/sms/service/SmsService.java

@@ -5,9 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.dc.eai.data.CompositeData;
 import com.dcfs.esb.client.ESBClient;
-import com.xunmei.common.core.constant.ErrorMsgConstants;
-import com.xunmei.common.core.constant.HttpStatus;
-import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.*;
 import com.xunmei.common.core.domain.reminder.dto.ReminderScheduleMsgDto;
 import com.xunmei.common.core.domain.reminder.vo.ReminderScheduleMsgVo;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -167,7 +165,7 @@ public class SmsService implements ISmsService {
                 smsInfoVo.setOccurDate(day);
                 smsInfoVo.setOccurTime(sfm);
                 smsInfoVo.setRetMsg(type);
-                smsInfoVo.setBak3("任务【" + content + "】未完成,将于" + date + "逾期。");
+                smsInfoVo.setBak3("任务【" + content + "】未完成,将于" + DateUtil.format(time, Constants.HMS_FORMAT) + "逾期。");
                 deal(sysOrg, sysUser, smsInfoVo);
             }
         }