Commit b2161207 by hzc

下发人可以看到自己下发的任务

parent 779395ff
...@@ -53,28 +53,16 @@ public class ShortboardTaskService { ...@@ -53,28 +53,16 @@ public class ShortboardTaskService {
shortBoardTask.setRuleIds(shortboardRecord.getShortboardRuleIds()); shortBoardTask.setRuleIds(shortboardRecord.getShortboardRuleIds());
shortBoardTask.setActionRecord("未执行"); shortBoardTask.setActionRecord("未执行");
shortBoardTask.setStatus(Constants.SHORT_BOARD_START); shortBoardTask.setStatus(Constants.SHORT_BOARD_START);
//获取短板筛选规则名称 多个逗号分隔
// String shortboardRuleIds = shortboardRecord.getShortboardRuleIds(); //下发人-存的是用户的登录id
// StringBuffer ruleNames = new StringBuffer(); shortBoardTask.setCreateUserId(SystemUserUtil.getCurrentUserName());
// if(StringUtils.isNotBlank(shortboardRuleIds)){
// String[] split = shortboardRuleIds.split(Constants.SEP_COMMA); //接收人-主键id
// List<Integer> ruleIds = new ArrayList<>(); String userId = SystemUserUtil.getCurrentUserId();
// for (String s : split) { String enterUserId = shortBoardTask.getEnterUserId();
// ruleIds.add(Integer.valueOf(s)); enterUserId =enterUserId+","+userId+",";
// } shortBoardTask.setEnterUserId(enterUserId);
// List<ShortboardRule> ShortboardRules = this.shortboardRuleMapper.findByIdList(ruleIds);
// for (ShortboardRule shortboardRule : ShortboardRules) {
// ruleNames.append(shortboardRule.getRuleName());
// ruleNames.append(Constants.SEP_COMMA);
// }
// ruleNames=ruleNames.delete(ruleNames.length()-1,ruleNames.length());
// }
// shortBoardTask.setRuleNames(ruleNames.toString());
//接收人待定
// shortBoardTask.setEnterUserId(",1,");
// shortBoardTask.setEnterUser("root");
//下发人id
shortBoardTask.setCreateUserId(SystemUserUtil.getCurrentUserId());
String currentUser = SystemUserUtil.getCurrentUser(); String currentUser = SystemUserUtil.getCurrentUser();
String[] split = currentUser.split(Constants.SEP_COLON); String[] split = currentUser.split(Constants.SEP_COLON);
if(split.length>2){ if(split.length>2){
...@@ -82,7 +70,7 @@ public class ShortboardTaskService { ...@@ -82,7 +70,7 @@ public class ShortboardTaskService {
} }
shortBoardTask.setCreateTime(date); shortBoardTask.setCreateTime(date);
shortBoardTask.setUpdateTime(date); shortBoardTask.setUpdateTime(date);
shortBoardTask.setUpdater(SystemUserUtil.getCurrentUser()); shortBoardTask.setUpdater(currentUser);
//插入后返回id //插入后返回id
shortBoardTask.setId(null); shortBoardTask.setId(null);
shortboardTaskMapper.insert(shortBoardTask); shortboardTaskMapper.insert(shortBoardTask);
...@@ -90,7 +78,6 @@ public class ShortboardTaskService { ...@@ -90,7 +78,6 @@ public class ShortboardTaskService {
shortboardRecord.setIsIssue("1"); shortboardRecord.setIsIssue("1");
shortboardRecordMapper.updateByPrimaryKeySelective(shortboardRecord); shortboardRecordMapper.updateByPrimaryKeySelective(shortboardRecord);
String message = currentUser+":下发了短板,短板id:{}短板名:{}"; String message = currentUser+":下发了短板,短板id:{}短板名:{}";
// System.out.println(shortBoardTask);
LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,message,shortBoardTask.getId(),shortBoardTask.getShortboardName()); LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,message,shortBoardTask.getId(),shortBoardTask.getShortboardName());
} }
return Result.genOkResult(); return Result.genOkResult();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment