教育培训任务代码提交

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -95,8 +95,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         //如果是App段的查询
         if (ObjectUtil.isNotNull(request.getDate())) {
             Date date = java.sql.Date.valueOf(request.getDate());
-            request.setStartTime(DateUtil.beginOfDay(date));
-            request.setEndTime(DateUtil.endOfDay(date));
+            request.setStartTime(DateUtil.beginOfMonth(date));
+            request.setEndTime(DateUtil.endOfMonth(date));
 
         }
         if (ObjectUtil.equal(1, request.getIsAppSelect())) {
@@ -188,6 +188,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Override
     public int updateCoreEduTrainingTask(CoreEduTrainingTaskEditDto request) {
         CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
+        taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
         BeanUtils.copyProperties(request, coreEduTrainingTask);
         coreEduTrainingTask.setRecorderId(SecurityUtils.getUserId());
         coreEduTrainingTask.setImageList(ObjectUtil.isNotEmpty(request.getImageList()) ? JSON.toJSONString(request.getImageList()) : null);
@@ -205,7 +206,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
         coreEduTrainingTask.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreEduTrainingTask.setUpdateTime(DateUtils.getNowDate());
-        taskToUserMapper.deleteByMap(MapUtil.of("edu_training_task_id", request.getId()));
+
         return coreEduTrainingTaskMapper.updateById(coreEduTrainingTask);
     }
 

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

@@ -104,10 +104,10 @@
                 and t.status=#{request.status}
             </if>
             <if test="request.startTime != null">
-                and t.start_time >=#{request.startTime}
+                and t.start_date >=#{request.startTime}
             </if>
             <if test="request.endTime != null">
-                and t.end_time <![CDATA[<=]]> #{request.endTime}
+                and t.end_date <![CDATA[<=]]> #{request.endTime}
             </if>
         </where>
     </select>