法规意见收集，回显评估人优化

jero-boot/db/蔚来标准sql/dev_third_record.sql

@@ -1167,3 +1167,6 @@ ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应
 -- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 未同步生产环境
 ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result`
     ADD COLUMN `clause_content` varchar(600) NULL COMMENT '条款内容' AFTER `acti_proc_inst_id`;
+-- 法规意见收集 增加字段 评估人id  2022-09-27 未同步生产环境
+ALTER TABLE `laws_weilai`.`laws_opinion_gather`
+    ADD COLUMN `evaluator_ids` varchar(4000) NULL COMMENT '评估人ids，多个之间使用英文逗号分隔' AFTER `opinion_archive_id`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionAssessmentResultEOController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -54,10 +56,17 @@ public class LawsOpinionAssessmentResultEOController extends JeroController<Laws
 	public Result<?> queryPageList(LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   @RequestParam(name="cut") String cut,
 								   HttpServletRequest req) {
 		QueryWrapper<LawsOpinionAssessmentResultEO> queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionAssessmentResultEO, req.getParameterMap());
 		Page<LawsOpinionAssessmentResultEO> page = new Page<LawsOpinionAssessmentResultEO>(pageNo, pageSize);
-		IPage<LawsOpinionAssessmentResultEO> pageList = lawsOpinionAssessmentResultEOService.page(page, queryWrapper);
+		IPage<LawsOpinionAssessmentResultEO> pageList = this.lawsOpinionAssessmentResultEOService.page(page, queryWrapper);
+		List<LawsOpinionAssessmentResultEO> records = pageList.getRecords();
+		if(CollectionUtils.isEmpty(records)){
+			records = new ArrayList<>();
+		}
+		this.lawsOpinionAssessmentResultEOService.disposeData(records,lawsOpinionAssessmentResultEO,cut);
+		pageList.setRecords(records);
 		return Result.OK(pageList);
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionGatherEO.java

@@ -119,4 +119,7 @@ public class LawsOpinionGatherEO implements Serializable {
     /**对外意见归档文件数组**/
     @TableField(exist = false)
     private List<OSSFile> opinionArchiveFileList;
+
+    @ApiModelProperty(value = "评估人ids，多个之间使用英文逗号分隔")
+    private String evaluatorIds;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionAssessmentResultEOService.java

@@ -71,4 +71,10 @@ public interface ILawsOpinionAssessmentResultEOService extends IService<LawsOpin
     void insertBatch(JSONObject json);
 
     void exportXls(HttpServletResponse response, HttpServletRequest request, LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO, Map<String,Object> params);
+
+	/**
+	 * 处理数据
+	 * @param lawsOpinionAssessmentResultEOList
+	 */
+	void disposeData(List<LawsOpinionAssessmentResultEO> lawsOpinionAssessmentResultEOList,LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,String cut);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java

@@ -16,8 +16,11 @@ import com.jero.modules.lawsOpinionGather.entity.LawsOpinionAssessmentResultEO;
 import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
 import com.jero.modules.lawsOpinionGather.mapper.LawsOpinionAssessmentResultEOMapper;
 import com.jero.modules.lawsOpinionGather.service.ILawsOpinionAssessmentResultEOService;
+import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
+import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.util.PDFUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -57,6 +60,10 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 
 	@Autowired
 	private IOSSFileService iOSSFileService;
+	@Autowired
+	private ILawsOpinionGatherEOService lawsOpinionGatherEOService;
+	@Autowired
+	private ISysUserService sysUserService;
 
 	/**
 	 * 保存
@@ -177,9 +184,12 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 			Page<LawsOpinionAssessmentResultEO> page = new Page<LawsOpinionAssessmentResultEO>(pageNo, pageSize);
 			IPage<LawsOpinionAssessmentResultEO> pageList = this.page(page, queryWrapper);
 			exportData = pageList.getRecords();
+			if(CollectionUtils.isEmpty(exportData)){
+				exportData = new ArrayList<>();
+			}
 		}
 
-		this.disposeData(exportData,cut);
+		this.disposeData(exportData,lawsOpinionAssessmentResultEO,cut);
 
 		String title = "";
 		String fileName = "";
@@ -307,6 +317,52 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 		}
 	}
 
+	@Override
+	public void disposeData(List<LawsOpinionAssessmentResultEO> records,LawsOpinionAssessmentResultEO lawsOpinionAssessmentResultEO,String cut) {
+		if(CollectionUtils.isNotEmpty(records)){
+			for (LawsOpinionAssessmentResultEO data : records) {
+				if(StringUtils.isNotEmpty(data.getAccessoryFile())){
+					List<OSSFile> accessoryFileList = iOSSFileService.getFileInfos(data.getAccessoryFile());
+					String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					data.setAccessoryFileName(accessoryFileName);
+				}
+			}
+		}
+
+		LawsOpinionGatherEO lawsOpinionGatherEO = lawsOpinionGatherEOService.getById(lawsOpinionAssessmentResultEO.getLawsOpinionGatherId());
+		List<String> evaluatorIdList = Arrays.asList(lawsOpinionGatherEO.getEvaluatorIds().split(","));
+		List<SysUser> evaluatorUserList = this.sysUserService.querySysUserListByIdList(evaluatorIdList);
+
+		//处理评估人没有填写任何评估结果情况。
+		if(CollectionUtils.isEmpty(records)){
+			if(lawsOpinionGatherEO != null){
+				for (SysUser evaluatorUser : evaluatorUserList) {
+					LawsOpinionAssessmentResultEO lawsOpinionAssessmentResult = new LawsOpinionAssessmentResultEO();
+					lawsOpinionAssessmentResult.setCreateBy(evaluatorUser.getUsername());
+					records.add(lawsOpinionAssessmentResult);
+				}
+			}
+		}else {
+			List<SysUser> evaluatorUsers = evaluatorUserList.stream().filter(evaluatorUser -> {
+				boolean flag = true;
+				for (LawsOpinionAssessmentResultEO record : records) {
+					if(com.jero.modules.system.util.StringUtils.equals(evaluatorUser.getUsername(),record.getCreateBy())){
+						flag = false;
+						break;
+					}
+				}
+				return flag;
+			}).collect(Collectors.toList());
+			if(CollectionUtils.isNotEmpty(evaluatorUsers)){
+				for (SysUser evaluatorUser : evaluatorUsers) {
+					LawsOpinionAssessmentResultEO lawsOpinionAssessmentResult = new LawsOpinionAssessmentResultEO();
+					lawsOpinionAssessmentResult.setCreateBy(evaluatorUser.getUsername());
+					records.add(lawsOpinionAssessmentResult);
+				}
+			}
+		}
+	}
+
 	public static void copyFile(InputStream in, String newFile) throws IOException {
 		File file2 = new File(newFile);
 		if (!file2.exists()) {
@@ -327,23 +383,6 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
 		}
 	}
 
-	/**
-	 * 处理数据
-	 * @param datas
-	 * @param cut
-	 */
-	public void disposeData(List<LawsOpinionAssessmentResultEO> datas,String cut){
-		if(CollectionUtils.isNotEmpty(datas)){
-			for (LawsOpinionAssessmentResultEO data : datas) {
-				if(StringUtils.isNotEmpty(data.getAccessoryFile())){
-					List<OSSFile> accessoryFileList = iOSSFileService.getFileInfos(data.getAccessoryFile());
-					String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
-					data.setAccessoryFileName(accessoryFileName);
-				}
-			}
-		}
-	}
-
 	public String disposeDate(Date date){
 		String result = "";
 		try {