From 8f84385c6bdb6b3d17d2e42c54be161557018556 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Sat, 10 Apr 2021 15:41:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BE=93=E5=87=BA=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=88=A0=E9=99=A4=E6=89=80=E6=9C=89=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/tall/bean/dto/DeliverDto.java | 20 +++++++++ .../com/ccsens/tall/bean/vo/InputDocVo.java | 11 +++++ .../com/ccsens/tall/bean/vo/MessageVo.java | 39 +++++++++++------ .../ccsens/tall/service/IRobotService.java | 2 +- .../tall/service/ITaskDeliverService.java | 12 ++++++ .../ccsens/tall/service/InputDocService.java | 43 +++++++++++++++++-- .../tall/service/ProjectMessageService.java | 1 + .../com/ccsens/tall/service/RobotService.java | 33 +++++++++++--- .../tall/service/TaskDeliverService.java | 39 ++++++++++++++++- .../java/com/ccsens/tall/util/RobotUtil.java | 2 + .../ccsens/tall/web/DeliverController.java | 25 +++++++++++ .../ccsens/tall/web/InputDocController.java | 8 ++-- .../main/resources/mapper_dao/DeliverDao.xml | 2 + .../resources/mapper_dao/IInputDocDao.xml | 9 ++-- .../resources/mapper_dao/SysOperationDao.xml | 1 + 15 files changed, 215 insertions(+), 32 deletions(-) diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java index 4c1e5281..3eec42ab 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java @@ -8,8 +8,10 @@ import lombok.Setter; import javax.validation.constraints.Max; import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.List; + public class DeliverDto { @ApiModel @Data @@ -54,4 +56,22 @@ public class DeliverDto { @ApiModelProperty("wps文件Id，可以为空") private Long wpsFileId; } + + @ApiModel + @Data + public static class DelAllFileOfDeliver { + @NotNull(message = "请选择输出文档") + @ApiModelProperty("交付物ID") + private Long deliverId; + } + + @ApiModel + @Data + public static class UpdateRemarkOfDeliver { + @NotNull(message = "请选择要修改输出文档记录") + @ApiModelProperty("输出文档上传记录id") + private Long recordId; + @ApiModelProperty("备注信息") + private String remark; + } } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java index fe7cbb96..513c7114 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/InputDocVo.java @@ -56,12 +56,21 @@ public class InputDocVo { @Data @ApiModel("查看文档历史记录") public static class HistoryRecord{ + @ApiModelProperty("记录id") + private String recordId; @ApiModelProperty("文件名称") private String fileName; @ApiModelProperty("文件访问地址") private String docUrl; + @ApiModelProperty("备注") + private String remark; + @JsonIgnore + @ApiModelProperty("文件id") + private String fileId; @ApiModelProperty("文件状态 0未使用 1正在使用") private String status; + @ApiModelProperty("文件列表") + private List fileList = new ArrayList<>(); } @Data @@ -70,6 +79,8 @@ public class InputDocVo { @JsonIgnore @ApiModelProperty("消息操作ID") private Long operationId; + @ApiModelProperty("消息操作ID(0-默认,1-上传,2-修改,3-删除,4-通过,5-驳回)") + private Byte doType; @JsonFormat(pattern="yyyy-MM-dd HH:mm") @ApiModelProperty("发送时间") private Date createTime; diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java index efe3218f..a2d4e62d 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/MessageVo.java @@ -38,6 +38,8 @@ public class MessageVo { private Long operatorId; @ApiModelProperty("任务id") private Long taskId; + @ApiModelProperty("操作类型(0-默认,1-上传,2-修改,3-删除,4-通过,5-驳回)") + private Byte doType; @ApiModelProperty("消息列表") private List messages = new ArrayList<>(); @@ -55,10 +57,23 @@ public class MessageVo { this.taskId = taskId; } + public Inform(Long projectId, Long operatorId, Byte doType) { + this.projectId = projectId; + this.operatorId = operatorId; + this.doType = doType; + } + public Inform appendMessage(Message message) { messages.add(message); return this; } + + public Inform(Long projectId, Long operatorId, Long taskId, Byte doType) { + this.projectId = projectId; + this.operatorId = operatorId; + this.taskId = taskId; + this.doType = doType; + } } @Data @@ -148,8 +163,8 @@ public class MessageVo { * @param deliverName * @return */ - public static Inform addDeliver(Long userId, String userName, Long projectId, String projectName, String taskName, String deliverName) { - MessageVo.Inform inform = new MessageVo.Inform(projectId, userId); + public static Inform addDeliver(Long userId, String userName, Long projectId, String projectName, String taskName, String deliverName,Byte doType) { + MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,doType); inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Deliverable.value, deliverName)) @@ -168,8 +183,8 @@ public class MessageVo { * @param deliverName * @return */ - public static Inform checkDeliver(Long userId, String userName, Long projectId, String projectName, String taskName, String principalName, String deliverName) { - MessageVo.Inform inform = new MessageVo.Inform(projectId, userId); + public static Inform checkDeliver(Long userId, String userName, Long projectId, String projectName, String taskName, String principalName, String deliverName,Byte doType) { + MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,doType); inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Deliverable.value, deliverName)) @@ -178,8 +193,8 @@ public class MessageVo { return inform; } - public static Inform deleteDeliver(Long userId, String userName, Long projectId, String projectName, String taskName, String deliverName) { - MessageVo.Inform inform = new MessageVo.Inform(projectId, userId); + public static Inform deleteDeliver(Long userId, String userName, Long projectId, String projectName, String taskName, String deliverName,Byte doType) { + MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,doType); inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Deliverable.value, deliverName)) @@ -222,8 +237,8 @@ public class MessageVo { * @param taskName * @return */ - public static Inform uploadForDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId) { - MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId); + public static Inform uploadForDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId,Byte doType) { + MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId,doType); inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName)) @@ -240,8 +255,8 @@ public class MessageVo { * @param taskName * @return */ - public static Inform delDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId) { - MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId); + public static Inform delDocComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId,Byte doType) { + MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId,doType); inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName)) @@ -258,8 +273,8 @@ public class MessageVo { * @param taskName * @return */ - public static Inform updateDocRemarkComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId) { - MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId); + public static Inform updateDocRemarkComment(Long userId, String userName, Long projectId, String projectName, String taskName,String deliverName,Long taskId,Byte doType) { + MessageVo.Inform inform = new MessageVo.Inform(projectId, userId,taskId,doType); inform.appendMessage(new MessageVo.Message(WebConstant.TemplateParam.Operator.value, userName)) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.ProjectName.value, projectName, WebConstant.Message.TYPE_LINK, Message.getProjectSettings(projectId))) .appendMessage(new MessageVo.Message(WebConstant.TemplateParam.TaskName.value,taskName)) diff --git a/tall/src/main/java/com/ccsens/tall/service/IRobotService.java b/tall/src/main/java/com/ccsens/tall/service/IRobotService.java index 060b8303..e7eddc6a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/IRobotService.java +++ b/tall/src/main/java/com/ccsens/tall/service/IRobotService.java @@ -61,7 +61,7 @@ public interface IRobotService { * @param userIdSet * @param name */ - void checkDeliverRobotSend(Long currentUserId, ProTaskDetail task, Long userIdSet, String name) throws Exception; + void checkDeliverRobotSend(Long currentUserId, ProTaskDetail task, Long userIdSet, String name,Boolean flag) throws Exception; /** * 评论任务信息 diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java index c93e9db5..975331b2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java @@ -34,4 +34,16 @@ public interface ITaskDeliverService { void deleteDeliver(Long userId, Long deliverId, Long taskId) throws Exception; Long isTaskOrSubTime(Long id)throws Exception; + + /** + * 删除输出文档下所有的文件 + * @param param + */ + void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver param); + + /** + * 修改输出文档下的备注信息 + * @param param + */ + void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param); } diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java index 8d8e1ae7..67bf7a4f 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -293,7 +293,40 @@ public class InputDocService implements IInputDocService { */ @Override public List viewDocHistory(InputDocDto.ViewDocHistory param) { - return iInputDocDao.viewDocHistory(param.getDocId()); + List historyRecords = iInputDocDao.viewDocHistory(param.getDocId()); + historyRecords.forEach(historyRecord ->{ + if (StrUtil.isNotBlank(historyRecord.getFileId())){ + if (historyRecord.getFileId().contains(",")){ + //拆分文件id + String[] split = historyRecord.getFileId().split(","); + List splits =new ArrayList<>(Arrays.asList(split)); + if(split.length != 0) { + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl, splits); + JsonResponse> a = JSONObject.parseObject(c, JsonResponse.class); + if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { + List fileList = a.getData(); + historyRecord.setFileList(fileList); + } + } + }else{ + List idList = new ArrayList<>(); + idList.add(historyRecord.getFileId()); + //获取文件项目的路径 + String requestUrl = PropUtil.filedeal; + //通过文件id查询文件信息 + String c = RestTemplateUtil.postBody1(requestUrl, idList); + JsonResponse> a = JSONObject.parseObject(c, JsonResponse.class); + if (ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())) { + List fileList = a.getData(); + historyRecord.setFileList(fileList); + } + } + } + }); + return historyRecords; } /** @@ -486,9 +519,13 @@ public class InputDocService implements IInputDocService { ProTaskInputRecord proTaskInputRecord = new ProTaskInputRecord(); proTaskInputRecord.setRecStatus((byte)2); proTaskInputRecordMapper.updateByExampleSelective(proTaskInputRecord,example2); - } - //TODO 文档 改回未上传状态 + //文档 改回未上传状态 + ProTaskInputDoc doc = new ProTaskInputDoc(); + doc.setId(param.getDocId()); + doc.setIsUpload(0); + proTaskInputDocMapper.updateByPrimaryKeySelective(doc); + } } } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java b/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java index 7d2758e5..79d7c53f 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProjectMessageService.java @@ -198,6 +198,7 @@ public class ProjectMessageService implements IProjectMessageService { operation.setOperatorId(inform.getOperatorId()); operation.setOperateType((byte)operateType.value()); operation.setTaskDetailId(inform.getTaskId()); + operation.setDoType(inform.getDoType()); log.info("保存操作记录：{}", operation); sysOperationDao.insertSelective(operation); // 操作内容 diff --git a/tall/src/main/java/com/ccsens/tall/service/RobotService.java b/tall/src/main/java/com/ccsens/tall/service/RobotService.java index 10474ee1..1ae86cf2 100644 --- a/tall/src/main/java/com/ccsens/tall/service/RobotService.java +++ b/tall/src/main/java/com/ccsens/tall/service/RobotService.java @@ -251,6 +251,14 @@ public class RobotService implements IRobotService{ RobotUtil.setWxTemplate(WxTemplateUtil.getChangeTask(normalTask.getProjectId(), userName, normalTask.getName())); } + /** + * 上传交付物信息 消息 + * @param currentUserId + * @param deliverName + * @param subTimeId + * @param project + * @throws Exception + */ @Override public void addDeliverRobotSend(Long currentUserId, String deliverName, Long subTimeId,SysProject project) throws Exception { String userName = userService.getUserNameByUserId(currentUserId); @@ -281,7 +289,7 @@ public class RobotService implements IRobotService{ } RobotUtil.setRobotMessage(message); // 添加消息通知 - MessageVo.Inform inform = MessageVo.addDeliver(currentUserId, userName, taskDetail.getProjectId(), projectName, taskDetail.getName(),deliverName); + MessageVo.Inform inform = MessageVo.addDeliver(currentUserId, userName, taskDetail.getProjectId(), projectName, taskDetail.getName(),deliverName,(byte)1); RobotUtil.setInform(inform); // 添加wx消息通知 RobotUtil.setWxTemplate(WxTemplateUtil.getAddDeliver(taskDetail.getProjectId(), userName, deliverName)); @@ -318,14 +326,22 @@ public class RobotService implements IRobotService{ } RobotUtil.setRobotMessage(message); - MessageVo.Inform inform = MessageVo.deleteDeliver(currentUserId, userName, project.getId(), project.getName(), taskDetail.getName(), deliverName); + MessageVo.Inform inform = MessageVo.deleteDeliver(currentUserId, userName, project.getId(), project.getName(), taskDetail.getName(), deliverName,(byte)3); RobotUtil.setInform(inform); // 添加wx消息通知 RobotUtil.setWxTemplate(WxTemplateUtil.getDeleteDeliver(taskDetail.getProjectId(), userName, deliverName)); } + /** + * 检查交付物 消息 + * @param currentUserId + * @param task + * @param uploadUserId + * @param deliverName + * @throws Exception + */ @Override - public void checkDeliverRobotSend(Long currentUserId, ProTaskDetail task, Long uploadUserId, String deliverName) throws Exception { + public void checkDeliverRobotSend(Long currentUserId, ProTaskDetail task, Long uploadUserId, String deliverName,Boolean flag) throws Exception { String userName = userService.getUserNameByUserId(currentUserId); String uploadUserName = ""; if(ObjectUtil.isNotNull(uploadUserId)){ @@ -352,8 +368,11 @@ public class RobotService implements IRobotService{ message.appendMentionedMobileList(memberPhone); } RobotUtil.setRobotMessage(message); + //判断是审核状态是通过还是驳回 + byte doType = flag == true ? (byte) 4 : (byte) 5 ; + - MessageVo.Inform inform = MessageVo.checkDeliver(currentUserId, userName, project.getId(), project.getName(), task.getName(), uploadUserName, deliverName); + MessageVo.Inform inform = MessageVo.checkDeliver(currentUserId, userName, project.getId(), project.getName(), task.getName(), uploadUserName, deliverName,doType); RobotUtil.setInform(inform); // 添加wx消息通知 RobotUtil.setWxTemplate(WxTemplateUtil.getCheckDeliver(project.getId(), userName, deliverName)); @@ -413,7 +432,7 @@ public class RobotService implements IRobotService{ } RobotUtil.setRobotMessage(message); - MessageVo.Inform inform = MessageVo.uploadForDocComment(currentUserId, userName, project.getId(), project.getName(), task.getName(),deliverable,task.getId()); + MessageVo.Inform inform = MessageVo.uploadForDocComment(currentUserId, userName, project.getId(), project.getName(), task.getName(),deliverable,task.getId(),(byte)1); RobotUtil.setInform(inform); // 添加wx消息通知 RobotUtil.setWxTemplate(WxTemplateUtil.uploadFileForDoc(project.getId(), userName,project.getName(),task.getName(),deliverable)); @@ -450,7 +469,7 @@ public class RobotService implements IRobotService{ } RobotUtil.setRobotMessage(message); - MessageVo.Inform inform = MessageVo.delDocComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name,taskDetail.getId()); + MessageVo.Inform inform = MessageVo.delDocComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name,taskDetail.getId(),(byte)3); RobotUtil.setInform(inform); // 添加wx消息通知 RobotUtil.setWxTemplate(WxTemplateUtil.delFileForDoc(project.getId(), userName,project.getName(),taskDetail.getName(),name)); @@ -487,7 +506,7 @@ public class RobotService implements IRobotService{ } RobotUtil.setRobotMessage(message); - MessageVo.Inform inform = MessageVo.updateDocRemarkComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name,taskDetail.getId()); + MessageVo.Inform inform = MessageVo.updateDocRemarkComment(userId, userName, project.getId(), project.getName(), taskDetail.getName(),name,taskDetail.getId(),(byte)2); RobotUtil.setInform(inform); // 添加wx消息通知 RobotUtil.setWxTemplate(WxTemplateUtil.updateDocRemark(project.getId(), userName,project.getName(),taskDetail.getName(),name)); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index b9521a91..76a6ef67 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -672,7 +672,7 @@ public class TaskDeliverService implements ITaskDeliverService { //检查完，返回数据 DeliverVo.DeliverInfo deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), checkDeliver.getTaskId(),token); //用智能助手发送消息+ws/公众号发送 - robotService.checkDeliverRobotSend(currentUserId,task,uploadUserId,deliver.getName()); + robotService.checkDeliverRobotSend(currentUserId,task,uploadUserId,deliver.getName(),checkDeliver.getCheckStatus()); return deliverInfo; } @@ -916,4 +916,41 @@ public class TaskDeliverService implements ITaskDeliverService { file.delete(); } } + + /** + * 删除输出文档下的所有文件 + * @param param + */ + @Override + public void delAllFileOfDeliver(DeliverDto.DelAllFileOfDeliver param) { + ProTaskDeliverPostLogExample example = new ProTaskDeliverPostLogExample(); + example.createCriteria().andDeliverIdEqualTo(param.getDeliverId()); + List proTaskDeliverPostLogs = deliverPostLogDao.selectByExample(example); + if (CollectionUtil.isNotEmpty(proTaskDeliverPostLogs)){ + for (ProTaskDeliverPostLog deliverPostLog : proTaskDeliverPostLogs) { + deliverPostLog.setRecStatus((byte)2); + deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); + } + //将交付物改为未上传状态 + ProTaskDeliver taskDeliver = new ProTaskDeliver(); + taskDeliver.setId(param.getDeliverId()); + taskDeliver.setIsUpload(0); + taskDeliverDao.updateByPrimaryKeySelective(taskDeliver); + } + } + + /** + * 修改输出文档下的备注信息 + * @param param + */ + @Override + public void updateRemarkOfDeliver(DeliverDto.UpdateRemarkOfDeliver param) { + ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); + deliverPostLog.setId(param.getRecordId()); + if (StrUtil.isNotBlank(param.getRemark())){ + deliverPostLog.setDescription(param.getRemark()); + } + deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog); + } + } diff --git a/tall/src/main/java/com/ccsens/tall/util/RobotUtil.java b/tall/src/main/java/com/ccsens/tall/util/RobotUtil.java index 0b53d544..3358122b 100644 --- a/tall/src/main/java/com/ccsens/tall/util/RobotUtil.java +++ b/tall/src/main/java/com/ccsens/tall/util/RobotUtil.java @@ -25,6 +25,8 @@ public class RobotUtil { private boolean isAtAll = false; private Long projectId; private Long taskId; + //操作类型(0-默认无,1-上传,2-修改,3-删除,4-通过,5-驳回) + private byte doType; private List params = new ArrayList<>(); public Message(){ diff --git a/tall/src/main/java/com/ccsens/tall/web/DeliverController.java b/tall/src/main/java/com/ccsens/tall/web/DeliverController.java index 265bb901..1bb4efaf 100644 --- a/tall/src/main/java/com/ccsens/tall/web/DeliverController.java +++ b/tall/src/main/java/com/ccsens/tall/web/DeliverController.java @@ -1,6 +1,8 @@ package com.ccsens.tall.web; +import com.ccsens.tall.annotation.MustLoginTall; import com.ccsens.tall.bean.dto.DeliverDto; +import com.ccsens.tall.bean.dto.InputDocDto; import com.ccsens.tall.bean.vo.DeliverVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.service.ITaskDeliverService; @@ -8,8 +10,10 @@ import com.ccsens.util.JsonResponse; import com.ccsens.util.UploadFileUtil_Servlet3; import com.ccsens.util.WebConstant; import com.ccsens.util.annotation.OperateType; +import com.ccsens.util.bean.dto.QueryDto; import io.jsonwebtoken.Claims; import io.swagger.annotations.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,6 +29,7 @@ import java.util.List; */ @Api(tags = "交付物相关API", description = "DeliverController | 交付物操作控制器类") @RestController +@Slf4j @RequestMapping("/delivers") public class DeliverController { @Autowired @@ -156,4 +161,24 @@ public class DeliverController { return JsonResponse.newInstance().ok(); } + @MustLoginTall + @ApiOperation(value = "删除输出文档下所有的文件", notes = "m:删除输出文档下所有的文件") + @RequestMapping(value = "/delAllFileOfDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse delAllFileOfDeliver(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("删除输出文档下所有的文件：{}",params); + deliverService.delAllFileOfDeliver(params.getParam()); + log.info("删除输出文档下所有的文件"); + return JsonResponse.newInstance().ok(); + } + + @MustLoginTall + @ApiOperation(value = "修改输出文档中的备注", notes = "m:修改输出文档中的备注") + @RequestMapping(value = "/updateRemarkOfDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateRemarkOfDeliver(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("修改输出文档中的备注：{}",params); + deliverService.updateRemarkOfDeliver(params.getParam()); + log.info("修改输出文档中的备注"); + return JsonResponse.newInstance().ok(); + } + } diff --git a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java index 556bd62e..519bae5f 100644 --- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java +++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java @@ -69,7 +69,7 @@ public class InputDocController { } @MustLoginTall - @ApiOperation(value = "查看文档上传历史记录", notes = "1007:查看文档上传历史记录") + @ApiOperation(value = "查看文档上传文件历史记录", notes = "1007:查看文档上传历史记录") @RequestMapping(value = "/viewDocHistory", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> viewDocHistory(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看文档上传历史记录：{}",params); @@ -131,12 +131,12 @@ public class InputDocController { } @MustLoginTall - @ApiOperation(value = "查询历史记录(根据任务id)", notes = "1007:查询输入文档上传记录") + @ApiOperation(value = "查询操作历史记录(根据任务id)", notes = "1007:查询输入文档上传记录") @RequestMapping(value = "/docRecordByTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> findDocRecordByTask(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查询输入文档上传记录：{}",params); + log.info("查询文档操作历史记录：{}",params); PageInfo docRecordByTask = iInputDocService.findDocRecordByTask(params.getParam()); - log.info("查询输入文档上传记录"); + log.info("查询文档操作历史记录"); return JsonResponse.newInstance().ok(docRecordByTask); } diff --git a/tall/src/main/resources/mapper_dao/DeliverDao.xml b/tall/src/main/resources/mapper_dao/DeliverDao.xml index 144997ab..2ddad186 100644 --- a/tall/src/main/resources/mapper_dao/DeliverDao.xml +++ b/tall/src/main/resources/mapper_dao/DeliverDao.xml @@ -151,6 +151,8 @@ WHERE l.rec_status = 0 and + l.deliver_id = #{deliverId} + and l.task_sub_time_id = #{subTimeId} ORDER BY l.time DESC diff --git a/tall/src/main/resources/mapper_dao/IInputDocDao.xml b/tall/src/main/resources/mapper_dao/IInputDocDao.xml index 560b5867..19c5b0d0 100644 --- a/tall/src/main/resources/mapper_dao/IInputDocDao.xml +++ b/tall/src/main/resources/mapper_dao/IInputDocDao.xml @@ -168,14 +168,15 @@ SELECT so.id AS operationId, + so.do_type AS doType, so.created_at AS createTime FROM t_sys_operation AS so