elink-star
/
esua-epdc-cloud
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

居民管理界面查询修改

dev
尹作梅 6 years ago
parent
bd5145e9de
commit
f5a054cdcd
9 changed files with 37 additions and 250 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java
  2. 27
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java
  3. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java
  4. 15
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java
  5. 27
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
  6. 23
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
  7. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
  8. 21
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  9. 92
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

71
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserQueryFormDTO.java
View File

@ -1,71 +0,0 @@
package com.elink.esua.epdc.dto.epdc.form;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description 居民管理[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询入参DTO
* @Author yinzuomei
* @Date 2019/11/28 15:50
*/
@Data
public class EpdcUserQueryFormDTO implements Serializable {
private static final long serialVersionUID = -6726464735906160180L;
/**
* 姓名
*/
private String realName;
/**
* 手机号
*/
private String mobile;
/**
* 身份证号
*/
private String identityNo;
/**
* 注册开始日期
*/
private String startTime;
/**
* 注册结束日期
*/
private String endTime;
/**
* 是否是党员
*/
private String partyFlag;
/**
* 状态
*/
private String state;
/**
* 当前页码
*/
private int page;
/**
* 每页条数
*/
private int limit;
/**
* 所属机构
*/
private List<String> deptIdList;
/**
* 所属机构字符串
*/
private String deptIdListStr;
}

27
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserQueryResultDTO.java
View File

@ -1,27 +0,0 @@
package com.elink.esua.epdc.dto.epdc.result;
import com.elink.esua.epdc.dto.UserDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description 居民管理[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询返参DTO
* @Author yinzuomei
* @Date 2019/11/28 16:13
*/
@Data
public class EpdcUserQueryResultDTO implements Serializable {
private static final long serialVersionUID = -7375391737870073472L;
/**
* 总记录数
*/
private int total;
/**
* 居民信息列表
*/
private List<UserDTO> list;
}

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

@ -48,7 +48,7 @@ import java.util.Map;
* @since v1.0.0 2019-11-21
*/
@RestController
@RequestMapping(Constant.EPDC_APP+"userauthenticatehistory")
@RequestMapping("userauthenticatehistory")
public class UserAuthenticateHistoryController {
@Autowired

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

@ -27,8 +27,6 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserQueryResultDTO;
import com.elink.esua.epdc.enums.AppUserStatesEnum;
import com.elink.esua.epdc.excel.UserExcel;
import com.elink.esua.epdc.service.UserService;
@ -59,19 +57,6 @@ public class UserController {
return new Result<PageData<UserDTO>>().ok(page);
}
/**
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.UserDTO>>
* @Author yinzuomei
* @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法
* @Date 2019/11/28 16:01
**/
@PostMapping("query")
public Result<EpdcUserQueryResultDTO> query(@RequestBody EpdcUserQueryFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return userService.listUserDTO(formDTO);
}
@GetMapping("{id}")
public Result<UserDTO> get(@PathVariable("id") String id) {
UserDTO data = userService.get(id);

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

@ -18,17 +18,11 @@
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
import com.elink.esua.epdc.dto.UserDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO;
import com.elink.esua.epdc.dto.epdc.result.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
import com.elink.esua.epdc.dto.epdc.result.*;
import com.elink.esua.epdc.entity.UserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -154,21 +148,4 @@ public interface UserDao extends BaseDao<UserEntity> {
*/
int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
/**
* @param formDTO
* @return java.util.List<com.elink.esua.epdc.dto.UserDTO>
* @Author yinzuomei
* @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法
* @Date 2019/11/28 16:23
**/
List<UserDTO> selectListUserDTO(EpdcUserQueryFormDTO formDTO);
/**
* @param formDTO
* @return int
* @Author yinzuomei
* @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询总记录数
* @Date 2019/11/28 16:23
**/
int selectCountOfUserDTO(EpdcUserQueryFormDTO formDTO);
}

23
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserGridRelationEntity.java
View File

@ -28,7 +28,7 @@ import java.util.Date;
/**
* 网格长与网格关系表
*
* @author work@yujt.net.cn
* @author work@yujt.net.cn
* @since v1.0.0 2019-10-23
*/
@Data
@ -63,4 +63,23 @@ public class UserGridRelationEntity extends BaseEpdcEntity {
*/
private String leaderFlag;
}
/***
*所有部门名称
*/
private String allDeptNames;
/***
*所有部门ID
*/
private String allDeptIds;
/***
*父所有部门
*/
private String parentDeptNames;
/***
*父所有部门
*/
private String parentDeptIds;
}

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

@ -238,13 +238,4 @@ public interface UserService extends BaseService<UserEntity> {
* @date 2019/11/19 13:28
*/
Result<Integer> getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
/**
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserQueryResultDTO>
* @Author yinzuomei
* @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法
* @Date 2019/11/28 16:17
**/
Result<EpdcUserQueryResultDTO> listUserDTO(EpdcUserQueryFormDTO formDTO);
}

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

@ -645,26 +645,5 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
public Result<Integer> getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto) {
return new Result<Integer>().ok(baseDao.selectOneAnauthorizedAmount(fromDto));
}
/**
* @param formDTO
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserQueryResultDTO>
* @Author yinzuomei
* @Description 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法
* @Date 2019/11/28 16:17
**/
@Override
public Result<EpdcUserQueryResultDTO> listUserDTO(EpdcUserQueryFormDTO formDTO) {
EpdcUserQueryResultDTO data = new EpdcUserQueryResultDTO();
int pageIndex = (formDTO.getPage() - NumConstant.ONE) * formDTO.getLimit();
formDTO.setPage(pageIndex);
if (null != formDTO.getDeptIdList() && formDTO.getDeptIdList().size() > 0) {
formDTO.setDeptIdListStr(formDTO.getDeptIdList().stream().map(String::valueOf).collect(Collectors.joining(",")));
}
List<UserDTO> userDTOList = baseDao.selectListUserDTO(formDTO);
int total = baseDao.selectCountOfUserDTO(formDTO);
data.setTotal(total);
data.setList(userDTOList);
return new Result<EpdcUserQueryResultDTO>().ok(data);
}
}

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

@ -66,11 +66,7 @@
ADDRESS,
STATE,
PARTY_FLAG,
CONCAT(
ifnull(ug.STREET,''),
'-',ug.COMMUNITY,
'-',ug.GRID
) AS myGridName
ug.ALL_DEPT_NAMES AS myGridName
FROM
epdc_user u
LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
@ -82,9 +78,18 @@
<if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
<if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
<if test="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>
<if test="streetId != '' and streetId != null">and ug.street_id = #{streetId}</if>
<if test="communityId != '' and communityId != null">and ug.community_id = #{communityId}</if>
<if test="gridId != '' and gridId != null">and ug.grid_id = #{gridId}</if>
<if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS)
OR find_in_set(#{streetId},ug.ALL_DEPT_IDS))
</if>
<if test="communityId != '' and communityId != null">
AND (find_in_set(#{communityId},ug.PARENT_DEPT_IDS)
OR find_in_set(#{communityId},ug.ALL_DEPT_IDS))
</if>
<if test="gridId != '' and gridId != null">
and (ug.grid_id = #{gridId}
OR find_in_set(#{gridId},ug.ALL_DEPT_IDS))
</if>
GROUP BY
u.ID
ORDER BY
@ -305,75 +310,4 @@
</choose>
</select>
<!-- 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询方法 -->
<select id="selectListUserDTO" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO" resultType="com.elink.esua.epdc.dto.UserDTO">
SELECT
u.id,
u.REAL_NAME AS realName,
u.mobile,
u.REGISTER_TIME AS registerTime,
IDENTITY_NO AS identityNo,
address,
state,
PARTY_FLAG AS partyFlag,
u.ALL_DEPT_NAMES AS myGridName
FROM
epdc_user u
WHERE
u.del_flag = '0'
<if test="startTime != '' and endTime != ''">
and u.register_time between #{startTime} and #{endTime}
</if>
<if test="state != '' and state != null">
and u.state = #{state}
</if>
<if test="realName != '' and realName != null">
and u.real_name like '%${realName}%'
</if>
<if test="mobile != '' and mobile != null">
and u.mobile like '%${mobile}%'
</if>
<if test="identityNo != '' and identityNo != null">
and u.identity_no like '%${identityNo}%'
</if>
<if test="partyFlag != '' and partyFlag != null">
and u.party_flag = #{partyFlag}
</if>
<if test="deptIdListStr != '' and deptIdListStr != null">
and u.ALL_DEPT_IDS=#{deptIdListStr}
</if>
ORDER BY u.register_time desc
LIMIT #{page},#{limit}
</select>
<!-- 居民列表[未认证居民、待认证居民、已认证居民、居民认证失败]页面查询总记录数 -->
<select id="selectCountOfUserDTO" parameterType="com.elink.esua.epdc.dto.epdc.form.EpdcUserQueryFormDTO" resultType="java.lang.Integer">
SELECT
count(u.id) as totalNum
FROM
epdc_user u
WHERE
u.del_flag = '0'
<if test="startTime != '' and endTime != ''">
and u.register_time between #{startTime} and #{endTime}
</if>
<if test="state != '' and state != null">
and u.state = #{state}
</if>
<if test="realName != '' and realName != null">
and u.real_name like '%${realName}%'
</if>
<if test="mobile != '' and mobile != null">
and u.mobile like '%${mobile}%'
</if>
<if test="identityNo != '' and identityNo != null">
and u.identity_no like '%${identityNo}%'
</if>
<if test="partyFlag != '' and partyFlag != null">
and u.party_flag = #{partyFlag}
</if>
<if test="deptIdListStr != '' and deptIdListStr != null">
and u.ALL_DEPT_IDS=#{deptIdListStr}
</if>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save