|
@@ -278,6 +278,11 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public int insertCoreEduTrainingTask(CoreEduTrainingTaskInsertDto request) {
|
|
public int insertCoreEduTrainingTask(CoreEduTrainingTaskInsertDto request) {
|
|
|
|
|
+ if(StringUtils.isEmpty(request.getTitle()))
|
|
|
|
|
+ {
|
|
|
|
|
+ throw new SystemException("任务名称不能为空!");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(
|
|
SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(
|
|
|
() -> orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
|
|
() -> orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
|
|
|
CoreEduTrainingTask task = new CoreEduTrainingTask();
|
|
CoreEduTrainingTask task = new CoreEduTrainingTask();
|
|
@@ -291,6 +296,13 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
task.setEndDate(DateUtil.endOfDay(new Date(endTime + 7 * 24 * 60 * 60 * 1000 - 1000)));
|
|
task.setEndDate(DateUtil.endOfDay(new Date(endTime + 7 * 24 * 60 * 60 * 1000 - 1000)));
|
|
|
// task.setEndDate(DateUtil.endOfDay(new Date()));
|
|
// task.setEndDate(DateUtil.endOfDay(new Date()));
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 现场偶现过2次 临时登记的教育培训任务数据无 title 和 type 的情况,导致跟踪页面查询报错
|
|
|
|
|
+ if(StringUtils.isEmpty(task.getTitle()))
|
|
|
|
|
+ {
|
|
|
|
|
+ task.setTitle(request.getTitle());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
task.setCreateTime(DateUtils.getNowDate());
|
|
task.setCreateTime(DateUtils.getNowDate());
|
|
|
task.setUpdateTime(DateUtils.getNowDate());
|
|
task.setUpdateTime(DateUtils.getNowDate());
|
|
|
task.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
|
|
task.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
|
|
@@ -327,6 +339,10 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
|
|
|
CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
|
|
CoreEduTrainingTask coreEduTrainingTask = coreEduTrainingTaskMapper.selectById(request.getId());
|
|
|
boolean isAdd = false;
|
|
boolean isAdd = false;
|
|
|
if (coreEduTrainingTask == null) {
|
|
if (coreEduTrainingTask == null) {
|
|
|
|
|
+ if(StringUtils.isEmpty(request.getTitle()))
|
|
|
|
|
+ {
|
|
|
|
|
+ throw new SystemException("任务名称不能为空!");
|
|
|
|
|
+ }
|
|
|
isAdd = true;
|
|
isAdd = true;
|
|
|
SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
|
|
SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
|
|
|
orgService.selectOrgById(SecurityUtils.getLoginUser().getSysUser().getOrgId(), SecurityConstants.INNER),
|
|
orgService.selectOrgById(SecurityUtils.getLoginUser().getSysUser().getOrgId(), SecurityConstants.INNER),
|