ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mzaxd
2024-01-29 10:31:46 +08:00
parent 561f2b39d0
commit 60c42d43e6
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java
+3
View File
@@ -40,6 +40,9 @@ public class OtherDraftUserVO {
@ApiModelProperty(value = "1：不能操作显示/2：可以上传并且将起草人改为‘我’/3：可以上传起草人字段维持不变") @ApiModelProperty(value = "1：不能操作显示/2：可以上传并且将起草人改为‘我’/3：可以上传起草人字段维持不变")
private String operateType; private String operateType;
@ApiModelProperty(value = "绑定的taskId")
private String taskId;
public String getISODeadlineTime() { public String getISODeadlineTime() {
SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
return isoFormat.format(this.deadline); return isoFormat.format(this.deadline);
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+18 -5
View File
@@ -305,17 +305,30 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
} catch (Exception e) { } catch (Exception e) {
log.error("获取当前用户失败"); log.error("获取当前用户失败");
} }
boolean findFlag = false;
otherDraftUserVOS.forEach(o -> {o.setOperateType(null);});
for (OtherDraftUserVO o : otherDraftUserVOS) { for (OtherDraftUserVO o : otherDraftUserVOS) {
if (o.getUser().equals(curUserId)) { if (findFlag) {
o.setOperateType(OperateTypeEnum.UPLOAD_AND_CHANGE_DRAFT_USER.getValue()); o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
continue; continue;
} }
if (o.getUser().equals(userId)) { if (o.getUser().equals(userId)) {
o.setOperateType(OperateTypeEnum.UPLOAD.getValue()); if (StrUtil.isBlank(o.getTaskId())) {
continue; 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; break;
case CONTACT_USER_DISTRIBUTE: case CONTACT_USER_DISTRIBUTE:
if (pass) { if (pass) {