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

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml

@@ -10,7 +10,6 @@
         <result property="startColor" column="START_COLOR"/>
         <result property="endColor" column="END_COLOR"/>
         <result property="lableColor" column="LABLE_COLOR"/>
-        <result property="icon" column="ICON"/>
         <result property="templateCode" column="TEMPLATE_CODE"/>
         <result property="templateName" column="TEMPLATE_NAME"/>
         <result property="revision" column="REVISION"/>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 工作端，用户登录，用户管理相关接口
@@ -34,11 +33,10 @@ public class ApiWorkUserController {
     private WorkUserService workUserService;
 
     /**
-     *
      * 工作端-获取token
      *
-     * @params [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkAppAuthorizationDTO>
+     * @params [formDto]
      * @author liuchuang
      * @since 2019/11/19 17:23
      */
@@ -49,11 +47,10 @@ public class ApiWorkUserController {
     }
 
     /**
-     *
      * 工作端-用户登录
      *
-     * @params [formDto]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
+     * @params [formDto]
      * @author liuchuang
      * @since 2019/11/19 23:03
      */
@@ -70,7 +67,7 @@ public class ApiWorkUserController {
      * @return
      */
     @GetMapping("residentDetail")
-    public Result<EpdcResidentDetailResultDTO> residentDetail(@RequestBody EpdcResidentDetailFormDTO formDto) {
+    public Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return workUserService.residentDetail(formDto);
     }
@@ -101,7 +98,7 @@ public class ApiWorkUserController {
     /***
      * 用户列表
      * @param workUserFromDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO>>
      * @author qushutong
      * @date 2019/11/18 13:53
      */
@@ -118,8 +115,8 @@ public class ApiWorkUserController {
      * @date 2019/11/19 10:54
      */
     @GetMapping("unauthorizedAmount")
-    public Result<Integer> unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto){
-        return workUserService.getUnauthorizedAmount(userDetail,fromDto);
+    public Result<Integer> unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) {
+        return workUserService.getUnauthorizedAmount(userDetail, fromDto);
     }
 
     /**
@@ -142,8 +139,21 @@ public class ApiWorkUserController {
      * @Date 2019/11/22 13:16
      **/
     @GetMapping("authenticateHistory")
-    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(@RequestBody EpdcAuthenticateHistoryFormDTO formDTO) {
+    public Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return workUserService.authenticateHistory(formDTO);
     }
+
+    /**
+     * 获取用户扫码的网格
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/26 15:52
+     */
+    @GetMapping("listGrid")
+    public Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId) {
+        return workUserService.listUserGrid(userId);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@@ -19,47 +19,49 @@ import java.util.Map;
  */
 public interface WorkUserService {
 
-	/**
-	 *
-	 * 工作端-获取token
-	 *
-	 * @params [formDto]
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkAppAuthorizationDTO>
-	 * @author liuchuang
-	 * @since 2019/11/19 17:28
-	 */
-	Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto);
+    /**
+     * 工作端-获取token
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkAppAuthorizationDTO>
+     * @params [formDto]
+     * @author liuchuang
+     * @since 2019/11/19 17:28
+     */
+    Result<WorkUserAuthorizationDTO> getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto);
+
+    /**
+     * 工作端-用户登录
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
+     * @params [formDto]
+     * @author liuchuang
+     * @since 2019/11/19 23:04
+     */
+    Result<WorkUserAuthorizationDTO> login(WorkUserLoginDTO formDto);
 
-	/**
-	 *
-	 * 工作端-用户登录
-	 *
-	 * @params [formDto]
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO>
-	 * @author liuchuang
-	 * @since 2019/11/19 23:04
-	 */
-	Result<WorkUserAuthorizationDTO> login(WorkUserLoginDTO formDto);
+    /**
+     * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+     *
+     * @param formDto 用户Id
+     * @return
+     */
+    Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto);
 
-	/**
-	 * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
-	 * @param formDto 用户Id
-	 * @return
-	 */
-	Result<EpdcResidentDetailResultDTO> residentDetail(EpdcResidentDetailFormDTO formDto);
-	/**
-	 * 认证用户（用户信息审核）
-	 * @param formDTO
-	 * @return
-	 */
-	Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
+    /**
+     * 认证用户（用户信息审核）
+     *
+     * @param formDTO
+     * @return
+     */
+    Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 
-	/**
-	 * 获取党员详情（已认证或未认证的党员用户）
-	 * @param userId
-	 * @return
-	 */
-	Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
+    /**
+     * 获取党员详情（已认证或未认证的党员用户）
+     *
+     * @param userId
+     * @return
+     */
+    Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId);
 
     /***
      *  用户列表
@@ -70,30 +72,40 @@ public interface WorkUserService {
      */
     Result<List<EpdcWorkUserResultDTO>> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto);
 
-	/***
-	 * 查询待认证用户数量
-	 * @param
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
-	 * @author qushutong
-	 * @date 2019/11/19 10:56
-	 */
-    Result<Integer> getUnauthorizedAmount(TokenDto userDetail,  EpdcUnauthorizedAmountFromDTO fromDto);
+    /***
+     * 查询待认证用户数量
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.Integer>
+     * @author qushutong
+     * @date 2019/11/19 10:56
+     */
+    Result<Integer> getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto);
 
-	/**
-	 * @param userDetail
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 首页面板 获取工作端APP菜单
-	 * @Date 2019/11/20 10:43
-	 **/
-	Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail);
+    /**
+     * @param userDetail
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
+     * @Author yinzuomei
+     * @Description 首页面板 获取工作端APP菜单
+     * @Date 2019/11/20 10:43
+     **/
+    Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(TokenDto userDetail);
 
-	/**
-	 * @param formDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
-	 * @Author yinzuomei
-	 * @Description 用户认证审核历史
-	 * @Date 2019/11/22 13:16
-	 **/
-	Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO>>
+     * @Author yinzuomei
+     * @Description 用户认证审核历史
+     * @Date 2019/11/22 13:16
+     **/
+    Result<List<EpdcAuthenticateHistoryResultDTO>> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO);
+
+    /**
+     * 获取用户扫码的网格
+     *
+     * @param userId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
+     * @author work@yujt.net.cn
+     * @date 2019/11/26 15:52
+     */
+    Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -178,4 +178,8 @@ public class WorkUserServiceImpl implements WorkUserService {
         return userFeignClient.authenticateHistory(formDTO);
     }
 
+    @Override
+    public Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId) {
+        return userFeignClient.listUserGrid(userId);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@@ -487,7 +487,7 @@
                 <![CDATA[ AND DATE_FORMAT(t1.DISTRIBUTE_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
                 ORDER BY
                 <if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
-                issue.DISTRIBUTE_TIME DESC
+                t1.DISTRIBUTE_TIME DESC
                 LIMIT #{pageIndex},#{pageSize}
             ) temp
         )

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml

@@ -10,6 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>epdc-kpi-client</artifactId>
+    <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
 </project>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml

@@ -10,6 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>epdc-kpi-server</artifactId>
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>com.esua.epdc</groupId>

esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@@ -18,11 +18,6 @@
             <artifactId>epdc-news-client</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-commons-tools</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.esua.epdc</groupId>
             <artifactId>epdc-commons-mybatis</artifactId>

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

@@ -18,6 +18,10 @@ public class EpdcPartyMemberDetailDto implements Serializable {
      * 真实姓名
      */
     private String realName;
+    /**
+     * 手机号
+     */
+    private String mobile;
     /**
      * 身份证号
      */

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

@@ -45,6 +45,10 @@ public class EpdcResidentDetailResultDTO implements Serializable {
 	 * 审核状态（1待认证 3已认证）
 	 */
 	private String state;
+	/**
+	 * 用户手机号
+	 */
+	private String mobile;
 	/**
 	 * 扫码网格列表
 	 */

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

@@ -569,7 +569,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             } else {
                 throw new RenException("是否认证通过数据不匹配");
             }
-            this.update(userDTO);
+            //插入认证历史表
+            UserAuthenticateHistoryEntity authenticateHistoryEntity=new UserAuthenticateHistoryEntity();
+            authenticateHistoryEntity.setUserId(userDTO.getId());
+            authenticateHistoryEntity.setMobile(userDTO.getMobile());
+            authenticateHistoryEntity.setRealName(userDTO.getRealName());
+            authenticateHistoryEntity.setAddress(userDTO.getAddress());
+            authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过
+            //authenticateHistoryEntity.setRemark(userDTO.getRemark());
+            userAuthenticateHistoryDao.insert(authenticateHistoryEntity);
         }
         return new Result();
     }

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

@@ -105,6 +105,7 @@
         <result column="DWELLING_PLACE" property="dwellingPlace"/>
         <result column="PARTY_FLAG" property="partyFlag"/>
         <result column="state" property="state"/>
+        <result column="mobile" property="mobile"/>
         <collection property="gridList" ofType="com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailGridResultDTO">
             <result column="completeName" property="completeName"/>
             <result column="leaderFlag" property="leaderFlag"/>
@@ -120,6 +121,7 @@
             eu.DWELLING_PLACE,
             eu.PARTY_FLAG ,
             eu.state,
+            eu.mobile,
             CONCAT_WS('-',eugr.STREET,eugr.COMMUNITY,eugr.GRID) as completeName,
             eugr.LEADER_FLAG as leaderFlag
         FROM
@@ -190,6 +192,7 @@
             eu.REAL_NAME AS realName,
             eu.IDENTITY_NO AS identityNo,
             eu.ROAD AS road,
+            eu.MOBILE as mobile,
             eu.VILLAGE_NAME AS villageName,
             eu.DWELLING_PLACE as dwellingPlace,
             '1' as authenticatedFlag,
@@ -306,4 +309,4 @@
         AND ug_r.DEL_FLAG = '0'
         AND u.DEL_FLAG = '0'
     </select>
-</mapper>
+</mapper>