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

esua-epdc/doc/db/newupdate.sql

@@ -3,3 +3,6 @@ ALTER TABLE esua_epdc_admin.sys_dept ADD type_key varchar(50) NULL COMMENT '机
 
 -------------  2019-09-20 部门编码--------------------
 ALTER TABLE sys_dept ADD party_code varchar(50)
+
+-------------  2019-09-24 --------------------
+ALTER TABLE epdc_user ADD REMARK VARCHAR(255) NULL COMMENT '审核备注'

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,7 +60,7 @@ public class SysDeptController {
     /***
      *  通过编码得到党委编码
      * @param partyCode
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map < java.lang.String , java.lang.String>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map   <   java.lang.String   ,   java.lang.String>>
      * @author qushutong
      * @date 2019/9/20 19:56
      */
@@ -106,9 +107,8 @@ public class SysDeptController {
     public Result delete(@PathVariable("id") Long id) {
         //效验数据
         AssertUtils.isNull(id, "id");
-
-        sysDeptService.delete(id);
-
+//        sysDeptService.delete(id);
+        sysDeptService.deleteBatchIds(Arrays.asList(new Long[]{id}));
         return new Result();
     }
 
@@ -135,7 +135,7 @@ public class SysDeptController {
      * 通过街道ID获取项目可流转部门
      *
      * @Params: [deptId]
-     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.SysDeptDTO>>
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.dto.SysDeptDTO>>
      * @Author: liuchuang
      * @Date: 2019/9/16 17:00
      */

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -10,12 +10,10 @@ package com.elink.esua.epdc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SysDictDao;
 import com.elink.esua.epdc.dto.SysDictDTO;
@@ -30,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -48,12 +47,10 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
 
     @Override
     public PageData<SysDictDTO> page(Map<String, Object> params) {
-        QueryWrapper<SysDictEntity> wrapper = getWrapper(params);
-        wrapper.eq("pid", Constant.DICT_ROOT);
 
         IPage<SysDictEntity> page = baseDao.selectPage(
-            getPage(params, "sort", true),
-            wrapper
+                getPage(params, "sort", true),
+                getWrapper(params)
         );
 
         return getPageData(page, SysDictDTO.class);
@@ -72,14 +69,13 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
         return ConvertUtils.sourceToTarget(entityList, SysDictDTO.class);
     }
 
-    private QueryWrapper<SysDictEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<SysDictEntity> getWrapper(Map<String, Object> params) {
         String pid = (String) params.get("pid");
         String dictType = (String) params.get("dictType");
         String dictName = (String) params.get("dictName");
         String dictValue = (String) params.get("dictValue");
 
         QueryWrapper<SysDictEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
         wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid));
         wrapper.eq(StringUtils.isNotBlank(dictType), "dict_type", dictType);
         wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName);
@@ -115,14 +111,14 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
         //逻辑删除
-        logicDelete(ids, SysDictEntity.class);
+        baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
     @Override
     public void delete(Long id) {
         SysDictDTO dto = this.get(id);
         dictRedis.removeSimpleDictList(dto.getDictType());
-        logicDelete(new Long[]{id}, SysDictEntity.class);
+        baseDao.deleteById(id);
     }
 
     @Override

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface UserFeignClient {
 
     /**
-     * 获取用户信息
+     * 获取用户信息(注册用)
      *
      * @param openId
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
@@ -34,6 +34,17 @@ public interface UserFeignClient {
     @GetMapping("app-user/epdc-app/user/getByOpenId/{openId}")
     Result<UserDTO> getUserInfoByOpenId(@PathVariable("openId") String openId);
 
+    /**
+     * 获取用户信息（登录用）
+     *
+     * @param openId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/20 18:43
+     */
+    @GetMapping("app-user/epdc-app/user/getForLogin/{openId}")
+    Result<UserDTO> getUserForLoginByOpenId(@PathVariable("openId") String openId);
+
     /**
      * 获取用户信息
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -22,6 +22,11 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByOpenId", openId);
     }
 
+    @Override
+    public Result<UserDTO> getUserForLoginByOpenId(String openId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserForLoginByOpenId", openId);
+    }
+
     @Override
     public Result<UserDTO> getUserInfoByUnionId(String unionId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoByUnionId", unionId);

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

@@ -98,7 +98,7 @@ public class AppUserServiceImpl implements AppUserService {
      */
     private Result<EpdcAppAuthorizationDTO> getTokenByUnionId(String unionId) {
         // 查询当前微信是否已注册用户
-        Result<UserDTO> userInfoResult = userFeignClient.getUserInfoByUnionId(unionId);
+        Result<UserDTO> userInfoResult = userFeignClient.getUserForLoginByOpenId(unionId);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());
         }
@@ -115,7 +115,7 @@ public class AppUserServiceImpl implements AppUserService {
      */
     private Result<EpdcAppAuthorizationDTO> getTokenByOpenId(String openId) {
         // 查询当前微信是否已注册用户
-        Result<UserDTO> userInfoResult = userFeignClient.getUserInfoByOpenId(openId);
+        Result<UserDTO> userInfoResult = userFeignClient.getUserForLoginByOpenId(openId);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());
         }
@@ -139,11 +139,22 @@ public class AppUserServiceImpl implements AppUserService {
             return new Result().ok(authorization);
         }
         String state = userDto.getState();
-        String userId = userDto.getId();
-        TokenDto tokenInfo = tokenUtil.getTokenInfo(userId);
-
-        // 用户已注册且审核通过，可以正常登录系统
-        if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(state)) {
+        // 用户注册审核失败
+        if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(state)) {
+            authorization.setUserState(AppUserStateEnum.AUDIT_FAILURE.value());
+            Result result = new Result().ok(authorization);
+            result.setMsg(userDto.getRemark());
+            return result;
+        }
+        // 用户提交注册、正在等待审核
+        else if (AppUserAuditStateEnum.UNDER_AUDIT.value().equals(state)) {
+            authorization.setUserState(AppUserStateEnum.UNDER_AUDIT.value());
+            return new Result().ok(authorization);
+        }
+        // 用户已注册且审核通过，正常登录系统
+        else if (AppUserAuditStateEnum.AUDIT_SUCCESS.value().equals(state)) {
+            String userId = userDto.getId();
+            TokenDto tokenInfo = tokenUtil.getTokenInfo(userId);
             // 生成token
             String token = jwtTokenUtils.generateToken(userId);
             Long expire;
@@ -154,7 +165,6 @@ public class AppUserServiceImpl implements AppUserService {
             } else {
                 expire = (long) jwtTokenProperties.getExpire();
             }
-
             TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class);
             tokenDto.setUserId(userId);
             cpUserDetailRedis.set(tokenDto, expire);
@@ -164,16 +174,9 @@ public class AppUserServiceImpl implements AppUserService {
             authorization.setUserId(userId);
             authorization.setExpire(expire);
             return new Result().ok(authorization);
+        } else {
+            return new Result().error("Login failed");
         }
-
-        // 用户提交注册、正在等待审核或审核失败
-        if (AppUserAuditStateEnum.UNDER_AUDIT.value().equals(state)) {
-            authorization.setUserState(AppUserStateEnum.UNDER_AUDIT.value());
-        } else if (AppUserAuditStateEnum.AUDIT_FAILURE.value().equals(state)) {
-            authorization.setUserState(AppUserStateEnum.AUDIT_FAILURE.value());
-        }
-        return new Result().ok(authorization);
-
     }
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventsReviewFormDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -32,6 +33,6 @@ public class EpdcEventsReviewFormDTO implements Serializable {
     /**
      * 处理意见
      */
-    @NotBlank(message = "处理意见不能为空")
+    @Size(min = 1, max = 500, message = "处理意见在500字以内")
     private String advice;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueContentDetailDTO.java

@@ -39,6 +39,10 @@ public class IssueContentDetailDTO implements Serializable {
      * 评论数
      */
     private Integer commentNum;
+    /**
+     * 图片
+     */
+    private List<String> images;
     /**
      * 工作反馈或处理进度
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/IssueWaitHandleDetailDTO.java

@@ -31,6 +31,10 @@ public class IssueWaitHandleDetailDTO implements Serializable {
      * 议题内容
      */
     private String issueContent;
+    /**
+     * 图片
+     */
+    private List<String> images;
     /**
      * 工作反馈
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueWaitHandleSubmitFormDTO.java

@@ -2,8 +2,8 @@ package com.elink.esua.epdc.dto.issue.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -22,7 +22,7 @@ public class IssueWaitHandleSubmitFormDTO implements Serializable {
     /**
      * 处理意见
      */
-    @NotBlank(message = "处理意见不能为空")
+    @Size(min = 1, max = 500, message = "处理意见在500字以内")
     private String advice;
     /**
      * 状态 1 添加处理意见，2 关闭，4 转项目

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java

@@ -2,10 +2,9 @@ package com.elink.esua.epdc.dto.item.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Author LC
@@ -21,7 +20,7 @@ public class EvaluationFormDTO implements Serializable {
     @NotBlank(message = "满意度评价得分不能为空")
     private int evaluationScore;
 
-    @NotBlank(message = "满意度评价内容不能为空")
+    @Size(min = 1, max = 100, message = "满意度评价内容在100字以内")
     private String evaluationContent;
 
     private String userId;

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
 
@@ -27,13 +28,13 @@ public class ItemHandleSubmitFormDTO implements Serializable {
     /**
      * 处理意见（内部）
      */
-    @NotBlank(message = "处理意见（内部）不能为空")
+    @Size(min = 1, max = 500, message = "处理意见在500字以内")
     private String handleAdvice;
 
     /**
      * 处理意见（外部）
      */
-    @NotBlank(message = "处理意见（外部）不能为空")
+    @Size(min = 1, max = 500, message = "处理意见在500字以内")
     private String outHandleAdvice;
 
     /**

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemContentForPCEndResultDTO.java

@@ -47,4 +47,8 @@ public class ItemContentForPCEndResultDTO implements Serializable {
      * 项目处理进度
      */
     private List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
+    /**
+     * 图片
+     */
+    private List<String> images;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java

@@ -54,6 +54,7 @@ public class EpdcAppItemController {
 
     @PostMapping("evaluation")
     public Result evaluation(@RequestBody EvaluationFormDTO evaluationFormDTO) {
+        ValidatorUtils.validateEntity(evaluationFormDTO);
         return this.itemService.evaluation(evaluationFormDTO);
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -461,6 +461,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      * @Date: 2019/9/16 19:42
      */
     private Result checkItemCirculation(ItemHandleSubmitFormDTO dto) {
+        // 判断流转部门不能为空
+        if (null == dto.getDeptResultDTOS() || dto.getDeptResultDTOS().size() <= 0) {
+            return new Result().error("请选择流转协助部门");
+        }
         // 校验是否跨级流转
         String typeKey = "";
         for (ItemCirculationDeptResultDTO circulationDeptResultDTO:

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

@@ -73,6 +73,12 @@
             <if test="gridId != null and gridId != ''">
                 AND temp.grid_id = #{gridId}
             </if>
+            <if test="streetId != null and streetId != ''">
+                AND temp.STREET_ID = #{streetId}
+            </if>
+            <if test="communityId != null and communityId != ''">
+                AND temp.COMMUNITY_ID = #{communityId}
+            </if>
             AND temp.EVENT_STATE = 2
         ORDER BY
             temp.CREATED_TIME DESC

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

@@ -41,6 +41,9 @@
         <result property="nickName" column="NICK_NAME"/>
         <result property="distributeTime" column="DISTRIBUTE_TIME"/>
         <result property="issueContent" column="ISSUE_CONTENT"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
         <collection property="jobFeedbackDTOS" ofType="com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO">
             <result property="stateName" column="stateName"/>
             <result property="createdTime" column="CREATED_TIME"/>
@@ -64,32 +67,50 @@
                     '【反馈】'
                     WHEN 2 THEN
                     '【已关闭】' ELSE ''
-                 END) AS stateName
+                 END) AS stateName,
+                 img.IMG_URL
             FROM
                 epdc_issue i
                 LEFT JOIN epdc_issue_handle h ON i.ID = h.ISSUE_ID
                 AND h.DEL_FLAG = '0'
+                LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
+				AND img.DEL_FLAG = '0'
             WHERE
                 i.DEL_FLAG = '0'
                 AND i.ID = #{id}
-            ORDER BY h.CREATED_TIME DESC
+            ORDER BY h.CREATED_TIME, img.CREATED_TIME DESC
     </select>
 
-    <select id="selectOneIssueContentDetail" resultType="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
+    <resultMap id="issueContentDetailMap" type="com.elink.esua.epdc.dto.issue.IssueContentDetailDTO">
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="issueContent" column="ISSUE_CONTENT"/>
+        <result property="approveNum" column="APPROVE_NUM"/>
+        <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectOneIssueContentDetail" resultMap="issueContentDetailMap">
         SELECT
-            i.NICK_NAME AS nickName,
-            i.DISTRIBUTE_TIME AS distributeTime,
-            i.ISSUE_CONTENT AS issueContent,
-            e.APPROVE_NUM AS approveNum,
-            e.OPPOSE_NUM AS opposeNum,
-            e.COMMENT_NUM AS commentNum
+            i.NICK_NAME,
+            i.DISTRIBUTE_TIME,
+            i.ISSUE_CONTENT,
+            e.APPROVE_NUM,
+            e.OPPOSE_NUM,
+            e.COMMENT_NUM,
+            img.IMG_URL
         FROM
             epdc_issue i
             LEFT JOIN epdc_events e ON i.EVENT_ID = e.ID
             AND e.DEL_FLAG = '0'
+            LEFT JOIN epdc_img img ON i.EVENT_ID = img.REFERENCE_ID
+			AND img.DEL_FLAG = '0'
         WHERE
             i.DEL_FLAG = '0'
             AND i.ID = #{issueId}
+        ORDER BY img.CREATED_TIME
     </select>
 
     <select id="selectListOfJobFeedBack" resultType="com.elink.esua.epdc.dto.issue.IssueJobFeedbackDTO">

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -301,6 +301,7 @@
             <if test="outOrInside == 1">
                 OUT_HANDLE_ADVICE AS advice,
             </if>
+            HANDLER_DEPT AS handlerDept,
             CASE WHEN STATE = 0 THEN '【处理中】' WHEN STATE = 5 THEN '【已关闭】' WHEN STATE = 10 THEN '【已结案】' ELSE '' END AS progressName
         FROM
             epdc_item_handle_process
@@ -310,6 +311,7 @@
         SELECT
             EVALUATION_TIME AS createdTime,
             EVALUATION_CONTENT AS advice,
+            NICK_NAME AS handlerDept,
             CASE
             EVALUATION_SCORE
             WHEN 0 THEN
@@ -329,7 +331,19 @@
             createdTime DESC
     </select>
 
-    <select id="selectItemContentForPCEnd" resultType="com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO">
+    <resultMap id="itemContentForPCEndMap" type="com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO">
+        <result property="id" column="ID"/>
+        <result property="nickName" column="NICK_NAME"/>
+        <result property="distributeTime" column="DISTRIBUTE_TIME"/>
+        <result property="itemContent" column="ITEM_CONTENT"/>
+        <result property="approveNum" column="APPROVE_NUM"/>
+        <result property="opposeNum" column="OPPOSE_NUM"/>
+        <result property="commentNum" column="COMMENT_NUM"/>
+        <collection property="images" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectItemContentForPCEnd" resultMap="itemContentForPCEndMap">
         SELECT
             item.ID,
             item.NICK_NAME,
@@ -337,13 +351,17 @@
             item.ITEM_CONTENT,
             eve.APPROVE_NUM,
             eve.OPPOSE_NUM,
-            eve.COMMENT_NUM
+            eve.COMMENT_NUM,
+            img.IMG_URL
         FROM
             epdc_item item
             LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID
             AND eve.DEL_FLAG = '0'
+            LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID
+			AND img.DEL_FLAG = '0'
         WHERE
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
+        ORDER BY img.CREATED_TIME
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml

@@ -15,7 +15,7 @@
             im.BUSINESS_ID,
             im.BUSINESS_TYPE,
             im.REL_BUSINESS_CONTENT,
-            DATE_FORMAT( im.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) AS `time`
+            im.CREATED_TIME AS `time`
         FROM
             epdc_information im
         WHERE
@@ -23,7 +23,7 @@
             AND im.CREATED_TIME <= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
             AND im.DEL_FLAG= '0'
         ORDER BY
-            im.READ_FLAG DESC, im.CREATED_TIME DESC
+            im.READ_FLAG ASC, im.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 

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

@@ -307,4 +307,9 @@ public class UserDTO implements Serializable {
      */
     private String tagIds;
 
+    /**
+     * 审核备注
+     */
+    private String remark;
+
 }

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

@@ -36,6 +36,19 @@ public class EpdcAppUserController {
         return userService.getUserInfoByOpenId(openId);
     }
 
+    /**
+     * 登录前，获取用户信息
+     *
+     * @param openId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/24 13:57
+     */
+    @GetMapping("getForLogin/{openId}")
+    public Result<UserDTO> getUserForLoginByOpenId(@PathVariable("openId") String openId) {
+        return userService.getUserForLoginByOpenId(openId);
+    }
+
     /**
      * 根据用户unionId获取用户信息(只查询已注册或审核中的用户)
      *

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

@@ -17,7 +17,6 @@
 
 package com.elink.esua.epdc.controller;
 
-import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -29,7 +28,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.excel.UserExcel;
 import com.elink.esua.epdc.service.UserService;
-import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserEntity.java

@@ -263,5 +263,10 @@ public class UserEntity extends BaseEpdcEntity {
      */
     private String firstName;
 
+    /**
+     * 审核备注
+     */
+    private String remark;
+
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java

@@ -30,81 +30,50 @@ import java.util.Date;
  */
 @Data
 public class UserExcel {
-    @Excel(name = "主键")
-    private String id;
-    @Excel(name = "昵称")
-    private String nickname;
-    @Excel(name = "手机号")
-    private String mobile;
-    @Excel(name = "密码")
-    private String password;
-    @Excel(name = "注册时间")
-    private Date registerTime;
-    @Excel(name = "头像")
-    private String faceImg;
-    @Excel(name = "性别(女性-female，男性-male)")
-    private String sex;
-    @Excel(name = "生日")
-    private Date birthday;
-    @Excel(name = "邮箱")
-    private String email;
-    @Excel(name = "电话")
-    private String telephone;
-    @Excel(name = "邮编")
-    private String zipCode;
-    @Excel(name = "职业")
-    private String profession;
-    @Excel(name = "爱好")
-    private String hobbies;
-    @Excel(name = "个性签名")
-    private String userSign;
-    @Excel(name = "邀请码")
-    private String invitationCode;
-    @Excel(name = "最近登录时间")
-    private Date lastLoginTime;
-    @Excel(name = "最近登录IP")
-    private String lastLoginIp;
-    @Excel(name = "最近登录位置经度")
-    private String lastLongitude;
-    @Excel(name = "最近登录位置维度")
-    private String lastLatitude;
+
     @Excel(name = "真实姓名")
     private String realName;
+
     @Excel(name = "身份证号")
     private String identityNo;
+
+    @Excel(name = "是否党员", replace = {"是_1", "否_0"})
+    private String partyFlag;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "街道")
+    private String street;
+
+    @Excel(name = "社区")
+    private String community;
+
+    @Excel(name = "网格")
+    private String grid;
+
     @Excel(name = "居民住址")
     private String address;
-    @Excel(name = "微信OPENID")
-    private String wxOpenId;
-    @Excel(name = "是否是党员(0-否，1-是)")
-    private String partyFlag;
-    @Excel(name = "注册方式（wx：微信注册）")
-    private String registerWay;
-    @Excel(name = "用户来源(wp:公众号)")
-    private String registerSource;
+
+    @Excel(name = "昵称")
+    private String nickname;
+
+    @Excel(name = "性别", replace = {"男_1", "女_0", "保密_2"})
+    private String sex;
+
+    @Excel(name = "生日", format = "yyyy-MM-dd")
+    private Date birthday;
+
+    @Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date registerTime;
+
     @Excel(name = "手机号所属省份")
-    private String phoneProvince;
+    private String mobileProvince;
+
     @Excel(name = "手机号所属城市")
-    private String phoneCity;
+    private String mobileCity;
+
     @Excel(name = "手机号所属运营商")
-    private String phoneCarrier;
-    @Excel(name = "用户积分")
-    private Integer points;
-    @Excel(name = "邀请人ID")
-    private String inviteUserId;
-    @Excel(name = "乐观锁")
-    private Integer revision;
-    @Excel(name = "网格ID")
-    private String gridId;
-    @Excel(name = "创建人")
-    private String createdBy;
-    @Excel(name = "创建时间")
-    private Date createdTime;
-    @Excel(name = "更新人")
-    private String updatedBy;
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-    @Excel(name = "删除标记")
-    private String delFlag;
+    private String mobileCarrier;
 
 }

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

@@ -22,8 +22,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 
@@ -114,4 +112,14 @@ public interface UserService extends BaseService<UserEntity> {
      * @date 2019/9/21 11:04
      */
     Result verifyUserRegisterData(EpdcUserRegistFormDTO formDto);
+
+    /**
+     * 登录前，获取用户信息
+     *
+     * @param openId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.UserDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/24 13:57
+     */
+    Result<UserDTO> getUserForLoginByOpenId(String openId);
 }

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

@@ -33,8 +33,6 @@ import com.elink.esua.epdc.dao.UserDao;
 import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateAvatarFromDTO;
-import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.entity.UserEntity;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
@@ -109,7 +107,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         wrapper.ge(StringUtils.isNotBlank(startTime), "REGISTER_TIME", startTime);
         wrapper.lt(StringUtils.isNotBlank(endTime), "REGISTER_TIME", endTime);
         wrapper.eq(StringUtils.isNotBlank(auditState), FieldConstant.STATE, auditState);
-        wrapper.in(CollUtil.isNotEmpty(deptIdList), "GRID_ID", deptIdList);
+        wrapper.in(CollUtil.isNotEmpty(deptIdList), FieldConstant.GRID_ID, deptIdList);
         wrapper.eq(StringUtils.isNotBlank(isParty), "PARTY_FLAG", isParty);
         return wrapper;
     }
@@ -172,9 +170,21 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         baseDao.deleteByUnionId(wxUnionId);
     }
 
+    @Override
+    public Result<UserDTO> getUserForLoginByOpenId(String openId) {
+        QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+        // 根据openId获取已提交注册的用户信息
+        wrapper.eq("WX_OPEN_ID", openId)
+                .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",
+                        FieldConstant.STATE, FieldConstant.GRID_ID, "PARTY_FLAG", "REMARK");
+        UserEntity userEntity = this.baseDao.selectOne(wrapper);
+        return new Result().ok(ConvertUtils.sourceToTarget(userEntity, UserDTO.class));
+    }
+
     @Override
     public Result<UserDTO> getUserInfoByOpenId(String openId) {
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+        // 根据openId查询审核中或审核通过的用户信息
         wrapper.eq("WX_OPEN_ID", openId)
                 .ne(FieldConstant.STATE, AppUserAuditStateEnum.AUDIT_FAILURE.value())
                 .select(FieldConstant.ID, "NICKNAME", "FACE_IMG", FieldConstant.MOBILE, "REAL_NAME",