fix: 80448 企标制修订流程（其他起草人上传企标）--其他起草人收到待办与列表中数据条数一一对应

2024-01-29 10:31:46 +08:00
parent 561f2b39d0
commit 60c42d43e6
2 changed files with 21 additions and 5 deletions
@@ -40,6 +40,9 @@ public class OtherDraftUserVO {
    @ApiModelProperty(value = "1：不能操作显示/2：可以上传并且将起草人改为‘我’/3：可以上传起草人字段维持不变")
    private String operateType;

+    @ApiModelProperty(value = "绑定的taskId")
+    private String taskId;
+
    public String getISODeadlineTime() {
        SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
        return isoFormat.format(this.deadline);
@@ -305,17 +305,30 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                } catch (Exception e) {
                    log.error("获取当前用户失败");
                }
+                boolean findFlag = false;
+                otherDraftUserVOS.forEach(o -> {o.setOperateType(null);});
                for (OtherDraftUserVO o : otherDraftUserVOS) {
-                    if (o.getUser().equals(curUserId)) {
-                        o.setOperateType(OperateTypeEnum.UPLOAD_AND_CHANGE_DRAFT_USER.getValue());
+                    if (findFlag) {
+                        o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                        continue;
                    }
                    if (o.getUser().equals(userId)) {
-                        o.setOperateType(OperateTypeEnum.UPLOAD.getValue());
-                        continue;
+                        if (StrUtil.isBlank(o.getTaskId())) {
+                            o.setOperateType(OperateTypeEnum.UPLOAD.getValue());
+                            o.setTaskId(taskId);
+                            findFlag = true;
+                        } else {
+                            if (!taskId.equals(o.getTaskId())) {
+                                o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
+                            }
+                        }
+                    } else {
+                        o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                    }
-                    o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
                }
+                data.setOtherDraftUserVOS(otherDraftUserVOS);
+                data.setOtherDrafterUploadFileJson(otherDraftUserVOS);
+                updateById(data);
                break;
            case CONTACT_USER_DISTRIBUTE:
                if (pass) {