完成党员亮旗审核处理，改善亮旗党员-分页列表

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/epdc/form/StandardBearerExamineFormDTO.java

@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.user.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StandardBearerExamineFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -1726784183187953463L;
+
+    /**
+     * '1'通过；'2'驳回
+     */
+    private String examineStatus;
+
+    /**
+     * 审核意见
+     */
+    private String remark;
+
+    /**
+     * id
+     */
+    private String id;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/controller/UserController.java

@@ -31,6 +31,7 @@ import com.elink.esua.epdc.user.dto.PartyMemberModifyFormDTO;
 import com.elink.esua.epdc.user.dto.UserDTO;
 import com.elink.esua.epdc.user.dto.UserStandaeBearerPage;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.StandardBearerExamineFormDTO;
 import com.elink.esua.epdc.user.enums.AppUserStatesEnum;
 import com.elink.esua.epdc.user.excel.UserExcel;
 import com.elink.esua.epdc.user.service.UserService;
@@ -295,9 +296,30 @@ public class UserController {
         return new Result<PageData<UserStandaeBearerPage>>().ok(page);
     }
 
+    /**
+     * 亮旗党员-分页列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.user.dto.UserStandaeBearerPage>>
+     * @author LZN
+     * @date 2022/4/29 10:53
+     */
     @GetMapping("/partymembers/standardbearer/page")
     public Result<PageData<UserStandaeBearerPage>> BrightFlagPartyMem(@RequestParam Map<String, Object> params) {
         PageData<UserStandaeBearerPage> page = userService.BrightFlagPartyMem(params);
         return new Result<PageData<UserStandaeBearerPage>>().ok(page);
     }
+
+    /**
+     * 党员亮旗审核处理
+     *
+     * @param form
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/4/29 10:57
+     */
+    @PostMapping("/partymembers/standardbearer/examine")
+    public Result standaedBearerExamine(@RequestBody StandardBearerExamineFormDTO form){
+        return userService.standaedBearerExamine(form);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/dao/UserDao.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.user.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.user.dto.UserStandaeBearerPage;
+import com.elink.esua.epdc.user.dto.epdc.form.*;
 import com.elink.esua.epdc.user.dto.epdc.result.*;
 import com.elink.esua.epdc.user.dto.epdc.result.StandardBearerStatusResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.UserPartyStandardAppltResultDTO;
@@ -26,10 +27,6 @@ import com.elink.esua.epdc.user.entity.UserEntity;
 import com.elink.esua.epdc.user.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.user.dto.UserActivePointsResultDTO;
 import com.elink.esua.epdc.user.dto.UserDTO;
-import com.elink.esua.epdc.user.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
-import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserGroupInviteFormDTO;
-import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserMatchTagFormDTO;
-import com.elink.esua.epdc.user.dto.epdc.form.EpdcWorkUserFromDTO;
 import com.elink.esua.epdc.user.dto.product.result.EpmetUserBaseInfoDTO;
 import com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -458,4 +455,16 @@ public interface UserDao extends BaseDao<UserEntity> {
      * @date 2022/4/29 9:50
      */
     List<UserStandaeBearerPage> BrightFlagPartyMem(Map<String, Object> params);
+
+
+
+    /**
+     *查询TagId
+     *
+     * @param value
+     * @return java.lang.String
+     * @author LZN
+     * @date 2022/4/29 11:10
+     */
+    String selectTagId(String value);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/user/service/UserService.java

@@ -464,4 +464,14 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2022/4/29 9:49
      */
     PageData<UserStandaeBearerPage> BrightFlagPartyMem(Map<String, Object> params);
+
+    /**
+     * 党员亮旗审核处理
+     *
+     * @param form
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/4/29 10:58
+     */
+    Result standaedBearerExamine(StandardBearerExamineFormDTO form);
 }

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

@@ -26,8 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
-import com.elink.esua.epdc.user.dao.PartyStandardBearerApplyDao;
-import com.elink.esua.epdc.user.dao.UserDao;
+import com.elink.esua.epdc.user.dao.*;
 import com.elink.esua.epdc.user.datasources.DataSourceNames;
 import com.elink.esua.epdc.user.dto.*;
 import com.elink.esua.epdc.user.dto.PointLogFormDTO;
@@ -53,9 +52,6 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.user.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.user.constant.UserFieldConsant;
-import com.elink.esua.epdc.user.dao.PartyAuthenticationFailedDao;
-import com.elink.esua.epdc.user.dao.PartyMembersDao;
-import com.elink.esua.epdc.user.dao.UserAuthenticateHistoryDao;
 import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.user.dto.epdc.EpdcCompleteAppUserDTO;
 import com.elink.esua.epdc.user.dto.epdc.EpdcGridLeaderRegisterDTO;
@@ -71,10 +67,12 @@ import com.elink.esua.epdc.user.feign.PointFeignClient;
 import com.elink.esua.epdc.user.redis.UserRedis;
 import com.elink.esua.epdc.user.util.AppUserUtils;
 import com.google.common.collect.Lists;
+import com.sun.xml.internal.ws.api.FeatureConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.helper.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -130,6 +128,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private PartyStandardBearerApplyDao partyStandardBearerApplyDao;
 
+    @Autowired
+    private PartyStandardBearerApplyService partyStandardBearerApplyService;
+
+    @Autowired
+    private PartyTagRelationService partyTagRelationService;
+
     @Override
     @DataSource(value = DataSourceNames.FIRST)
     public PageData<UserDTO> page(Map<String, Object> params) {
@@ -1813,7 +1817,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             dto.setStatus(NumConstant.ONE_STR);
             return new Result<StandardBearerStatusResultDTO>().ok(dto);
         }
-        if (dto.getStatus() == NumConstant.ZERO_STR) {
+        if (dto.getStatus().equals(NumConstant.ZERO_STR)) {
             dto.setStatus(NumConstant.FOUR_STR);
             return new Result<StandardBearerStatusResultDTO>().ok(dto);
         }
@@ -1974,4 +1978,30 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         List<UserStandaeBearerPage> list = this.baseDao.BrightFlagPartyMem(params);
         return new PageData<>(list, iPage.getTotal());
     }
+
+    /**
+     * 党员亮旗审核处理
+     *
+     * @param form
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/4/29 10:59
+     */
+    @Override
+    public Result standaedBearerExamine(StandardBearerExamineFormDTO form) {
+        form.setId(SecurityUser.getUser().getId().toString());
+        PartyStandardBearerApplyEntity entity = new PartyStandardBearerApplyEntity();
+        entity.setId(form.getId());
+        entity.setRemark(form.getRemark());
+        entity.setExamineFlag(form.getExamineStatus());
+        if(partyStandardBearerApplyService.updateById(entity)){
+            String TagId = baseDao.selectTagId(UserTagEnum.PARTY_STANDARD_BEARER.value());
+            PartyTagRelationEntity TagRelEntity = new PartyTagRelationEntity();
+            TagRelEntity.setPartyId(form.getId());
+            TagRelEntity.setTagId(TagId);
+            partyTagRelationService.insert(TagRelEntity);
+            return new Result();
+        }
+        return new Result().error("党员亮旗审核处理失败");
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -1847,10 +1847,13 @@
             epdc_user u
             LEFT JOIN epdc_party_standard_bearer_apply AS a ON u.id = a.USER_ID
             AND a.DEL_FLAG = '0'
+            LEFT JOIN epdc_party_tag_relation r ON u.id = r.PARTY_ID
+            AND r.DEL_FLAG = '0'
         <where>
             u.del_flag = '0'
             AND u.IDENTITY_NO = #{identityNo}
             AND a.USER_ID = #{userId}
+            AND r.PARTY_ID = #{userId}
             <if test="realName != null and realName != ''">
                 AND u.REAL_NAME = #{realName}
             </if>
@@ -1860,6 +1863,9 @@
 
         </where>
     </select>
+    <select id="selectTagId" resultType="java.lang.String">
+        select id from epdc_user_tag where TAG_CODE = #{value}
+    </select>
 
 
     <insert id="insertUserResiInfo" parameterType="com.elink.esua.epdc.user.dto.product.result.EpmetUserResiInfoDTO">
@@ -1931,4 +1937,5 @@
         set DEL_FLAG = 1
         where USER_ID = #{userId}
     </update>
+
 </mapper>