热心居民申请人工审核接口移至政府端服务

epmet-module/gov-org/gov-org-server/pom.xml

@@ -61,6 +61,12 @@
             <artifactId>gov-org-client</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-partymember-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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);
+    }
+
 }

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);
+
+
+}

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);
+    }
+}

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<CustomerStaffGridE
      * @date 2020-03-16
      */
     void delete(String[] ids);
+
+    /**
+     * 政府端-热心居民申请人工审核
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO);
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -20,14 +20,21 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.CustomerStaffGridDao;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.entity.CustomerStaffGridEntity;
+import com.epmet.feign.ResiPartymemberFeignClient;
 import com.epmet.redis.CustomerStaffGridRedis;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.service.CustomerStaffGridService;
+import com.epmet.util.ModuleConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +55,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
 
     @Autowired
     private CustomerStaffGridRedis customerStaffGridRedis;
+    @Autowired
+    private ResiPartymemberFeignClient resiPartymemberFeignClient;
 
     @Override
     public PageData<CustomerStaffGridDTO> page(Map<String, Object> params) {
@@ -65,8 +74,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         return ConvertUtils.sourceToTarget(entityList, CustomerStaffGridDTO.class);
     }
 
-    private QueryWrapper<CustomerStaffGridEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<CustomerStaffGridEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<CustomerStaffGridEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +110,25 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 政府端-热心居民申请人工审核
+     **/
+    @Override
+    public Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
+        }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getResiWarmApplyId())
+                || StringUtils.isBlank(formDTO.getAuditStatus())
+                || (!NumConstant.ZERO_STR.equals(formDTO.getAuditStatus()) && !NumConstant.ONE_STR.equals(formDTO.getAuditStatus()))) {
+            return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return resiPartymemberFeignClient.manageAudit(formDTO);
+    }
+
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/util/ModuleConstant.java

@@ -13,4 +13,9 @@ public interface ModuleConstant {
     String LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE = "00";
 
     int SUCCESS_CODE_RESULT = 0;
+
+    /**
+     * tokenDto不能为null userId不能为空
+     */
+    String USER_NOT_NULL="用户信息不能为空";
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@@ -7,7 +7,6 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -78,12 +77,4 @@ public interface ResiPartymemberFeignClient {
     @PostMapping("/resi/partymember/confirm/extra")
     Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO);
 
-    /**
-     * @Author sun
-     * @Description 政府端-热心居民申请人工审核
-     **/
-    @PostMapping(value = "resi/partymember/resiwarmheartedapply/manageaudit")
-    Result manageAudit(ResiWarmheartedAuditFormDTO formDTO);
-
-
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -8,7 +8,6 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -62,9 +61,4 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
     public Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberInfoExtra", partyMemberInfoDTO);
     }
-
-    @Override
-    public Result manageAudit(ResiWarmheartedAuditFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "manageAudit", formDTO);
-    }
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java

@@ -4,7 +4,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -45,15 +44,4 @@ public class ResiWarmheartedController {
         return resiWarmheartedService.submit(tokenDTO, formDTO);
     }
 
-    /**
-     * @param
-     * @Author sun
-     * @Description 政府端-热心居民申请人工审核
-     **/
-    @PostMapping("manageaudit")
-    public Result manageAudit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedAuditFormDTO formDTO) {
-        return resiWarmheartedService.manageAudit(tokenDTO, formDTO);
-    }
-
-
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java

@@ -2,7 +2,6 @@ package com.epmet.modules.warmhearted.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -32,13 +31,4 @@ public interface ResiWarmheartedService {
      */
     Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO);
 
-    /**
-     * 政府端-热心居民申请人工审核
-     *
-     * @param
-     * @return void
-     * @author sun
-     */
-    Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO);
-
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java

@@ -1,13 +1,11 @@
 package com.epmet.modules.warmhearted.service.impl;
 
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
-import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
 import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
@@ -65,24 +63,4 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
         return resiPartymemberFeignClient.submit(formDTO);
     }
 
-    /**
-     * @param
-     * @Author sun
-     * @Description 政府端-热心居民申请人工审核
-     **/
-    @Override
-    public Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO) {
-        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result().error(ModuleConstant.USER_NOT_NULL);
-        }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-                || StringUtils.isBlank(formDTO.getResiWarmApplyId())
-                || StringUtils.isBlank(formDTO.getAuditStatus())
-                || (!NumConstant.ZERO_STR.equals(formDTO.getAuditStatus())&&!NumConstant.ONE_STR.equals(formDTO.getAuditStatus()))) {
-            return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }
-        formDTO.setUserId(tokenDTO.getUserId());
-        return resiPartymemberFeignClient.manageAudit(formDTO);
-    }
-
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -188,7 +188,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
             //审核状态-通过
             entity.setAuditStatus(PartyMemberConstant.APPROVED);
         }
-        entity.setRefuseReason(formDTO.getRefuseReason());
+        if(!StringUtils.isBlank(formDTO.getRefuseReason())){
+            entity.setRefuseReason(formDTO.getRefuseReason());
+        }
         baseDao.updateById(entity);
         //2:审核通过的添加热心居民的角色
         if(NumConstant.ONE_STR.equals(formDTO.getAuditStatus())){