wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
wulin 2020-12-08 19:01:11 +08:00
commit 9bdde9674c
18 changed files with 1289 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -25,6 +25,7 @@ import com.lz.modules.flow.model.*;
import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.req.ResultDetailReq;
import com.lz.modules.flow.service.*; import com.lz.modules.flow.service.*;
import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.job.business.DingtalkBusiness;
import com.lz.modules.performance.res.ResultRankListRes;
import com.lz.modules.performance.service.ChartResultService; import com.lz.modules.performance.service.ChartResultService;
import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.controller.AbstractController;
import com.lz.modules.sys.entity.Print; import com.lz.modules.sys.entity.Print;
@ -1363,6 +1364,7 @@ public class ResultRecordController extends AbstractController {
@ApiOperation("导出绩效详情报表") @ApiOperation("导出绩效详情报表")
@GetMapping("/recordDetailExport") @GetMapping("/recordDetailExport")
@ApiResponses({@ApiResponse(code = 200,message = "成功",response = RecordDetailExportResp.class)})
public R recordDetailExport(Long recordId){ public R recordDetailExport(Long recordId){
RecordDetailExportResp resp = new RecordDetailExportResp(); RecordDetailExportResp resp = new RecordDetailExportResp();
Map map = Maps.newHashMap(); Map map = Maps.newHashMap();
@ -1371,7 +1373,9 @@ public class ResultRecordController extends AbstractController {
if(respnse.isSuccess()){ if(respnse.isSuccess()){
ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data"); ResultRecordDetailDto resultRecordDetailDto = (ResultRecordDetailDto) respnse.get("data");
//chartResultService.selectLevelDetailList(req); //chartResultService.selectLevelDetailList(req);
// TODO 暂时按照详情页面数据返回
resp.setRecortModelDtos(resultRecordDetailDto.getRecortModelDtos());
} }
return R.ok().put("data",resp); return R.ok().put("data",resp);
@ -1379,6 +1383,7 @@ public class ResultRecordController extends AbstractController {
@ApiOperation("保存绩效详情报表计划") @ApiOperation("保存绩效详情报表计划")
@PostMapping("/recordDetailExplan") @PostMapping("/recordDetailExplan")
@ApiResponses({@ApiResponse(code = 200,message = "成功")})
public R recordDetailExport(@RequestBody List<RecordDetailExplanReq> reqs){ public R recordDetailExport(@RequestBody List<RecordDetailExplanReq> reqs){
if(CollectionUtils.isEmpty(reqs)){ if(CollectionUtils.isEmpty(reqs)){
return R.error("添加数据为空"); return R.error("添加数据为空");

33
src/main/java/com/lz/modules/performance/dao/ResultTaskMapper.java Normal file
View File

@ -0,0 +1,33 @@
package com.lz.modules.performance.dao;
/**
* <p>
* 任务表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lz.modules.performance.entity.ResultTask;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface ResultTaskMapper extends BaseMapper<ResultTask> {
ResultTask selectResultTaskById(@Param("id") Long id);
Long insertResultTask(ResultTask resultTask);
int updateResultTaskById(ResultTask resultTask);
int updateCoverResultTaskById(ResultTask resultTask);
int deleteResultTaskById(@Param("id") Long id);
}

33
src/main/java/com/lz/modules/performance/dao/TaskCommentMapper.java Normal file
View File

@ -0,0 +1,33 @@
package com.lz.modules.performance.dao;
/**
* <p>
* 任务评论表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lz.modules.performance.entity.TaskComment;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@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);
}

33
src/main/java/com/lz/modules/performance/dao/TaskProcessRecordMapper.java Normal file
View File

@ -0,0 +1,33 @@
package com.lz.modules.performance.dao;
/**
* <p>
* 任务进度更新表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lz.modules.performance.entity.TaskProcessRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface TaskProcessRecordMapper extends BaseMapper<TaskProcessRecord> {
TaskProcessRecord selectTaskProcessRecordById(@Param("id") Long id);
Long insertTaskProcessRecord(TaskProcessRecord taskProcessRecord);
int updateTaskProcessRecordById(TaskProcessRecord taskProcessRecord);
int updateCoverTaskProcessRecordById(TaskProcessRecord taskProcessRecord);
int deleteTaskProcessRecordById(@Param("id") Long id);
}

160
src/main/java/com/lz/modules/performance/entity/ResultTask.java Normal file
View File

@ -0,0 +1,160 @@
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.math.BigDecimal;
import java.util.Date;
/**
* <p>
* </p>*任务表
* @author quyixiao
* @since 2020-12-08
*/
@Data
@TableName("lz_result_task")
@ApiModel(value = "任务表")
public class ResultTask 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;
//任务名称
@ApiModelProperty(value = "任务名称", name = "name")
private String name;
//lz_result_detail 的id
@ApiModelProperty(value = "lz_result_detail 的id", name = "detailId")
private Long detailId;
//任务的当前进度
@ApiModelProperty(value = "任务的当前进度", name = "processRate")
private BigDecimal processRate;
/**
*
* @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;
}
/**
* 任务名称
* @return
*/
public String getName() {
return name;
}
/**
* 任务名称
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* lz_result_detail 的id
* @return
*/
public Long getDetailId() {
return detailId;
}
/**
* lz_result_detail 的id
* @param detailId
*/
public void setDetailId(Long detailId) {
this.detailId = detailId;
}
/**
* 任务的当前进度
* @return
*/
public BigDecimal getProcessRate() {
return processRate;
}
/**
* 任务的当前进度
* @param processRate
*/
public void setProcessRate(BigDecimal processRate) {
this.processRate = processRate;
}
@Override
public String toString() {
return "ResultTask{" +
",id=" + id +
",isDelete=" + isDelete +
",gmtCreate=" + gmtCreate +
",gmtModified=" + gmtModified +
",name=" + name +
",detailId=" + detailId +
",processRate=" + processRate +
"}";
}
}

234
src/main/java/com/lz/modules/performance/entity/TaskComment.java Normal file
View File

@ -0,0 +1,234 @@
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 +
"}";
}
}

179
src/main/java/com/lz/modules/performance/entity/TaskProcessRecord.java Normal file
View File

@ -0,0 +1,179 @@
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.math.BigDecimal;
import java.util.Date;
/**
* <p>
* </p>*任务进度更新表
* @author quyixiao
* @since 2020-12-08
*/
@Data
@TableName("lz_task_process_record")
@ApiModel(value = "任务进度更新表")
public class TaskProcessRecord 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;
//当前进度
@ApiModelProperty(value = "当前进度", name = "processRate")
private BigDecimal processRate;
//更新说明
@ApiModelProperty(value = "更新说明", name = "remark")
private String remark;
//操作标签
@ApiModelProperty(value = "操作标签", name = "label")
private String label;
//1，修改名称，2修改进度 ，3名称和进度都修改
@ApiModelProperty(value = "1，修改名称，2修改进度 ，3名称和进度都修改", name = "type")
private Integer type;
/**
*
* @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;
}
/**
* 当前进度
* @return
*/
public BigDecimal getProcessRate() {
return processRate;
}
/**
* 当前进度
* @param processRate
*/
public void setProcessRate(BigDecimal processRate) {
this.processRate = processRate;
}
/**
* 更新说明
* @return
*/
public String getRemark() {
return remark;
}
/**
* 更新说明
* @param remark
*/
public void setRemark(String remark) {
this.remark = remark;
}
/**
* 操作标签
* @return
*/
public String getLabel() {
return label;
}
/**
* 操作标签
* @param label
*/
public void setLabel(String label) {
this.label = label;
}
/**
* 1，修改名称，2修改进度 ，3名称和进度都修改
* @return
*/
public Integer getType() {
return type;
}
/**
* 1，修改名称，2修改进度 ，3名称和进度都修改
* @param type
*/
public void setType(Integer type) {
this.type = type;
}
@Override
public String toString() {
return "TaskProcessRecord{" +
",id=" + id +
",isDelete=" + isDelete +
",gmtCreate=" + gmtCreate +
",gmtModified=" + gmtModified +
",processRate=" + processRate +
",remark=" + remark +
",label=" + label +
",type=" + type +
"}";
}
}

33
src/main/java/com/lz/modules/performance/service/ResultTaskService.java Normal file
View File

@ -0,0 +1,33 @@
package com.lz.modules.performance.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.modules.performance.entity.ResultTask;
/**
* <p>
* 任务表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
public interface ResultTaskService extends IService<ResultTask> {
ResultTask selectResultTaskById(Long id);
Long insertResultTask(ResultTask resultTask);
int updateResultTaskById(ResultTask resultTask);
int updateCoverResultTaskById(ResultTask resultTask);
int deleteResultTaskById(Long id);
}

33
src/main/java/com/lz/modules/performance/service/TaskCommentService.java Normal file
View File

@ -0,0 +1,33 @@
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);
}

33
src/main/java/com/lz/modules/performance/service/TaskProcessRecordService.java Normal file
View File

@ -0,0 +1,33 @@
package com.lz.modules.performance.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.modules.performance.entity.TaskProcessRecord;
/**
* <p>
* 任务进度更新表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
public interface TaskProcessRecordService extends IService<TaskProcessRecord> {
TaskProcessRecord selectTaskProcessRecordById(Long id);
Long insertTaskProcessRecord(TaskProcessRecord taskProcessRecord);
int updateTaskProcessRecordById(TaskProcessRecord taskProcessRecord);
int updateCoverTaskProcessRecordById(TaskProcessRecord taskProcessRecord);
int deleteTaskProcessRecordById(Long id);
}

63
src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java Normal file
View File

@ -0,0 +1,63 @@
package com.lz.modules.performance.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.modules.performance.dao.ResultTaskMapper;
import com.lz.modules.performance.entity.ResultTask;
import com.lz.modules.performance.service.ResultTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* <p>
* 任务表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
@Service
public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultTask> implements ResultTaskService {
@Autowired
private ResultTaskMapper resultTaskMapper;
@Override
public ResultTask selectResultTaskById(Long id){
return resultTaskMapper.selectResultTaskById(id);
}
@Override
public Long insertResultTask(ResultTask resultTask){
return resultTaskMapper.insertResultTask(resultTask);
}
@Override
public int updateResultTaskById(ResultTask resultTask){
return resultTaskMapper.updateResultTaskById(resultTask);
}
@Override
public int updateCoverResultTaskById(ResultTask resultTask){
return resultTaskMapper.updateCoverResultTaskById(resultTask);
}
@Override
public int deleteResultTaskById(Long id){
return resultTaskMapper.deleteResultTaskById(id);
}
}

63
src/main/java/com/lz/modules/performance/service/impl/TaskCommentServiceImpl.java Normal file
View File

@ -0,0 +1,63 @@
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);
}
}

63
src/main/java/com/lz/modules/performance/service/impl/TaskProcessRecordServiceImpl.java Normal file
View File

@ -0,0 +1,63 @@
package com.lz.modules.performance.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lz.modules.performance.dao.TaskProcessRecordMapper;
import com.lz.modules.performance.entity.TaskProcessRecord;
import com.lz.modules.performance.service.TaskProcessRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* <p>
* 任务进度更新表 服务类
* </p>
*
* @author quyixiao
* @since 2020-12-08
*/
@Service
public class TaskProcessRecordServiceImpl extends ServiceImpl<TaskProcessRecordMapper, TaskProcessRecord> implements TaskProcessRecordService {
@Autowired
private TaskProcessRecordMapper taskProcessRecordMapper;
@Override
public TaskProcessRecord selectTaskProcessRecordById(Long id){
return taskProcessRecordMapper.selectTaskProcessRecordById(id);
}
@Override
public Long insertTaskProcessRecord(TaskProcessRecord taskProcessRecord){
return taskProcessRecordMapper.insertTaskProcessRecord(taskProcessRecord);
}
@Override
public int updateTaskProcessRecordById(TaskProcessRecord taskProcessRecord){
return taskProcessRecordMapper.updateTaskProcessRecordById(taskProcessRecord);
}
@Override
public int updateCoverTaskProcessRecordById(TaskProcessRecord taskProcessRecord){
return taskProcessRecordMapper.updateCoverTaskProcessRecordById(taskProcessRecord);
}
@Override
public int deleteTaskProcessRecordById(Long id){
return taskProcessRecordMapper.deleteTaskProcessRecordById(id);
}
}

47
src/main/resources/2020_12_08_sql Normal file
View File

@ -0,0 +1,47 @@
ALTER TABLE `lz_management`.`lz_result_detail` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '进度' AFTER `model_id`;
CREATE TABLE `lz_result_task` (
`id` bigint(11) NOT NULL AUTO_INCREMENT,
`is_delete` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除状态，1：删除，0：有效',
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2289 DEFAULT CHARSET=utf8mb4 COMMENT='任务表';
CREATE TABLE `lz_task_comment` (
`id` bigint(11) NOT NULL AUTO_INCREMENT,
`is_delete` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除状态，1：删除，0：有效',
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2289 DEFAULT CHARSET=utf8mb4 COMMENT='任务评论表';
CREATE TABLE `lz_task_process_record` (
`id` bigint(11) NOT NULL AUTO_INCREMENT,
`is_delete` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否删除状态，1：删除，0：有效',
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '最后修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2289 DEFAULT CHARSET=utf8mb4 COMMENT='任务进度更新表';
ALTER TABLE `lz_management`.`lz_result_task` ADD COLUMN `name` text COMMENT '任务名称' AFTER `gmt_modified`, ADD COLUMN `detail_id` int(11) DEFAULT 0 COMMENT 'lz_result_detail 的id' AFTER `name`, ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '任务的当前进度' AFTER `detail_id`;
ALTER TABLE `lz_management`.`lz_task_comment` ADD COLUMN `task_id` int(11) DEFAULT 0 COMMENT '任务id' AFTER `gmt_modified`, ADD COLUMN `type` int(11) DEFAULT 0 COMMENT '0表示对所有评论，1表示对单个具体的detail做评论' AFTER `task_id`, ADD COLUMN `detail_id` int(11) AFTER `type`, ADD COLUMN `result_record_id` int(11) DEFAULT 0 COMMENT 'lz_result_record表id' AFTER `detail_id`, ADD COLUMN `staff_id` int(11) DEFAULT 0 COMMENT '评论人员' AFTER `result_record_id`, ADD COLUMN `content` text COMMENT '评论内容' AFTER `staff_id`, ADD COLUMN `staff_name` varchar(256) COMMENT '评论人员名称' AFTER `content`;
ALTER TABLE `lz_management`.`lz_task_process_record` ADD COLUMN `process_rate` decimal(12,2) DEFAULT 0 COMMENT '当前进度' AFTER `gmt_modified`, ADD COLUMN `remark` text COMMENT '更新说明' AFTER `process_rate`, ADD COLUMN `label` text COMMENT '操作标签' AFTER `remark`, ADD COLUMN `type` int(11) DEFAULT 3 COMMENT '1，修改名称，2修改进度 ，3名称和进度都修改' AFTER `label`;

83
src/main/resources/mapper/performance/ResultTaskMapper.xml Normal file
View File

@ -0,0 +1,83 @@
<?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.ResultTaskMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.lz.modules.performance.entity.ResultTask">
<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="name" property="name"/>
<result column="detail_id" property="detailId"/>
<result column="process_rate" property="processRate"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, name AS name, detail_id AS detailId, process_rate AS processRate
</sql>
<select id="selectResultTaskById" resultType="ResultTask" >
select * from lz_result_task where id=#{id} and is_delete = 0 limit 1
</select>
<insert id="insertResultTask" parameterType="ResultTask" useGeneratedKeys="true" keyProperty="id" >
insert into lz_result_task(
<if test="name != null">name, </if>
<if test="detailId != null">detail_id, </if>
<if test="processRate != null">process_rate, </if>
is_delete,
gmt_create,
gmt_modified
)values(
<if test="name != null">#{ name}, </if>
<if test="detailId != null">#{ detailId}, </if>
<if test="processRate != null">#{ processRate}, </if>
0,
now(),
now()
)
</insert>
<update id="updateResultTaskById" parameterType="ResultTask" >
update
lz_result_task
<trim prefix="set" suffixOverrides=",">
<if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
<if test="name != null">name = #{name},</if>
<if test="detailId != null">detail_id = #{detailId},</if>
<if test="processRate != null">process_rate = #{processRate}</if>
</trim>
,gmt_modified = now()
where id = #{id}
</update>
<update id="updateCoverResultTaskById" parameterType="ResultTask" >
update
lz_result_task
set
is_delete = #{isDelete},
gmt_create = #{gmtCreate},
name = #{name},
detail_id = #{detailId},
process_rate = #{processRate}
,gmt_modified = now()
where id = #{id}
</update>
<update id="deleteResultTaskById" parameterType="java.lang.Long">
update lz_result_task set is_delete = 1 where id=#{id} limit 1
</update>
</mapper>

103
src/main/resources/mapper/performance/TaskCommentMapper.xml Normal file
View File

@ -0,0 +1,103 @@
<?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.daor.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>
<update id="deleteTaskCommentById" parameterType="java.lang.Long">
update lz_task_comment set is_delete = 1 where id=#{id} limit 1
</update>
</mapper>

88
src/main/resources/mapper/performance/TaskProcessRecordMapper.xml Normal file
View File

@ -0,0 +1,88 @@
<?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.TaskProcessRecordMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.lz.modules.performance.entity.TaskProcessRecord">
<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="process_rate" property="processRate"/>
<result column="remark" property="remark"/>
<result column="label" property="label"/>
<result column="type" property="type"/>
</resultMap>
<!-- 通用查询结果列 -->
<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
</sql>
<select id="selectTaskProcessRecordById" resultType="TaskProcessRecord" >
select * from lz_task_process_record where id=#{id} and is_delete = 0 limit 1
</select>
<insert id="insertTaskProcessRecord" parameterType="TaskProcessRecord" useGeneratedKeys="true" keyProperty="id" >
insert into lz_task_process_record(
<if test="processRate != null">process_rate, </if>
<if test="remark != null">remark, </if>
<if test="label != null">label, </if>
<if test="type != null">type, </if>
is_delete,
gmt_create,
gmt_modified
)values(
<if test="processRate != null">#{ processRate}, </if>
<if test="remark != null">#{ remark}, </if>
<if test="label != null">#{ label}, </if>
<if test="type != null">#{ type}, </if>
0,
now(),
now()
)
</insert>
<update id="updateTaskProcessRecordById" parameterType="TaskProcessRecord" >
update
lz_task_process_record
<trim prefix="set" suffixOverrides=",">
<if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
<if test="processRate != null">process_rate = #{processRate},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="label != null">label = #{label},</if>
<if test="type != null">type = #{type}</if>
</trim>
,gmt_modified = now()
where id = #{id}
</update>
<update id="updateCoverTaskProcessRecordById" parameterType="TaskProcessRecord" >
update
lz_task_process_record
set
is_delete = #{isDelete},
gmt_create = #{gmtCreate},
process_rate = #{processRate},
remark = #{remark},
label = #{label},
type = #{type}
,gmt_modified = now()
where id = #{id}
</update>
<update id="deleteTaskProcessRecordById" parameterType="java.lang.Long">
update lz_task_process_record set is_delete = 1 where id=#{id} limit 1
</update>
</mapper>

5
src/test/java/com/lz/mysql/MysqlMain.java
View File

@ -84,8 +84,9 @@ public class MysqlMain {
List<TablesBean> list = new ArrayList<TablesBean>(); List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("lz_resource")); list.add(new TablesBean("lz_result_task"));
list.add(new TablesBean("lz_print")); list.add(new TablesBean("lz_task_process_record"));
list.add(new TablesBean("lz_task_comment"));
List<TablesBean> list2 = new ArrayList<TablesBean>(); List<TablesBean> list2 = new ArrayList<TablesBean>();
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments(); Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();