Browse Source

添加变身系统

master
zy_Java 5 years ago
parent
commit
c3183b5b92
  1. 38
      mt/src/main/java/com/ccsens/mt/api/DebugController.java
  2. 2
      mt/src/main/java/com/ccsens/mt/api/LevelController.java
  3. 27
      mt/src/main/java/com/ccsens/mt/bean/dto/LevelDto.java
  4. 26
      mt/src/main/java/com/ccsens/mt/service/CompeteService.java
  5. 19
      mt/src/main/java/com/ccsens/mt/service/DepartmentService.java
  6. 2
      mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java
  7. 4
      mt/src/main/java/com/ccsens/mt/service/LevelUpService.java
  8. 7
      mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
  9. 4
      mt/src/main/resources/mapper_dao/CompeteTeamDao.xml
  10. 6
      tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java
  11. 14
      tall/src/main/java/com/ccsens/tall/bean/dto/ProjectDto.java
  12. 81
      tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java
  13. 88
      tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java
  14. 490
      tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java
  15. 221
      tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogChecker.java
  16. 1440
      tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample.java
  17. 95
      tall/src/main/java/com/ccsens/tall/bean/po/SysImitation.java
  18. 621
      tall/src/main/java/com/ccsens/tall/bean/po/SysImitationExample.java
  19. 2
      tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java
  20. 2
      tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java
  21. 59
      tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogCheckerMapper.java
  22. 30
      tall/src/main/java/com/ccsens/tall/persist/mapper/SysImitationMapper.java
  23. 5
      tall/src/main/java/com/ccsens/tall/service/IProMemberService.java
  24. 2
      tall/src/main/java/com/ccsens/tall/service/IProRoleService.java
  25. 7
      tall/src/main/java/com/ccsens/tall/service/IProTaskDetailService.java
  26. 5
      tall/src/main/java/com/ccsens/tall/service/IProjectService.java
  27. 63
      tall/src/main/java/com/ccsens/tall/service/ProMemberService.java
  28. 4
      tall/src/main/java/com/ccsens/tall/service/ProRoleService.java
  29. 97
      tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
  30. 37
      tall/src/main/java/com/ccsens/tall/service/ProjectService.java
  31. 52
      tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
  32. 2
      tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java
  33. 6
      tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
  34. 3
      tall/src/main/java/com/ccsens/tall/web/DeliverController.java
  35. 63
      tall/src/main/java/com/ccsens/tall/web/ProjectController.java
  36. 141
      tall/src/main/resources/mapper_raw/ProShowMapper.xml
  37. 533
      tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogCheckerMapper.xml
  38. 243
      tall/src/main/resources/mapper_raw/SysImitationMapper.xml
  39. 5
      util/src/main/java/com/ccsens/util/CodeEnum.java
  40. 2
      util/src/main/java/com/ccsens/util/StringUtil.java
  41. 6
      util/src/test/java/com/ccsens/util/TestQrCord.java

38
mt/src/main/java/com/ccsens/mt/api/DebugController.java

@ -1,28 +1,62 @@
package com.ccsens.mt.api; package com.ccsens.mt.api;
import com.ccsens.mt.bean.dto.LevelDto;
import com.ccsens.mt.bean.po.LevelUser;
import com.ccsens.mt.service.ILevelUpService;
import com.ccsens.util.JsonResponse; import com.ccsens.util.JsonResponse;
import com.ccsens.util.RedisUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.data.redis.core.ZSetOperations;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Objects;
import java.util.Set;
@Api(tags = "DEBUG" , description = "DebugController | ") @Api(tags = "DEBUG" , description = "DebugController | ")
@RestController @RestController
@RequestMapping("/debug") @RequestMapping("/debug")
public class DebugController { public class DebugController {
@Resource
private RedisUtil redisUtil;
@Resource
private ILevelUpService levelUpService;
@ApiOperation(value = "/测试",notes = "") @ApiOperation(value = "/测试",notes = "")
@ApiImplicitParams({ @ApiImplicitParams({
}) })
@RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse getSmsCode(HttpServletRequest request) throws Exception { public JsonResponse debug(HttpServletRequest request) throws Exception {
return JsonResponse.newInstance().ok("测试"); return JsonResponse.newInstance().ok("测试");
} }
@ApiOperation(value = "/测试自动晋级",notes = "")
@ApiImplicitParams({
})
@RequestMapping(value="/levelUp",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
public JsonResponse levelUpDebug(HttpServletRequest request) throws Exception {
//比赛结束
//查询每个选手的分数存入redis(模拟分数存入)
String key = "compete_1_6";
Set<ZSetOperations.TypedTuple<Object>> typedTuples = redisUtil.zsRevGetWithScore(key, 0, -1);
typedTuples.forEach(type ->{
LevelUser levelUser = (LevelUser) type.getValue();
if(levelUser.getPlayerId() == 1305713484796923904L){
redisUtil.zsSet(key, levelUser, 20);
}
if(levelUser.getPlayerId() == 1305772321621020672L){
redisUtil.zsSet(key, levelUser, 22);
}
});
//调用自动晋级接口
LevelDto.AutoLevelUpDto autoLevelUpDto = new LevelDto.AutoLevelUpDto(1L,"6");
levelUpService.autoLevelUp(autoLevelUpDto);
return JsonResponse.newInstance().ok("OK");
}
} }

2
mt/src/main/java/com/ccsens/mt/api/LevelController.java

@ -45,7 +45,7 @@ public class LevelController {
@RequestMapping(value = "/userInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/userInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<PageInfo<LevelVo.QueryLevelUserInfo>> queryLevelUserInfo(@ApiParam @Validated @RequestBody QueryDto<LevelDto.QueryLevelUserInfo> params) { public JsonResponse<PageInfo<LevelVo.QueryLevelUserInfo>> queryLevelUserInfo(@ApiParam @Validated @RequestBody QueryDto<LevelDto.QueryLevelUserInfo> params) {
log.info("手动晋级:{}",params); log.info("手动晋级:{}",params);
PageInfo<LevelVo.QueryLevelUserInfo> levelUserInfoList = levelUpService.queryLevelUserInfo(params); PageInfo<LevelVo.QueryLevelUserInfo> levelUserInfoList = levelUpService.queryLevelUserInfo(params.getParam());
return JsonResponse.newInstance().ok(levelUserInfoList); return JsonResponse.newInstance().ok(levelUserInfoList);
} }
} }

27
mt/src/main/java/com/ccsens/mt/bean/dto/LevelDto.java

@ -23,6 +23,16 @@ public class LevelDto {
private String name; private String name;
@ApiModelProperty("团队id") @ApiModelProperty("团队id")
private Long teamId; private Long teamId;
public LevelUserDto() {
}
public LevelUserDto(Long playerId, String avatarUrl, String name, Long teamId) {
this.playerId = playerId;
this.avatarUrl = avatarUrl;
this.name = name;
this.teamId = teamId;
}
} }
@ -41,6 +51,15 @@ public class LevelDto {
private int additionScore; private int additionScore;
@ApiModelProperty("名次") @ApiModelProperty("名次")
private int ranking; private int ranking;
public LevelUpDto() {
}
public LevelUpDto(Long competeTimeId, String competeCode, Long playerId) {
this.competeTimeId = competeTimeId;
this.competeCode = competeCode;
this.playerId = playerId;
}
} }
@Data @Data
@ -50,6 +69,14 @@ public class LevelDto {
private Long competeTimeId; private Long competeTimeId;
@ApiModelProperty("比赛code") @ApiModelProperty("比赛code")
private String competeCode; private String competeCode;
public AutoLevelUpDto() {
}
public AutoLevelUpDto(Long competeTimeId, String competeCode) {
this.competeTimeId = competeTimeId;
this.competeCode = competeCode;
}
} }

26
mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake; import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.dto.CompeteDto;
import com.ccsens.mt.bean.dto.LevelDto;
import com.ccsens.mt.bean.po.*; import com.ccsens.mt.bean.po.*;
import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.mt.bean.vo.CompeteVo;
import com.ccsens.mt.persist.dao.CompetePlayerDao; import com.ccsens.mt.persist.dao.CompetePlayerDao;
@ -52,6 +53,8 @@ public class CompeteService implements ICompeteService{
private CompeteProjectPlayerMapper competeProjectPlayerMapper; private CompeteProjectPlayerMapper competeProjectPlayerMapper;
@Resource @Resource
private CompeteGroupMapper competeGroupMapper; private CompeteGroupMapper competeGroupMapper;
@Resource
private ILevelUpService levelUpService;
/** /**
@ -115,13 +118,13 @@ public class CompeteService implements ICompeteService{
CompeteDto.CompetePlayerInfo competePlayerInfo = params.getParam(); CompeteDto.CompetePlayerInfo competePlayerInfo = params.getParam();
Long userId = params.getUserId(); Long userId = params.getUserId();
//检查验证码是否正确 // //检查验证码是否正确
if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) { // if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) {
throw new BaseException(CodeEnum.SMS_CODE_CORRECT); // throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
} // }
if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) { // if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) {
throw new BaseException(CodeEnum.SMS_CODE_CORRECT); // throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
} // }
//检查此用户是否已经报名 //检查此用户是否已经报名
CompetePlayerExample playerExample = new CompetePlayerExample(); CompetePlayerExample playerExample = new CompetePlayerExample();
playerExample.createCriteria().andUserIdEqualTo(userId); playerExample.createCriteria().andUserIdEqualTo(userId);
@ -162,6 +165,11 @@ public class CompeteService implements ICompeteService{
player.setCompanyId(company.getId()); player.setCompanyId(company.getId());
competePlayerDao.insertSelective(player); competePlayerDao.insertSelective(player);
// TODO
LevelDto.LevelUserDto levelUserDto = new LevelDto.LevelUserDto(player.getId(),null,player.getName(),null);
log.info("将选手信息储存在晋级系统中:{}",levelUserDto);
levelUpService.saveLevelUser(levelUserDto);
return new CompeteVo.CompetePlayerInfo(player, group, company,getCompeteProjectAll(params.getUserId(), params.getParam().getCompeteTimeId())); return new CompeteVo.CompetePlayerInfo(player, group, company,getCompeteProjectAll(params.getUserId(), params.getParam().getCompeteTimeId()));
} }
@ -231,11 +239,13 @@ public class CompeteService implements ICompeteService{
} }
CompeteGroup group = competeGroupMapper.selectByPrimaryKey(player.getCompeteGroupId()); CompeteGroup group = competeGroupMapper.selectByPrimaryKey(player.getCompeteGroupId());
CompeteCompany company = competeCompanyMapper.selectByPrimaryKey(player.getCompanyId()); CompeteCompany company = competeCompanyMapper.selectByPrimaryKey(player.getCompanyId());
CompeteVo.CompetePlayerInfo info = new CompeteVo.CompetePlayerInfo(player, group, company,getCompeteProjectAll(params.getUserId(), params.getParam().getCompeteTimeId())); CompeteVo.CompetePlayerInfo info = new CompeteVo.CompetePlayerInfo(player, group, company,getCompeteProjectAll(params.getUserId(), params.getParam().getCompeteTimeId()));
LevelDto.LevelUpDto levelUpDto = new LevelDto.LevelUpDto(params.getParam().getCompeteTimeId(),params.getParam().getCompeteProjectId().toString(),player.getId());
log.info("添加晋级表信息,{}",levelUpDto);
levelUpService.joinCompete(levelUpDto);
log.info("{}参加返回:{}", params.getUserId(), info); log.info("{}参加返回:{}", params.getUserId(), info);
return info; return info;

19
mt/src/main/java/com/ccsens/mt/service/DepartmentService.java

@ -87,14 +87,29 @@ public class DepartmentService implements IDepartmentService{
Long userId = params.getUserId(); Long userId = params.getUserId();
//查看该院系的报名信息 //查看该院系的报名信息
Long companyId = competePlayerDao.getCompanyIdByUser(params.getUserId()); Long companyId = competePlayerDao.getCompanyIdByUser(params.getUserId());
log.info("查看该用户的院系:{}",companyId);
if(ObjectUtil.isNotNull(companyId)){ if(ObjectUtil.isNotNull(companyId)){
throw new BaseException(CodeEnum.PLAYER_INFO_ALREADY); throw new BaseException(CodeEnum.PLAYER_INFO_ALREADY);
} }
CompeteCompanyRoleExample companyRoleExample = new CompeteCompanyRoleExample(); CompeteCompanyRoleExample companyRoleExample = new CompeteCompanyRoleExample();
companyRoleExample.createCriteria().andCompeteCompanyIdEqualTo(departmentInfo.getId()).andTypeEqualTo((byte)2); companyRoleExample.createCriteria().andCompeteCompanyIdEqualTo(departmentInfo.getId()).andTypeEqualTo((byte)2);
if(competeCompanyRoleMapper.countByExample(companyRoleExample) == 0) { if(competeCompanyRoleMapper.countByExample(companyRoleExample) == 0) {
//检查报名时间是否符合
CompeteVo.CompeteTime competeTime = competeTimeDao.getCompeteTimeByType(departmentInfo.getType(),System.currentTimeMillis());
log.info("检查报名时间是否符合:{}",competeTime);
if(ObjectUtil.isNotNull(competeTime)){
if(competeTime.getSignUpStartTime() > System.currentTimeMillis()){
throw new BaseException(CodeEnum.SIGN_UP_TIME_NOT_START);
}
if(competeTime.getSignUpEndTime() < System.currentTimeMillis()){
throw new BaseException(CodeEnum.SIGN_UP_TIME_FINISHED);
}
}
//添加裁判领队等信息 //添加裁判领队等信息
if (CollectionUtil.isNotEmpty(departmentInfo.getRoleList())) { if (CollectionUtil.isNotEmpty(departmentInfo.getRoleList())) {
log.info("添加裁判领队等信息:{}",departmentInfo.getRoleList());
departmentInfo.getRoleList().forEach(departmentRole -> { departmentInfo.getRoleList().forEach(departmentRole -> {
//添加player信息 //添加player信息
CompetePlayer competePlayer = new CompetePlayer(); CompetePlayer competePlayer = new CompetePlayer();
@ -117,13 +132,16 @@ public class DepartmentService implements IDepartmentService{
} }
//添加比赛报名信息 //添加比赛报名信息
if (CollectionUtil.isNotEmpty(departmentInfo.getProjectList())) { if (CollectionUtil.isNotEmpty(departmentInfo.getProjectList())) {
log.info("添加比赛报名信息:{}",departmentInfo.getProjectList());
departmentInfo.getProjectList().forEach(departmentProject -> { departmentInfo.getProjectList().forEach(departmentProject -> {
CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(departmentProject.getCompeteProjectId()); CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(departmentProject.getCompeteProjectId());
if (ObjectUtil.isNotNull(competeProject)) { if (ObjectUtil.isNotNull(competeProject)) {
if (competeProject.getTeam() == 0) { if (competeProject.getTeam() == 0) {
//不是团队比赛 //不是团队比赛
log.info("不是团队比赛:{}",competeProject);
String names = StringUtil.replaceComma(departmentProject.getNames()); String names = StringUtil.replaceComma(departmentProject.getNames());
String[] playerNames = names.split(","); String[] playerNames = names.split(",");
// String[] playerNames = names.split("、");
if (ObjectUtil.isNotNull(playerNames)) { if (ObjectUtil.isNotNull(playerNames)) {
for (String playerName : playerNames) { for (String playerName : playerNames) {
//直接添加选手 //直接添加选手
@ -143,6 +161,7 @@ public class DepartmentService implements IDepartmentService{
} }
} else if (competeProject.getTeam() == 1) { } else if (competeProject.getTeam() == 1) {
//创建一个团队 //创建一个团队
log.info("创建一个团队:{}",competeProject);
CompeteTeam competeTeam = new CompeteTeam(); CompeteTeam competeTeam = new CompeteTeam();
competeTeam.setId(snowflake.nextId()); competeTeam.setId(snowflake.nextId());
competeTeam.setProjectId(departmentProject.getCompeteProjectId()); competeTeam.setProjectId(departmentProject.getCompeteProjectId());

2
mt/src/main/java/com/ccsens/mt/service/ILevelUpService.java

@ -39,5 +39,5 @@ public interface ILevelUpService {
* @param params 比赛id和分页信息 * @param params 比赛id和分页信息
* @return 返回查到的比赛下所有晋级的选手的信息 * @return 返回查到的比赛下所有晋级的选手的信息
*/ */
PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(QueryDto<LevelDto.QueryLevelUserInfo> params); PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(LevelDto.QueryLevelUserInfo params);
} }

4
mt/src/main/java/com/ccsens/mt/service/LevelUpService.java

@ -161,6 +161,8 @@ public class LevelUpService implements ILevelUpService{
default: default:
break; break;
} }
//将旧的数据从redis中删除
redisUtil.del(key);
} }
/** /**
@ -240,7 +242,7 @@ public class LevelUpService implements ILevelUpService{
* @return 返回查到的比赛下所有晋级的选手的信息 * @return 返回查到的比赛下所有晋级的选手的信息
*/ */
@Override @Override
public PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(QueryDto<LevelDto.QueryLevelUserInfo> params) { public PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(LevelDto.QueryLevelUserInfo params) {
LevelDto.QueryLevelUserInfo levelUserInfo = params.getParam(); LevelDto.QueryLevelUserInfo levelUserInfo = params.getParam();
if(levelUserInfo.getPage() != -1){ if(levelUserInfo.getPage() != -1){
PageHelper.startPage(levelUserInfo.getPage(), levelUserInfo.getPageSize()); PageHelper.startPage(levelUserInfo.getPage(), levelUserInfo.getPageSize());

7
mt/src/main/resources/mapper_dao/CompetePlayerDao.xml

@ -102,7 +102,7 @@
</select> </select>
<select id="getMemberNamesByProjectId" resultType="java.lang.String"> <select id="getMemberNamesByProjectId" resultType="java.lang.String">
SELECT SELECT
GROUP_CONCAT(e.`name` ORDER BY e.id) GROUP_CONCAT(e.`name` separator '、')
FROM FROM
t_compete_project_player p LEFT JOIN t_compete_player e on p.player_id = e.id t_compete_project_player p LEFT JOIN t_compete_player e on p.player_id = e.id
WHERE WHERE
@ -118,7 +118,7 @@
</select> </select>
<select id="getTeamMemberNamesByProjectId" resultType="java.lang.String"> <select id="getTeamMemberNamesByProjectId" resultType="java.lang.String">
SELECT SELECT
GROUP_CONCAT(p.`name` ORDER BY p.id) GROUP_CONCAT(p.`name` separator '、')
FROM FROM
t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
LEFT JOIN t_compete_player p on m.player_id = p.id LEFT JOIN t_compete_player p on m.player_id = p.id
@ -148,6 +148,9 @@
r.type = 2 r.type = 2
and and
p.user_id = #{userId} p.user_id = #{userId}
and c.rec_status = 0
and r.rec_status = 0
and p.rec_status = 0
LIMIT 1 LIMIT 1
</select> </select>
</mapper> </mapper>

4
mt/src/main/resources/mapper_dao/CompeteTeamDao.xml

@ -89,6 +89,10 @@
AND p.user_id = #{userId} AND p.user_id = #{userId}
AND pp.compete_time_id = #{competeTimeId} AND pp.compete_time_id = #{competeTimeId}
AND p2.team = 0 AND p2.team = 0
and p.rec_status = 0
and pp.rec_status = 0
and p1.rec_status = 0
and p2.rec_status = 0
</select> </select>
<select id="queryTeam" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTeamProject"> <select id="queryTeam" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTeamProject">
SELECT SELECT

6
tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java

@ -6,6 +6,8 @@ import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import java.util.List; import java.util.List;
public class DeliverDto { public class DeliverDto {
@ -20,6 +22,10 @@ public class DeliverDto {
private Boolean checkStatus; private Boolean checkStatus;
@ApiModelProperty("检查人备注") @ApiModelProperty("检查人备注")
private String text; private String text;
@Max(10)
@Min(0)
@ApiModelProperty("评分")
private int score = 10;
} }
@ApiModel @ApiModel

14
tall/src/main/java/com/ccsens/tall/bean/dto/ProjectDto.java

@ -110,4 +110,18 @@ public class ProjectDto {
} }
} }
} }
@Data
@ApiModel("用户选择变身成为某个角色")
public static class ImitationRole{
@NotNull
@ApiModelProperty("项目的id")
private Long projectId;
@NotNull
@ApiModelProperty("角色的id")
private Long roleId;
@NotNull
@ApiModelProperty("变身的秘钥")
private String code;
}
} }

81
tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java

@ -2,6 +2,7 @@ package com.ccsens.tall.bean.dto;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ccsens.util.exception.BaseException; import com.ccsens.util.exception.BaseException;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -45,7 +46,7 @@ public class TaskDto {
} }
@Data @Data
@ApiModel("设置任务提醒") @ApiModel("添加时设置任务提醒")
public static class TaskRemindByAdd{ public static class TaskRemindByAdd{
@ApiModelProperty("提醒时机 0不提醒 1开始前,2开始时,3开始后,4结束前,5结束时,6结束后,7自定义时间") @ApiModelProperty("提醒时机 0不提醒 1开始前,2开始时,3开始后,4结束前,5结束时,6结束后,7自定义时间")
private Byte remindTiming; private Byte remindTiming;
@ -138,15 +139,15 @@ public class TaskDto {
private Long prevId; //移动之后的前一个节点 private Long prevId; //移动之后的前一个节点
} }
@Data // @Data
public static class InsertTask { // public static class InsertTask {
@NotNull(message = "projectId is required.") // @NotNull(message = "projectId is required.")
private Long projectId; // private Long projectId;
@NotNull(message = "roleId is required.") // @NotNull(message = "roleId is required.")
private Long roleId; // private Long roleId;
private Long prevId; //移动之后的前一个节点 // private Long prevId; //移动之后的前一个节点
private __TaskDto taskId; //插入的节点 // private __TaskDto taskId; //插入的节点
} // }
@Data @Data
@ApiModel @ApiModel
@ -173,9 +174,22 @@ public class TaskDto {
private Long delayTime; private Long delayTime;
@ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0") @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0")
private Byte priority; private Byte priority;
@ApiModelProperty("交付物id和修改后的名字")
private List<UpdateTaskDeliverName> deliverList;
@ApiModelProperty("需要修改的插件Id")
private List<Long> plugins;
@ApiModelProperty("任务提醒信息") @ApiModelProperty("任务提醒信息")
private List<UpdateTaskRemind> taskRemindList; private List<UpdateTaskRemind> taskRemindList;
} }
@Data
@ApiModel("修改任务时修改交付物名称")
public static class UpdateTaskDeliverName {
@ApiModelProperty("交付物id")
private Long deliverId;
@ApiModelProperty("交付物名字")
private String deliverName;
}
@ApiModel @ApiModel
@Data @Data
@ -195,16 +209,16 @@ public class TaskDto {
} }
public static class __TaskDto{ // public static class __TaskDto{
private String name; // private String name;
private String description; // private String description;
private Long duration; // private Long duration;
private Long prevId; // private Long prevId;
private Boolean isVirtual; // private Boolean isVirtual;
private String title; // private String title;
private String speaker; // private String speaker;
private String text; // private String text;
} // }
@ApiModel @ApiModel
@Data @Data
@ -251,7 +265,7 @@ public class TaskDto {
} }
@Data @Data
@ApiModel("设置任务提醒") @ApiModel("给任务添加提醒")
public static class TaskRemind{ public static class TaskRemind{
@NotNull @NotNull
@ApiModelProperty("任务日期id(subTimeId)") @ApiModelProperty("任务日期id(subTimeId)")
@ -289,7 +303,7 @@ public class TaskDto {
private Long remindId; private Long remindId;
} }
@Data @Data
@ApiModel("设置任务提醒") @ApiModel("修改时设置任务提醒")
public static class UpdateTaskRemind{ public static class UpdateTaskRemind{
@NotNull @NotNull
@ApiModelProperty("提醒信息的id") @ApiModelProperty("提醒信息的id")
@ -340,4 +354,27 @@ public class TaskDto {
@ApiModelProperty("角色id") @ApiModelProperty("角色id")
private List<Long> roleList; private List<Long> roleList;
} }
@Data
@ApiModel("根据角色查找任务")
public static class QueryTaskInfoByRoleId{
@ApiModelProperty("角色Id")
private Long roleId;
@ApiModelProperty("开始时间")
private Long startTime;
@ApiModelProperty("结束时间")
private Long endTime;
@ApiModelProperty("完成状态 0全部,1完成,2未完成")
private Integer process = 0;
@ApiModelProperty("优先级排序 0无 1倒叙(优先级高的在前) 2正序")
private Integer priority = 0;
@ApiModelProperty("是否是变身模式 0否 1是")
private Integer imitation = 0;
@ApiModelProperty("页数 -1表示不分页")
private Integer page = 1;
@ApiModelProperty("每页数量")
private Integer pageSize = 10;
}
} }

88
tall/src/main/java/com/ccsens/tall/bean/po/ProShow.java

@ -16,12 +16,6 @@ public class ProShow implements Serializable {
private Byte createTask; private Byte createTask;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private String timeShow; private String timeShow;
private Byte duration; private Byte duration;
@ -34,6 +28,16 @@ public class ProShow implements Serializable {
private Byte pimsNavType; private Byte pimsNavType;
private Byte shareChange;
private String shareChangeCode;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public Long getId() { public Long getId() {
@ -84,30 +88,6 @@ public class ProShow implements Serializable {
this.createTask = createTask; this.createTask = createTask;
} }
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
public String getTimeShow() { public String getTimeShow() {
return timeShow; return timeShow;
} }
@ -156,6 +136,46 @@ public class ProShow implements Serializable {
this.pimsNavType = pimsNavType; this.pimsNavType = pimsNavType;
} }
public Byte getShareChange() {
return shareChange;
}
public void setShareChange(Byte shareChange) {
this.shareChange = shareChange;
}
public String getShareChangeCode() {
return shareChangeCode;
}
public void setShareChangeCode(String shareChangeCode) {
this.shareChangeCode = shareChangeCode == null ? null : shareChangeCode.trim();
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -168,15 +188,17 @@ public class ProShow implements Serializable {
sb.append(", filter=").append(filter); sb.append(", filter=").append(filter);
sb.append(", isShowMvp=").append(isShowMvp); sb.append(", isShowMvp=").append(isShowMvp);
sb.append(", createTask=").append(createTask); sb.append(", createTask=").append(createTask);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", timeShow=").append(timeShow); sb.append(", timeShow=").append(timeShow);
sb.append(", duration=").append(duration); sb.append(", duration=").append(duration);
sb.append(", showShortcuts=").append(showShortcuts); sb.append(", showShortcuts=").append(showShortcuts);
sb.append(", selectTaskType=").append(selectTaskType); sb.append(", selectTaskType=").append(selectTaskType);
sb.append(", detailPath=").append(detailPath); sb.append(", detailPath=").append(detailPath);
sb.append(", pimsNavType=").append(pimsNavType); sb.append(", pimsNavType=").append(pimsNavType);
sb.append(", shareChange=").append(shareChange);
sb.append(", shareChangeCode=").append(shareChangeCode);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }

490
tall/src/main/java/com/ccsens/tall/bean/po/ProShowExample.java

@ -465,186 +465,6 @@ public class ProShowExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
}
public Criteria andCreatedAtIsNotNull() {
addCriterion("created_at is not null");
return (Criteria) this;
}
public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("created_at =", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("created_at <>", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("created_at >", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("created_at >=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThan(Date value) {
addCriterion("created_at <", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("created_at <=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("created_at in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("created_at not in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNull() {
addCriterion("updated_at is null");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNotNull() {
addCriterion("updated_at is not null");
return (Criteria) this;
}
public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andRecStatusIsNull() {
addCriterion("rec_status is null");
return (Criteria) this;
}
public Criteria andRecStatusIsNotNull() {
addCriterion("rec_status is not null");
return (Criteria) this;
}
public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("rec_status =", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("rec_status >", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThan(Byte value) {
addCriterion("rec_status <", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("rec_status in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andTimeShowIsNull() { public Criteria andTimeShowIsNull() {
addCriterion("time_show is null"); addCriterion("time_show is null");
return (Criteria) this; return (Criteria) this;
@ -1024,6 +844,316 @@ public class ProShowExample {
addCriterion("pims_nav_type not between", value1, value2, "pimsNavType"); addCriterion("pims_nav_type not between", value1, value2, "pimsNavType");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andShareChangeIsNull() {
addCriterion("share_change is null");
return (Criteria) this;
}
public Criteria andShareChangeIsNotNull() {
addCriterion("share_change is not null");
return (Criteria) this;
}
public Criteria andShareChangeEqualTo(Byte value) {
addCriterion("share_change =", value, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeNotEqualTo(Byte value) {
addCriterion("share_change <>", value, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeGreaterThan(Byte value) {
addCriterion("share_change >", value, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeGreaterThanOrEqualTo(Byte value) {
addCriterion("share_change >=", value, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeLessThan(Byte value) {
addCriterion("share_change <", value, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeLessThanOrEqualTo(Byte value) {
addCriterion("share_change <=", value, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeIn(List<Byte> values) {
addCriterion("share_change in", values, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeNotIn(List<Byte> values) {
addCriterion("share_change not in", values, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeBetween(Byte value1, Byte value2) {
addCriterion("share_change between", value1, value2, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeNotBetween(Byte value1, Byte value2) {
addCriterion("share_change not between", value1, value2, "shareChange");
return (Criteria) this;
}
public Criteria andShareChangeCodeIsNull() {
addCriterion("share_change_code is null");
return (Criteria) this;
}
public Criteria andShareChangeCodeIsNotNull() {
addCriterion("share_change_code is not null");
return (Criteria) this;
}
public Criteria andShareChangeCodeEqualTo(String value) {
addCriterion("share_change_code =", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeNotEqualTo(String value) {
addCriterion("share_change_code <>", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeGreaterThan(String value) {
addCriterion("share_change_code >", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeGreaterThanOrEqualTo(String value) {
addCriterion("share_change_code >=", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeLessThan(String value) {
addCriterion("share_change_code <", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeLessThanOrEqualTo(String value) {
addCriterion("share_change_code <=", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeLike(String value) {
addCriterion("share_change_code like", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeNotLike(String value) {
addCriterion("share_change_code not like", value, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeIn(List<String> values) {
addCriterion("share_change_code in", values, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeNotIn(List<String> values) {
addCriterion("share_change_code not in", values, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeBetween(String value1, String value2) {
addCriterion("share_change_code between", value1, value2, "shareChangeCode");
return (Criteria) this;
}
public Criteria andShareChangeCodeNotBetween(String value1, String value2) {
addCriterion("share_change_code not between", value1, value2, "shareChangeCode");
return (Criteria) this;
}
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
}
public Criteria andCreatedAtIsNotNull() {
addCriterion("created_at is not null");
return (Criteria) this;
}
public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("created_at =", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("created_at <>", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("created_at >", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("created_at >=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThan(Date value) {
addCriterion("created_at <", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("created_at <=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("created_at in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("created_at not in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNull() {
addCriterion("updated_at is null");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNotNull() {
addCriterion("updated_at is not null");
return (Criteria) this;
}
public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andRecStatusIsNull() {
addCriterion("rec_status is null");
return (Criteria) this;
}
public Criteria andRecStatusIsNotNull() {
addCriterion("rec_status is not null");
return (Criteria) this;
}
public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("rec_status =", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("rec_status >", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThan(Byte value) {
addCriterion("rec_status <", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("rec_status in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
} }
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {

221
tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogChecker.java

@ -1,106 +1,117 @@
package com.ccsens.tall.bean.po; package com.ccsens.tall.bean.po;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
public class ProTaskDeliverPostLogChecker implements Serializable { public class ProTaskDeliverPostLogChecker implements Serializable {
private Long id; private Long id;
private Long deliverPostLogId; private Long deliverPostLogId;
private Long checkerId; private Long checkerId;
private String remark; private String remark;
private Integer checkStatus; private Integer checkStatus;
private Date createdAt; private Integer score;
private Date updatedAt; private Date createdAt;
private Byte recStatus; private Date updatedAt;
private static final long serialVersionUID = 1L; private Byte recStatus;
public Long getId() { private static final long serialVersionUID = 1L;
return id;
} public Long getId() {
return id;
public void setId(Long id) { }
this.id = id;
} public void setId(Long id) {
this.id = id;
public Long getDeliverPostLogId() { }
return deliverPostLogId;
} public Long getDeliverPostLogId() {
return deliverPostLogId;
public void setDeliverPostLogId(Long deliverPostLogId) { }
this.deliverPostLogId = deliverPostLogId;
} public void setDeliverPostLogId(Long deliverPostLogId) {
this.deliverPostLogId = deliverPostLogId;
public Long getCheckerId() { }
return checkerId;
} public Long getCheckerId() {
return checkerId;
public void setCheckerId(Long checkerId) { }
this.checkerId = checkerId;
} public void setCheckerId(Long checkerId) {
this.checkerId = checkerId;
public String getRemark() { }
return remark;
} public String getRemark() {
return remark;
public void setRemark(String remark) { }
this.remark = remark == null ? null : remark.trim();
} public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
public Integer getCheckStatus() { }
return checkStatus;
} public Integer getCheckStatus() {
return checkStatus;
public void setCheckStatus(Integer checkStatus) { }
this.checkStatus = checkStatus;
} public void setCheckStatus(Integer checkStatus) {
this.checkStatus = checkStatus;
public Date getCreatedAt() { }
return createdAt;
} public Integer getScore() {
return score;
public void setCreatedAt(Date createdAt) { }
this.createdAt = createdAt;
} public void setScore(Integer score) {
this.score = score;
public Date getUpdatedAt() { }
return updatedAt;
} public Date getCreatedAt() {
return createdAt;
public void setUpdatedAt(Date updatedAt) { }
this.updatedAt = updatedAt;
} public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
public Byte getRecStatus() { }
return recStatus;
} public Date getUpdatedAt() {
return updatedAt;
public void setRecStatus(Byte recStatus) { }
this.recStatus = recStatus;
} public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
@Override }
public String toString() {
StringBuilder sb = new StringBuilder(); public Byte getRecStatus() {
sb.append(getClass().getSimpleName()); return recStatus;
sb.append(" ["); }
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); public void setRecStatus(Byte recStatus) {
sb.append(", deliverPostLogId=").append(deliverPostLogId); this.recStatus = recStatus;
sb.append(", checkerId=").append(checkerId); }
sb.append(", remark=").append(remark);
sb.append(", checkStatus=").append(checkStatus); @Override
sb.append(", createdAt=").append(createdAt); public String toString() {
sb.append(", updatedAt=").append(updatedAt); StringBuilder sb = new StringBuilder();
sb.append(", recStatus=").append(recStatus); sb.append(getClass().getSimpleName());
sb.append("]"); sb.append(" [");
return sb.toString(); sb.append("Hash = ").append(hashCode());
} sb.append(", id=").append(id);
sb.append(", deliverPostLogId=").append(deliverPostLogId);
sb.append(", checkerId=").append(checkerId);
sb.append(", remark=").append(remark);
sb.append(", checkStatus=").append(checkStatus);
sb.append(", score=").append(score);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
} }

1440
tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogCheckerExample.java

File diff suppressed because it is too large

95
tall/src/main/java/com/ccsens/tall/bean/po/SysImitation.java

@ -0,0 +1,95 @@
package com.ccsens.tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class SysImitation implements Serializable {
private Long id;
private Long userId;
private Long projectId;
private Long roleId;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getProjectId() {
return projectId;
}
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public Long getRoleId() {
return roleId;
}
public void setRoleId(Long roleId) {
this.roleId = roleId;
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", userId=").append(userId);
sb.append(", projectId=").append(projectId);
sb.append(", roleId=").append(roleId);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
}

621
tall/src/main/java/com/ccsens/tall/bean/po/SysImitationExample.java

@ -0,0 +1,621 @@
package com.ccsens.tall.bean.po;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class SysImitationExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public SysImitationExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andUserIdEqualTo(Long value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotEqualTo(Long value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThan(Long value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThan(Long value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdLessThanOrEqualTo(Long value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andUserIdIn(List<Long> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Long> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdBetween(Long value1, Long value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotBetween(Long value1, Long value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andProjectIdIsNull() {
addCriterion("project_id is null");
return (Criteria) this;
}
public Criteria andProjectIdIsNotNull() {
addCriterion("project_id is not null");
return (Criteria) this;
}
public Criteria andProjectIdEqualTo(Long value) {
addCriterion("project_id =", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotEqualTo(Long value) {
addCriterion("project_id <>", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThan(Long value) {
addCriterion("project_id >", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThanOrEqualTo(Long value) {
addCriterion("project_id >=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThan(Long value) {
addCriterion("project_id <", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThanOrEqualTo(Long value) {
addCriterion("project_id <=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdIn(List<Long> values) {
addCriterion("project_id in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotIn(List<Long> values) {
addCriterion("project_id not in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdBetween(Long value1, Long value2) {
addCriterion("project_id between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotBetween(Long value1, Long value2) {
addCriterion("project_id not between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andRoleIdIsNull() {
addCriterion("role_id is null");
return (Criteria) this;
}
public Criteria andRoleIdIsNotNull() {
addCriterion("role_id is not null");
return (Criteria) this;
}
public Criteria andRoleIdEqualTo(Long value) {
addCriterion("role_id =", value, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdNotEqualTo(Long value) {
addCriterion("role_id <>", value, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdGreaterThan(Long value) {
addCriterion("role_id >", value, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdGreaterThanOrEqualTo(Long value) {
addCriterion("role_id >=", value, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdLessThan(Long value) {
addCriterion("role_id <", value, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdLessThanOrEqualTo(Long value) {
addCriterion("role_id <=", value, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdIn(List<Long> values) {
addCriterion("role_id in", values, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdNotIn(List<Long> values) {
addCriterion("role_id not in", values, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdBetween(Long value1, Long value2) {
addCriterion("role_id between", value1, value2, "roleId");
return (Criteria) this;
}
public Criteria andRoleIdNotBetween(Long value1, Long value2) {
addCriterion("role_id not between", value1, value2, "roleId");
return (Criteria) this;
}
public Criteria andCreatedAtIsNull() {
addCriterion("created_at is null");
return (Criteria) this;
}
public Criteria andCreatedAtIsNotNull() {
addCriterion("created_at is not null");
return (Criteria) this;
}
public Criteria andCreatedAtEqualTo(Date value) {
addCriterion("created_at =", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotEqualTo(Date value) {
addCriterion("created_at <>", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThan(Date value) {
addCriterion("created_at >", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("created_at >=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThan(Date value) {
addCriterion("created_at <", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
addCriterion("created_at <=", value, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtIn(List<Date> values) {
addCriterion("created_at in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotIn(List<Date> values) {
addCriterion("created_at not in", values, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtBetween(Date value1, Date value2) {
addCriterion("created_at between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
addCriterion("created_at not between", value1, value2, "createdAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNull() {
addCriterion("updated_at is null");
return (Criteria) this;
}
public Criteria andUpdatedAtIsNotNull() {
addCriterion("updated_at is not null");
return (Criteria) this;
}
public Criteria andUpdatedAtEqualTo(Date value) {
addCriterion("updated_at =", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotEqualTo(Date value) {
addCriterion("updated_at <>", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThan(Date value) {
addCriterion("updated_at >", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
addCriterion("updated_at >=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThan(Date value) {
addCriterion("updated_at <", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
addCriterion("updated_at <=", value, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtIn(List<Date> values) {
addCriterion("updated_at in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotIn(List<Date> values) {
addCriterion("updated_at not in", values, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtBetween(Date value1, Date value2) {
addCriterion("updated_at between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
addCriterion("updated_at not between", value1, value2, "updatedAt");
return (Criteria) this;
}
public Criteria andRecStatusIsNull() {
addCriterion("rec_status is null");
return (Criteria) this;
}
public Criteria andRecStatusIsNotNull() {
addCriterion("rec_status is not null");
return (Criteria) this;
}
public Criteria andRecStatusEqualTo(Byte value) {
addCriterion("rec_status =", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotEqualTo(Byte value) {
addCriterion("rec_status <>", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThan(Byte value) {
addCriterion("rec_status >", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
addCriterion("rec_status >=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThan(Byte value) {
addCriterion("rec_status <", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
addCriterion("rec_status <=", value, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusIn(List<Byte> values) {
addCriterion("rec_status in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotIn(List<Byte> values) {
addCriterion("rec_status not in", values, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusBetween(Byte value1, Byte value2) {
addCriterion("rec_status between", value1, value2, "recStatus");
return (Criteria) this;
}
public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
addCriterion("rec_status not between", value1, value2, "recStatus");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

2
tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java

@ -65,6 +65,8 @@ public class DeliverVo {
private String checkerName; private String checkerName;
@ApiModelProperty("检查情况 0未检查,1合格,2不合格") @ApiModelProperty("检查情况 0未检查,1合格,2不合格")
private int checkerStatus; private int checkerStatus;
@ApiModelProperty("检查人评分")
private int score;
@ApiModelProperty("检查人备注") @ApiModelProperty("检查人备注")
private String remark; private String remark;
} }

2
tall/src/main/java/com/ccsens/tall/bean/vo/ProjectVo.java

@ -163,7 +163,7 @@ public class ProjectVo {
@ApiModelProperty("是否是当前角色的奖惩干系人") @ApiModelProperty("是否是当前角色的奖惩干系人")
private boolean stakeholder; private boolean stakeholder;
@ApiModelProperty("该角色是否显示") @ApiModelProperty("该角色是否显示")
private Boolean isShow; private Boolean isShow = true;
@ApiModelProperty("成员信息") @ApiModelProperty("成员信息")
private List<ProMemberVo> members; private List<ProMemberVo> members;
@JsonIgnore @JsonIgnore

59
tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogCheckerMapper.java

@ -1,31 +1,30 @@
package com.ccsens.tall.persist.mapper; package com.ccsens.tall.persist.mapper;
import com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker; import com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker;
import com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample; import com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample;
import org.apache.ibatis.annotations.Param; import java.util.List;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ProTaskDeliverPostLogCheckerMapper {
public interface ProTaskDeliverPostLogCheckerMapper { long countByExample(ProTaskDeliverPostLogCheckerExample example);
long countByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByPrimaryKey(Long id);
int deleteByPrimaryKey(Long id);
int insert(ProTaskDeliverPostLogChecker record);
int insert(ProTaskDeliverPostLogChecker record);
int insertSelective(ProTaskDeliverPostLogChecker record);
int insertSelective(ProTaskDeliverPostLogChecker record);
List<ProTaskDeliverPostLogChecker> selectByExample(ProTaskDeliverPostLogCheckerExample example);
List<ProTaskDeliverPostLogChecker> selectByExample(ProTaskDeliverPostLogCheckerExample example);
ProTaskDeliverPostLogChecker selectByPrimaryKey(Long id);
ProTaskDeliverPostLogChecker selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByExampleSelective(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByExample(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByExample(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByPrimaryKeySelective(ProTaskDeliverPostLogChecker record);
int updateByPrimaryKeySelective(ProTaskDeliverPostLogChecker record);
int updateByPrimaryKey(ProTaskDeliverPostLogChecker record);
int updateByPrimaryKey(ProTaskDeliverPostLogChecker record);
} }

30
tall/src/main/java/com/ccsens/tall/persist/mapper/SysImitationMapper.java

@ -0,0 +1,30 @@
package com.ccsens.tall.persist.mapper;
import com.ccsens.tall.bean.po.SysImitation;
import com.ccsens.tall.bean.po.SysImitationExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface SysImitationMapper {
long countByExample(SysImitationExample example);
int deleteByExample(SysImitationExample example);
int deleteByPrimaryKey(Long id);
int insert(SysImitation record);
int insertSelective(SysImitation record);
List<SysImitation> selectByExample(SysImitationExample example);
SysImitation selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") SysImitation record, @Param("example") SysImitationExample example);
int updateByExample(@Param("record") SysImitation record, @Param("example") SysImitationExample example);
int updateByPrimaryKeySelective(SysImitation record);
int updateByPrimaryKey(SysImitation record);
}

5
tall/src/main/java/com/ccsens/tall/service/IProMemberService.java

@ -14,9 +14,9 @@ public interface IProMemberService {
List<ProjectVo.MembersByProject> selectMembersByProjectId(Long projectId) throws Exception; List<ProjectVo.MembersByProject> selectMembersByProjectId(Long projectId) throws Exception;
Boolean userIsBelongRole(Long currentUserId, Long id) throws Exception; Boolean userIsBelongRole(Long currentUserId, Long id,Integer imitation) throws Exception;
List<ProRole> selectRolesByUserIdAndProjectId(Long currentUserId, Long projectId) throws Exception; List<ProRole> selectRolesByUserIdAndProjectId(Long currentUserId, Long projectId,Integer imitation) throws Exception;
MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId)throws Exception; MemberVo.MemberInfo getProMemberByProjectIdAndUserId(Long projectId, Long currentUserId)throws Exception;
@ -69,4 +69,5 @@ public interface IProMemberService {
* @return 用户信息 * @return 用户信息
*/ */
MemberVo.MemberInfo getMemberByUserIdAndTaskId(Long userId, Long taskId); MemberVo.MemberInfo getMemberByUserIdAndTaskId(Long userId, Long taskId);
} }

2
tall/src/main/java/com/ccsens/tall/service/IProRoleService.java

@ -14,7 +14,7 @@ public interface IProRoleService {
List<ProRole> getProRoleByProjectIdAndUserId(Long projectId, Long currentUserId); List<ProRole> getProRoleByProjectIdAndUserId(Long projectId, Long currentUserId);
List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception; List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId,Integer imitation) throws Exception;
List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId); List<ProjectVo.RoleInfo> getRealMemberRolesByProjectId(Long projectId);

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

@ -10,12 +10,11 @@ import java.util.List;
public interface IProTaskDetailService { public interface IProTaskDetailService {
void saveTaskDetail(ProTaskDetail taskDetail); void saveTaskDetail(ProTaskDetail taskDetail);
Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, Object getTasksByRoleId(Long currentUserId, Long projectId, TaskDto.QueryTaskInfoByRoleId taskInfoByRoleId) throws Exception;
Integer page, Integer pageSize,Integer priority) throws Exception;
List<TaskVo.FirstTask> getTaskInfoByMvp(Long projectId); List<TaskVo.FirstTask> getTaskInfoByMvp(Long projectId);
TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception; TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId,Integer imitation) throws Exception;
TaskVo.TaskCheckList selectTaskList(Long currentUserId, String key, String start, String end, String role, Integer page, Integer pageSize) throws Exception; TaskVo.TaskCheckList selectTaskList(Long currentUserId, String key, String start, String end, String role, Integer page, Integer pageSize) throws Exception;
@ -37,7 +36,7 @@ public interface IProTaskDetailService {
/** /**
* 处理任务的插件 * 处理任务的插件
*/ */
void managePlugin(Long userId,Long roleId,TaskVo.NormalTask normalTask) throws Exception; void managePlugin(Long userId,Long roleId,TaskVo.NormalTask normalTask,Integer imitation) throws Exception;
/** /**
* 修改任务的配置信息 * 修改任务的配置信息

5
tall/src/main/java/com/ccsens/tall/service/IProjectService.java

@ -44,4 +44,9 @@ public interface IProjectService {
* @return 返回修改后的项目信息 * @return 返回修改后的项目信息
*/ */
ProjectVo.ProjectInfo updateProjectConfig(Long currentUserId, ProjectDto.ProjectConfig projectConfig,String token); ProjectVo.ProjectInfo updateProjectConfig(Long currentUserId, ProjectDto.ProjectConfig projectConfig,String token);
/**
* 变身成为某个角色
*/
void imitationRole(Long currentUserId, ProjectDto.ImitationRole imitationRole);
} }

63
tall/src/main/java/com/ccsens/tall/service/ProMemberService.java

@ -12,6 +12,7 @@ import com.ccsens.tall.bean.po.*;
import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.MemberVo;
import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.ProjectVo;
import com.ccsens.tall.persist.dao.*; import com.ccsens.tall.persist.dao.*;
import com.ccsens.tall.persist.mapper.SysImitationMapper;
import com.ccsens.util.CodeEnum; import com.ccsens.util.CodeEnum;
import com.ccsens.util.WebConstant; import com.ccsens.util.WebConstant;
import com.ccsens.util.exception.BaseException; import com.ccsens.util.exception.BaseException;
@ -49,6 +50,8 @@ public class ProMemberService implements IProMemberService {
private Snowflake snowflake; private Snowflake snowflake;
@Resource @Resource
private UserAttentionDao userAttentionDao; private UserAttentionDao userAttentionDao;
@Resource
private SysImitationMapper imitationMapper;
@Override @Override
@ -65,21 +68,29 @@ public class ProMemberService implements IProMemberService {
*该用户是否是角色下的成员 *该用户是否是角色下的成员
*/ */
@Override @Override
public Boolean userIsBelongRole(Long userId, Long roleId) { public Boolean userIsBelongRole(Long userId, Long roleId,Integer imitation) {
boolean flag = false; boolean flag = false;
//如果该角色是全体成员返回true //如果该角色是全体成员返回true
ProRole role = proRoleDao.selectByPrimaryKey(roleId); ProRole role = proRoleDao.selectByPrimaryKey(roleId);
if(role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)){ if(role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)){
flag = true; flag = true;
} }
ProMemberRoleExample memberRoleExample = new ProMemberRoleExample(); if(imitation != null && imitation == 1){
memberRoleExample.createCriteria().andRoleIdEqualTo(roleId); SysImitationExample sysImitationExample = new SysImitationExample();
List<ProMemberRole> memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample); sysImitationExample.createCriteria().andUserIdEqualTo(userId).andRoleIdEqualTo(roleId);
if (CollectionUtil.isNotEmpty(memberRoleList)) { if(imitationMapper.countByExample(sysImitationExample) != 0){
for (ProMemberRole memberRole : memberRoleList) { flag = true;
ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId()); }
if (ObjectUtil.isNotNull(proMember) && proMember.getUserId().longValue() == userId) { }else {
flag = true; ProMemberRoleExample memberRoleExample = new ProMemberRoleExample();
memberRoleExample.createCriteria().andRoleIdEqualTo(roleId);
List<ProMemberRole> memberRoleList = proMemberRoleDao.selectByExample(memberRoleExample);
if (CollectionUtil.isNotEmpty(memberRoleList)) {
for (ProMemberRole memberRole : memberRoleList) {
ProMember proMember = proMemberDao.selectByPrimaryKey(memberRole.getMemberId());
if (ObjectUtil.isNotNull(proMember) && proMember.getUserId().longValue() == userId) {
flag = true;
}
} }
} }
} }
@ -90,16 +101,30 @@ public class ProMemberService implements IProMemberService {
* 获取用户在项目中所属的所有角色 * 获取用户在项目中所属的所有角色
*/ */
@Override @Override
public List<ProRole> selectRolesByUserIdAndProjectId(Long userId, Long projectId) { public List<ProRole> selectRolesByUserIdAndProjectId(Long userId, Long projectId,Integer imitation) {
List<ProRole> roleList = new ArrayList<>();
List<ProRole> roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, userId); if(imitation != null && imitation == 1){
if(CollectionUtil.isEmpty(roleList)){ SysImitationExample imitationExample = new SysImitationExample();
ProRoleExample roleExample = new ProRoleExample(); imitationExample.createCriteria().andProjectIdEqualTo(projectId).andUserIdEqualTo(userId);
roleExample.createCriteria().andProjectIdEqualTo(projectId) List<SysImitation> sysImitationList = imitationMapper.selectByExample(imitationExample);
.andNameEqualTo(WebConstant.ROLE_NAME.Attention.phase).andParentIdNotEqualTo(0L); if(CollectionUtil.isNotEmpty(sysImitationList)){
List<ProRole> proRoleList = proRoleDao.selectByExample(roleExample); for(SysImitation sysImitation: sysImitationList){
if(CollectionUtil.isNotEmpty(proRoleList)){ ProRole role = proRoleDao.selectByPrimaryKey(sysImitation.getRoleId());
roleList.addAll(proRoleList); if(ObjectUtil.isNotNull(role)){
roleList.add(role);
}
}
}
}else {
roleList = proRoleDao.selectRolesByProjectIdAndUserId(projectId, userId);
if (CollectionUtil.isEmpty(roleList)) {
ProRoleExample roleExample = new ProRoleExample();
roleExample.createCriteria().andProjectIdEqualTo(projectId)
.andNameEqualTo(WebConstant.ROLE_NAME.Attention.phase).andParentIdNotEqualTo(0L);
List<ProRole> proRoleList = proRoleDao.selectByExample(roleExample);
if (CollectionUtil.isNotEmpty(proRoleList)) {
roleList.addAll(proRoleList);
}
} }
} }
return roleList; return roleList;

4
tall/src/main/java/com/ccsens/tall/service/ProRoleService.java

@ -66,11 +66,11 @@ public class ProRoleService implements IProRoleService {
* 根据项目id和用户Id查询项目下的所有二级角色的详细信息 * 根据项目id和用户Id查询项目下的所有二级角色的详细信息
*/ */
@Override @Override
public List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId) throws Exception { public List<ProjectVo.RoleInfo> getRolesByProjectIdAndUserId(Long projectId, Long currentUserId,Integer imitation) throws Exception {
List<ProjectVo.RoleInfo> memberRoleList; List<ProjectVo.RoleInfo> memberRoleList;
//获取用户在项目中的角色 //获取用户在项目中的角色
List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId); List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId,imitation);
//1.查询二级角色(项目经理+项目成员+mvp) //1.查询二级角色(项目经理+项目成员+mvp)
memberRoleList = getRealMemberRolesByProjectId(projectId); memberRoleList = getRealMemberRolesByProjectId(projectId);
if (CollectionUtil.isNotEmpty(memberRoleList)) { if (CollectionUtil.isNotEmpty(memberRoleList)) {

97
tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@ -42,7 +42,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
@Resource @Resource
private IUserAttentionService attentionService; private IUserAttentionService attentionService;
@Resource @Resource
private ITaskPluginService pluginService; private TaskPluginDao taskPluginDao;
@Resource @Resource
private IProMemberService proMemberService; private IProMemberService proMemberService;
@Resource @Resource
@ -75,6 +75,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
private IRobotService robotService; private IRobotService robotService;
@Resource @Resource
private ProRemindDao proRemindDao; private ProRemindDao proRemindDao;
@Resource
private TaskDeliverDao taskDeliverDao;
@Override @Override
public void saveTaskDetail(ProTaskDetail taskDetail) { public void saveTaskDetail(ProTaskDetail taskDetail) {
@ -82,17 +84,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
@Override @Override
public Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process, public Object getTasksByRoleId(Long currentUserId, Long projectId, TaskDto.QueryTaskInfoByRoleId taskInfoByRoleId) throws Exception {
Integer page, Integer pageSize,Integer priority) throws Exception {
SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId); SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId);
if (ObjectUtil.isNull(sysProject)) { if (ObjectUtil.isNull(sysProject)) {
throw new BaseException(CodeEnum.NOT_PROJECT); throw new BaseException(CodeEnum.NOT_PROJECT);
} }
startTime = startTime == null ? sysProject.getBeginTime() : startTime; taskInfoByRoleId.setStartTime(taskInfoByRoleId.getStartTime() == null ? sysProject.getBeginTime() : taskInfoByRoleId.getStartTime());
endTime = endTime == null ? sysProject.getEndTime() : endTime; taskInfoByRoleId.setEndTime(taskInfoByRoleId.getEndTime() == null ? sysProject.getEndTime() : taskInfoByRoleId.getEndTime());
Object obj = null; Object obj = null;
ProRole role = proRoleDao.selectByPrimaryKey(roleId); ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId());
if (ObjectUtil.isNull(role)) { if (ObjectUtil.isNull(role)) {
throw new BaseException(CodeEnum.NOT_ROLE); throw new BaseException(CodeEnum.NOT_ROLE);
} }
@ -105,9 +106,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
// obj = getTaskInfoByMvp(projectId, page, pageSize); // obj = getTaskInfoByMvp(projectId, page, pageSize);
// } else // } else
if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) { if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.PM.value)) {
obj = getTaskInfoByProjectIdAndPM(currentUserId, projectId, roleId, startTime, endTime, process, page, pageSize,priority); obj = getTaskInfoByProjectIdAndPM(currentUserId, projectId, taskInfoByRoleId.getRoleId(),
taskInfoByRoleId.getStartTime(), taskInfoByRoleId.getEndTime(), taskInfoByRoleId.getProcess(),
taskInfoByRoleId.getPage(), taskInfoByRoleId.getPageSize(),taskInfoByRoleId.getPriority(),taskInfoByRoleId.getImitation());
} else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.Member.value)) { } else if (parentRole.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.Member.value)) {
obj = getTaskInfoByProjectIdAndRoleId(currentUserId, projectId, roleId, startTime, endTime, process, page, pageSize,priority); obj = getTaskInfoByProjectIdAndRoleId(currentUserId, projectId,taskInfoByRoleId.getRoleId(),
taskInfoByRoleId.getStartTime(), taskInfoByRoleId.getEndTime(), taskInfoByRoleId.getProcess(),
taskInfoByRoleId.getPage(), taskInfoByRoleId.getPageSize(),taskInfoByRoleId.getPriority(),taskInfoByRoleId.getImitation());
} }
} else { } else {
throw new BaseException(CodeEnum.NOT_ROLE); throw new BaseException(CodeEnum.NOT_ROLE);
@ -138,7 +143,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 查看任务 项目经理 * 查看任务 项目经理
*/ */
private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long currentUserId, Long projectId,Long roleId, Long startTime, Long endTime, private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndPM(Long currentUserId, Long projectId,Long roleId, Long startTime, Long endTime,
Integer process, Integer page, Integer pageSize,Integer priority) throws Exception { Integer process, Integer page, Integer pageSize,Integer priority,Integer imitation) throws Exception {
TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo();
List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>(); List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
@ -190,7 +195,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
task.setScore(score); task.setScore(score);
} }
//处理插件 //处理插件
managePlugin(currentUserId,roleId,task); managePlugin(currentUserId,roleId,task,imitation);
//二级任务完成状态 //二级任务完成状态
if(task.getProcess() != 2) { if(task.getProcess() != 2) {
ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, task.getId()); ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, task.getId());
@ -240,7 +245,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 查看任务 项目成员 * 查看任务 项目成员
*/ */
private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, private TaskVo.ProTaskInfo getTaskInfoByProjectIdAndRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime,
Long endTime, Integer process, Integer page, Integer pageSize,Integer priority) throws Exception { Long endTime, Integer process, Integer page, Integer pageSize,Integer priority,Integer imitation) throws Exception {
TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo(); TaskVo.ProTaskInfo proTaskInfo = new TaskVo.ProTaskInfo();
List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>(); List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
@ -267,7 +272,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
} }
//处理插件 //处理插件
managePlugin(currentUserId,roleId,normalTask); managePlugin(currentUserId,roleId,normalTask,imitation);
//任务完成状态 //任务完成状态
if(normalTask.getProcess() != 2) { if(normalTask.getProcess() != 2) {
ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());
@ -435,8 +440,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 处理任务的插件 * 处理任务的插件
*/ */
@Override @Override
public void managePlugin(Long userId,Long roleId,TaskVo.NormalTask normalTask) throws Exception { public void managePlugin(Long userId,Long roleId,TaskVo.NormalTask normalTask,Integer imitation) throws Exception {
Boolean isMain = proMemberService.userIsBelongRole(userId,roleId); Boolean isMain = proMemberService.userIsBelongRole(userId,roleId,imitation);
if(!isMain){ if(!isMain){
normalTask.setPlugins(null); normalTask.setPlugins(null);
}else { }else {
@ -536,7 +541,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 通过任务id查任务详情 * 通过任务id查任务详情
*/ */
@Override @Override
public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId) throws Exception { public TaskVo.NormalTask getTaskInfoByTaskId(Long currentUserId, Long projectId, Long taskId, Integer imitation) throws Exception {
ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId); ProTaskSubTime subTime = taskSubTimeDao.selectByPrimaryKey(taskId);
TaskVo.NormalTask taskDetail = null; TaskVo.NormalTask taskDetail = null;
@ -545,7 +550,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
taskDetail = taskDetailDao.selectTaskByTaskId(subTime.getId(), subTime.getTaskDetailId(),task.getExecutorRole()); taskDetail = taskDetailDao.selectTaskByTaskId(subTime.getId(), subTime.getTaskDetailId(),task.getExecutorRole());
if(ObjectUtil.isNotNull(taskDetail)) { if(ObjectUtil.isNotNull(taskDetail)) {
//处理查询到的任务的插件 //处理查询到的任务的插件
managePlugin(currentUserId,task.getExecutorRole(),taskDetail); managePlugin(currentUserId,task.getExecutorRole(),taskDetail,imitation);
//任务的完成状态 //任务的完成状态
if(taskDetail.getProcess() != 2) { if(taskDetail.getProcess() != 2) {
ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, taskDetail.getId()); ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, taskDetail.getId());
@ -578,7 +583,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
groupTask = taskDetailDao.selectTaskByTaskId(subTimeId, detail.getId(),detail.getExecutorRole()); groupTask = taskDetailDao.selectTaskByTaskId(subTimeId, detail.getId(),detail.getExecutorRole());
if(ObjectUtil.isNotNull(groupTask)){ if(ObjectUtil.isNotNull(groupTask)){
//处理查询到的任务的插件 //处理查询到的任务的插件
managePlugin(currentUserId,task.getExecutorRole(),taskDetail); managePlugin(currentUserId,task.getExecutorRole(),taskDetail,imitation);
//任务的完成状态 //任务的完成状态
if(taskDetail.getProcess() != 2) { if(taskDetail.getProcess() != 2) {
ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId, groupTask.getId()); ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId, groupTask.getId());
@ -767,7 +772,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
if(CollectionUtil.isEmpty(roleList)){ if(CollectionUtil.isEmpty(roleList)){
roleList = new HashSet<>(); roleList = new HashSet<>();
//查询此用户在项目中的的所有角色的任务 //查询此用户在项目中的的所有角色的任务
List<ProRole> roles = proMemberService.selectRolesByUserIdAndProjectId(userId, project.getId()); List<ProRole> roles = proMemberService.selectRolesByUserIdAndProjectId(userId, project.getId(),null);
for (ProRole role : roles){ for (ProRole role : roles){
roleList.add(role.getId()); roleList.add(role.getId());
} }
@ -989,7 +994,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
ProMember porMember = proMemberService.selectByUserId(userId, taskDetail.getProjectId()); ProMember porMember = proMemberService.selectByUserId(userId, taskDetail.getProjectId());
//该用户是否是任务的负责人 //该用户是否是任务的负责人
ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole());
Boolean isBelongRole = proMemberService.userIsBelongRole(userId, role.getId()); Boolean isBelongRole = proMemberService.userIsBelongRole(userId, role.getId(),null);
if (isBelongRole) { if (isBelongRole) {
for(ProSubTimeMember sTimeMember:subTimeMemberList){ for(ProSubTimeMember sTimeMember:subTimeMemberList){
if(sTimeMember.getMemberId().longValue() == porMember.getId()){ if(sTimeMember.getMemberId().longValue() == porMember.getId()){
@ -1168,6 +1173,56 @@ public class ProTaskDetailService implements IProTaskDetailService {
partTaskSubTime(taskDetail); partTaskSubTime(taskDetail);
} }
} }
//如果传入的插件不为空,先将原来的插件删除,
if(CollectionUtil.isNotEmpty(updateTaskInfo.getPlugins())){
ProTaskPluginExample pluginExample = new ProTaskPluginExample();
pluginExample.createCriteria().andTaskDetailIdEqualTo(taskDetail.getId())
.andMemberRoleIdEqualTo(taskDetail.getExecutorRole());
List<ProTaskPlugin> pluginList = taskPluginDao.selectByExample(pluginExample);
if(CollectionUtil.isNotEmpty(pluginList)){
pluginList.forEach(proTaskPlugin -> {
proTaskPlugin.setRecStatus((byte) 2);
taskPluginDao.updateByPrimaryKeySelective(proTaskPlugin);
});
}
//将新的插件加入任务
updateTaskInfo.getPlugins().forEach(taskPlugin -> {
SysPlugin sysPlugin = sysPluginDao.selectByPrimaryKey(taskPlugin);
if(ObjectUtil.isNull(sysPlugin)){
throw new BaseException(CodeEnum.WBS_NOT_PLUGIN);
}
ProTaskPlugin plugin = new ProTaskPlugin();
plugin.setId(snowflake.nextId());
plugin.setTaskDetailId(taskDetail.getId());
plugin.setPluginId(taskPlugin);
plugin.setMemberRoleId(taskDetail.getExecutorRole());
taskPluginDao.insertSelective(plugin);
});
}
//修改交付物信息
if(CollectionUtil.isNotEmpty(updateTaskInfo.getDeliverList())){
updateTaskInfo.getDeliverList().forEach(taskDeliver -> {
if(StrUtil.isNotEmpty(taskDeliver.getDeliverName())){
if(ObjectUtil.isNotNull(taskDeliver.getDeliverId())) {
ProTaskDeliver deliver = taskDeliverDao.selectByPrimaryKey(taskDeliver.getDeliverId());
if (ObjectUtil.isNotNull(deliver)) {
deliver.setName(taskDeliver.getDeliverName());
taskDeliverDao.updateByPrimaryKeySelective(deliver);
}
}else {
ProTaskDeliver deliver = new ProTaskDeliver();
deliver.setId(snowflake.nextId());
deliver.setTaskDetailId(taskDetail.getId());
deliver.setName(taskDeliver.getDeliverName());
deliver.setIsInput(0);
deliver.setIsFinal(1);
taskDeliverService.saveDeliver(deliver);
}
}
});
}
//修改数据 //修改数据
taskDetailDao.updateByPrimaryKeySelective(taskDetail); taskDetailDao.updateByPrimaryKeySelective(taskDetail);
//修改提醒信息 //修改提醒信息
@ -1178,7 +1233,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
} }
//返回的任务详细信息 //返回的任务详细信息
Long subTimeId = taskDeliverService.isTaskOrSubTime(taskDetail.getId()); Long subTimeId = taskDeliverService.isTaskOrSubTime(taskDetail.getId());
normalTask = getTaskInfoByTaskId(currentUserId,project.getId(),subTimeId); normalTask = getTaskInfoByTaskId(currentUserId,project.getId(),subTimeId,null);
} else { } else {
throw new BaseException(CodeEnum.NOT_POWER); throw new BaseException(CodeEnum.NOT_POWER);
} }
@ -1351,6 +1406,6 @@ public class ProTaskDetailService implements IProTaskDetailService {
BeanUtil.copyProperties(updateTaskConfig,proTaskShow); BeanUtil.copyProperties(updateTaskConfig,proTaskShow);
proTaskShowDao.updateByPrimaryKeySelective(proTaskShow); proTaskShowDao.updateByPrimaryKeySelective(proTaskShow);
} }
return getTaskInfoByTaskId(userId,taskDetail.getProjectId(),updateTaskConfig.getTaskId()); return getTaskInfoByTaskId(userId,taskDetail.getProjectId(),updateTaskConfig.getTaskId(),null);
} }
} }

37
tall/src/main/java/com/ccsens/tall/service/ProjectService.java

@ -10,6 +10,7 @@ import com.ccsens.tall.bean.po.*;
import com.ccsens.tall.bean.vo.LabelVo; import com.ccsens.tall.bean.vo.LabelVo;
import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.ProjectVo;
import com.ccsens.tall.persist.dao.*; import com.ccsens.tall.persist.dao.*;
import com.ccsens.tall.persist.mapper.SysImitationMapper;
import com.ccsens.util.CodeEnum; import com.ccsens.util.CodeEnum;
import com.ccsens.util.DateUtil; import com.ccsens.util.DateUtil;
import com.ccsens.util.WebConstant; import com.ccsens.util.WebConstant;
@ -63,6 +64,8 @@ public class ProjectService implements IProjectService {
private IWpsService wpsService; private IWpsService wpsService;
@Resource @Resource
private ProTaskShowDao proTaskShowDao; private ProTaskShowDao proTaskShowDao;
@Resource
private SysImitationMapper imitationMapper;
@Override @Override
public void saveProject(SysProject sysProject) { public void saveProject(SysProject sysProject) {
@ -913,4 +916,38 @@ public class ProjectService implements IProjectService {
} }
return getProjectInfoById(currentUserId,projectConfig.getProjectId(),token); return getProjectInfoById(currentUserId,projectConfig.getProjectId(),token);
} }
@Override
public void imitationRole(Long currentUserId, ProjectDto.ImitationRole imitationRole) {
log.info("用户:{}选择一个角色变身:{}",currentUserId,imitationRole);
//检查此项目是否开启变身功能且变身密码正确
ProShowExample proShowExample = new ProShowExample();
proShowExample.createCriteria().andProjectIdEqualTo(imitationRole.getProjectId());
List<ProShow> proShowList = proShowDao.selectByExample(proShowExample);
if(CollectionUtil.isNotEmpty(proShowList)){
if(proShowList.get(0).getShareChange() == 4){
throw new BaseException(CodeEnum.PROJECT_IMITATION_NO);
}
if(!proShowList.get(0).getShareChangeCode().equalsIgnoreCase(imitationRole.getCode())){
throw new BaseException(CodeEnum.PROJECT_IMITATION_CODE_ERROR);
}
}
//将该用户在此项目中以前的变身角色信息删除
SysImitationExample sysImitationExample = new SysImitationExample();
sysImitationExample.createCriteria().andProjectIdEqualTo(imitationRole.getProjectId()).andUserIdEqualTo(currentUserId);
List<SysImitation> sysImitationList = imitationMapper.selectByExample(sysImitationExample);
if(CollectionUtil.isNotEmpty(sysImitationList)){
sysImitationList.forEach(sysImitation -> {
sysImitation.setRecStatus((byte) 2);
imitationMapper.updateByPrimaryKeySelective(sysImitation);
});
}
//新加一条变身信息
SysImitation sysImitation = new SysImitation();
sysImitation.setId(snowflake.nextId());
sysImitation.setProjectId(imitationRole.getProjectId());
sysImitation.setRoleId(imitationRole.getRoleId());
sysImitation.setUserId(currentUserId);
imitationMapper.insertSelective(sysImitation);
}
} }

52
tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@ -181,7 +181,7 @@ public class TaskDeliverService implements ITaskDeliverService {
ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskDeliver.getTaskDetailId()); ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskDeliver.getTaskDetailId());
ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole());
Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId()); Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId(),null);
if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){ if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){
throw new BaseException(CodeEnum.NOT_CHECKER); throw new BaseException(CodeEnum.NOT_CHECKER);
} }
@ -258,7 +258,7 @@ public class TaskDeliverService implements ITaskDeliverService {
} }
Long roleId; Long roleId;
if (role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) { if (role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) {
List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, taskDetail.getProjectId()); List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, taskDetail.getProjectId(),null);
roleId = roleList.get(0).getId(); roleId = roleList.get(0).getId();
} else { } else {
roleId = taskDetail.getExecutorRole(); roleId = taskDetail.getExecutorRole();
@ -403,7 +403,7 @@ public class TaskDeliverService implements ITaskDeliverService {
//获取此用户在这个项目中的角色 //获取此用户在这个项目中的角色
ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId()); ProTaskDetail task = taskDetailDao.selectByPrimaryKey(deliver.getTaskDetailId());
List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId(),null);
if (ObjectUtil.isNotNull(deliver)) { if (ObjectUtil.isNotNull(deliver)) {
deliverInfo.setDeliverId(deliver.getId()); deliverInfo.setDeliverId(deliver.getId());
@ -460,7 +460,7 @@ public class TaskDeliverService implements ITaskDeliverService {
} }
//添加上传人所属的角色 //添加上传人所属的角色
List<DeliverVo.DRole> dRoleList = new ArrayList<>(); List<DeliverVo.DRole> dRoleList = new ArrayList<>();
List<ProRole> uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId()); List<ProRole> uploaderRoleList = proMemberService.selectRolesByUserIdAndProjectId(filePath.getUploaderId(), task.getProjectId(),null);
if (CollectionUtil.isNotEmpty(uploaderRoleList)) { if (CollectionUtil.isNotEmpty(uploaderRoleList)) {
for (ProRole role : uploaderRoleList) { for (ProRole role : uploaderRoleList) {
DeliverVo.DRole dRole = new DeliverVo.DRole(); DeliverVo.DRole dRole = new DeliverVo.DRole();
@ -484,6 +484,7 @@ public class TaskDeliverService implements ITaskDeliverService {
checker.setCheckerName(role.getName()); checker.setCheckerName(role.getName());
checker.setRemark(postLogChecker.getRemark()); checker.setRemark(postLogChecker.getRemark());
checker.setCheckerStatus(postLogChecker.getCheckStatus()); checker.setCheckerStatus(postLogChecker.getCheckStatus());
checker.setScore(postLogChecker.getScore());
checkerList.add(checker); checkerList.add(checker);
if (CollectionUtil.isNotEmpty(roleList)) { if (CollectionUtil.isNotEmpty(roleList)) {
for (ProRole proRole : roleList) { for (ProRole proRole : roleList) {
@ -534,39 +535,32 @@ public class TaskDeliverService implements ITaskDeliverService {
throw new BaseException(CodeEnum.NOT_TASK); throw new BaseException(CodeEnum.NOT_TASK);
} }
ProRole proRole = proRoleDao.selectByPrimaryKey(task.getExecutorRole()); ProRole proRole = proRoleDao.selectByPrimaryKey(task.getExecutorRole());
List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId()); List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, task.getProjectId(),null);
if (CollectionUtil.isNotEmpty(roleList)) { if (CollectionUtil.isNotEmpty(roleList)) {
for (ProRole role : roleList) { for (ProRole role : roleList) {
// ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample();
// logExample.createCriteria().andDeliverIdEqualTo(checkDeliver.getDeliverId()).andTaskSubTimeIdEqualTo(subTimeId); ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample();
// logExample.setOrderByClause("time DESC"); checkerExample.createCriteria().andDeliverPostLogIdEqualTo(deliverPostLog.getId()).andCheckerIdEqualTo(role.getId());
// List<ProTaskDeliverPostLog> deliverPostLogList = deliverPostLogDao.selectByExample(logExample); List<ProTaskDeliverPostLogChecker> postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample);
// if (CollectionUtil.isNotEmpty(deliverPostLogList)) { if (CollectionUtil.isNotEmpty(postLogCheckerList)) {
// ProTaskDeliverPostLog postLog = deliverPostLogList.get(0); for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) {
// for (ProTaskDeliverPostLog postLog : deliverPostLogList) { if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) {
ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); postLogChecker.setRemark(checkDeliver.getText());
checkerExample.createCriteria().andDeliverPostLogIdEqualTo(deliverPostLog.getId()).andCheckerIdEqualTo(role.getId()); if (checkDeliver.getCheckStatus()) {
List<ProTaskDeliverPostLogChecker> postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample); postLogChecker.setCheckStatus(1);
if (CollectionUtil.isNotEmpty(postLogCheckerList)) { postLogChecker.setScore(checkDeliver.getScore());
for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) { } else {
if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) { postLogChecker.setCheckStatus(2);
postLogChecker.setRemark(checkDeliver.getText()); postLogChecker.setScore(0);
if (checkDeliver.getCheckStatus()) { returnTask(subTimeId);
postLogChecker.setCheckStatus(1);
} else {
postLogChecker.setCheckStatus(2);
returnTask(subTimeId);
}
postLogCheckerDao.updateByPrimaryKeySelective(postLogChecker);
} }
postLogCheckerDao.updateByPrimaryKeySelective(postLogChecker);
} }
// } }
userIdSet.add(deliverPostLog.getUserId().toString()); userIdSet.add(deliverPostLog.getUserId().toString());
uploadUserId = deliverPostLog.getUserId(); uploadUserId = deliverPostLog.getUserId();
checkRole = role; checkRole = role;
// }
} }
} }
if (ObjectUtil.isNull(checkRole)) { if (ObjectUtil.isNull(checkRole)) {
throw new BaseException(CodeEnum.IS_NOT_CHECKER); throw new BaseException(CodeEnum.IS_NOT_CHECKER);

2
tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java

@ -85,7 +85,7 @@ public class TaskPluginService implements ITaskPluginService{
List<TaskVo.PluginVo> pluginList = new ArrayList<>(); List<TaskVo.PluginVo> pluginList = new ArrayList<>();
//获取用户在此项目中的所有角色 //获取用户在此项目中的所有角色
ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskId); ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskId);
List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(userId,taskDetail.getProjectId()); List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(userId,taskDetail.getProjectId(),null);
List<TaskVo.PluginVo> pluginVoList = sysPluginDao.getPluginByTask(taskId); List<TaskVo.PluginVo> pluginVoList = sysPluginDao.getPluginByTask(taskId);
if(CollectionUtil.isNotEmpty(pluginVoList)){ if(CollectionUtil.isNotEmpty(pluginVoList)){

6
tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java

@ -107,7 +107,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
} }
//该用户是否是任务的负责人 //该用户是否是任务的负责人
ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole());
Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId()); Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId(),null);
if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole) { if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole) {
log.info("此用户不是该任务的负责人:{}", role); log.info("此用户不是该任务的负责人:{}", role);
throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); throw new BaseException(CodeEnum.IS_NOT_EXECUTOR);
@ -193,7 +193,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
//返回的任务详细信息 //返回的任务详细信息
TaskVo.NormalTask normalTask = taskDetailService.getTaskInfoByTaskId(currentUserId, taskDetail.getProjectId(), subTimeId.getId()); TaskVo.NormalTask normalTask = taskDetailService.getTaskInfoByTaskId(currentUserId, taskDetail.getProjectId(), subTimeId.getId(),null);
//用智能助手/ws/wx发送消息 //用智能助手/ws/wx发送消息
robotService.finishTaskRobotSend(currentUserId, normalTask.getProjectId(), normalTask.getProjectName(), normalTask.getName(), normalTask.getExecutorRole(), completedStatus); robotService.finishTaskRobotSend(currentUserId, normalTask.getProjectId(), normalTask.getProjectName(), normalTask.getName(), normalTask.getExecutorRole(), completedStatus);
@ -462,7 +462,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
TaskVo.NormalTask taskDetail = taskDetailDao.selectTaskByTaskId(subTimeId, detail.getId(), detail.getExecutorRole()); TaskVo.NormalTask taskDetail = taskDetailDao.selectTaskByTaskId(subTimeId, detail.getId(), detail.getExecutorRole());
if (ObjectUtil.isNotNull(taskDetail)) { if (ObjectUtil.isNotNull(taskDetail)) {
taskDetailService.managePlugin(currentUserId, detail.getExecutorRole(), taskDetail); taskDetailService.managePlugin(currentUserId, detail.getExecutorRole(), taskDetail,null);
taskDetail.setRemindInfoList(remindInfoList); taskDetail.setRemindInfoList(remindInfoList);
} }
//通过智能助手发送通知 //通过智能助手发送通知

3
tall/src/main/java/com/ccsens/tall/web/DeliverController.java

@ -11,6 +11,7 @@ import com.ccsens.util.annotation.OperateType;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -111,7 +112,7 @@ public class DeliverController {
}) })
@RequestMapping(value = "/check", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/check", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<DeliverVo.DeliverInfo> checkDeliver(HttpServletRequest request, public JsonResponse<DeliverVo.DeliverInfo> checkDeliver(HttpServletRequest request,
@ApiParam @RequestBody DeliverDto.CheckDeliver checker) throws Exception { @Validated @ApiParam @RequestBody DeliverDto.CheckDeliver checker) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length()); String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length());

63
tall/src/main/java/com/ccsens/tall/web/ProjectController.java

@ -1,6 +1,7 @@
package com.ccsens.tall.web; package com.ccsens.tall.web;
import com.ccsens.tall.bean.dto.ProjectDto; import com.ccsens.tall.bean.dto.ProjectDto;
import com.ccsens.tall.bean.dto.TaskDto;
import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.ProjectVo;
import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.bean.vo.TaskVo;
import com.ccsens.tall.service.IProMemberService; import com.ccsens.tall.service.IProMemberService;
@ -86,13 +87,15 @@ public class ProjectController {
@ApiOperation(value = "根据项目id获取二级角色列表",notes = "PM,MVP,Mine,Others...") @ApiOperation(value = "根据项目id获取二级角色列表",notes = "PM,MVP,Mine,Others...")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "项目Id", required = true, paramType = "path") @ApiImplicitParam(name = "id", value = "项目Id", required = true, paramType = "path"),
@ApiImplicitParam(name = "imitation", value = "是否是变身模式 0否 1是", required = true, paramType = "query")
}) })
@RequestMapping(value = "/{id}/roles", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/{id}/roles", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<ProjectVo.RoleInfo>> getRolesByProjectId(HttpServletRequest request, public JsonResponse<List<ProjectVo.RoleInfo>> getRolesByProjectId(HttpServletRequest request,
@PathVariable("id") Long projectId) throws Exception { @PathVariable("id") Long projectId,
@RequestParam(required = false) Integer imitation) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
List<ProjectVo.RoleInfo> roleInfoList = proRoleService.getRolesByProjectIdAndUserId(projectId, currentUserId); List<ProjectVo.RoleInfo> roleInfoList = proRoleService.getRolesByProjectIdAndUserId(projectId, currentUserId,imitation);
return JsonResponse.newInstance().ok(roleInfoList); return JsonResponse.newInstance().ok(roleInfoList);
} }
@ -108,6 +111,31 @@ public class ProjectController {
return JsonResponse.newInstance().ok(membersByProjects); return JsonResponse.newInstance().ok(membersByProjects);
} }
// @ApiOperation(value = "根据角色id获取日程(任务列表 + 插件列表)",notes = "")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "id", value = "项目Id", required = true, paramType = "path"),
// @ApiImplicitParam(name = "roleId", value = "角色Id", required = true, paramType = "query"),
// @ApiImplicitParam(name = "startTime", value = "开始时间", required = true, paramType = "query"),
// @ApiImplicitParam(name = "endTime", value = "结束时间", required = true, paramType = "query"),
// @ApiImplicitParam(name = "process", value = "完成状态 0全部,1完成,2未完成", required = true, paramType = "query"),
// @ApiImplicitParam(name = "page", value = "页数", required = true, paramType = "query"),
// @ApiImplicitParam(name = "priority", value = "优先级排序 0无 1倒叙(优先级高的在前) 2正序", required = true, paramType = "query")
// })
// @RequestMapping(value = "/{id}/tasks", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
// public JsonResponse<TaskVo.ProTaskInfo> getTasksByRoleId(HttpServletRequest request,
// @PathVariable("id") Long projectId,
// @RequestParam(required = true) Long roleId, Integer page,
// Long startTime, Long endTime, Integer process,Integer priority) throws Exception{
// Integer pageSize = 10;
// page = page == null ? 1 : page;
// process = process == null ? 0 : process;
// priority = priority == null ? 0 :priority;
//
// Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
// Object proTaskInfo = taskDetailService.getTasksByRoleId(currentUserId,projectId,roleId,startTime,endTime,process,page,pageSize,priority);
// return JsonResponse.newInstance().ok(proTaskInfo);
// }
@ApiOperation(value = "根据角色id获取日程(任务列表 + 插件列表)",notes = "") @ApiOperation(value = "根据角色id获取日程(任务列表 + 插件列表)",notes = "")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "项目Id", required = true, paramType = "path"), @ApiImplicitParam(name = "id", value = "项目Id", required = true, paramType = "path"),
@ -118,18 +146,13 @@ public class ProjectController {
@ApiImplicitParam(name = "page", value = "页数", required = true, paramType = "query"), @ApiImplicitParam(name = "page", value = "页数", required = true, paramType = "query"),
@ApiImplicitParam(name = "priority", value = "优先级排序 0无 1倒叙(优先级高的在前) 2正序", required = true, paramType = "query") @ApiImplicitParam(name = "priority", value = "优先级排序 0无 1倒叙(优先级高的在前) 2正序", required = true, paramType = "query")
}) })
@RequestMapping(value = "/{id}/tasks", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/{id}/tasks", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<TaskVo.ProTaskInfo> getTasksByRoleId(HttpServletRequest request, public JsonResponse<TaskVo.ProTaskInfo> getTasksByRoleId(HttpServletRequest request,
@PathVariable("id") Long projectId, @PathVariable("id") Long projectId,
@RequestParam(required = true) Long roleId, Integer page, @RequestBody TaskDto.QueryTaskInfoByRoleId taskInfoByRoleId) throws Exception{
Long startTime, Long endTime, Integer process,Integer priority) throws Exception{
Integer pageSize = 10;
page = page == null ? 1 : page;
process = process == null ? 0 : process;
priority = priority == null ? 0 :priority;
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
Object proTaskInfo = taskDetailService.getTasksByRoleId(currentUserId,projectId,roleId,startTime,endTime,process,page,pageSize,priority); Object proTaskInfo = taskDetailService.getTasksByRoleId(currentUserId,projectId,taskInfoByRoleId);
return JsonResponse.newInstance().ok(proTaskInfo); return JsonResponse.newInstance().ok(proTaskInfo);
} }
@ -154,9 +177,10 @@ public class ProjectController {
@RequestMapping(value = "/{id}/tasks/{taskId}", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"}) @RequestMapping(value = "/{id}/tasks/{taskId}", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse<TaskVo.NormalTask> getTasksByTaskId(HttpServletRequest request, public JsonResponse<TaskVo.NormalTask> getTasksByTaskId(HttpServletRequest request,
@PathVariable("id") Long projectId, @PathVariable("id") Long projectId,
@PathVariable("taskId") Long taskId) throws Exception{ @PathVariable("taskId") Long taskId,
@RequestParam(required = false) Integer imitation) throws Exception{
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
TaskVo.NormalTask taskVo = taskDetailService.getTaskInfoByTaskId(currentUserId,projectId,taskId); TaskVo.NormalTask taskVo = taskDetailService.getTaskInfoByTaskId(currentUserId,projectId,taskId,imitation);
return JsonResponse.newInstance().ok(taskVo); return JsonResponse.newInstance().ok(taskVo);
} }
@ -296,4 +320,15 @@ public class ProjectController {
return JsonResponse.newInstance().ok(projectInfo); return JsonResponse.newInstance().ok(projectInfo);
} }
@ApiOperation(value = "变身", notes = "")
@ApiImplicitParams({
})
@RequestMapping(value = "/imitation", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse imitationRole(HttpServletRequest request,
@Validated @RequestBody ProjectDto.ImitationRole imitationRole) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
projectService.imitationRole(currentUserId,imitationRole);
return JsonResponse.newInstance().ok();
}
} }

141
tall/src/main/resources/mapper_raw/ProShowMapper.xml

@ -8,15 +8,17 @@
<result column="filter" jdbcType="TINYINT" property="filter" /> <result column="filter" jdbcType="TINYINT" property="filter" />
<result column="is_show_mvp" jdbcType="TINYINT" property="isShowMvp" /> <result column="is_show_mvp" jdbcType="TINYINT" property="isShowMvp" />
<result column="create_task" jdbcType="TINYINT" property="createTask" /> <result column="create_task" jdbcType="TINYINT" property="createTask" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="time_show" jdbcType="VARCHAR" property="timeShow" /> <result column="time_show" jdbcType="VARCHAR" property="timeShow" />
<result column="duration" jdbcType="TINYINT" property="duration" /> <result column="duration" jdbcType="TINYINT" property="duration" />
<result column="show_shortcuts" jdbcType="TINYINT" property="showShortcuts" /> <result column="show_shortcuts" jdbcType="TINYINT" property="showShortcuts" />
<result column="select_task_type" jdbcType="TINYINT" property="selectTaskType" /> <result column="select_task_type" jdbcType="TINYINT" property="selectTaskType" />
<result column="detail_path" jdbcType="VARCHAR" property="detailPath" /> <result column="detail_path" jdbcType="VARCHAR" property="detailPath" />
<result column="pims_nav_type" jdbcType="TINYINT" property="pimsNavType" /> <result column="pims_nav_type" jdbcType="TINYINT" property="pimsNavType" />
<result column="share_change" jdbcType="TINYINT" property="shareChange" />
<result column="share_change_code" jdbcType="VARCHAR" property="shareChangeCode" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -77,8 +79,9 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, project_id, slide, filter, is_show_mvp, create_task, created_at, updated_at, id, project_id, slide, filter, is_show_mvp, create_task, time_show, duration, show_shortcuts,
rec_status, time_show, duration, show_shortcuts, select_task_type, detail_path, pims_nav_type select_task_type, detail_path, pims_nav_type, share_change, share_change_code, created_at,
updated_at, rec_status
</sql> </sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultMap="BaseResultMap">
select select
@ -113,16 +116,16 @@
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProShow"> <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProShow">
insert into t_pro_show (id, project_id, slide, insert into t_pro_show (id, project_id, slide,
filter, is_show_mvp, create_task, filter, is_show_mvp, create_task,
created_at, updated_at, rec_status,
time_show, duration, show_shortcuts, time_show, duration, show_shortcuts,
select_task_type, detail_path, pims_nav_type select_task_type, detail_path, pims_nav_type,
) share_change, share_change_code, created_at,
updated_at, rec_status)
values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,jdbcType=TINYINT}, values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,jdbcType=TINYINT},
#{filter,jdbcType=TINYINT}, #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT}, #{filter,jdbcType=TINYINT}, #{isShowMvp,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT},
#{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, #{showShortcuts,jdbcType=TINYINT}, #{timeShow,jdbcType=VARCHAR}, #{duration,jdbcType=TINYINT}, #{showShortcuts,jdbcType=TINYINT},
#{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, #{pimsNavType,jdbcType=TINYINT} #{selectTaskType,jdbcType=TINYINT}, #{detailPath,jdbcType=VARCHAR}, #{pimsNavType,jdbcType=TINYINT},
) #{shareChange,jdbcType=TINYINT}, #{shareChangeCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProShow"> <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProShow">
insert into t_pro_show insert into t_pro_show
@ -145,15 +148,6 @@
<if test="createTask != null"> <if test="createTask != null">
create_task, create_task,
</if> </if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
<if test="timeShow != null"> <if test="timeShow != null">
time_show, time_show,
</if> </if>
@ -172,6 +166,21 @@
<if test="pimsNavType != null"> <if test="pimsNavType != null">
pims_nav_type, pims_nav_type,
</if> </if>
<if test="shareChange != null">
share_change,
</if>
<if test="shareChangeCode != null">
share_change_code,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -192,15 +201,6 @@
<if test="createTask != null"> <if test="createTask != null">
#{createTask,jdbcType=TINYINT}, #{createTask,jdbcType=TINYINT},
</if> </if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
<if test="timeShow != null"> <if test="timeShow != null">
#{timeShow,jdbcType=VARCHAR}, #{timeShow,jdbcType=VARCHAR},
</if> </if>
@ -219,6 +219,21 @@
<if test="pimsNavType != null"> <if test="pimsNavType != null">
#{pimsNavType,jdbcType=TINYINT}, #{pimsNavType,jdbcType=TINYINT},
</if> </if>
<if test="shareChange != null">
#{shareChange,jdbcType=TINYINT},
</if>
<if test="shareChangeCode != null">
#{shareChangeCode,jdbcType=VARCHAR},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultType="java.lang.Long">
@ -248,15 +263,6 @@
<if test="record.createTask != null"> <if test="record.createTask != null">
create_task = #{record.createTask,jdbcType=TINYINT}, create_task = #{record.createTask,jdbcType=TINYINT},
</if> </if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
<if test="record.timeShow != null"> <if test="record.timeShow != null">
time_show = #{record.timeShow,jdbcType=VARCHAR}, time_show = #{record.timeShow,jdbcType=VARCHAR},
</if> </if>
@ -275,6 +281,21 @@
<if test="record.pimsNavType != null"> <if test="record.pimsNavType != null">
pims_nav_type = #{record.pimsNavType,jdbcType=TINYINT}, pims_nav_type = #{record.pimsNavType,jdbcType=TINYINT},
</if> </if>
<if test="record.shareChange != null">
share_change = #{record.shareChange,jdbcType=TINYINT},
</if>
<if test="record.shareChangeCode != null">
share_change_code = #{record.shareChangeCode,jdbcType=VARCHAR},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -288,15 +309,17 @@
filter = #{record.filter,jdbcType=TINYINT}, filter = #{record.filter,jdbcType=TINYINT},
is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT}, is_show_mvp = #{record.isShowMvp,jdbcType=TINYINT},
create_task = #{record.createTask,jdbcType=TINYINT}, create_task = #{record.createTask,jdbcType=TINYINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT},
time_show = #{record.timeShow,jdbcType=VARCHAR}, time_show = #{record.timeShow,jdbcType=VARCHAR},
duration = #{record.duration,jdbcType=TINYINT}, duration = #{record.duration,jdbcType=TINYINT},
show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT}, show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT},
select_task_type = #{record.selectTaskType,jdbcType=TINYINT}, select_task_type = #{record.selectTaskType,jdbcType=TINYINT},
detail_path = #{record.detailPath,jdbcType=VARCHAR}, detail_path = #{record.detailPath,jdbcType=VARCHAR},
pims_nav_type = #{record.pimsNavType,jdbcType=TINYINT} pims_nav_type = #{record.pimsNavType,jdbcType=TINYINT},
share_change = #{record.shareChange,jdbcType=TINYINT},
share_change_code = #{record.shareChangeCode,jdbcType=VARCHAR},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -319,15 +342,6 @@
<if test="createTask != null"> <if test="createTask != null">
create_task = #{createTask,jdbcType=TINYINT}, create_task = #{createTask,jdbcType=TINYINT},
</if> </if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
<if test="timeShow != null"> <if test="timeShow != null">
time_show = #{timeShow,jdbcType=VARCHAR}, time_show = #{timeShow,jdbcType=VARCHAR},
</if> </if>
@ -346,6 +360,21 @@
<if test="pimsNavType != null"> <if test="pimsNavType != null">
pims_nav_type = #{pimsNavType,jdbcType=TINYINT}, pims_nav_type = #{pimsNavType,jdbcType=TINYINT},
</if> </if>
<if test="shareChange != null">
share_change = #{shareChange,jdbcType=TINYINT},
</if>
<if test="shareChangeCode != null">
share_change_code = #{shareChangeCode,jdbcType=VARCHAR},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
@ -356,15 +385,17 @@
filter = #{filter,jdbcType=TINYINT}, filter = #{filter,jdbcType=TINYINT},
is_show_mvp = #{isShowMvp,jdbcType=TINYINT}, is_show_mvp = #{isShowMvp,jdbcType=TINYINT},
create_task = #{createTask,jdbcType=TINYINT}, create_task = #{createTask,jdbcType=TINYINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
time_show = #{timeShow,jdbcType=VARCHAR}, time_show = #{timeShow,jdbcType=VARCHAR},
duration = #{duration,jdbcType=TINYINT}, duration = #{duration,jdbcType=TINYINT},
show_shortcuts = #{showShortcuts,jdbcType=TINYINT}, show_shortcuts = #{showShortcuts,jdbcType=TINYINT},
select_task_type = #{selectTaskType,jdbcType=TINYINT}, select_task_type = #{selectTaskType,jdbcType=TINYINT},
detail_path = #{detailPath,jdbcType=VARCHAR}, detail_path = #{detailPath,jdbcType=VARCHAR},
pims_nav_type = #{pimsNavType,jdbcType=TINYINT} pims_nav_type = #{pimsNavType,jdbcType=TINYINT},
share_change = #{shareChange,jdbcType=TINYINT},
share_change_code = #{shareChangeCode,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>

533
tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogCheckerMapper.xml

@ -1,259 +1,276 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.tall.persist.mapper.ProTaskDeliverPostLogCheckerMapper"> <mapper namespace="com.ccsens.tall.persist.mapper.ProTaskDeliverPostLogCheckerMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker"> <resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="deliver_post_log_id" jdbcType="BIGINT" property="deliverPostLogId" /> <result column="deliver_post_log_id" jdbcType="BIGINT" property="deliverPostLogId" />
<result column="checker_id" jdbcType="BIGINT" property="checkerId" /> <result column="checker_id" jdbcType="BIGINT" property="checkerId" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="check_status" jdbcType="INTEGER" property="checkStatus" /> <result column="check_status" jdbcType="INTEGER" property="checkStatus" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" /> <result column="score" jdbcType="INTEGER" property="score" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" /> <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" /> <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
</resultMap> <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<sql id="Example_Where_Clause"> </resultMap>
<where> <sql id="Example_Where_Clause">
<foreach collection="oredCriteria" item="criteria" separator="or"> <where>
<if test="criteria.valid"> <foreach collection="oredCriteria" item="criteria" separator="or">
<trim prefix="(" prefixOverrides="and" suffix=")"> <if test="criteria.valid">
<foreach collection="criteria.criteria" item="criterion"> <trim prefix="(" prefixOverrides="and" suffix=")">
<choose> <foreach collection="criteria.criteria" item="criterion">
<when test="criterion.noValue"> <choose>
and ${criterion.condition} <when test="criterion.noValue">
</when> and ${criterion.condition}
<when test="criterion.singleValue"> </when>
and ${criterion.condition} #{criterion.value} <when test="criterion.singleValue">
</when> and ${criterion.condition} #{criterion.value}
<when test="criterion.betweenValue"> </when>
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} <when test="criterion.betweenValue">
</when> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
<when test="criterion.listValue"> </when>
and ${criterion.condition} <when test="criterion.listValue">
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> and ${criterion.condition}
#{listItem} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
</foreach> #{listItem}
</when> </foreach>
</choose> </when>
</foreach> </choose>
</trim> </foreach>
</if> </trim>
</foreach> </if>
</where> </foreach>
</sql> </where>
<sql id="Update_By_Example_Where_Clause"> </sql>
<where> <sql id="Update_By_Example_Where_Clause">
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <where>
<if test="criteria.valid"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<trim prefix="(" prefixOverrides="and" suffix=")"> <if test="criteria.valid">
<foreach collection="criteria.criteria" item="criterion"> <trim prefix="(" prefixOverrides="and" suffix=")">
<choose> <foreach collection="criteria.criteria" item="criterion">
<when test="criterion.noValue"> <choose>
and ${criterion.condition} <when test="criterion.noValue">
</when> and ${criterion.condition}
<when test="criterion.singleValue"> </when>
and ${criterion.condition} #{criterion.value} <when test="criterion.singleValue">
</when> and ${criterion.condition} #{criterion.value}
<when test="criterion.betweenValue"> </when>
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} <when test="criterion.betweenValue">
</when> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
<when test="criterion.listValue"> </when>
and ${criterion.condition} <when test="criterion.listValue">
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> and ${criterion.condition}
#{listItem} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
</foreach> #{listItem}
</when> </foreach>
</choose> </when>
</foreach> </choose>
</trim> </foreach>
</if> </trim>
</foreach> </if>
</where> </foreach>
</sql> </where>
<sql id="Base_Column_List"> </sql>
id, deliver_post_log_id, checker_id, remark, check_status, created_at, updated_at, <sql id="Base_Column_List">
rec_status id, deliver_post_log_id, checker_id, remark, check_status, score, created_at, updated_at,
</sql> rec_status
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample" resultMap="BaseResultMap"> </sql>
select <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample" resultMap="BaseResultMap">
<if test="distinct"> select
distinct <if test="distinct">
</if> distinct
<include refid="Base_Column_List" /> </if>
from t_pro_task_deliver_post_log_checker <include refid="Base_Column_List" />
<if test="_parameter != null"> from t_pro_task_deliver_post_log_checker
<include refid="Example_Where_Clause" /> <if test="_parameter != null">
</if> <include refid="Example_Where_Clause" />
<if test="orderByClause != null"> </if>
order by ${orderByClause} <if test="orderByClause != null">
</if> order by ${orderByClause}
</select> </if>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> </select>
select <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<include refid="Base_Column_List" /> select
from t_pro_task_deliver_post_log_checker <include refid="Base_Column_List" />
where id = #{id,jdbcType=BIGINT} from t_pro_task_deliver_post_log_checker
</select> where id = #{id,jdbcType=BIGINT}
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> </select>
delete from t_pro_task_deliver_post_log_checker <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
where id = #{id,jdbcType=BIGINT} delete from t_pro_task_deliver_post_log_checker
</delete> where id = #{id,jdbcType=BIGINT}
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample"> </delete>
delete from t_pro_task_deliver_post_log_checker <delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample">
<if test="_parameter != null"> delete from t_pro_task_deliver_post_log_checker
<include refid="Example_Where_Clause" /> <if test="_parameter != null">
</if> <include refid="Example_Where_Clause" />
</delete> </if>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker"> </delete>
insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id, <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
remark, check_status, created_at, insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id,
updated_at, rec_status) remark, check_status, score,
values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT}, created_at, updated_at, rec_status
#{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP}, )
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT},
</insert> #{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{score,jdbcType=INTEGER},
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker"> #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
insert into t_pro_task_deliver_post_log_checker )
<trim prefix="(" suffix=")" suffixOverrides=","> </insert>
<if test="id != null"> <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
id, insert into t_pro_task_deliver_post_log_checker
</if> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="deliverPostLogId != null"> <if test="id != null">
deliver_post_log_id, id,
</if> </if>
<if test="checkerId != null"> <if test="deliverPostLogId != null">
checker_id, deliver_post_log_id,
</if> </if>
<if test="remark != null"> <if test="checkerId != null">
remark, checker_id,
</if> </if>
<if test="checkStatus != null"> <if test="remark != null">
check_status, remark,
</if> </if>
<if test="createdAt != null"> <if test="checkStatus != null">
created_at, check_status,
</if> </if>
<if test="updatedAt != null"> <if test="score != null">
updated_at, score,
</if> </if>
<if test="recStatus != null"> <if test="createdAt != null">
rec_status, created_at,
</if> </if>
</trim> <if test="updatedAt != null">
<trim prefix="values (" suffix=")" suffixOverrides=","> updated_at,
<if test="id != null"> </if>
#{id,jdbcType=BIGINT}, <if test="recStatus != null">
</if> rec_status,
<if test="deliverPostLogId != null"> </if>
#{deliverPostLogId,jdbcType=BIGINT}, </trim>
</if> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="checkerId != null"> <if test="id != null">
#{checkerId,jdbcType=BIGINT}, #{id,jdbcType=BIGINT},
</if> </if>
<if test="remark != null"> <if test="deliverPostLogId != null">
#{remark,jdbcType=VARCHAR}, #{deliverPostLogId,jdbcType=BIGINT},
</if> </if>
<if test="checkStatus != null"> <if test="checkerId != null">
#{checkStatus,jdbcType=INTEGER}, #{checkerId,jdbcType=BIGINT},
</if> </if>
<if test="createdAt != null"> <if test="remark != null">
#{createdAt,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR},
</if> </if>
<if test="updatedAt != null"> <if test="checkStatus != null">
#{updatedAt,jdbcType=TIMESTAMP}, #{checkStatus,jdbcType=INTEGER},
</if> </if>
<if test="recStatus != null"> <if test="score != null">
#{recStatus,jdbcType=TINYINT}, #{score,jdbcType=INTEGER},
</if> </if>
</trim> <if test="createdAt != null">
</insert> #{createdAt,jdbcType=TIMESTAMP},
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample" resultType="java.lang.Long"> </if>
select count(*) from t_pro_task_deliver_post_log_checker <if test="updatedAt != null">
<if test="_parameter != null"> #{updatedAt,jdbcType=TIMESTAMP},
<include refid="Example_Where_Clause" /> </if>
</if> <if test="recStatus != null">
</select> #{recStatus,jdbcType=TINYINT},
<update id="updateByExampleSelective" parameterType="map"> </if>
update t_pro_task_deliver_post_log_checker </trim>
<set> </insert>
<if test="record.id != null"> <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample" resultType="java.lang.Long">
id = #{record.id,jdbcType=BIGINT}, select count(*) from t_pro_task_deliver_post_log_checker
</if> <if test="_parameter != null">
<if test="record.deliverPostLogId != null"> <include refid="Example_Where_Clause" />
deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, </if>
</if> </select>
<if test="record.checkerId != null"> <update id="updateByExampleSelective" parameterType="map">
checker_id = #{record.checkerId,jdbcType=BIGINT}, update t_pro_task_deliver_post_log_checker
</if> <set>
<if test="record.remark != null"> <if test="record.id != null">
remark = #{record.remark,jdbcType=VARCHAR}, id = #{record.id,jdbcType=BIGINT},
</if> </if>
<if test="record.checkStatus != null"> <if test="record.deliverPostLogId != null">
check_status = #{record.checkStatus,jdbcType=INTEGER}, deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT},
</if> </if>
<if test="record.createdAt != null"> <if test="record.checkerId != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, checker_id = #{record.checkerId,jdbcType=BIGINT},
</if> </if>
<if test="record.updatedAt != null"> <if test="record.remark != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, remark = #{record.remark,jdbcType=VARCHAR},
</if> </if>
<if test="record.recStatus != null"> <if test="record.checkStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT}, check_status = #{record.checkStatus,jdbcType=INTEGER},
</if> </if>
</set> <if test="record.score != null">
<if test="_parameter != null"> score = #{record.score,jdbcType=INTEGER},
<include refid="Update_By_Example_Where_Clause" /> </if>
</if> <if test="record.createdAt != null">
</update> created_at = #{record.createdAt,jdbcType=TIMESTAMP},
<update id="updateByExample" parameterType="map"> </if>
update t_pro_task_deliver_post_log_checker <if test="record.updatedAt != null">
set id = #{record.id,jdbcType=BIGINT}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT}, </if>
checker_id = #{record.checkerId,jdbcType=BIGINT}, <if test="record.recStatus != null">
remark = #{record.remark,jdbcType=VARCHAR}, rec_status = #{record.recStatus,jdbcType=TINYINT},
check_status = #{record.checkStatus,jdbcType=INTEGER}, </if>
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, </set>
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, <if test="_parameter != null">
rec_status = #{record.recStatus,jdbcType=TINYINT} <include refid="Update_By_Example_Where_Clause" />
<if test="_parameter != null"> </if>
<include refid="Update_By_Example_Where_Clause" /> </update>
</if> <update id="updateByExample" parameterType="map">
</update> update t_pro_task_deliver_post_log_checker
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker"> set id = #{record.id,jdbcType=BIGINT},
update t_pro_task_deliver_post_log_checker deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT},
<set> checker_id = #{record.checkerId,jdbcType=BIGINT},
<if test="deliverPostLogId != null"> remark = #{record.remark,jdbcType=VARCHAR},
deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, check_status = #{record.checkStatus,jdbcType=INTEGER},
</if> score = #{record.score,jdbcType=INTEGER},
<if test="checkerId != null"> created_at = #{record.createdAt,jdbcType=TIMESTAMP},
checker_id = #{checkerId,jdbcType=BIGINT}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if> rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="remark != null"> <if test="_parameter != null">
remark = #{remark,jdbcType=VARCHAR}, <include refid="Update_By_Example_Where_Clause" />
</if> </if>
<if test="checkStatus != null"> </update>
check_status = #{checkStatus,jdbcType=INTEGER}, <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
</if> update t_pro_task_deliver_post_log_checker
<if test="createdAt != null"> <set>
created_at = #{createdAt,jdbcType=TIMESTAMP}, <if test="deliverPostLogId != null">
</if> deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT},
<if test="updatedAt != null"> </if>
updated_at = #{updatedAt,jdbcType=TIMESTAMP}, <if test="checkerId != null">
</if> checker_id = #{checkerId,jdbcType=BIGINT},
<if test="recStatus != null"> </if>
rec_status = #{recStatus,jdbcType=TINYINT}, <if test="remark != null">
</if> remark = #{remark,jdbcType=VARCHAR},
</set> </if>
where id = #{id,jdbcType=BIGINT} <if test="checkStatus != null">
</update> check_status = #{checkStatus,jdbcType=INTEGER},
<update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker"> </if>
update t_pro_task_deliver_post_log_checker <if test="score != null">
set deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT}, score = #{score,jdbcType=INTEGER},
checker_id = #{checkerId,jdbcType=BIGINT}, </if>
remark = #{remark,jdbcType=VARCHAR}, <if test="createdAt != null">
check_status = #{checkStatus,jdbcType=INTEGER}, created_at = #{createdAt,jdbcType=TIMESTAMP},
created_at = #{createdAt,jdbcType=TIMESTAMP}, </if>
updated_at = #{updatedAt,jdbcType=TIMESTAMP}, <if test="updatedAt != null">
rec_status = #{recStatus,jdbcType=TINYINT} updated_at = #{updatedAt,jdbcType=TIMESTAMP},
where id = #{id,jdbcType=BIGINT} </if>
</update> <if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
update t_pro_task_deliver_post_log_checker
set deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT},
checker_id = #{checkerId,jdbcType=BIGINT},
remark = #{remark,jdbcType=VARCHAR},
check_status = #{checkStatus,jdbcType=INTEGER},
score = #{score,jdbcType=INTEGER},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper> </mapper>

243
tall/src/main/resources/mapper_raw/SysImitationMapper.xml

@ -0,0 +1,243 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.tall.persist.mapper.SysImitationMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.SysImitation">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="project_id" jdbcType="BIGINT" property="projectId" />
<result column="role_id" jdbcType="BIGINT" property="roleId" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, user_id, project_id, role_id, created_at, updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysImitationExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_sys_imitation
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_sys_imitation
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_sys_imitation
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.SysImitationExample">
delete from t_sys_imitation
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.SysImitation">
insert into t_sys_imitation (id, user_id, project_id,
role_id, created_at, updated_at,
rec_status)
values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT},
#{roleId,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysImitation">
insert into t_sys_imitation
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="userId != null">
user_id,
</if>
<if test="projectId != null">
project_id,
</if>
<if test="roleId != null">
role_id,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
<if test="projectId != null">
#{projectId,jdbcType=BIGINT},
</if>
<if test="roleId != null">
#{roleId,jdbcType=BIGINT},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysImitationExample" resultType="java.lang.Long">
select count(*) from t_sys_imitation
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_sys_imitation
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT},
</if>
<if test="record.projectId != null">
project_id = #{record.projectId,jdbcType=BIGINT},
</if>
<if test="record.roleId != null">
role_id = #{record.roleId,jdbcType=BIGINT},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_sys_imitation
set id = #{record.id,jdbcType=BIGINT},
user_id = #{record.userId,jdbcType=BIGINT},
project_id = #{record.projectId,jdbcType=BIGINT},
role_id = #{record.roleId,jdbcType=BIGINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.SysImitation">
update t_sys_imitation
<set>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
</if>
<if test="projectId != null">
project_id = #{projectId,jdbcType=BIGINT},
</if>
<if test="roleId != null">
role_id = #{roleId,jdbcType=BIGINT},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.SysImitation">
update t_sys_imitation
set user_id = #{userId,jdbcType=BIGINT},
project_id = #{projectId,jdbcType=BIGINT},
role_id = #{roleId,jdbcType=BIGINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

5
util/src/main/java/com/ccsens/util/CodeEnum.java

@ -151,6 +151,11 @@ public enum CodeEnum {
GAME_TIME_DUE(128,"您的游戏已到期,请重新购买", true), GAME_TIME_DUE(128,"您的游戏已到期,请重新购买", true),
TEAM_MEMBER_ERROR(129,"参赛人数不符合,请重新填写", true), TEAM_MEMBER_ERROR(129,"参赛人数不符合,请重新填写", true),
SIGN_UP_TIME_NOT_START(130,"报名未开始", true),
SIGN_UP_TIME_FINISHED(131,"报名已结束", true),
PROJECT_IMITATION_NO(132,"该项目未开启变身系统", true),
PROJECT_IMITATION_CODE_ERROR(131,"秘钥错误", true),
; ;

2
util/src/main/java/com/ccsens/util/StringUtil.java

@ -166,7 +166,7 @@ public class StringUtil {
*/ */
public static String replaceComma(String str) { public static String replaceComma(String str) {
//可以在中括号内加上任何想要替换的字符 //可以在中括号内加上任何想要替换的字符
String regEx = "[,,]"; String regEx = "[,,]";
String lBracket = "[(]"; String lBracket = "[(]";
String rBracket = "[)]"; String rBracket = "[)]";

6
util/src/test/java/com/ccsens/util/TestQrCord.java

@ -28,9 +28,9 @@ public class TestQrCord {
// String fileName = "zzz/" + DateUtil.today() + "/" + i+"组" + ".png"; // String fileName = "zzz/" + DateUtil.today() + "/" + i+"组" + ".png";
// String text = "https://www.tall.wiki/pt-dev/respond?groupId="+i+"&groupName="+i+"组"; // String text = "https://www.tall.wiki/pt-dev/respond?groupId="+i+"&groupName="+i+"组";
// String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://www.tall.wiki/pt-dev/vote&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://www.tall.wiki/pt-dev/vote&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://test.tall.wiki/compete&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; // String text = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx7af1bf1e14facf82&redirect_uri=http://test.tall.wiki/compete&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
String fileName = "zzz/" + "远程比赛.png"; String fileName = "zzz/" + "远程比赛(生产).png";
QRCodeWriter qrCodeWriter = new QRCodeWriter(); QRCodeWriter qrCodeWriter = new QRCodeWriter();

Loading…
Cancel
Save