fix
This commit is contained in:
杜建超
commit
b7681844fe
@ -257,7 +257,7 @@ public class StaffRoleController extends AbstractController {
|
||||
|
||||
|
||||
|
||||
// http://localhost:8080/lz_management/user/lzstaffrole/task/comment?taskId=1&content=xxx&staffId=294&atStaffId=314
|
||||
// http://localhost:8080/lz_management/user/lzstaffrole/task/comment?taskId=1&content=xxx&staffId=294&atStaffIds=314,320
|
||||
@RequestMapping("/task/comment")
|
||||
public R taskComment(TaskModel taskModel) {
|
||||
if(taskModel.getStaffId() == null && getUser()!=null && getUserId() !=null){
|
||||
|
||||
@ -318,7 +318,7 @@ public class TestController {
|
||||
}
|
||||
|
||||
|
||||
// http://localhost:8080/lz_management/test/task/comment?taskId=1&content=xxx&staffId=294&atStaffId=314
|
||||
// http://localhost:8080/lz_management/test/task/comment?taskId=1&content=xxx&staffId=294&atStaffIds=314,320
|
||||
@RequestMapping("/test/task/comment")
|
||||
public R taskComment(TaskModel taskModel) {
|
||||
return staffRoleService.taskComment(taskModel);
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.lz.modules.app.dto;
|
||||
|
||||
import com.lz.modules.performance.entity.TaskComment;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@ -17,6 +16,9 @@ public class TaskCommentDto {
|
||||
private Long staffId;
|
||||
private String label;
|
||||
private String staffName;
|
||||
private Long atStaffId;
|
||||
private String atStaffName;
|
||||
private String atStaffIds;
|
||||
private String atStaffNames;
|
||||
private String avatar;
|
||||
private String taskName;
|
||||
|
||||
}
|
||||
|
||||
@ -12,5 +12,5 @@ public class TaskModel {
|
||||
private String content;
|
||||
private Long staffId;
|
||||
private int useType;
|
||||
private Long atStaffId;
|
||||
private String atStaffIds;
|
||||
}
|
||||
|
||||
@ -27,12 +27,9 @@ import com.lz.modules.flow.dao.StaffRoleMapper;
|
||||
import com.lz.modules.flow.entity.*;
|
||||
import com.lz.modules.flow.service.*;
|
||||
import com.lz.modules.job.business.DingtalkBusiness;
|
||||
import com.lz.modules.performance.dao.TaskCommentMapper;
|
||||
import com.lz.modules.performance.entity.ResultTask;
|
||||
import com.lz.modules.performance.entity.TaskComment;
|
||||
import com.lz.modules.performance.entity.TaskProcessRecord;
|
||||
import com.lz.modules.performance.service.ResultTaskService;
|
||||
import com.lz.modules.performance.service.TaskCommentService;
|
||||
import com.lz.modules.performance.service.TaskProcessRecordService;
|
||||
import com.lz.modules.sys.entity.SysMenuEntity;
|
||||
import com.lz.modules.sys.entity.SysRoleEntity;
|
||||
@ -112,8 +109,6 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
||||
@Autowired
|
||||
private ResultDetailService resultDetailService;
|
||||
|
||||
@Autowired
|
||||
private TaskCommentService taskCommentService;
|
||||
|
||||
@Autowired
|
||||
private TaskProcessRecordService taskProcessRecordService;
|
||||
@ -121,8 +116,6 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
||||
@Autowired
|
||||
private DingtalkBusiness dingtalkBusiness;
|
||||
|
||||
@Autowired
|
||||
private TaskCommentMapper taskCommentMapper;
|
||||
|
||||
@Override
|
||||
public StaffRole selectStaffRoleById(Long id) {
|
||||
@ -647,11 +640,17 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
||||
taskProcessRecord.setStaffName(staffEntity.getName());
|
||||
}
|
||||
|
||||
StaffEntity atStaffEntity = staffDao.selectStaffById(roleModel.getAtStaffId());
|
||||
if (atStaffEntity != null) {
|
||||
taskProcessRecord.setAtStaffId(atStaffEntity.getId());
|
||||
taskProcessRecord.setAtStaffName(atStaffEntity.getName());
|
||||
taskProcessRecord.setAtStaffIds(roleModel.getAtStaffIds());
|
||||
StringBuilder staffNames = new StringBuilder();
|
||||
for (String staffIdStr : StringUtil.splitToList(roleModel.getAtStaffIds(), ",")) {
|
||||
if (StringUtil.isNotBlank(staffIdStr)) {
|
||||
StaffEntity atStaffEntity = staffDao.selectStaffById(NumberUtil.objToLongDefault(staffIdStr, 0l));
|
||||
if (atStaffEntity != null) {
|
||||
staffNames.append(atStaffEntity.getName()).append(",");
|
||||
}
|
||||
}
|
||||
}
|
||||
taskProcessRecord.setAtStaffNames(staffNames.toString());
|
||||
taskProcessRecord.setUseType(1);
|
||||
taskProcessRecordService.insertTaskProcessRecord(taskProcessRecord);
|
||||
try {
|
||||
@ -677,10 +676,21 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
|
||||
if (taskProcessRecord.getStaffId().equals(taskModel.getStaffId())) {
|
||||
taskCommentDto.setIsSelf(1);
|
||||
}
|
||||
StaffEntity staffEntity = staffDao.selectStaffById(taskProcessRecord.getStaffId());
|
||||
if(staffEntity !=null){
|
||||
taskCommentDto.setAvatar(staffEntity.getAvatar());
|
||||
}
|
||||
if(taskProcessRecord.getTaskId() !=null){
|
||||
ResultTask resultTask = resultTaskService.selectResultTaskById(taskProcessRecord.getTaskId());
|
||||
if(resultTask !=null){
|
||||
taskCommentDto.setTaskName(resultTask.getName());
|
||||
}
|
||||
}
|
||||
taskCommentDtoList.add(taskCommentDto);
|
||||
}
|
||||
pageUtils.setList(taskCommentDtoList);
|
||||
return R.ok().put("data", pageUtils);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -4,11 +4,7 @@ import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.dingtalk.api.DefaultDingTalkClient;
|
||||
import com.dingtalk.api.DingTalkClient;
|
||||
import com.dingtalk.api.request.OapiRoleListRequest;
|
||||
import com.dingtalk.api.request.OapiRoleSimplelistRequest;
|
||||
import com.dingtalk.api.request.OapiSmartworkHrmEmployeeQueryonjobRequest;
|
||||
import com.dingtalk.api.response.OapiRoleListResponse;
|
||||
import com.dingtalk.api.response.OapiRoleSimplelistResponse;
|
||||
import com.dingtalk.api.response.OapiSmartworkHrmEmployeeQueryonjobResponse;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.lz.common.emun.WorkMsgTypeEnum;
|
||||
@ -29,10 +25,9 @@ import com.lz.modules.flow.service.FlowRecordService;
|
||||
import com.lz.modules.flow.service.FlowStartService;
|
||||
import com.lz.modules.job.model.responseBo.DepartmentInfosBo;
|
||||
import com.lz.modules.job.model.responseBo.DepartmentStaffBo;
|
||||
import com.lz.modules.performance.entity.ResultTask;
|
||||
import com.lz.modules.performance.entity.TaskComment;
|
||||
import com.lz.modules.performance.entity.TaskProcessRecord;
|
||||
import com.lz.modules.performance.service.ResultTaskService;
|
||||
import com.lz.modules.performance.service.TaskCommentService;
|
||||
import com.lz.modules.performance.service.TaskProcessRecordService;
|
||||
import com.lz.modules.sys.dao.SysUserTokenDao;
|
||||
import com.lz.modules.sys.entity.SysUserTokenEntity;
|
||||
import com.lz.modules.sys.entity.app.ResultDetail;
|
||||
@ -45,14 +40,11 @@ import com.lz.modules.third.entity.WorkMsg;
|
||||
import com.lz.modules.third.service.ThirdAppConfigService;
|
||||
import com.lz.modules.third.service.ThirdMsgSendRecordService;
|
||||
import com.taobao.api.ApiException;
|
||||
import org.apache.commons.collections.map.CompositeMap;
|
||||
import org.apache.commons.collections.map.HashedMap;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.net.URLEncoder;
|
||||
@ -114,7 +106,7 @@ public class DingtalkBusiness {
|
||||
private ResultTaskService resultTaskService;
|
||||
|
||||
@Autowired
|
||||
private TaskCommentService taskCommentService;
|
||||
private TaskProcessRecordService taskProcessRecordService;
|
||||
|
||||
@Resource
|
||||
StaffDao staffDao;
|
||||
@ -702,14 +694,14 @@ public class DingtalkBusiness {
|
||||
public String sendTaskNoticeMsg(Long detailId, Long taskId) {
|
||||
ResultDetail resultDetail = resultDetailService.selectResultDetailById(detailId);
|
||||
logger.info("评论通知指标id{}， 任务id{}", detailId, taskId);
|
||||
/*if(resultDetail != null){
|
||||
TaskComment taskComment = null;
|
||||
if(resultDetail != null){
|
||||
TaskProcessRecord taskProcessRecord = null;
|
||||
if(taskId == null){
|
||||
taskComment = taskCommentService.selectTaskCommentByDetailId(detailId);
|
||||
taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByDetailId(detailId);
|
||||
}else{
|
||||
taskComment = taskCommentService.selectTaskCommentByTaskId(taskId);
|
||||
taskProcessRecord = taskProcessRecordService.selectCommentTaskProcessRecordByTaskId(taskId);
|
||||
}
|
||||
StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskComment.getStaffId());
|
||||
StaffSimpleInfo fromStaffSimpleInfo = staffService.selectStaffSimpleInfo(taskProcessRecord.getStaffId());
|
||||
StaffSimpleInfo toStaffSimpleInfo = staffService.selectStaffSimpleInfo(resultDetail.getStaffId());
|
||||
|
||||
ThirdAppConfig thirdAppConfig = thirdAppConfigService.getByAppId(appid);
|
||||
@ -743,7 +735,7 @@ public class DingtalkBusiness {
|
||||
}else{
|
||||
return "token无效";
|
||||
}
|
||||
}*/
|
||||
}
|
||||
return "OK";
|
||||
}
|
||||
public String sendNoticeMsg(ResultRecord lzResultRecord, List<StaffEntity> staffs) {
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
package com.lz.modules.performance.dao;
|
||||
/**
|
||||
* <p>
|
||||
* 任务评论表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author quyixiao
|
||||
* @since 2020-12-08
|
||||
*/
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.lz.modules.app.model.TaskModel;
|
||||
import com.lz.modules.performance.entity.TaskComment;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface TaskCommentMapper extends BaseMapper<TaskComment> {
|
||||
|
||||
|
||||
TaskComment selectTaskCommentById(@Param("id") Long id);
|
||||
|
||||
|
||||
Long insertTaskComment(TaskComment taskComment);
|
||||
|
||||
|
||||
int updateTaskCommentById(TaskComment taskComment);
|
||||
|
||||
|
||||
int updateCoverTaskCommentById(TaskComment taskComment);
|
||||
|
||||
|
||||
int deleteTaskCommentById(@Param("id") Long id);
|
||||
|
||||
|
||||
int deleteTaskCommensByTaskId(@Param("taskId") Long taskId);
|
||||
|
||||
List<TaskComment> selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel);
|
||||
|
||||
TaskComment selectTaskCommentByTaskId(Long taskId);
|
||||
|
||||
TaskComment selectTaskCommentByDetailId(Long detailId);
|
||||
}
|
||||
@ -40,4 +40,8 @@ public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
|
||||
List<TaskProcessRecordDto> selectTaskProcessRecordsByTaskIdsAndType(@Param("page") IPage page, @Param("taskIds") List<Long> taskIds,@Param("useType") Integer useType);
|
||||
|
||||
List<TaskProcessRecord> selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel);
|
||||
|
||||
TaskProcessRecord selectCommentTaskProcessRecordByDetailId(@Param("detailId") Long detailId);
|
||||
|
||||
TaskProcessRecord selectCommentTaskProcessRecordByTaskId(@Param("taskId") Long taskId);
|
||||
}
|
||||
@ -1,234 +0,0 @@
|
||||
package com.lz.modules.performance.entity;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.util.Date;
|
||||
/**
|
||||
* <p>
|
||||
* </p>*任务评论表
|
||||
* @author quyixiao
|
||||
* @since 2020-12-08
|
||||
*/
|
||||
|
||||
@Data
|
||||
@TableName("lz_task_comment")
|
||||
@ApiModel(value = "任务评论表")
|
||||
public class TaskComment implements java.io.Serializable {
|
||||
//
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Long id;
|
||||
//是否删除状态，1：删除，0：有效
|
||||
@ApiModelProperty(value = "是否删除状态，1：删除，0：有效", name = "isDelete")
|
||||
private Integer isDelete;
|
||||
//创建时间
|
||||
@ApiModelProperty(value = "创建时间", name = "gmtCreate")
|
||||
private Date gmtCreate;
|
||||
//最后修改时间
|
||||
@ApiModelProperty(value = "最后修改时间", name = "gmtModified")
|
||||
private Date gmtModified;
|
||||
//任务id
|
||||
@ApiModelProperty(value = "任务id", name = "taskId")
|
||||
private Long taskId;
|
||||
//0表示对所有评论，1表示对单个具体的detail做评论
|
||||
@ApiModelProperty(value = "0表示对所有评论，1表示对单个具体的detail做评论", name = "type")
|
||||
private Integer type;
|
||||
//
|
||||
@ApiModelProperty(value = "", name = "detailId")
|
||||
private Long detailId;
|
||||
//lz_result_record表id
|
||||
@ApiModelProperty(value = "lz_result_record表id", name = "resultRecordId")
|
||||
private Long resultRecordId;
|
||||
//评论人员
|
||||
@ApiModelProperty(value = "评论人员", name = "staffId")
|
||||
private Long staffId;
|
||||
//评论内容
|
||||
@ApiModelProperty(value = "评论内容", name = "content")
|
||||
private String content;
|
||||
//评论人员名称
|
||||
@ApiModelProperty(value = "评论人员名称", name = "staffName")
|
||||
private String staffName;
|
||||
/**
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @param id
|
||||
*/
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
/**
|
||||
* 是否删除状态，1：删除，0：有效
|
||||
* @return
|
||||
*/
|
||||
public Integer getIsDelete() {
|
||||
return isDelete;
|
||||
}
|
||||
/**
|
||||
* 是否删除状态，1：删除，0：有效
|
||||
* @param isDelete
|
||||
*/
|
||||
public void setIsDelete(Integer isDelete) {
|
||||
this.isDelete = isDelete;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
* @return
|
||||
*/
|
||||
public Date getGmtCreate() {
|
||||
return gmtCreate;
|
||||
}
|
||||
/**
|
||||
* 创建时间
|
||||
* @param gmtCreate
|
||||
*/
|
||||
public void setGmtCreate(Date gmtCreate) {
|
||||
this.gmtCreate = gmtCreate;
|
||||
}
|
||||
|
||||
/**
|
||||
* 最后修改时间
|
||||
* @return
|
||||
*/
|
||||
public Date getGmtModified() {
|
||||
return gmtModified;
|
||||
}
|
||||
/**
|
||||
* 最后修改时间
|
||||
* @param gmtModified
|
||||
*/
|
||||
public void setGmtModified(Date gmtModified) {
|
||||
this.gmtModified = gmtModified;
|
||||
}
|
||||
|
||||
/**
|
||||
* 任务id
|
||||
* @return
|
||||
*/
|
||||
public Long getTaskId() {
|
||||
return taskId;
|
||||
}
|
||||
/**
|
||||
* 任务id
|
||||
* @param taskId
|
||||
*/
|
||||
public void setTaskId(Long taskId) {
|
||||
this.taskId = taskId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 0表示对所有评论，1表示对单个具体的detail做评论
|
||||
* @return
|
||||
*/
|
||||
public Integer getType() {
|
||||
return type;
|
||||
}
|
||||
/**
|
||||
* 0表示对所有评论，1表示对单个具体的detail做评论
|
||||
* @param type
|
||||
*/
|
||||
public void setType(Integer type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Long getDetailId() {
|
||||
return detailId;
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @param detailId
|
||||
*/
|
||||
public void setDetailId(Long detailId) {
|
||||
this.detailId = detailId;
|
||||
}
|
||||
|
||||
/**
|
||||
* lz_result_record表id
|
||||
* @return
|
||||
*/
|
||||
public Long getResultRecordId() {
|
||||
return resultRecordId;
|
||||
}
|
||||
/**
|
||||
* lz_result_record表id
|
||||
* @param resultRecordId
|
||||
*/
|
||||
public void setResultRecordId(Long resultRecordId) {
|
||||
this.resultRecordId = resultRecordId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 评论人员
|
||||
* @return
|
||||
*/
|
||||
public Long getStaffId() {
|
||||
return staffId;
|
||||
}
|
||||
/**
|
||||
* 评论人员
|
||||
* @param staffId
|
||||
*/
|
||||
public void setStaffId(Long staffId) {
|
||||
this.staffId = staffId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 评论内容
|
||||
* @return
|
||||
*/
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
/**
|
||||
* 评论内容
|
||||
* @param content
|
||||
*/
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
/**
|
||||
* 评论人员名称
|
||||
* @return
|
||||
*/
|
||||
public String getStaffName() {
|
||||
return staffName;
|
||||
}
|
||||
/**
|
||||
* 评论人员名称
|
||||
* @param staffName
|
||||
*/
|
||||
public void setStaffName(String staffName) {
|
||||
this.staffName = staffName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "TaskComment{" +
|
||||
",id=" + id +
|
||||
",isDelete=" + isDelete +
|
||||
",gmtCreate=" + gmtCreate +
|
||||
",gmtModified=" + gmtModified +
|
||||
",taskId=" + taskId +
|
||||
",type=" + type +
|
||||
",detailId=" + detailId +
|
||||
",resultRecordId=" + resultRecordId +
|
||||
",staffId=" + staffId +
|
||||
",content=" + content +
|
||||
",staffName=" + staffName +
|
||||
"}";
|
||||
}
|
||||
}
|
||||
@ -40,8 +40,8 @@ public class TaskProcessRecord implements java.io.Serializable {
|
||||
//操作标签
|
||||
@ApiModelProperty(value = "操作标签", name = "label")
|
||||
private String label;
|
||||
//1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除
|
||||
@ApiModelProperty(value = "1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除", name = "type")
|
||||
//user_type为0时：1，修改名称，2修改进度 ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论
|
||||
@ApiModelProperty(value = "user_type为0时：1，修改名称，2修改进度 ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论", name = "type")
|
||||
private Integer type;
|
||||
//任务 result_task得id
|
||||
@ApiModelProperty(value = "任务 result_task得id ", name = "taskId")
|
||||
@ -53,11 +53,11 @@ public class TaskProcessRecord implements java.io.Serializable {
|
||||
@ApiModelProperty(value = "0表示记录，1 表示评论", name = "useType")
|
||||
private Integer useType;
|
||||
//@人员id
|
||||
@ApiModelProperty(value = "@人员id", name = "atStaffId")
|
||||
private Long atStaffId;
|
||||
@ApiModelProperty(value = "@人员id", name = "atStaffIds")
|
||||
private String atStaffIds;
|
||||
//@人员名称
|
||||
@ApiModelProperty(value = "@人员名称", name = "atStaffName")
|
||||
private String atStaffName;
|
||||
@ApiModelProperty(value = "@人员名称", name = "atStaffNames")
|
||||
private String atStaffNames;
|
||||
//lz_result_record表id
|
||||
@ApiModelProperty(value = "lz_result_record表id", name = "detailId")
|
||||
private Long detailId;
|
||||
@ -176,14 +176,14 @@ public class TaskProcessRecord implements java.io.Serializable {
|
||||
}
|
||||
|
||||
/**
|
||||
* 1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除
|
||||
* user_type为0时：1，修改名称，2修改进度 ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论
|
||||
* @return
|
||||
*/
|
||||
public Integer getType() {
|
||||
return type;
|
||||
}
|
||||
/**
|
||||
* 1，修改名称，2修改进度 ，3名称和进度都修改 4:新增 5：删除
|
||||
* user_type为0时：1，修改名称，2修改进度 ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论
|
||||
* @param type
|
||||
*/
|
||||
public void setType(Integer type) {
|
||||
@ -239,30 +239,30 @@ public class TaskProcessRecord implements java.io.Serializable {
|
||||
* @人员id
|
||||
* @return
|
||||
*/
|
||||
public Long getAtStaffId() {
|
||||
return atStaffId;
|
||||
public String getAtStaffIds() {
|
||||
return atStaffIds;
|
||||
}
|
||||
/**
|
||||
* @人员id
|
||||
* @param atStaffId
|
||||
* @param atStaffIds
|
||||
*/
|
||||
public void setAtStaffId(Long atStaffId) {
|
||||
this.atStaffId = atStaffId;
|
||||
public void setAtStaffIds(String atStaffIds) {
|
||||
this.atStaffIds = atStaffIds;
|
||||
}
|
||||
|
||||
/**
|
||||
* @人员名称
|
||||
* @return
|
||||
*/
|
||||
public String getAtStaffName() {
|
||||
return atStaffName;
|
||||
public String getAtStaffNames() {
|
||||
return atStaffNames;
|
||||
}
|
||||
/**
|
||||
* @人员名称
|
||||
* @param atStaffName
|
||||
* @param atStaffNames
|
||||
*/
|
||||
public void setAtStaffName(String atStaffName) {
|
||||
this.atStaffName = atStaffName;
|
||||
public void setAtStaffNames(String atStaffNames) {
|
||||
this.atStaffNames = atStaffNames;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -339,8 +339,8 @@ public class TaskProcessRecord implements java.io.Serializable {
|
||||
",taskId=" + taskId +
|
||||
",name=" + name +
|
||||
",useType=" + useType +
|
||||
",atStaffId=" + atStaffId +
|
||||
",atStaffName=" + atStaffName +
|
||||
",atStaffIds=" + atStaffIds +
|
||||
",atStaffNames=" + atStaffNames +
|
||||
",detailId=" + detailId +
|
||||
",resultRecordId=" + resultRecordId +
|
||||
",staffId=" + staffId +
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
package com.lz.modules.performance.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.lz.modules.performance.entity.TaskComment;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 任务评论表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author quyixiao
|
||||
* @since 2020-12-08
|
||||
*/
|
||||
public interface TaskCommentService extends IService<TaskComment> {
|
||||
|
||||
|
||||
|
||||
TaskComment selectTaskCommentById(Long id);
|
||||
|
||||
|
||||
Long insertTaskComment(TaskComment taskComment);
|
||||
|
||||
|
||||
int updateTaskCommentById(TaskComment taskComment);
|
||||
|
||||
|
||||
int updateCoverTaskCommentById(TaskComment taskComment);
|
||||
|
||||
|
||||
int deleteTaskCommentById(Long id);
|
||||
|
||||
|
||||
int deleteTaskCommensByTaskId(Long taskId);
|
||||
|
||||
TaskComment selectTaskCommentByDetailId(Long detailId);
|
||||
|
||||
TaskComment selectTaskCommentByTaskId(Long taskId);
|
||||
}
|
||||
@ -41,4 +41,8 @@ public interface TaskProcessRecordService extends IService<TaskProcessRecord> {
|
||||
int deleteTaskProcessRecordsByTaskId(Long taskId);
|
||||
|
||||
List<TaskProcessRecord> selectByCondition(IPage page, TaskModel taskModel);
|
||||
|
||||
TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId);
|
||||
|
||||
TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId);
|
||||
}
|
||||
@ -14,11 +14,9 @@ import com.lz.modules.performance.enums.ProcessRecordEnum;
|
||||
import com.lz.modules.performance.req.ResultUpdateTaskReq;
|
||||
import com.lz.modules.performance.res.ResultTaskDetailRes;
|
||||
import com.lz.modules.performance.service.ResultTaskService;
|
||||
import com.lz.modules.performance.service.TaskCommentService;
|
||||
import com.lz.modules.performance.service.TaskProcessRecordService;
|
||||
import com.lz.modules.sys.entity.app.ResultDetail;
|
||||
import com.lz.modules.sys.service.app.ResultDetailService;
|
||||
import com.sun.org.apache.regexp.internal.RE;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
@ -28,7 +26,6 @@ import org.springframework.stereotype.Service;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@ -47,9 +44,7 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
|
||||
@Autowired
|
||||
private ResultTaskMapper resultTaskMapper;
|
||||
@Autowired
|
||||
private ResultDetailService resultDetailService;
|
||||
@Autowired
|
||||
private TaskCommentService taskCommentService;
|
||||
private ResultDetailService resultDetailService;;
|
||||
@Autowired
|
||||
private TaskProcessRecordService taskProcessRecordService;
|
||||
@Autowired
|
||||
@ -232,7 +227,6 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
|
||||
for (ResultTask task : tasks
|
||||
) {
|
||||
taskProcessRecordService.deleteTaskProcessRecordsByTaskId(task.getId());
|
||||
taskCommentService.deleteTaskCommensByTaskId(task.getId());
|
||||
}
|
||||
return resultTaskMapper.deleteResultTasksByDetailId(detailId);
|
||||
}
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
package com.lz.modules.performance.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.lz.modules.performance.dao.TaskCommentMapper;
|
||||
import com.lz.modules.performance.entity.TaskComment;
|
||||
import com.lz.modules.performance.service.TaskCommentService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 任务评论表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author quyixiao
|
||||
* @since 2020-12-08
|
||||
*/
|
||||
|
||||
@Service
|
||||
public class TaskCommentServiceImpl extends ServiceImpl<TaskCommentMapper, TaskComment> implements TaskCommentService {
|
||||
|
||||
|
||||
@Autowired
|
||||
private TaskCommentMapper taskCommentMapper;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public TaskComment selectTaskCommentById(Long id){
|
||||
return taskCommentMapper.selectTaskCommentById(id);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Long insertTaskComment(TaskComment taskComment){
|
||||
return taskCommentMapper.insertTaskComment(taskComment);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public int updateTaskCommentById(TaskComment taskComment){
|
||||
return taskCommentMapper.updateTaskCommentById(taskComment);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public int updateCoverTaskCommentById(TaskComment taskComment){
|
||||
return taskCommentMapper.updateCoverTaskCommentById(taskComment);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public int deleteTaskCommentById(Long id){
|
||||
return taskCommentMapper.deleteTaskCommentById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int deleteTaskCommensByTaskId(Long taskId){
|
||||
return taskCommentMapper.deleteTaskCommensByTaskId(taskId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TaskComment selectTaskCommentByDetailId(Long detailId){
|
||||
return taskCommentMapper.selectTaskCommentByDetailId(detailId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TaskComment selectTaskCommentByTaskId(Long taskId){
|
||||
return taskCommentMapper.selectTaskCommentByTaskId(taskId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -142,4 +142,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordM
|
||||
public List<TaskProcessRecord> selectByCondition(IPage page, TaskModel taskModel) {
|
||||
return taskProcessRecordMapper.selectByCondition(page,taskModel);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId){
|
||||
return taskProcessRecordMapper.selectCommentTaskProcessRecordByDetailId(detailId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId){
|
||||
return taskProcessRecordMapper.selectCommentTaskProcessRecordByTaskId(taskId);
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,4 +52,14 @@ ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `process_rate` d
|
||||
|
||||
ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `type` `type` int(11) DEFAULT 3 COMMENT 'user_type为0时：1，修改名称，2修改进度 ，3名称和进度都修改 4，新增 ，5， 删除 。user_type为1时：0表示对所有评论，1表示对单个具体的task做评论';
|
||||
|
||||
ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `staff_id` int(11) COMMENT '员工id' AFTER `result_record_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '员工名称' AFTER `staff_id`;
|
||||
ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `staff_id` int(11) COMMENT '员工id' AFTER `result_record_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '员工名称' AFTER `staff_id`;
|
||||
|
||||
|
||||
ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `staff_id` `staff_ids` varchar(256) DEFAULT NULL COMMENT '员工id', CHANGE COLUMN `staff_name` `staff_names` varchar(256) DEFAULT NULL COMMENT '员工名称';
|
||||
|
||||
|
||||
|
||||
ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `at_staff_id` `at_staff_ids` int(11) DEFAULT NULL COMMENT '@人员id', CHANGE COLUMN `at_staff_name` `at_staff_names` varchar(256) DEFAULT NULL COMMENT '@人员名称', CHANGE COLUMN `staff_ids` `staff_id` int(11) DEFAULT NULL COMMENT '员工id', CHANGE COLUMN `staff_names` `staff_name` varchar(256) DEFAULT NULL COMMENT '员工名称';
|
||||
|
||||
|
||||
ALTER TABLE `lz_management`.`lz_task_process_record` CHANGE COLUMN `at_staff_ids` `at_staff_ids` varchar(256) DEFAULT NULL COMMENT '@人员id';
|
||||
@ -1,123 +0,0 @@
|
||||
<?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.lz.modules.performance.dao.TaskCommentMapper">
|
||||
|
||||
<!-- 通用查询映射结果 -->
|
||||
<resultMap id="BaseResultMap" type="com.lz.modules.performance.entity.TaskComment">
|
||||
<id column="id" property="id"/>
|
||||
<result column="is_delete" property="isDelete"/>
|
||||
<result column="gmt_create" property="gmtCreate"/>
|
||||
<result column="gmt_modified" property="gmtModified"/>
|
||||
<result column="task_id" property="taskId"/>
|
||||
<result column="type" property="type"/>
|
||||
<result column="detail_id" property="detailId"/>
|
||||
<result column="result_record_id" property="resultRecordId"/>
|
||||
<result column="staff_id" property="staffId"/>
|
||||
<result column="content" property="content"/>
|
||||
<result column="staff_name" property="staffName"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
<!-- 通用查询结果列 -->
|
||||
<sql id="Base_Column_List">
|
||||
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, task_id AS taskId, type AS type, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, content AS content, staff_name AS staffName
|
||||
</sql>
|
||||
|
||||
|
||||
|
||||
|
||||
<select id="selectTaskCommentById" resultType="TaskComment" >
|
||||
select * from lz_task_comment where id=#{id} and is_delete = 0 limit 1
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertTaskComment" parameterType="TaskComment" useGeneratedKeys="true" keyProperty="id" >
|
||||
insert into lz_task_comment(
|
||||
<if test="taskId != null">task_id, </if>
|
||||
<if test="type != null">type, </if>
|
||||
<if test="detailId != null">detail_id, </if>
|
||||
<if test="resultRecordId != null">result_record_id, </if>
|
||||
<if test="staffId != null">staff_id, </if>
|
||||
<if test="content != null">content, </if>
|
||||
<if test="staffName != null">staff_name, </if>
|
||||
is_delete,
|
||||
gmt_create,
|
||||
gmt_modified
|
||||
)values(
|
||||
<if test="taskId != null">#{ taskId}, </if>
|
||||
<if test="type != null">#{ type}, </if>
|
||||
<if test="detailId != null">#{ detailId}, </if>
|
||||
<if test="resultRecordId != null">#{ resultRecordId}, </if>
|
||||
<if test="staffId != null">#{ staffId}, </if>
|
||||
<if test="content != null">#{ content}, </if>
|
||||
<if test="staffName != null">#{ staffName}, </if>
|
||||
0,
|
||||
now(),
|
||||
now()
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
<update id="updateTaskCommentById" parameterType="TaskComment" >
|
||||
update
|
||||
lz_task_comment
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="isDelete != null">is_delete = #{isDelete},</if>
|
||||
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
|
||||
<if test="taskId != null">task_id = #{taskId},</if>
|
||||
<if test="type != null">type = #{type},</if>
|
||||
<if test="detailId != null">detail_id = #{detailId},</if>
|
||||
<if test="resultRecordId != null">result_record_id = #{resultRecordId},</if>
|
||||
<if test="staffId != null">staff_id = #{staffId},</if>
|
||||
<if test="content != null">content = #{content},</if>
|
||||
<if test="staffName != null">staff_name = #{staffName}</if>
|
||||
</trim>
|
||||
,gmt_modified = now()
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<update id="updateCoverTaskCommentById" parameterType="TaskComment" >
|
||||
update
|
||||
lz_task_comment
|
||||
set
|
||||
is_delete = #{isDelete},
|
||||
gmt_create = #{gmtCreate},
|
||||
task_id = #{taskId},
|
||||
type = #{type},
|
||||
detail_id = #{detailId},
|
||||
result_record_id = #{resultRecordId},
|
||||
staff_id = #{staffId},
|
||||
content = #{content},
|
||||
staff_name = #{staffName}
|
||||
,gmt_modified = now()
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
|
||||
<select id="selectByCondition" resultType="com.lz.modules.performance.entity.TaskComment">
|
||||
select * from lz_task_comment where is_delete = 0
|
||||
and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} )
|
||||
order by id desc
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<update id="deleteTaskCommentById" parameterType="java.lang.Long">
|
||||
update lz_task_comment set is_delete = 1 where id=#{id} limit 1
|
||||
</update>
|
||||
|
||||
<update id="deleteTaskCommensByTaskId" parameterType="java.lang.Long">
|
||||
update lz_task_comment set is_delete = 1 where task_id=#{taskId}
|
||||
</update>
|
||||
|
||||
<select id="selectTaskCommentByTaskId" resultType="TaskComment" >
|
||||
select * from lz_task_comment where task_id=#{taskId} and is_delete = 0 order by id desc limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectTaskCommentByDetailId" resultType="TaskComment" >
|
||||
select * from lz_task_comment where detail_id=#{detailId} and is_delete = 0 order by id desc limit 1
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
<result column="task_id" property="taskId"/>
|
||||
<result column="name" property="name"/>
|
||||
<result column="use_type" property="useType"/>
|
||||
<result column="at_staff_id" property="atStaffId"/>
|
||||
<result column="at_staff_name" property="atStaffName"/>
|
||||
<result column="at_staff_ids" property="atStaffIds"/>
|
||||
<result column="at_staff_names" property="atStaffNames"/>
|
||||
<result column="detail_id" property="detailId"/>
|
||||
<result column="result_record_id" property="resultRecordId"/>
|
||||
<result column="staff_id" property="staffId"/>
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
<!-- 通用查询结果列 -->
|
||||
<sql id="Base_Column_List">
|
||||
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, process_rate AS processRate, remark AS remark, label AS label, type AS type, task_id AS taskId, name AS name, use_type AS useType, at_staff_id AS atStaffId, at_staff_name AS atStaffName, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, staff_name AS staffName
|
||||
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, process_rate AS processRate, remark AS remark, label AS label, type AS type, task_id AS taskId, name AS name, use_type AS useType, at_staff_ids AS atStaffIds, at_staff_names AS atStaffNames, detail_id AS detailId, result_record_id AS resultRecordId, staff_id AS staffId, staff_name AS staffName
|
||||
</sql>
|
||||
|
||||
|
||||
@ -45,8 +45,8 @@
|
||||
<if test="taskId != null">task_id, </if>
|
||||
<if test="name != null">name, </if>
|
||||
<if test="useType != null">use_type, </if>
|
||||
<if test="atStaffId != null">at_staff_id, </if>
|
||||
<if test="atStaffName != null">at_staff_name, </if>
|
||||
<if test="atStaffIds != null">at_staff_ids, </if>
|
||||
<if test="atStaffNames != null">at_staff_names, </if>
|
||||
<if test="detailId != null">detail_id, </if>
|
||||
<if test="resultRecordId != null">result_record_id, </if>
|
||||
<if test="staffId != null">staff_id, </if>
|
||||
@ -62,8 +62,8 @@
|
||||
<if test="taskId != null">#{ taskId}, </if>
|
||||
<if test="name != null">#{ name}, </if>
|
||||
<if test="useType != null">#{ useType}, </if>
|
||||
<if test="atStaffId != null">#{ atStaffId}, </if>
|
||||
<if test="atStaffName != null">#{ atStaffName}, </if>
|
||||
<if test="atStaffIds != null">#{ atStaffIds}, </if>
|
||||
<if test="atStaffNames != null">#{ atStaffNames}, </if>
|
||||
<if test="detailId != null">#{ detailId}, </if>
|
||||
<if test="resultRecordId != null">#{ resultRecordId}, </if>
|
||||
<if test="staffId != null">#{ staffId}, </if>
|
||||
@ -88,8 +88,8 @@
|
||||
<if test="taskId != null">task_id = #{taskId},</if>
|
||||
<if test="name != null">name = #{name},</if>
|
||||
<if test="useType != null">use_type = #{useType},</if>
|
||||
<if test="atStaffId != null">at_staff_id = #{atStaffId},</if>
|
||||
<if test="atStaffName != null">at_staff_name = #{atStaffName},</if>
|
||||
<if test="atStaffIds != null">at_staff_ids = #{atStaffIds},</if>
|
||||
<if test="atStaffNames != null">at_staff_names = #{atStaffNames},</if>
|
||||
<if test="detailId != null">detail_id = #{detailId},</if>
|
||||
<if test="resultRecordId != null">result_record_id = #{resultRecordId},</if>
|
||||
<if test="staffId != null">staff_id = #{staffId},</if>
|
||||
@ -113,8 +113,8 @@
|
||||
task_id = #{taskId},
|
||||
name = #{name},
|
||||
use_type = #{useType},
|
||||
at_staff_id = #{atStaffId},
|
||||
at_staff_name = #{atStaffName},
|
||||
at_staff_ids = #{atStaffIds},
|
||||
at_staff_names = #{atStaffNames},
|
||||
detail_id = #{detailId},
|
||||
result_record_id = #{resultRecordId},
|
||||
staff_id = #{staffId},
|
||||
@ -128,6 +128,8 @@
|
||||
update lz_task_process_record set is_delete = 1 where id=#{id} limit 1
|
||||
</update>
|
||||
|
||||
|
||||
|
||||
<select id="selectTaskProcessRecordsByTaskId" resultType="com.lz.modules.performance.dto.TaskProcessRecordDto">
|
||||
select gmt_create,remark,label,type,name,use_type from lz_task_process_record where task_id=#{taskId}
|
||||
<if test="useType !=null">
|
||||
@ -163,5 +165,16 @@
|
||||
select * from lz_task_process_record where is_delete = 0 and (detail_id = #{taskModel.detailId} or task_id=#{taskModel.taskId} ) and use_type=#{taskModel.useType} order by id desc
|
||||
</select>
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<select id="selectCommentTaskProcessRecordByDetailId" resultType="TaskProcessRecord" >
|
||||
select * from lz_task_process_record where detail_id=#{detailId} and is_delete = 0 and use_type=1 order by id desc limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectCommentTaskProcessRecordByTaskId" resultType="TaskProcessRecord" >
|
||||
select * from lz_task_process_record where task_id=#{taskId} and is_delete = 0 and use_type=1 order by id desc limit 1
|
||||
</select>
|
||||
|
||||
>>>>>>> 0759c9bb2ac2d85becab14db3150110f2bf20e63
|
||||
</mapper>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user