fix: 制修订流程-其他出起草人上传后回显文件名

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java

@@ -215,13 +215,6 @@ public class ProcessEsRevision implements Serializable {
     @ApiModelProperty(value = "相关部门领导")
     private String relatedLeader;
 
-    /**
-     * 其他起草人上传文件Id
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "其他起草人上传文件Id")
-    private String otherDrafterUploadFileId;
-
     /**
      * 授权部门
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/vo/OtherDraftUserVO.java

@@ -33,6 +33,7 @@ public class OtherDraftUserVO {
     @ApiModelProperty(value = "截止日期")
     private Date deadline;
 
+    @Dict(dicCode = "id", dicText = "file_name", dictTable = "oss_file")
     @ApiModelProperty(value = "文件ID")
     private String fileId;
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java

@@ -323,18 +323,14 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 break;
             case OTHER_DRAFT_USER_UPLOAD:
                 data = revisionData.getData();
-                List<OtherDraftUserVO> otherDraftUserVOListDB = dataDb.parseOtherDraftUserVOS();
-                Map<String, OtherDraftUserVO> map = otherDraftUserVOListDB.stream()
-                        .collect(Collectors.toMap(OtherDraftUserVO::getUser, o -> o));
-                OtherDraftUserVO otherDraftUserVO = map.get(userId);
-                otherDraftUserVO.setFileId(data.getOtherDrafterUploadFileId());
+                List<OtherDraftUserVO> otherDraftUserVOListDB = data.getOtherDraftUserVOS();
                 dataDb.setOtherDrafterUploadFileJson(otherDraftUserVOListDB);
                 saveOrUpdate(dataDb);
                 break;
             case MAIN_DRAFT_USER_COLLECT_FIRST:
                 // 判断是否需要稽查 设置流程变量 保存稽查列表
                 data = revisionData.getData();
-                boolean inspectFlag = !data.getInspectFlag().equals("0");
+                boolean inspectFlag = !data.getInspectFlag().equals(YesOrNoEnum.NO.getValue());
                 if (inspectFlag) {
                     List<InspectContentVO> inspectContents = data.getInspectContents();
                     data.setInspectContentJson(inspectContents);