From 2977d91ff6493c97254aa1c58dc4e3f95bfac731 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 24 Sep 2019 11:08:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B6=88=E6=81=AF=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=EF=BC=9B=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B8=8E=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/InformationDao.xml | 4 +- .../com/elink/esua/epdc/excel/UserExcel.java | 103 ++++++------------ .../epdc/service/impl/UserServiceImpl.java | 4 +- 3 files changed, 39 insertions(+), 72 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml index f01290303..be8924cb3 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/InformationDao.xml +++ b/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} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java index ea5990a00..c325257ea 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserExcel.java +++ b/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; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index f68c33ab2..26c25a2a5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/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 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; }