年审,评价,添加修改任务时 小于当前时间自动启动
This commit is contained in:
@ -86,7 +86,7 @@ public interface CoscoAnnualreviewTaskMapper {
|
||||
* 查询需要开启的任务信息
|
||||
* @return
|
||||
*/
|
||||
List<NoTaskVo> selectNoTask();
|
||||
List<NoTaskVo> selectNoTask(String taskId);
|
||||
|
||||
/**
|
||||
* 查询供应商年审数量统计
|
||||
|
@ -9,4 +9,6 @@ public interface AnnualScheduledTasksService {
|
||||
List<NoTaskVo> checkTask();
|
||||
List<MessageAnnualreviewVo> closeTask();
|
||||
|
||||
List<NoTaskVo> MessageTask(String taskId);
|
||||
|
||||
}
|
||||
|
@ -48,7 +48,15 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
|
||||
@Scheduled(cron = "0 15 1 * * ?")
|
||||
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY)
|
||||
public List<NoTaskVo> checkTask() {
|
||||
List<NoTaskVo> noTasks = coscoAnnualreviewTaskMapper.selectNoTask();
|
||||
List<NoTaskVo> noTasks = coscoAnnualreviewTaskMapper.selectNoTask(null);
|
||||
//查询小于当前时间 未开启任务
|
||||
coscoAnnualreviewTaskMapper.updateNOTask();
|
||||
return noTasks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<NoTaskVo> MessageTask(String taskId) {
|
||||
List<NoTaskVo> noTasks = coscoAnnualreviewTaskMapper.selectNoTask(taskId);
|
||||
//查询小于当前时间 未开启任务
|
||||
coscoAnnualreviewTaskMapper.updateNOTask();
|
||||
return noTasks;
|
||||
@ -122,4 +130,6 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
@ -14,6 +14,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.AnnualScheduledTasksService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo;
|
||||
@ -43,6 +44,8 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
|
||||
@Autowired
|
||||
private CoscoAnnualreviewTaskMapper coscoAnnualreviewTaskMapper;
|
||||
@Autowired
|
||||
private AnnualScheduledTasksService annualScheduledTasksService;
|
||||
@Autowired
|
||||
private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper;
|
||||
@Autowired
|
||||
private CoscoAnnualreviewTaskSupplierMapper coscoAnnualreviewTaskSupplierMapper;
|
||||
@ -54,8 +57,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
|
||||
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
|
||||
@Autowired
|
||||
private IUserService userService;
|
||||
@Autowired
|
||||
private CoscoAnnualreviewTemplateMapper coscoAnnualreviewTemplateMapper;
|
||||
|
||||
@Autowired
|
||||
private IOrgService orgService;
|
||||
@Autowired
|
||||
@ -184,6 +186,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
|
||||
taskVo.setStatus(AnnualreviewTaskConstant.NOT_START);
|
||||
coscoAnnualreviewTaskMapper.insertCoscoAnnualreviewTask(taskVo);
|
||||
addList(taskVo);
|
||||
if(taskVo.getStartTime().getTime()<=System.currentTimeMillis()){
|
||||
annualScheduledTasksService.MessageTask(taskVo.getId());
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,7 @@ public interface CoscoEvaluateTaskMapper {
|
||||
* 查询没有开启评价的任务
|
||||
* @return
|
||||
*/
|
||||
List<NoTaskVo> selectNoTask();
|
||||
List<NoTaskVo> selectNoTask(String taskId);
|
||||
|
||||
/**
|
||||
* 查询评价任务信息
|
||||
|
@ -6,5 +6,7 @@ import java.util.List;
|
||||
|
||||
public interface ScheduledTasksService {
|
||||
List<NoTaskVo> checkTask();
|
||||
|
||||
List<NoTaskVo> MessageTask(String taskId);
|
||||
void closeTask();
|
||||
}
|
||||
|
@ -23,6 +23,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ScheduledTasksService;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
|
||||
@ -72,6 +73,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
private ICoscoEvaluateTaskAssignDeptService coscoEvaluateTaskAssignDeptService;
|
||||
@Autowired
|
||||
private ICoscoCategoryService coscoCategoryService;
|
||||
@Autowired
|
||||
private ScheduledTasksService scheduledTasksService;
|
||||
|
||||
/**
|
||||
* 查询【供应商评价_评价任务主表】
|
||||
@ -542,6 +545,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
|
||||
if (addCoscoEvaluateTaskVo.getTaskStatus() != null) {
|
||||
coscoEvaluateTaskAssignDeptService.insertAssignDept(addCoscoEvaluateTaskVo);
|
||||
}
|
||||
if(addCoscoEvaluateTaskVo.getStartTime().getTime()<=System.currentTimeMillis()){
|
||||
scheduledTasksService.MessageTask(addCoscoEvaluateTaskVo.getId());
|
||||
}
|
||||
}
|
||||
|
||||
private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
|
||||
|
@ -55,7 +55,18 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService {
|
||||
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY)
|
||||
public List<NoTaskVo> checkTask() {
|
||||
//查询小于当前时间 未开启任务
|
||||
List<NoTaskVo> noTasks = coscoEvaluateTaskMapper.selectNoTask();
|
||||
List<NoTaskVo> noTasks = coscoEvaluateTaskMapper.selectNoTask(null);
|
||||
List<String> ids = noTasks.stream().map(NoTaskVo::getTaskId).collect(Collectors.toList());
|
||||
//修改任务信息
|
||||
coscoEvaluateTaskMapper.updateNOTask(ids);
|
||||
return noTasks;
|
||||
}
|
||||
|
||||
|
||||
@MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY)
|
||||
public List<NoTaskVo> MessageTask(String taskId) {
|
||||
//查询小于当前时间 未开启任务
|
||||
List<NoTaskVo> noTasks = coscoEvaluateTaskMapper.selectNoTask(taskId);
|
||||
List<String> ids = noTasks.stream().map(NoTaskVo::getTaskId).collect(Collectors.toList());
|
||||
//修改任务信息
|
||||
coscoEvaluateTaskMapper.updateNOTask(ids);
|
||||
|
@ -303,6 +303,8 @@
|
||||
join cosco_supplier_base csb on csb.id = catsu.supplier_id
|
||||
where cat.status = 0
|
||||
and cat.start_time <= now()
|
||||
<if test="taskId!=null">and csb.id = #{taskId}</if>
|
||||
|
||||
</select>
|
||||
<select id="selectAnnualrviewCountNum"
|
||||
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.EvaluateCountNumVo">
|
||||
|
@ -118,7 +118,10 @@
|
||||
join cosco_evaluate_task_supplier_user cetsu on cet.id = cetsu.evaluate_task_id
|
||||
join cosco_supplier_base csb on csb.id = cetsu.supplier_id
|
||||
where cet.status = 0
|
||||
and start_time <= now()
|
||||
<if test="taskId!=null"> and cet.id = #{taskId}</if>
|
||||
<if test="taskId==null"> and start_time <= now()</if>
|
||||
|
||||
|
||||
</select>
|
||||
<select id="selectDivisionVo" resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.DivisionVo"
|
||||
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTaskListVo">
|
||||
|
Reference in New Issue
Block a user