Merge branch 'dev_1118' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_1118

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

@@ -315,4 +315,19 @@ public class UserDTO implements Serializable {
 
     private String leaderFlag;
 
-}
+    /**
+     * 认证历史-累计提交认证次数
+     */
+    private Integer totalSubmitNum;
+
+    /**
+     * 认证历史-通过次数
+     */
+    private Integer totalPassSubmitNum;
+
+    /**
+     * 认证历史-不通过次数
+     */
+    private Integer totalFailNum;
+
+}

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

@@ -26,8 +26,10 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import com.elink.esua.epdc.excel.UserAuthenticateHistoryExcel;
 import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,7 +47,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("userauthenticatehistory")
 public class UserAuthenticateHistoryController {
-    
+
     @Autowired
     private UserAuthenticateHistoryService userAuthenticateHistoryService;
 
@@ -61,6 +63,22 @@ public class UserAuthenticateHistoryController {
         return new Result<UserAuthenticateHistoryDTO>().ok(data);
     }
 
+    /**
+     * @param userId 用户id
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>>
+     * @Author yinzuomei
+     * @Description 根据用户id查询认证历史记录
+     * @Date 2019/11/21 13:59
+     **/
+    @GetMapping("listUserAuthenticateHistory/{userId}")
+    public Result<List<UserAuthenticateHistoryEntity>> listUserAuthenticateHistory(@PathVariable("userId") String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new Result().error("用户id不能为空");
+        }
+        List<UserAuthenticateHistoryEntity> list = userAuthenticateHistoryService.listUserAuthenticateHistory(userId);
+        return new Result<List<UserAuthenticateHistoryEntity>>().ok(list);
+    }
+
     @PostMapping
     public Result save(@RequestBody UserAuthenticateHistoryDTO dto){
         //效验数据
@@ -91,4 +109,4 @@ public class UserAuthenticateHistoryController {
         ExcelUtils.exportExcelToTarget(response, null, list, UserAuthenticateHistoryExcel.class);
     }
 
-}
+}

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

@@ -20,6 +20,10 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.List;
 
 /**
  * 用户认证历史表
@@ -29,5 +33,22 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserAuthenticateHistoryDao extends BaseDao<UserAuthenticateHistoryEntity> {
-	
-}
+	/**
+	 * @param userId 用户id
+	 * @return java.util.List<com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity>
+	 * @Author yinzuomei
+	 * @Description 根据用户id查询认证历史记录
+	 * @Date 2019/11/21 15:26
+	 **/
+	List<UserAuthenticateHistoryEntity> selectListUserAuthenticateHistory(String userId);
+
+	/**
+	 * @param userId 用户id
+	 * @param authenticatedFlag  是否认证通过 0未通过1通过
+	 * @return java.lang.Integer
+	 * @Author yinzuomei
+	 * @Description  统计用户认证次数
+	 * @Date 2019/11/21 15:55
+	 **/
+	Integer countAuthenticateHistory(@Param("userId") String userId, @Param("authenticatedFlag")String authenticatedFlag);
+}

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

@@ -92,4 +92,13 @@ public interface UserAuthenticateHistoryService extends BaseService<UserAuthenti
      * @date 2019-11-21
      */
     void delete(String[] ids);
-}
+
+    /**
+     * @param userId 用户id
+     * @return java.util.List<com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>
+     * @Author yinzuomei
+     * @Description 根据用户id查询认证历史记录
+     * @Date 2019/11/21 14:01
+     **/
+    List<UserAuthenticateHistoryEntity> listUserAuthenticateHistory(String userId);
+}

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

@@ -101,4 +101,16 @@ public class UserAuthenticateHistoryServiceImpl extends BaseServiceImpl<UserAuth
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-}
+    /**
+     * @param userId 用户id
+     * @return java.util.List<com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO>
+     * @Author yinzuomei
+     * @Description 根据用户id查询认证历史记录
+     * @Date 2019/11/21 14:01
+     **/
+    @Override
+    public List<UserAuthenticateHistoryEntity> listUserAuthenticateHistory(String userId) {
+        return baseDao.selectListUserAuthenticateHistory(userId);
+    }
+
+}

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

@@ -112,8 +112,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public UserDTO get(String id) {
         UserEntity entity = baseDao.selectById(id);
-
-        return ConvertUtils.sourceToTarget(entity, UserDTO.class);
+        UserDTO resultDTO=ConvertUtils.sourceToTarget(entity, UserDTO.class);
+        resultDTO.setTotalSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,null));
+        resultDTO.setTotalFailNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ZERO_STR));//0 未通过1通过
+        resultDTO.setTotalPassSubmitNum(userAuthenticateHistoryDao.countAuthenticateHistory(id,NumConstant.ONE_STR));
+        return resultDTO;
     }
 
     @Override
@@ -154,6 +157,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userTagRelationDTO.setTagId(tagId);
             userTagRelationService.save(userTagRelationDTO);
         }*/
+        //组装数据并插入用户认证历史表(epdc_user_authenticate_history)
+        UserEntity userEntity=this.baseDao.selectById(entity.getId());
+        UserAuthenticateHistoryEntity userAuthenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+        userAuthenticateHistoryEntity.setUserId(userEntity.getId());
+        userAuthenticateHistoryEntity.setMobile(userEntity.getMobile());
+        userAuthenticateHistoryEntity.setRealName(userEntity.getRealName());
+        userAuthenticateHistoryEntity.setAddress(userEntity.getAddress());
+        userAuthenticateHistoryEntity.setAuthenticatedFlag(userEntity.getState());//状态(0-已注册，1-已完善信息待审核，2-信息审核不通过，3-信息审核通过)
+        if(NumConstant.THREE_STR.equals(entity.getState())){
+            userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.YES.value());
+        }else{
+            userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value());
+        }
+        userAuthenticateHistoryEntity.setRemark(dto.getRemark());
+        userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity);
     }
 
 
@@ -483,6 +501,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userAuthenticateHistoryEntity.setMobile(userDto.getMobile());
             userAuthenticateHistoryEntity.setRealName(userDto.getRealName());
             userAuthenticateHistoryEntity.setAddress(userDto.getAddress());
+            userAuthenticateHistoryEntity.setRemark(userDto.getRemark());
             userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity);
         } else {
             if (oldEntity.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) {

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

@@ -19,5 +19,25 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
 
+    <!--  根据用户id查询认证历史记录  -->
+    <select id="selectListUserAuthenticateHistory" resultMap="userAuthenticateHistoryMap">
+        select *
+        from epdc_user_authenticate_history m
+        where  m.DEL_FLAG='0'
+        and m.USER_ID=#{value}
+	    order by m.CREATED_TIME desc
+    </select>
 
-</mapper>
+    <!--  统计用户认证次数  -->
+    <select id="countAuthenticateHistory" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            count(1)as totalNum
+        FROM
+            epdc_user_authenticate_history m
+            where m.DEL_FLAG='0'
+            and m.USER_ID=#{userId}
+            <if test="authenticatedFlag!=null and authenticatedFlag!=''">
+                and m.AUTHENTICATED_FLAG=#{authenticatedFlag}
+            </if>
+    </select>
+</mapper>