update

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.document.entity.BussDocumentLibraryEO;
 import com.jero.modules.document.entity.OSSFileForDocumentLibrary;
+import com.jero.modules.document.vo.QueryConditionVO;
 import com.jero.modules.oss.entity.OSSFile;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -220,4 +221,6 @@ public interface IBussDocumentLibraryEOService extends IService<BussDocumentLibr
     void isModifyForOcrAndSplit(Map<String, Object> parameter);
 
     String getTitle(String id,String cut);
+
+    String sqlJoint(List<QueryConditionVO> queryConditionVOList);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -5755,8 +5755,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 
 
     //高级搜索条件拼接
-
+    @Override
-    private String sqlJoint(List<QueryConditionVO> queryConditionVOList){
+    public String sqlJoint(List<QueryConditionVO> queryConditionVOList){
         StringBuilder sb = new StringBuilder();
         if(queryConditionVOList.size() != 0){
             int count =0;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java

@@ -122,6 +122,8 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable {
 	@Excel(name = "评估人id", width = 15)
     @ApiModelProperty(value = "评估人id")
     private java.lang.String evaluatorId;
+	@TableField(exist = false)
+    private java.lang.String evaluatorName;
 
 	/**流程实例id*/
 	@Excel(name = "流程实例id", width = 15)

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java

@@ -21,6 +21,8 @@ import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.project.enums.OperatorTypeEnum;
 import com.jero.modules.project.enums.RequestSourceEnum;
 import com.jero.modules.system.entity.SysCategory;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.util.PDFUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -62,6 +64,8 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 	private SysCategoryServiceImpl sysCategoryService;
 	@Autowired
 	private IOSSFileService iOSSFileService;
+	@Autowired
+	private ISysUserService sysUserService;
 
 	/**
 	 * 保存
@@ -190,6 +194,13 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 	@Override
 	public void disposeData(List<LawsTechnologyEvaluationItemResultEO> datas, String cut) {
 		if(CollectionUtils.isNotEmpty(datas)){
+			List<String> evaluatorIdList = datas.stream().map(LawsTechnologyEvaluationItemResultEO::getEvaluatorId).distinct().collect(Collectors.toList());
+
+			List<SysUser> sysUserList = new ArrayList<>();
+			if(CollectionUtils.isNotEmpty(evaluatorIdList)){
+				sysUserList = this.sysUserService.querySysUserListByIdList(evaluatorIdList);
+			}
+
 			List<SysCategory> categoryList = sysCategoryService.list();
 			for (LawsTechnologyEvaluationItemResultEO data : datas) {
 				String evaluationMethods = data.getEvaluationMethods();
@@ -205,6 +216,19 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 					String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
 					data.setAccessoryFileName(accessoryFileName);
 				}
+
+				if(StringUtils.isNotEmpty(data.getEvaluatorId())){
+					if(CollectionUtils.isNotEmpty(sysUserList)){
+						String evaluatorNames = sysUserList.stream().filter(sysUser -> {
+							boolean flag = false;
+							if(StringUtils.equals(sysUser.getId(),data.getEvaluatorId())){
+								flag = true;
+							}
+							return flag;
+						}).map(SysUser::getUsername).collect(Collectors.joining(","));
+						data.setEvaluatorName(evaluatorNames);
+					}
+				}
 			}
 		}
 	}