提交枚举

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationRoleEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum RectificationRoleEnum {
+
+	片区运营角色("area,bw-area,ys-area"), 设计角色("design,bw-design"), 工程角色("engineering,bw-engineering"), 投融角色("ys-tourong"),
+	法务角色("ys-fawu");
+
+	/**
+	 * 名称，描述
+	 */
+	private String name;
+
+	public static RectificationRoleEnum getNodeByName(String name) {
+		RectificationRoleEnum dealerReviewEnum = null;
+		for (RectificationRoleEnum type : RectificationRoleEnum.values()) {
+			if (type.getName().contains(name)) {
+				dealerReviewEnum = type;
+				break;
+			}
+		}
+		return dealerReviewEnum;
+	}
+}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -850,9 +850,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		//增加整改单数据
 		List<HygfRectificationOrder> hygfRectificationOrderList= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.并网.getName());
 		if (CollectionUtil.isNotEmpty(hygfRectificationOrderList)){
-			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("area")).collect(Collectors.toList());
-			List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("engineering")).collect(Collectors.toList());
-			List<HygfRectificationOrder>  designOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("design")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("bw-area")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("bw-engineering")).collect(Collectors.toList());
+			List<HygfRectificationOrder>  designOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("bw-design")).collect(Collectors.toList());
 			hygfOnGrid.setAreaOrders(areaOrders.size()>0?areaOrders:null);
 			hygfOnGrid.setEngineeringOrders(engineeringOrders.size()>0?engineeringOrders:null);
 			hygfOnGrid.setDesignOrders(designOrders.size()>0?designOrders:null);