Browse Source

Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

pt
hyy-alt 5 years ago
parent
commit
bcaae34670
  1. 6
      tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java
  2. 7
      tall/src/main/java/com/ccsens/tall/service/ExcelService.java
  3. 14
      tall/src/main/resources/mapper_dao/TaskDetailDao.xml

6
tall/src/main/java/com/ccsens/tall/persist/dao/TaskDetailDao.java

@ -103,4 +103,10 @@ public interface TaskDetailDao extends ProTaskDetailMapper {
* @return 二级任务
*/
List<TaskVo.NormalTask> getSecondTasks(Long detailId);
/**
* 批量添加分解任务
* @param proTaskSubTimeList 任务列表
*/
void insertSelectiveList(@Param("proTaskSubTimeList") List<ProTaskSubTime> proTaskSubTimeList);
}

7
tall/src/main/java/com/ccsens/tall/service/ExcelService.java

@ -1220,6 +1220,7 @@ public class ExcelService implements IExcelService {
if (CollectionUtil.isEmpty(taskDateList)) {
return;
}
List<ProTaskSubTime> proTaskSubTimeList = new ArrayList<>();
for (CronConstant.TaskDate taskDate : taskDateList) {
ProTaskSubTime proTaskSubTime = new ProTaskSubTime();
@ -1228,7 +1229,11 @@ public class ExcelService implements IExcelService {
proTaskSubTime.setBeginTime(taskDate.getStartDate().getTime());
proTaskSubTime.setEndTime(taskDate.getEndDate().getTime());
taskSubTimeService.saveProTaskSubTask(proTaskSubTime);
// taskSubTimeService.saveProTaskSubTask(proTaskSubTime);
proTaskSubTimeList.add(proTaskSubTime);
}
if(CollectionUtil.isNotEmpty(proTaskSubTimeList)){
taskDetailDao.insertSelectiveList(proTaskSubTimeList);
}
}catch (Exception e){
throw new BaseException(CodeEnum.NOT_SUPPORT_CYCLE.addMsg(taskDetail.getCycle()));

14
tall/src/main/resources/mapper_dao/TaskDetailDao.xml

@ -60,6 +60,20 @@
<result column="sId" property="subTimeId" />
</resultMap>
<insert id="insertSelectiveList">
INSERT INTO t_pro_task_sub_time
(
id,
task_detail_id,
begin_time,
end_time
)
VALUES
<foreach collection="proTaskSubTimeList" item="item" separator=",">
(#{item.id},#{item.taskDetailId},#{item.beginTime},#{item.endTime})
</foreach>
</insert>
<select id="selectTaskByRoleAndAllMembers" parameterType="java.util.Map"
resultMap="secondTask">

Loading…
Cancel
Save