法规技术评估-条款信息评估结果表-列表查询完善。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationItemResultEOController.java

@@ -72,6 +72,7 @@ public class LawsTechnologyEvaluationItemResultEOController extends JeroControll
 																		HttpServletRequest req,
 																		String cut) {
         List<LawsTechnologyEvaluationItemResultEO> list = lawsTechnologyEvaluationItemResultEOService.queryList(lawsTechnologyEvaluationItemResultEO,req,cut);
+        this.lawsTechnologyEvaluationItemResultEOService.disposeData(list,cut);
         return Result.OK(list);
 	}
 

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

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -85,6 +86,8 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable {
 	@Excel(name = "评估方式", width = 15)
     @ApiModelProperty(value = "评估方式")
     private java.lang.String evaluationMethods;
+	@TableField(exist = false)
+    private java.lang.String evaluationMethodsName;
 
 	/**技术文件名称*/
 	@Excel(name = "技术文件名称", width = 15)

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

@@ -77,4 +77,6 @@ public interface ILawsTechnologyEvaluationItemResultEOService extends IService<L
 	 * @param jsonObject
 	 */
 	void batchUpdate(JSONObject jsonObject);
+
+    void disposeData(List<LawsTechnologyEvaluationItemResultEO> datas, String cut);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
@@ -12,13 +13,19 @@ import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluation
 import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationItemResultEOService;
 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.service.impl.SysCategoryServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Date;
+import java.util.stream.Collectors;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +42,9 @@ import javax.servlet.http.HttpServletRequest;
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
 public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl<LawsTechnologyEvaluationItemResultEOMapper, LawsTechnologyEvaluationItemResultEO> implements ILawsTechnologyEvaluationItemResultEOService {
 
+	@Autowired
+	private SysCategoryServiceImpl sysCategoryService;
+
 	/**
 	 * 保存
 	 *
@@ -158,4 +168,36 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 			this.updateBatchById(itemResultEOList);
 		}
 	}
+
+	@Override
+	public void disposeData(List<LawsTechnologyEvaluationItemResultEO> datas, String cut) {
+		if(CollectionUtils.isNotEmpty(datas)){
+			List<SysCategory> categoryList = sysCategoryService.list();
+			for (LawsTechnologyEvaluationItemResultEO data : datas) {
+				String evaluationMethods = data.getEvaluationMethods();
+				List<String> evaluationMethodsList = Arrays.asList(evaluationMethods.split(","));
+				String name = getTreeName(cut, categoryList, evaluationMethodsList);
+				data.setEvaluationMethodsName(name);
+			}
+		}
+	}
+
+	private String getTreeName(String cut, List<SysCategory> categoryList, List<String> evaluationMethodsList) {
+		StringBuilder sb = new StringBuilder();
+		for (String evaluationMethods : evaluationMethodsList) {
+			List<SysCategory> collect = categoryList.stream().filter(e -> evaluationMethods.equals(e.getId())).collect(Collectors.toList());
+			if(collect.size() != 0){
+				if (CutEnum.CN.getValue().equals(cut)) {
+					sb.append(collect.get(0).getName() + ",");
+				} else {
+					sb.append(collect.get(0).getEnName()+ ",");
+				}
+			}
+		}
+		String evaluationMethodsName = "";
+		if (StringUtils.isNotBlank(sb)) {
+			evaluationMethodsName = sb.substring(0, sb.length() - 1);
+		}
+		return evaluationMethodsName;
+	}
 }

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -175,7 +175,6 @@
         getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
           actiProcInstId: this.$route.query.prcId,
-          createBy: this.userInfo().username
         }).then((res) => {
           if (res.success) {
             this.evaluatorFeedbackList = res.result || []