更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillController.java

@@ -756,11 +756,11 @@ public class AllotBillController {
             messageService.add(messageBto);
         }
         List<FileVo> fileVoList = new ArrayList<>();
-        if (fileUploadVo.getReceiveFiles()!=null&&fileUploadVo.getReceiveFiles().size()>0){
-            fileUploadVo.getReceiveFiles().forEach(fileRet -> {
+        if (fileUploadVo.getReceiveFileList()!=null&&fileUploadVo.getReceiveFileList().size()>0){
+            fileUploadVo.getReceiveFileList().forEach(fileRet -> {
                 fileVoList.add(new FileVo("配发单", fileRet.getName(), fileRet.getPreviewPath()));
             });
-            allotBill.setReceiveFiles(FilesUtil.stringFileToList(fileUploadVo.getReceiveFiles()));
+            allotBill.setReceiveFiles(FilesUtil.stringFileToList(fileUploadVo.getReceiveFileList()));
         }
 //            fileVoList.add(new FileVo("配发单", allotBill.getBillFileName(), allotBill.getBillFileUrl()));
         allotBillService.update(allotBill);

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java

@@ -192,11 +192,11 @@ public class BackController {
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),statusEnums);
         AllotBackBill allotBackBill = allotBackBillService.getOne(taskBto.getBillId());
         List<FileVo> fileVoList = new ArrayList<>();
-        if (allotBackReceiveVo.getReceiveFiles()!=null&&allotBackReceiveVo.getReceiveFiles().size()>0){
-            allotBackReceiveVo.getReceiveFiles().forEach(fileRet -> {
+        if (allotBackReceiveVo.getReceiveFileList()!=null&&allotBackReceiveVo.getReceiveFileList().size()>0){
+            allotBackReceiveVo.getReceiveFileList().forEach(fileRet -> {
                 fileVoList.add(new FileVo("退回单", fileRet.getName(), fileRet.getPreviewPath()));
             });
-            allotBackBill.setReceiveFiles(FilesUtil.stringFileToList(allotBackReceiveVo.getReceiveFiles()));
+            allotBackBill.setReceiveFiles(FilesUtil.stringFileToList(allotBackReceiveVo.getReceiveFileList()));
         }
 //        fileVoList.add(new FileVo("退回单", allotBackReceiveVo.getBillFileName(), allotBackReceiveVo.getBillFileUrl()));
 //        fileVoList.add(new FileVo("入库确认单", allotReceiveVo.getReceiveFileName(), allotReceiveVo.getReceiveFileUrl()));
@@ -291,7 +291,6 @@ public class BackController {
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.WAIT_UPLOAD_ALLOT_BACK_FILE);
         Integer userId = userUtils.getCurrentUserId();
         taskService.addInvolveUser(taskBto,userId);
-        //不上传单据
         taskService.moveToEnd(taskBto);
         taskService.moveAllSonNodeToEnd(taskBto.getId());
         AllotBackBill allotBackBill = allotBackBillService.getOne(taskBto.getBillId());
@@ -301,12 +300,17 @@ public class BackController {
             allotBackBill.setSendUserbId(fileUploadVo.getSendUserbId());
             allotBackBill.setAgent(userPublicService.getOne(fileUploadVo.getSendUserbId()).getName());
         }
+        if (fileUploadVo.getReceiveUserbId()!=null){
+            allotBackBill.setReceiveUserbId(fileUploadVo.getReceiveUserbId());
+            MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", Collections.singletonList(fileUploadVo.getReceiveUserbId()), 1);
+            messageService.add(messageBto);
+        }
         List<FileVo> fileVoList = new ArrayList<>();
-        if (fileUploadVo.getReceiveFiles()!=null&&fileUploadVo.getReceiveFiles().size()>0){
-            fileUploadVo.getReceiveFiles().forEach(fileRet -> {
+        if (fileUploadVo.getReceiveFileList()!=null&&fileUploadVo.getReceiveFileList().size()>0){
+            fileUploadVo.getReceiveFileList().forEach(fileRet -> {
                 fileVoList.add(new FileVo("退回单", fileRet.getName(), fileRet.getPreviewPath()));
             });
-            allotBackBill.setReceiveFiles(FilesUtil.stringFileToList(fileUploadVo.getReceiveFiles()));
+            allotBackBill.setReceiveFiles(FilesUtil.stringFileToList(fileUploadVo.getReceiveFileList()));
         }
         allotBackBillService.update(allotBackBill);
 //            fileVoList.add(new FileVo("退回单", allotBackBill.getBillFileName(), allotBackBill.getBillFileUrl()));

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/AllotBackReceiveVo.java

@@ -62,7 +62,7 @@ public class AllotBackReceiveVo {
     private Integer status = 0;
 
     @ApiModelProperty(value = "接收方配发单")
-    private List<FileRet> receiveFiles;
+    private List<FileRet> receiveFileList;
 
     @ApiModelProperty(value = "收件单位签章id")
     private String rightSignatureId;

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/vo/FileUploadVo.java

@@ -40,5 +40,5 @@ public class FileUploadVo {
     private Integer receiveUserbId;
 
     @ApiModelProperty(value = "接收方配发单")
-    private List<FileRet> receiveFiles;
+    private List<FileRet> receiveFileList;
 }

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -82,6 +82,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add 0,point++
@@ -104,6 +105,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto, String customInfo) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add 0,point++
@@ -127,6 +129,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto, Integer userId) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add userId,point++
@@ -150,6 +153,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto, Integer userId, String customInfo) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add userId,point++
@@ -173,6 +177,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add 0,point++
@@ -196,6 +201,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum, String customInfo) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add 0,point++
@@ -220,6 +226,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum, Integer userId) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add userId,point++
@@ -244,6 +251,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum, Integer userId, String customInfo) {
+        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add userId,point++
@@ -264,6 +272,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToEnd(TaskBto taskBto) {
+        confirmUser(taskBto);
         //set status end
         taskBto.setBillStatus(StatusEnum.END.id);
         update(taskBto);
@@ -277,6 +286,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToArchive(TaskBto taskBto) {
+        confirmUser(taskBto);
         //set status archive
         taskBto.setBillStatus(StatusEnum.ARCHIVE.id);
         update(taskBto);
@@ -564,7 +574,7 @@ public class TaskServiceImpl implements TaskService {
                 taskUserVos = taskDao.findAll(getSelectSpecification(taskSelectVo)).stream()
                         .map(Task::parse2Bto)
                         .map(TaskBto::toVo)
-                        .filter(taskUserVo -> !Collections.disjoint(idLists, taskUserVo.getInvolveUserIdList()))
+                        .filter(taskUserVo -> !Collections.disjoint(idLists, taskUserVo.getInvolveUserIdList())||(taskUserVo.getCreateUserId()!=null&&idLists.contains(taskUserVo.getCreateUserId())))
                         .collect(Collectors.toList());
             }
             //set经办人，置顶以及阅读情况
@@ -671,6 +681,7 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     public TaskBto addInvolveUser(TaskBto taskBto, Integer userId) {
+        confirmUser(taskBto);
         List<Integer> list = taskBto.getInvolveUserIdList();
         //添加涉及用户Id
         list.add(userId);
@@ -1126,4 +1137,27 @@ public class TaskServiceImpl implements TaskService {
         });
         return unitIds;
     }
+
+    public void confirmUser(TaskBto taskBto){
+        Integer userId = userUtils.getCurrentUserId();
+        List<Integer> userIds = taskBto.getInvolveUserIdList();
+        List<Integer> ids = new ArrayList<>();
+        if (userIds.size() > 0 && taskBto.getCurrentPoint() < userIds.size()) {
+            Integer userId3 = userIds.get(taskBto.getCurrentPoint());
+            //当前指针userId大于0，待办人即当前id
+            if (userId3 > 0) {
+                ids.add(userId3);
+            }
+            //当前指针userId等于0，待办人为所属单位下所有用户
+            else if (userId3 == 0 && taskBto.getOwnUnit() != null) {
+                List<User> users = userCache.findAll();
+                users.stream().filter(user -> user.getUnitsId().equals(taskBto.getOwnUnit())).forEach(user -> {
+                    ids.add(user.getUserId());
+                });
+            }
+        }
+        if (!ids.contains(userId)){
+            throw new ApiException(ResponseEntity.status(50000).body("当前用户不能操作此任务"));
+        }
+    }
 }

dev-task/src/main/java/com/tykj/dev/device/task/subject/domin/Task.java

@@ -18,9 +18,7 @@ import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
 /**
  * entity class for task
@@ -135,12 +133,7 @@ public class Task {
         ModelMapper mapper = BeanHelper.getUserMapper();
         TaskBto taskBto = mapper.map(this, TaskBto.class);
         //解析组合字段并添加
-        List<Integer> ids = new ArrayList<>();
-        if (this.createUserId!=null){
-            ids.add(this.createUserId);
-        }
-        ids.addAll(StringSplitUtil.userIdSplit(this.involveUsers));
-        taskBto.setInvolveUserIdList(ids);
+        taskBto.setInvolveUserIdList(StringSplitUtil.userIdSplit(this.involveUsers));
         taskBto.setTopFlagDetailList(StringSplitUtil.userIdSplit(this.topFlagDetail));
         taskBto.setUserReadDetailList(StringSplitUtil.userIdSplit(this.userReadDetail));
         return taskBto;

dev-task/src/main/java/com/tykj/dev/device/task/subject/vo/TaskUserVo.java

@@ -102,4 +102,7 @@ public class TaskUserVo {
 
     @ApiModelProperty(value = "创建用户")
     private String createUser;
+
+    @ApiModelProperty(value = "创建用户id")
+    private Integer createUserId;
 }