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;
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.RedisUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParams;
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.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Objects;
import java.util.Set;
@Api(tags = "DEBUG" , description = "DebugController | ")
@RestController
@RequestMapping("/debug")
public class DebugController {
@Resource
private RedisUtil redisUtil;
@Resource
private ILevelUpService levelUpService;
@ApiOperation(value = "/测试",notes = "")
@ApiImplicitParams({
})
@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("测试");
}
@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"})
public JsonResponse<PageInfo<LevelVo.QueryLevelUserInfo>> queryLevelUserInfo(@ApiParam @Validated @RequestBody QueryDto<LevelDto.QueryLevelUserInfo> params) {
log.info("手动晋级:{}",params);
PageInfo<LevelVo.QueryLevelUserInfo> levelUserInfoList = levelUpService.queryLevelUserInfo(params);
PageInfo<LevelVo.QueryLevelUserInfo> levelUserInfoList = levelUpService.queryLevelUserInfo(params.getParam());
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;
@ApiModelProperty("团队id")
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;
@ApiModelProperty("名次")
private int ranking;
public LevelUpDto() {
}
public LevelUpDto(Long competeTimeId, String competeCode, Long playerId) {
this.competeTimeId = competeTimeId;
this.competeCode = competeCode;
this.playerId = playerId;
}
}
@Data
@ -50,6 +69,14 @@ public class LevelDto {
private Long competeTimeId;
@ApiModelProperty("比赛code")
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.util.ObjectUtil;
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.vo.CompeteVo;
import com.ccsens.mt.persist.dao.CompetePlayerDao;
@ -52,6 +53,8 @@ public class CompeteService implements ICompeteService{
private CompeteProjectPlayerMapper competeProjectPlayerMapper;
@Resource
private CompeteGroupMapper competeGroupMapper;
@Resource
private ILevelUpService levelUpService;
/**
@ -115,13 +118,13 @@ public class CompeteService implements ICompeteService{
CompeteDto.CompetePlayerInfo competePlayerInfo = params.getParam();
Long userId = params.getUserId();
//检查验证码是否正确
if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) {
throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
}
if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) {
throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
}
// //检查验证码是否正确
// if (!redisUtil.hasKey(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone()))) {
// throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
// }
// if (!competePlayerInfo.getSmsCode().equals(redisUtil.get(RedisKeyManager.getSigninSmsKey(competePlayerInfo.getPhone())).toString())) {
// throw new BaseException(CodeEnum.SMS_CODE_CORRECT);
// }
//检查此用户是否已经报名
CompetePlayerExample playerExample = new CompetePlayerExample();
playerExample.createCriteria().andUserIdEqualTo(userId);
@ -162,6 +165,11 @@ public class CompeteService implements ICompeteService{
player.setCompanyId(company.getId());
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()));
}
@ -231,11 +239,13 @@ public class CompeteService implements ICompeteService{
}
CompeteGroup group = competeGroupMapper.selectByPrimaryKey(player.getCompeteGroupId());
CompeteCompany company = competeCompanyMapper.selectByPrimaryKey(player.getCompanyId());
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);
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 companyId = competePlayerDao.getCompanyIdByUser(params.getUserId());
log.info("查看该用户的院系:{}",companyId);
if(ObjectUtil.isNotNull(companyId)){
throw new BaseException(CodeEnum.PLAYER_INFO_ALREADY);
}
CompeteCompanyRoleExample companyRoleExample = new CompeteCompanyRoleExample();
companyRoleExample.createCriteria().andCompeteCompanyIdEqualTo(departmentInfo.getId()).andTypeEqualTo((byte)2);
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())) {
log.info("添加裁判领队等信息:{}",departmentInfo.getRoleList());
departmentInfo.getRoleList().forEach(departmentRole -> {
//添加player信息
CompetePlayer competePlayer = new CompetePlayer();
@ -117,13 +132,16 @@ public class DepartmentService implements IDepartmentService{
}
//添加比赛报名信息
if (CollectionUtil.isNotEmpty(departmentInfo.getProjectList())) {
log.info("添加比赛报名信息:{}",departmentInfo.getProjectList());
departmentInfo.getProjectList().forEach(departmentProject -> {
CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(departmentProject.getCompeteProjectId());
if (ObjectUtil.isNotNull(competeProject)) {
if (competeProject.getTeam() == 0) {
//不是团队比赛
log.info("不是团队比赛:{}",competeProject);
String names = StringUtil.replaceComma(departmentProject.getNames());
String[] playerNames = names.split(",");
// String[] playerNames = names.split("、");
if (ObjectUtil.isNotNull(playerNames)) {
for (String playerName : playerNames) {
//直接添加选手
@ -143,6 +161,7 @@ public class DepartmentService implements IDepartmentService{
}
} else if (competeProject.getTeam() == 1) {
//创建一个团队
log.info("创建一个团队:{}",competeProject);
CompeteTeam competeTeam = new CompeteTeam();
competeTeam.setId(snowflake.nextId());
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和分页信息
* @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:
break;
}
//将旧的数据从redis中删除
redisUtil.del(key);
}
/**
@ -240,7 +242,7 @@ public class LevelUpService implements ILevelUpService{
* @return 返回查到的比赛下所有晋级的选手的信息
*/
@Override
public PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(QueryDto<LevelDto.QueryLevelUserInfo> params) {
public PageInfo<LevelVo.QueryLevelUserInfo> queryLevelUserInfo(LevelDto.QueryLevelUserInfo params) {
LevelDto.QueryLevelUserInfo levelUserInfo = params.getParam();
if(levelUserInfo.getPage() != -1){
PageHelper.startPage(levelUserInfo.getPage(), levelUserInfo.getPageSize());

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

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

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

@ -89,6 +89,10 @@
AND p.user_id = #{userId}
AND pp.compete_time_id = #{competeTimeId}
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 id="queryTeam" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTeamProject">
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.Setter;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import java.util.List;
public class DeliverDto {
@ -20,6 +22,10 @@ public class DeliverDto {
private Boolean checkStatus;
@ApiModelProperty("检查人备注")
private String text;
@Max(10)
@Min(0)
@ApiModelProperty("评分")
private int score = 10;
}
@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 com.ccsens.util.exception.BaseException;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -45,7 +46,7 @@ public class TaskDto {
}
@Data
@ApiModel("设置任务提醒")
@ApiModel("添加时设置任务提醒")
public static class TaskRemindByAdd{
@ApiModelProperty("提醒时机 0不提醒 1开始前,2开始时,3开始后,4结束前,5结束时,6结束后,7自定义时间")
private Byte remindTiming;
@ -138,15 +139,15 @@ public class TaskDto {
private Long prevId; //移动之后的前一个节点
}
@Data
public static class InsertTask {
@NotNull(message = "projectId is required.")
private Long projectId;
@NotNull(message = "roleId is required.")
private Long roleId;
private Long prevId; //移动之后的前一个节点
private __TaskDto taskId; //插入的节点
}
// @Data
// public static class InsertTask {
// @NotNull(message = "projectId is required.")
// private Long projectId;
// @NotNull(message = "roleId is required.")
// private Long roleId;
// private Long prevId; //移动之后的前一个节点
// private __TaskDto taskId; //插入的节点
// }
@Data
@ApiModel
@ -173,9 +174,22 @@ public class TaskDto {
private Long delayTime;
@ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急 默认0")
private Byte priority;
@ApiModelProperty("交付物id和修改后的名字")
private List<UpdateTaskDeliverName> deliverList;
@ApiModelProperty("需要修改的插件Id")
private List<Long> plugins;
@ApiModelProperty("任务提醒信息")
private List<UpdateTaskRemind> taskRemindList;
}
@Data
@ApiModel("修改任务时修改交付物名称")
public static class UpdateTaskDeliverName {
@ApiModelProperty("交付物id")
private Long deliverId;
@ApiModelProperty("交付物名字")
private String deliverName;
}
@ApiModel
@Data
@ -195,16 +209,16 @@ public class TaskDto {
}
public static class __TaskDto{
private String name;
private String description;
private Long duration;
private Long prevId;
private Boolean isVirtual;
private String title;
private String speaker;
private String text;
}
// public static class __TaskDto{
// private String name;
// private String description;
// private Long duration;
// private Long prevId;
// private Boolean isVirtual;
// private String title;
// private String speaker;
// private String text;
// }
@ApiModel
@Data
@ -251,7 +265,7 @@ public class TaskDto {
}
@Data
@ApiModel("设置任务提醒")
@ApiModel("给任务添加提醒")
public static class TaskRemind{
@NotNull
@ApiModelProperty("任务日期id(subTimeId)")
@ -289,7 +303,7 @@ public class TaskDto {
private Long remindId;
}
@Data
@ApiModel("设置任务提醒")
@ApiModel("修改时设置任务提醒")
public static class UpdateTaskRemind{
@NotNull
@ApiModelProperty("提醒信息的id")
@ -340,4 +354,27 @@ public class TaskDto {
@ApiModelProperty("角色id")
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 Date createdAt;
private Date updatedAt;
private Byte recStatus;
private String timeShow;
private Byte duration;
@ -34,6 +28,16 @@ public class ProShow implements Serializable {
private Byte pimsNavType;
private Byte shareChange;
private String shareChangeCode;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
@ -84,30 +88,6 @@ public class ProShow implements Serializable {
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() {
return timeShow;
}
@ -156,6 +136,46 @@ public class ProShow implements Serializable {
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
public String toString() {
StringBuilder sb = new StringBuilder();
@ -168,15 +188,17 @@ public class ProShow implements Serializable {
sb.append(", filter=").append(filter);
sb.append(", isShowMvp=").append(isShowMvp);
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(", duration=").append(duration);
sb.append(", showShortcuts=").append(showShortcuts);
sb.append(", selectTaskType=").append(selectTaskType);
sb.append(", detailPath=").append(detailPath);
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("]");
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;
}
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() {
addCriterion("time_show is null");
return (Criteria) this;
@ -1024,6 +844,316 @@ public class ProShowExample {
addCriterion("pims_nav_type not between", value1, value2, "pimsNavType");
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 {

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

@ -1,106 +1,117 @@
package com.ccsens.tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class ProTaskDeliverPostLogChecker implements Serializable {
private Long id;
private Long deliverPostLogId;
private Long checkerId;
private String remark;
private Integer checkStatus;
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 getDeliverPostLogId() {
return deliverPostLogId;
}
public void setDeliverPostLogId(Long deliverPostLogId) {
this.deliverPostLogId = deliverPostLogId;
}
public Long getCheckerId() {
return checkerId;
}
public void setCheckerId(Long checkerId) {
this.checkerId = checkerId;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
public Integer getCheckStatus() {
return checkStatus;
}
public void setCheckStatus(Integer checkStatus) {
this.checkStatus = checkStatus;
}
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(", deliverPostLogId=").append(deliverPostLogId);
sb.append(", checkerId=").append(checkerId);
sb.append(", remark=").append(remark);
sb.append(", checkStatus=").append(checkStatus);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
package com.ccsens.tall.bean.po;
import java.io.Serializable;
import java.util.Date;
public class ProTaskDeliverPostLogChecker implements Serializable {
private Long id;
private Long deliverPostLogId;
private Long checkerId;
private String remark;
private Integer checkStatus;
private Integer score;
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 getDeliverPostLogId() {
return deliverPostLogId;
}
public void setDeliverPostLogId(Long deliverPostLogId) {
this.deliverPostLogId = deliverPostLogId;
}
public Long getCheckerId() {
return checkerId;
}
public void setCheckerId(Long checkerId) {
this.checkerId = checkerId;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
public Integer getCheckStatus() {
return checkStatus;
}
public void setCheckStatus(Integer checkStatus) {
this.checkStatus = checkStatus;
}
public Integer getScore() {
return score;
}
public void setScore(Integer score) {
this.score = score;
}
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(", 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;
@ApiModelProperty("检查情况 0未检查,1合格,2不合格")
private int checkerStatus;
@ApiModelProperty("检查人评分")
private int score;
@ApiModelProperty("检查人备注")
private String remark;
}

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

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

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

@ -1,31 +1,30 @@
package com.ccsens.tall.persist.mapper;
import com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker;
import com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface ProTaskDeliverPostLogCheckerMapper {
long countByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByPrimaryKey(Long id);
int insert(ProTaskDeliverPostLogChecker record);
int insertSelective(ProTaskDeliverPostLogChecker record);
List<ProTaskDeliverPostLogChecker> selectByExample(ProTaskDeliverPostLogCheckerExample example);
ProTaskDeliverPostLogChecker selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByExample(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByPrimaryKeySelective(ProTaskDeliverPostLogChecker record);
int updateByPrimaryKey(ProTaskDeliverPostLogChecker record);
package com.ccsens.tall.persist.mapper;
import com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker;
import com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ProTaskDeliverPostLogCheckerMapper {
long countByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByExample(ProTaskDeliverPostLogCheckerExample example);
int deleteByPrimaryKey(Long id);
int insert(ProTaskDeliverPostLogChecker record);
int insertSelective(ProTaskDeliverPostLogChecker record);
List<ProTaskDeliverPostLogChecker> selectByExample(ProTaskDeliverPostLogCheckerExample example);
ProTaskDeliverPostLogChecker selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByExample(@Param("record") ProTaskDeliverPostLogChecker record, @Param("example") ProTaskDeliverPostLogCheckerExample example);
int updateByPrimaryKeySelective(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;
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;
@ -69,4 +69,5 @@ public interface IProMemberService {
* @return 用户信息
*/
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<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);

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

@ -10,12 +10,11 @@ import java.util.List;
public interface IProTaskDetailService {
void saveTaskDetail(ProTaskDetail taskDetail);
Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process,
Integer page, Integer pageSize,Integer priority) throws Exception;
Object getTasksByRoleId(Long currentUserId, Long projectId, TaskDto.QueryTaskInfoByRoleId taskInfoByRoleId) throws Exception;
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;
@ -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 返回修改后的项目信息
*/
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.ProjectVo;
import com.ccsens.tall.persist.dao.*;
import com.ccsens.tall.persist.mapper.SysImitationMapper;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.WebConstant;
import com.ccsens.util.exception.BaseException;
@ -49,6 +50,8 @@ public class ProMemberService implements IProMemberService {
private Snowflake snowflake;
@Resource
private UserAttentionDao userAttentionDao;
@Resource
private SysImitationMapper imitationMapper;
@Override
@ -65,21 +68,29 @@ public class ProMemberService implements IProMemberService {
*该用户是否是角色下的成员
*/
@Override
public Boolean userIsBelongRole(Long userId, Long roleId) {
public Boolean userIsBelongRole(Long userId, Long roleId,Integer imitation) {
boolean flag = false;
//如果该角色是全体成员返回true
ProRole role = proRoleDao.selectByPrimaryKey(roleId);
if(role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase)){
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;
if(imitation != null && imitation == 1){
SysImitationExample sysImitationExample = new SysImitationExample();
sysImitationExample.createCriteria().andUserIdEqualTo(userId).andRoleIdEqualTo(roleId);
if(imitationMapper.countByExample(sysImitationExample) != 0){
flag = true;
}
}else {
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
public List<ProRole> selectRolesByUserIdAndProjectId(Long userId, Long projectId) {
List<ProRole> 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);
public List<ProRole> selectRolesByUserIdAndProjectId(Long userId, Long projectId,Integer imitation) {
List<ProRole> roleList = new ArrayList<>();
if(imitation != null && imitation == 1){
SysImitationExample imitationExample = new SysImitationExample();
imitationExample.createCriteria().andProjectIdEqualTo(projectId).andUserIdEqualTo(userId);
List<SysImitation> sysImitationList = imitationMapper.selectByExample(imitationExample);
if(CollectionUtil.isNotEmpty(sysImitationList)){
for(SysImitation sysImitation: sysImitationList){
ProRole role = proRoleDao.selectByPrimaryKey(sysImitation.getRoleId());
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;

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

@ -66,11 +66,11 @@ public class ProRoleService implements IProRoleService {
* 根据项目id和用户Id查询项目下的所有二级角色的详细信息
*/
@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<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId);
List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, projectId,imitation);
//1.查询二级角色(项目经理+项目成员+mvp)
memberRoleList = getRealMemberRolesByProjectId(projectId);
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
private IUserAttentionService attentionService;
@Resource
private ITaskPluginService pluginService;
private TaskPluginDao taskPluginDao;
@Resource
private IProMemberService proMemberService;
@Resource
@ -75,6 +75,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
private IRobotService robotService;
@Resource
private ProRemindDao proRemindDao;
@Resource
private TaskDeliverDao taskDeliverDao;
@Override
public void saveTaskDetail(ProTaskDetail taskDetail) {
@ -82,17 +84,16 @@ public class ProTaskDetailService implements IProTaskDetailService {
}
@Override
public Object getTasksByRoleId(Long currentUserId, Long projectId, Long roleId, Long startTime, Long endTime, Integer process,
Integer page, Integer pageSize,Integer priority) throws Exception {
public Object getTasksByRoleId(Long currentUserId, Long projectId, TaskDto.QueryTaskInfoByRoleId taskInfoByRoleId) throws Exception {
SysProject sysProject = sysProjectDao.selectByPrimaryKey(projectId);
if (ObjectUtil.isNull(sysProject)) {
throw new BaseException(CodeEnum.NOT_PROJECT);
}
startTime = startTime == null ? sysProject.getBeginTime() : startTime;
endTime = endTime == null ? sysProject.getEndTime() : endTime;
taskInfoByRoleId.setStartTime(taskInfoByRoleId.getStartTime() == null ? sysProject.getBeginTime() : taskInfoByRoleId.getStartTime());
taskInfoByRoleId.setEndTime(taskInfoByRoleId.getEndTime() == null ? sysProject.getEndTime() : taskInfoByRoleId.getEndTime());
Object obj = null;
ProRole role = proRoleDao.selectByPrimaryKey(roleId);
ProRole role = proRoleDao.selectByPrimaryKey(taskInfoByRoleId.getRoleId());
if (ObjectUtil.isNull(role)) {
throw new BaseException(CodeEnum.NOT_ROLE);
}
@ -105,9 +106,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
// obj = getTaskInfoByMvp(projectId, page, pageSize);
// } else
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)) {
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 {
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,
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();
List<TaskVo.GlobalTask> globalTaskList = new ArrayList<>();
@ -190,7 +195,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
task.setScore(score);
}
//处理插件
managePlugin(currentUserId,roleId,task);
managePlugin(currentUserId,roleId,task,imitation);
//二级任务完成状态
if(task.getProcess() != 2) {
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,
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();
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) {
ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId());
@ -435,8 +440,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 处理任务的插件
*/
@Override
public void managePlugin(Long userId,Long roleId,TaskVo.NormalTask normalTask) throws Exception {
Boolean isMain = proMemberService.userIsBelongRole(userId,roleId);
public void managePlugin(Long userId,Long roleId,TaskVo.NormalTask normalTask,Integer imitation) throws Exception {
Boolean isMain = proMemberService.userIsBelongRole(userId,roleId,imitation);
if(!isMain){
normalTask.setPlugins(null);
}else {
@ -536,7 +541,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
* 通过任务id查任务详情
*/
@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);
TaskVo.NormalTask taskDetail = null;
@ -545,7 +550,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
taskDetail = taskDetailDao.selectTaskByTaskId(subTime.getId(), subTime.getTaskDetailId(),task.getExecutorRole());
if(ObjectUtil.isNotNull(taskDetail)) {
//处理查询到的任务的插件
managePlugin(currentUserId,task.getExecutorRole(),taskDetail);
managePlugin(currentUserId,task.getExecutorRole(),taskDetail,imitation);
//任务的完成状态
if(taskDetail.getProcess() != 2) {
ProSubTimeMember subTimeMember = getProcessByUserIdAndTask(currentUserId, taskDetail.getId());
@ -578,7 +583,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
groupTask = taskDetailDao.selectTaskByTaskId(subTimeId, detail.getId(),detail.getExecutorRole());
if(ObjectUtil.isNotNull(groupTask)){
//处理查询到的任务的插件
managePlugin(currentUserId,task.getExecutorRole(),taskDetail);
managePlugin(currentUserId,task.getExecutorRole(),taskDetail,imitation);
//任务的完成状态
if(taskDetail.getProcess() != 2) {
ProSubTimeMember proSubTimeMember = getProcessByUserIdAndTask(currentUserId, groupTask.getId());
@ -767,7 +772,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
if(CollectionUtil.isEmpty(roleList)){
roleList = new HashSet<>();
//查询此用户在项目中的的所有角色的任务
List<ProRole> roles = proMemberService.selectRolesByUserIdAndProjectId(userId, project.getId());
List<ProRole> roles = proMemberService.selectRolesByUserIdAndProjectId(userId, project.getId(),null);
for (ProRole role : roles){
roleList.add(role.getId());
}
@ -989,7 +994,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
ProMember porMember = proMemberService.selectByUserId(userId, taskDetail.getProjectId());
//该用户是否是任务的负责人
ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole());
Boolean isBelongRole = proMemberService.userIsBelongRole(userId, role.getId());
Boolean isBelongRole = proMemberService.userIsBelongRole(userId, role.getId(),null);
if (isBelongRole) {
for(ProSubTimeMember sTimeMember:subTimeMemberList){
if(sTimeMember.getMemberId().longValue() == porMember.getId()){
@ -1168,6 +1173,56 @@ public class ProTaskDetailService implements IProTaskDetailService {
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);
//修改提醒信息
@ -1178,7 +1233,7 @@ public class ProTaskDetailService implements IProTaskDetailService {
}
//返回的任务详细信息
Long subTimeId = taskDeliverService.isTaskOrSubTime(taskDetail.getId());
normalTask = getTaskInfoByTaskId(currentUserId,project.getId(),subTimeId);
normalTask = getTaskInfoByTaskId(currentUserId,project.getId(),subTimeId,null);
} else {
throw new BaseException(CodeEnum.NOT_POWER);
}
@ -1351,6 +1406,6 @@ public class ProTaskDetailService implements IProTaskDetailService {
BeanUtil.copyProperties(updateTaskConfig,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.ProjectVo;
import com.ccsens.tall.persist.dao.*;
import com.ccsens.tall.persist.mapper.SysImitationMapper;
import com.ccsens.util.CodeEnum;
import com.ccsens.util.DateUtil;
import com.ccsens.util.WebConstant;
@ -63,6 +64,8 @@ public class ProjectService implements IProjectService {
private IWpsService wpsService;
@Resource
private ProTaskShowDao proTaskShowDao;
@Resource
private SysImitationMapper imitationMapper;
@Override
public void saveProject(SysProject sysProject) {
@ -913,4 +916,38 @@ public class ProjectService implements IProjectService {
}
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());
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){
throw new BaseException(CodeEnum.NOT_CHECKER);
}
@ -258,7 +258,7 @@ public class TaskDeliverService implements ITaskDeliverService {
}
Long roleId;
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();
} else {
roleId = taskDetail.getExecutorRole();
@ -403,7 +403,7 @@ public class TaskDeliverService implements ITaskDeliverService {
//获取此用户在这个项目中的角色
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)) {
deliverInfo.setDeliverId(deliver.getId());
@ -460,7 +460,7 @@ public class TaskDeliverService implements ITaskDeliverService {
}
//添加上传人所属的角色
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)) {
for (ProRole role : uploaderRoleList) {
DeliverVo.DRole dRole = new DeliverVo.DRole();
@ -484,6 +484,7 @@ public class TaskDeliverService implements ITaskDeliverService {
checker.setCheckerName(role.getName());
checker.setRemark(postLogChecker.getRemark());
checker.setCheckerStatus(postLogChecker.getCheckStatus());
checker.setScore(postLogChecker.getScore());
checkerList.add(checker);
if (CollectionUtil.isNotEmpty(roleList)) {
for (ProRole proRole : roleList) {
@ -534,39 +535,32 @@ public class TaskDeliverService implements ITaskDeliverService {
throw new BaseException(CodeEnum.NOT_TASK);
}
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)) {
for (ProRole role : roleList) {
// ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample();
// logExample.createCriteria().andDeliverIdEqualTo(checkDeliver.getDeliverId()).andTaskSubTimeIdEqualTo(subTimeId);
// logExample.setOrderByClause("time DESC");
// List<ProTaskDeliverPostLog> deliverPostLogList = deliverPostLogDao.selectByExample(logExample);
// if (CollectionUtil.isNotEmpty(deliverPostLogList)) {
// ProTaskDeliverPostLog postLog = deliverPostLogList.get(0);
// for (ProTaskDeliverPostLog postLog : deliverPostLogList) {
ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample();
checkerExample.createCriteria().andDeliverPostLogIdEqualTo(deliverPostLog.getId()).andCheckerIdEqualTo(role.getId());
List<ProTaskDeliverPostLogChecker> postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample);
if (CollectionUtil.isNotEmpty(postLogCheckerList)) {
for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) {
if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) {
postLogChecker.setRemark(checkDeliver.getText());
if (checkDeliver.getCheckStatus()) {
postLogChecker.setCheckStatus(1);
} else {
postLogChecker.setCheckStatus(2);
returnTask(subTimeId);
}
postLogCheckerDao.updateByPrimaryKeySelective(postLogChecker);
ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample();
checkerExample.createCriteria().andDeliverPostLogIdEqualTo(deliverPostLog.getId()).andCheckerIdEqualTo(role.getId());
List<ProTaskDeliverPostLogChecker> postLogCheckerList = postLogCheckerDao.selectByExample(checkerExample);
if (CollectionUtil.isNotEmpty(postLogCheckerList)) {
for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) {
if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) {
postLogChecker.setRemark(checkDeliver.getText());
if (checkDeliver.getCheckStatus()) {
postLogChecker.setCheckStatus(1);
postLogChecker.setScore(checkDeliver.getScore());
} else {
postLogChecker.setCheckStatus(2);
postLogChecker.setScore(0);
returnTask(subTimeId);
}
postLogCheckerDao.updateByPrimaryKeySelective(postLogChecker);
}
// }
}
userIdSet.add(deliverPostLog.getUserId().toString());
uploadUserId = deliverPostLog.getUserId();
checkRole = role;
// }
}
}
if (ObjectUtil.isNull(checkRole)) {
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<>();
//获取用户在此项目中的所有角色
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);
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());
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) {
log.info("此用户不是该任务的负责人:{}", role);
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发送消息
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());
if (ObjectUtil.isNotNull(taskDetail)) {
taskDetailService.managePlugin(currentUserId, detail.getExecutorRole(), taskDetail);
taskDetailService.managePlugin(currentUserId, detail.getExecutorRole(), taskDetail,null);
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.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@ -111,7 +112,7 @@ public class DeliverController {
})
@RequestMapping(value = "/check", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
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());
String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
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;
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.TaskVo;
import com.ccsens.tall.service.IProMemberService;
@ -86,13 +87,15 @@ public class ProjectController {
@ApiOperation(value = "根据项目id获取二级角色列表",notes = "PM,MVP,Mine,Others...")
@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"})
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());
List<ProjectVo.RoleInfo> roleInfoList = proRoleService.getRolesByProjectIdAndUserId(projectId, currentUserId);
List<ProjectVo.RoleInfo> roleInfoList = proRoleService.getRolesByProjectIdAndUserId(projectId, currentUserId,imitation);
return JsonResponse.newInstance().ok(roleInfoList);
}
@ -108,6 +111,31 @@ public class ProjectController {
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 = "")
@ApiImplicitParams({
@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 = "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,
@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;
@PathVariable("id") Long projectId,
@RequestBody TaskDto.QueryTaskInfoByRoleId taskInfoByRoleId) throws Exception{
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);
}
@ -154,9 +177,10 @@ public class ProjectController {
@RequestMapping(value = "/{id}/tasks/{taskId}", method = RequestMethod.GET, produces = {"application/json;charset=UTF-8"})
public JsonResponse<TaskVo.NormalTask> getTasksByTaskId(HttpServletRequest request,
@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());
TaskVo.NormalTask taskVo = taskDetailService.getTaskInfoByTaskId(currentUserId,projectId,taskId);
TaskVo.NormalTask taskVo = taskDetailService.getTaskInfoByTaskId(currentUserId,projectId,taskId,imitation);
return JsonResponse.newInstance().ok(taskVo);
}
@ -296,4 +320,15 @@ public class ProjectController {
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="is_show_mvp" jdbcType="TINYINT" property="isShowMvp" />
<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="duration" jdbcType="TINYINT" property="duration" />
<result column="show_shortcuts" jdbcType="TINYINT" property="showShortcuts" />
<result column="select_task_type" jdbcType="TINYINT" property="selectTaskType" />
<result column="detail_path" jdbcType="VARCHAR" property="detailPath" />
<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>
<sql id="Example_Where_Clause">
<where>
@ -77,8 +79,9 @@
</where>
</sql>
<sql id="Base_Column_List">
id, project_id, slide, filter, is_show_mvp, create_task, created_at, updated_at,
rec_status, time_show, duration, show_shortcuts, select_task_type, detail_path, pims_nav_type
id, project_id, slide, filter, is_show_mvp, create_task, time_show, duration, show_shortcuts,
select_task_type, detail_path, pims_nav_type, share_change, share_change_code, created_at,
updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultMap="BaseResultMap">
select
@ -113,16 +116,16 @@
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProShow">
insert into t_pro_show (id, project_id, slide,
filter, is_show_mvp, create_task,
created_at, updated_at, 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)
values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{slide,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},
#{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 id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProShow">
insert into t_pro_show
@ -145,15 +148,6 @@
<if test="createTask != null">
create_task,
</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">
time_show,
</if>
@ -172,6 +166,21 @@
<if test="pimsNavType != null">
pims_nav_type,
</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 prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -192,15 +201,6 @@
<if test="createTask != null">
#{createTask,jdbcType=TINYINT},
</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">
#{timeShow,jdbcType=VARCHAR},
</if>
@ -219,6 +219,21 @@
<if test="pimsNavType != null">
#{pimsNavType,jdbcType=TINYINT},
</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>
</insert>
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProShowExample" resultType="java.lang.Long">
@ -248,15 +263,6 @@
<if test="record.createTask != null">
create_task = #{record.createTask,jdbcType=TINYINT},
</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">
time_show = #{record.timeShow,jdbcType=VARCHAR},
</if>
@ -275,6 +281,21 @@
<if test="record.pimsNavType != null">
pims_nav_type = #{record.pimsNavType,jdbcType=TINYINT},
</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>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -288,15 +309,17 @@
filter = #{record.filter,jdbcType=TINYINT},
is_show_mvp = #{record.isShowMvp,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},
duration = #{record.duration,jdbcType=TINYINT},
show_shortcuts = #{record.showShortcuts,jdbcType=TINYINT},
select_task_type = #{record.selectTaskType,jdbcType=TINYINT},
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">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -319,15 +342,6 @@
<if test="createTask != null">
create_task = #{createTask,jdbcType=TINYINT},
</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">
time_show = #{timeShow,jdbcType=VARCHAR},
</if>
@ -346,6 +360,21 @@
<if test="pimsNavType != null">
pims_nav_type = #{pimsNavType,jdbcType=TINYINT},
</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>
where id = #{id,jdbcType=BIGINT}
</update>
@ -356,15 +385,17 @@
filter = #{filter,jdbcType=TINYINT},
is_show_mvp = #{isShowMvp,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},
duration = #{duration,jdbcType=TINYINT},
show_shortcuts = #{showShortcuts,jdbcType=TINYINT},
select_task_type = #{selectTaskType,jdbcType=TINYINT},
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}
</update>
</mapper>

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

@ -1,259 +1,276 @@
<?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.ProTaskDeliverPostLogCheckerMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="deliver_post_log_id" jdbcType="BIGINT" property="deliverPostLogId" />
<result column="checker_id" jdbcType="BIGINT" property="checkerId" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="check_status" jdbcType="INTEGER" property="checkStatus" />
<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, deliver_post_log_id, checker_id, remark, check_status, created_at, updated_at,
rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_pro_task_deliver_post_log_checker
<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_pro_task_deliver_post_log_checker
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_pro_task_deliver_post_log_checker
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample">
delete from t_pro_task_deliver_post_log_checker
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id,
remark, check_status, created_at,
updated_at, rec_status)
values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT},
#{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{createdAt,jdbcType=TIMESTAMP},
#{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
insert into t_pro_task_deliver_post_log_checker
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="deliverPostLogId != null">
deliver_post_log_id,
</if>
<if test="checkerId != null">
checker_id,
</if>
<if test="remark != null">
remark,
</if>
<if test="checkStatus != null">
check_status,
</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="deliverPostLogId != null">
#{deliverPostLogId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
#{checkerId,jdbcType=BIGINT},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="checkStatus != null">
#{checkStatus,jdbcType=INTEGER},
</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.ProTaskDeliverPostLogCheckerExample" resultType="java.lang.Long">
select count(*) from t_pro_task_deliver_post_log_checker
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_pro_task_deliver_post_log_checker
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.deliverPostLogId != null">
deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT},
</if>
<if test="record.checkerId != null">
checker_id = #{record.checkerId,jdbcType=BIGINT},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.checkStatus != null">
check_status = #{record.checkStatus,jdbcType=INTEGER},
</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_pro_task_deliver_post_log_checker
set id = #{record.id,jdbcType=BIGINT},
deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT},
checker_id = #{record.checkerId,jdbcType=BIGINT},
remark = #{record.remark,jdbcType=VARCHAR},
check_status = #{record.checkStatus,jdbcType=INTEGER},
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.ProTaskDeliverPostLogChecker">
update t_pro_task_deliver_post_log_checker
<set>
<if test="deliverPostLogId != null">
deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
checker_id = #{checkerId,jdbcType=BIGINT},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="checkStatus != null">
check_status = #{checkStatus,jdbcType=INTEGER},
</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.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},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
<?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.ProTaskDeliverPostLogCheckerMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="deliver_post_log_id" jdbcType="BIGINT" property="deliverPostLogId" />
<result column="checker_id" jdbcType="BIGINT" property="checkerId" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="check_status" jdbcType="INTEGER" property="checkStatus" />
<result column="score" jdbcType="INTEGER" property="score" />
<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, deliver_post_log_id, checker_id, remark, check_status, score, created_at, updated_at,
rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_pro_task_deliver_post_log_checker
<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_pro_task_deliver_post_log_checker
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_pro_task_deliver_post_log_checker
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogCheckerExample">
delete from t_pro_task_deliver_post_log_checker
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
insert into t_pro_task_deliver_post_log_checker (id, deliver_post_log_id, checker_id,
remark, check_status, score,
created_at, updated_at, rec_status
)
values (#{id,jdbcType=BIGINT}, #{deliverPostLogId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT},
#{remark,jdbcType=VARCHAR}, #{checkStatus,jdbcType=INTEGER}, #{score,jdbcType=INTEGER},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
)
</insert>
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogChecker">
insert into t_pro_task_deliver_post_log_checker
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="deliverPostLogId != null">
deliver_post_log_id,
</if>
<if test="checkerId != null">
checker_id,
</if>
<if test="remark != null">
remark,
</if>
<if test="checkStatus != null">
check_status,
</if>
<if test="score != null">
score,
</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="deliverPostLogId != null">
#{deliverPostLogId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
#{checkerId,jdbcType=BIGINT},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="checkStatus != null">
#{checkStatus,jdbcType=INTEGER},
</if>
<if test="score != null">
#{score,jdbcType=INTEGER},
</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.ProTaskDeliverPostLogCheckerExample" resultType="java.lang.Long">
select count(*) from t_pro_task_deliver_post_log_checker
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_pro_task_deliver_post_log_checker
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.deliverPostLogId != null">
deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT},
</if>
<if test="record.checkerId != null">
checker_id = #{record.checkerId,jdbcType=BIGINT},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
<if test="record.checkStatus != null">
check_status = #{record.checkStatus,jdbcType=INTEGER},
</if>
<if test="record.score != null">
score = #{record.score,jdbcType=INTEGER},
</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_pro_task_deliver_post_log_checker
set id = #{record.id,jdbcType=BIGINT},
deliver_post_log_id = #{record.deliverPostLogId,jdbcType=BIGINT},
checker_id = #{record.checkerId,jdbcType=BIGINT},
remark = #{record.remark,jdbcType=VARCHAR},
check_status = #{record.checkStatus,jdbcType=INTEGER},
score = #{record.score,jdbcType=INTEGER},
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.ProTaskDeliverPostLogChecker">
update t_pro_task_deliver_post_log_checker
<set>
<if test="deliverPostLogId != null">
deliver_post_log_id = #{deliverPostLogId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
checker_id = #{checkerId,jdbcType=BIGINT},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="checkStatus != null">
check_status = #{checkStatus,jdbcType=INTEGER},
</if>
<if test="score != null">
score = #{score,jdbcType=INTEGER},
</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.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>

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),
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) {
//可以在中括号内加上任何想要替换的字符
String regEx = "[,,]";
String regEx = "[,,]";
String lBracket = "[(]";
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 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://test.tall.wiki/compete&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
String fileName = "zzz/" + "远程比赛.png";
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 fileName = "zzz/" + "远程比赛(生产).png";
QRCodeWriter qrCodeWriter = new QRCodeWriter();

Loading…
Cancel
Save