Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddUserPartyBadgeFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/4 9:47
+ */
+@NoArgsConstructor
+@Data
+public class AddUserPartyBadgeFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -6890701885153412660L;
+	/**
+	 * 用户Id
+	 */
+	@NotBlank(message = "用户Id不能为空")
+	private String userId;
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -167,15 +167,29 @@ public class BadgeController {
     }
 
     /**
-     * @param gridIdList
+	 * @param gridIdList
-     * @author yinzuomei
+	 * @author yinzuomei
-     * @description 根据网格id, 查询每个网格有多少个徽章申请单
+	 * @description 根据网格id, 查询每个网格有多少个徽章申请单
-     * @Date 2020/11/12 15:51
+	 * @Date 2020/11/12 15:51
-     **/
+	 **/
-    @PostMapping("querygridauditingbadgecount")
+	@PostMapping("querygridauditingbadgecount")
-	public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList){
+	public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList) {
 		return new Result<List<GridAuditingBadgeCountResultDTO>>().ok(badgeService.queryGridAuditingBadgeCount(gridIdList));
 	}
 
-
+	/**
+	 * desc: 党员认证通过后，添加党员 徽章记录
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author LiuJanJun
+	 * @date 2020/11/18 10:28 上午
+	 */
+	@PostMapping("adduserpartybadgerecord")
+	public Result audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		badgeService.addUserPartyBadgeRecord(tokenDto, formDTO);
+		return new Result();
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java

@@ -166,5 +166,15 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @description 根据网格id, 查询每个网格有多少个徽章申请
 	 * @Date 2020/11/12 15:59
 	 **/
-    List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(@Param("gridIdList") List<String> gridIdList);
+	List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(@Param("gridIdList") List<String> gridIdList);
+
+	/**
+	 * desc: 获取党员徽章Id
+	 *
+	 * @param customerId
+	 * @return java.lang.String
+	 * @author LiuJanJun
+	 * @date 2020/11/18 10:43 上午
+	 */
+	String getPartyBadgeId(@Param("customerId") String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java

@@ -21,10 +21,7 @@ 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.dto.BadgeDTO;
-import com.epmet.dto.form.AddBadgeFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.BadgeAuditFormDTO;
-import com.epmet.dto.form.BadgeFormDTO;
-import com.epmet.dto.form.EditBadgeFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.BadgeEntity;
 
@@ -187,4 +184,15 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @Date 2020/11/12 15:56
      **/
     List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList);
+
+    /**
+     * desc: 添加用户党员徽章记录
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return java.lang.Boolean
+     * @author LiuJanJun
+     * @date 2020/11/18 10:32 上午
+     */
+    Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java

@@ -420,10 +420,25 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
      **/
     @Override
     public List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList) {
-        if(CollectionUtils.isEmpty(gridIdList)){
+        if (CollectionUtils.isEmpty(gridIdList)) {
             return new ArrayList<>();
         }
         return baseDao.queryGridAuditingBadgeCount(gridIdList);
     }
 
+    /**
+     * desc: 添加用户党员徽章记录
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return java.lang.Boolean
+     * @author LiuJanJun
+     * @date 2020/11/18 10:32 上午
+     */
+    @Override
+    public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) {
+        String badgeId = baseDao.getPartyBadgeId(tokenDto.getCustomerId());
+        return null;
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -267,4 +267,15 @@
             </foreach>
             group by m.GRID_ID
     </select>
+
+    <select id="getPartyBadgeId" resultType="java.lang.String">
+        SELECT
+            ID
+        FROM
+            badge
+        WHERE
+            DEL_FLAG = '0'
+            AND (CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} OR CUSTOMER_ID = 'default')
+        order by CREATED_TIME desc  LIMIT 1
+    </select>
 </mapper>