流动党员报道、在职党员报道、城市观察员、红色志愿服务队添加查看按钮、审核信息

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/FlowPartyDTO.java

@@ -90,4 +90,9 @@ public class FlowPartyDTO implements Serializable {
      */
     private String partyName;
 
+    /**
+     * 审核意见
+     */
+    private String examineMsg;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/KnightPionnerDTO.java

@@ -98,4 +98,15 @@ public class KnightPionnerDTO implements Serializable {
      */
 	private String allDeptNames;
 
+    /**
+     * 审核状态 0、待审核 1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 审核意见
+     */
+    private String examineMsg;
+
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/RedSpearheadDTO.java

@@ -93,4 +93,14 @@ public class RedSpearheadDTO implements Serializable {
      */
 	private String allDeptNames;
 
+    /**
+     * 审核状态 0、待审核 1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 审核意见
+     */
+    private String examineMsg;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java

@@ -133,4 +133,14 @@ public class ReportPartyDTO implements Serializable {
      * 所有部门名称
      */
     private String allDeptNames;
+
+    /**
+     * 审核状态 0、待审核 1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 审核信息
+     */
+    private String examineMsg;
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/FlowPartyEntity.java

@@ -82,4 +82,9 @@ public class FlowPartyEntity extends DeptScope {
 	 */
 	private String partyName;
 
+	/**
+	 * 审核意见
+	 */
+	private String examineMsg;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/KnightPionnerEntity.java

@@ -66,14 +66,24 @@ public class KnightPionnerEntity extends DeptScope {
 	 */
 	private Integer courier;
 
-	/**
+//	/**
-	 * 其它类型的补充名称
+//	 * 其它类型的补充名称
-	 */
+//	 */
-	private String courierText;
+//	private String courierText;
 
     /**
      * 居住网格id
      */
 	private String deptId;
 
+	/**
+	 * 审核状态 0、待审核 1、审核通过
+	 */
+	private Integer status;
+
+	/**
+	 * 审核意见
+	 */
+	private String examineMsg;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/RedSpearheadEntity.java

@@ -70,4 +70,14 @@ public class RedSpearheadEntity extends DeptScope {
      */
 	private String specialty;
 
+	/**
+	 * 审核状态 0、待审核 1、审核通过
+	 */
+	private Integer status;
+
+	/**
+	 * 审核意见
+	 */
+	private String examineMsg;
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java

@@ -110,4 +110,15 @@ public class ReportPartyEntity extends DeptScope {
      */
     private Integer owners;
 
+    /**
+     * 审核状态 0、待审核 1、审核通过
+     */
+    private Integer status;
+
+    /**
+     * 审核信息
+     */
+    private String examineMsg;
+
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java

@@ -41,6 +41,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 流动党员报道表
@@ -155,6 +156,9 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        if (Objects.equals(0,entity.getStatus())){
+            entity.setExamineMsg(null);
+        }
         updateById(entity);
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java

@@ -41,6 +41,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 骑士先锋
@@ -126,6 +127,7 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        entity.setStatus(0);
         insert(entity);
     }
 
@@ -152,6 +154,9 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        if (Objects.equals(0,entity.getStatus())){
+            entity.setExamineMsg(null);
+        }
         updateById(entity);
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java

@@ -41,6 +41,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 红色尖兵
@@ -125,6 +126,7 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        entity.setStatus(0);
         insert(entity);
     }
 
@@ -151,6 +153,9 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        if (Objects.equals(0,entity.getStatus())){
+            entity.setExamineMsg(null);
+        }
         updateById(entity);
     }
 

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java

@@ -41,6 +41,7 @@ import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 党员报道
@@ -60,7 +61,15 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, ReportPartyDTO.class);
+        PageData<ReportPartyDTO> result = getPageData(page, ReportPartyDTO.class);
+        page.getRecords().forEach(entity -> {
+            result.getList().forEach(dto -> {
+                if (entity.getId().equals(dto.getId())) {
+                    dto.setAllDeptIds(entity.getAllDeptIds().split(","));
+                }
+            });
+        });
+        return result;
     }
 
     @Override
@@ -116,6 +125,7 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        entity.setStatus(0);
         insert(entity);
     }
 
@@ -142,6 +152,9 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
             entity.setParentDeptIds(deptDTO.getParentDeptIds());
             entity.setParentDeptNames(deptDTO.getParentDeptNames());
         }
+        if (Objects.equals(0,entity.getStatus())){
+            entity.setExamineMsg(null);
+        }
         updateById(entity);
     }