diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java index 0149f48f..2357fa80 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java @@ -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){ diff --git a/src/main/java/com/lz/modules/app/controller/TestController.java b/src/main/java/com/lz/modules/app/controller/TestController.java index 67d39b9e..18083c1f 100644 --- a/src/main/java/com/lz/modules/app/controller/TestController.java +++ b/src/main/java/com/lz/modules/app/controller/TestController.java @@ -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); diff --git a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java index 9b4fb726..5a933a87 100644 --- a/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java +++ b/src/main/java/com/lz/modules/app/dto/TaskCommentDto.java @@ -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; + } diff --git a/src/main/java/com/lz/modules/app/model/TaskModel.java b/src/main/java/com/lz/modules/app/model/TaskModel.java index 87bd372c..1b9afe77 100644 --- a/src/main/java/com/lz/modules/app/model/TaskModel.java +++ b/src/main/java/com/lz/modules/app/model/TaskModel.java @@ -12,5 +12,5 @@ public class TaskModel { private String content; private Long staffId; private int useType; - private Long atStaffId; + private String atStaffIds; } diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java index fb556883..77114b52 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java @@ -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 staffs) { diff --git a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java deleted file mode 100644 index 794b55d5..00000000 --- a/src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.lz.modules.performance.dao; -/** -*

-* 任务评论表 服务类 -*

-* -* @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 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 selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); - - TaskComment selectTaskCommentByTaskId(Long taskId); - - TaskComment selectTaskCommentByDetailId(Long detailId); -} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java index 50fac591..92e18f7f 100644 --- a/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java +++ b/src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java @@ -40,4 +40,8 @@ public interface TaskProcessRecordMapper extends BaseMapper { List selectTaskProcessRecordsByTaskIdsAndType(@Param("page") IPage page, @Param("taskIds") List taskIds,@Param("useType") Integer useType); List selectByCondition(@Param("page") IPage page, @Param("taskModel") TaskModel taskModel); + + TaskProcessRecord selectCommentTaskProcessRecordByDetailId(@Param("detailId") Long detailId); + + TaskProcessRecord selectCommentTaskProcessRecordByTaskId(@Param("taskId") Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/entity/TaskComment.java b/src/main/java/com/lz/modules/performance/entity/TaskComment.java deleted file mode 100644 index 27de9f35..00000000 --- a/src/main/java/com/lz/modules/performance/entity/TaskComment.java +++ /dev/null @@ -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; -/** -*

-*

*任务评论表 -* @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 + - "}"; - } -} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java index f4ab3657..2bd0f3bb 100644 --- a/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java +++ b/src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java @@ -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 + diff --git a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java b/src/main/java/com/lz/modules/performance/service/TaskCommentService.java deleted file mode 100644 index a6e4a0dd..00000000 --- a/src/main/java/com/lz/modules/performance/service/TaskCommentService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.lz.modules.performance.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.lz.modules.performance.entity.TaskComment; - -/** -*

-* 任务评论表 服务类 -*

-* -* @author quyixiao -* @since 2020-12-08 -*/ -public interface TaskCommentService extends IService { - - - - 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); -} \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java index d2d9c1e0..dd4f857c 100644 --- a/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java +++ b/src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java @@ -41,4 +41,8 @@ public interface TaskProcessRecordService extends IService { int deleteTaskProcessRecordsByTaskId(Long taskId); List selectByCondition(IPage page, TaskModel taskModel); + + TaskProcessRecord selectCommentTaskProcessRecordByDetailId(Long detailId); + + TaskProcessRecord selectCommentTaskProcessRecordByTaskId(Long taskId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java index e75e886a..9c7b89e1 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java @@ -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; /** *

@@ -47,9 +44,7 @@ public class ResultTaskServiceImpl extends ServiceImpl -* 任务评论表 服务类 -*

-* -* @author quyixiao -* @since 2020-12-08 -*/ - -@Service -public class TaskCommentServiceImpl extends ServiceImpl 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); - } - - - -} diff --git a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java index 762c0d7f..b5f89af7 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java @@ -142,4 +142,14 @@ public class TaskProcessRecordServiceImpl extends ServiceImpl 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); + } } diff --git a/src/main/resources/2020_12_08_sql b/src/main/resources/2020_12_08_sql index c3b6f7c3..917764da 100644 --- a/src/main/resources/2020_12_08_sql +++ b/src/main/resources/2020_12_08_sql @@ -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`; \ No newline at end of file +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'; \ No newline at end of file diff --git a/src/main/resources/mapper/performance/TaskCommentMapper.xml b/src/main/resources/mapper/performance/TaskCommentMapper.xml deleted file mode 100644 index faf001d6..00000000 --- a/src/main/resources/mapper/performance/TaskCommentMapper.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - - insert into lz_task_comment( - task_id, - type, - detail_id, - result_record_id, - staff_id, - content, - staff_name, - is_delete, - gmt_create, - gmt_modified - )values( - #{ taskId}, - #{ type}, - #{ detailId}, - #{ resultRecordId}, - #{ staffId}, - #{ content}, - #{ staffName}, - 0, - now(), - now() - ) - - - - - update - lz_task_comment - - 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 - 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 lz_task_comment set is_delete = 1 where id=#{id} limit 1 - - - - update lz_task_comment set is_delete = 1 where task_id=#{taskId} - - - - - - - - diff --git a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml index be91df62..91df1ed4 100644 --- a/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml +++ b/src/main/resources/mapper/performance/TaskProcessRecordMapper.xml @@ -14,8 +14,8 @@ - - + + @@ -25,7 +25,7 @@ - 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 @@ -45,8 +45,8 @@ task_id, name, use_type, - at_staff_id, - at_staff_name, + at_staff_ids, + at_staff_names, detail_id, result_record_id, staff_id, @@ -62,8 +62,8 @@ #{ taskId}, #{ name}, #{ useType}, - #{ atStaffId}, - #{ atStaffName}, + #{ atStaffIds}, + #{ atStaffNames}, #{ detailId}, #{ resultRecordId}, #{ staffId}, @@ -88,8 +88,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}, @@ -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 + + +<<<<<<< HEAD +======= + + + + +>>>>>>> 0759c9bb2ac2d85becab14db3150110f2bf20e63