diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 1ab1be15fe..54875bf0ce 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -61,6 +61,12 @@
gov-org-client
2.0.0
+
+ com.epmet
+ resi-partymember-client
+ 2.0.0
+ compile
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
index 38d23d2962..29058e3247 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffGridController.java
@@ -17,7 +17,9 @@
package com.epmet.controller;
+import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@@ -27,6 +29,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.excel.CustomerStaffGridExcel;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
import com.epmet.service.CustomerStaffGridService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -91,4 +94,14 @@ public class CustomerStaffGridController {
ExcelUtils.exportExcelToTarget(response, null, list, CustomerStaffGridExcel.class);
}
+ /**
+ * @param
+ * @Author sun
+ * @Description 政府端-热心居民申请人工审核
+ **/
+ @PostMapping("manageaudit")
+ public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) {
+ return customerStaffGridService.manageAudit(tokenDTO, formDTO);
+ }
+
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
new file mode 100644
index 0000000000..f1e7ef4c9e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
@@ -0,0 +1,25 @@
+package com.epmet.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.ResiPartymemberFeignClientFallBack;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description 政府端工作人员审核
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class)
+public interface ResiPartymemberFeignClient {
+
+ /**
+ * @Author sun
+ * @Description 政府端-热心居民申请人工审核
+ **/
+ @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit")
+ Result manageAudit(ResiWarmheartedAuditFormDTO formDTO);
+
+
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
new file mode 100644
index 0000000000..90ddb00086
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
@@ -0,0 +1,21 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 政府端工作人员审核
+ * @Author sun
+ */
+@Component
+public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
+
+ @Override
+ public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) {
+ return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO);
+ }
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
index 9ebc45c530..8ddb524092 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
@@ -19,8 +19,11 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.entity.CustomerStaffGridEntity;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
import java.util.List;
import java.util.Map;
@@ -92,4 +95,14 @@ public interface CustomerStaffGridService extends BaseService page(Map params) {
@@ -65,8 +74,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl getWrapper(Map params){
- String id = (String)params.get(FieldConstant.ID_HUMP);
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +110,25 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl