添加整改类型

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfRectificationOrderController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationOrderEnum;
@@ -153,6 +155,16 @@ public class HygfRectificationOrderController extends BaseController {
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{
+				if(e.getRectificationIdea() != null && e.getRectificationIdea().size() > 0) {
+					List<String> types = new ArrayList<>();
+					e.getRectificationIdea().forEach(t -> {
+						JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t));
+						types.add(jsonObject.getString("type"));
+					});
+					e.setRectificationType(String.join(",", types));
+				}
+
+
 				if (longs.contains(areaId) && e.getRectificationSource().equals("area")){
 					e.setIsAudit("0");
 				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("engineering")){
@@ -219,9 +231,21 @@ public class HygfRectificationOrderController extends BaseController {
 		}
 
 		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId,status);
+
+
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{
+				if(e.getRectificationIdea() != null && e.getRectificationIdea().size() > 0) {
+					List<String> types = new ArrayList<>();
+					e.getRectificationIdea().forEach(t -> {
+						JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t));
+						types.add(jsonObject.getString("type"));
+					});
+					e.setRectificationType(String.join(",", types));
+				}
+
+
 				if (longs.contains(areaId) && e.getRectificationSource().equals("bw-area") &&rectificationSource.contains(e.getRectificationSource())){
 					e.setIsAudit("0");
 				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")&& rectificationSource.contains(e.getRectificationSource())){
@@ -240,7 +264,6 @@ public class HygfRectificationOrderController extends BaseController {
 	}
 
 
-
 	/**
 	 * 列表分页查询
 	 *
@@ -301,6 +324,16 @@ public class HygfRectificationOrderController extends BaseController {
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{
+				if(e.getRectificationIdea() != null && e.getRectificationIdea().size() > 0) {
+					List<String> types = new ArrayList<>();
+					e.getRectificationIdea().forEach(t -> {
+						JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(t));
+						types.add(jsonObject.getString("type"));
+					});
+					e.setRectificationType(String.join(",", types));
+				}
+
+
 				if (longs.contains(areaId) && e.getRectificationSource().equals("ys-area") && rectificationSource.contains(e.getRectificationSource()) ){
 					e.setIsAudit("0");
 				}else if (longs.contains(tourongId) && e.getRectificationSource().equals("ys-tourong")&& rectificationSource.contains(e.getRectificationSource())){