Browse Source

Merge branch 'hotfix/pcBug'

feature/dangjian
李鹏飞 5 years ago
parent
commit
607c145d4d
  1. 7
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java
  2. 1
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java
  3. 2
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
  4. 6
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml
  5. 14
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java
  6. 20
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java
  7. 14
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java
  8. 11
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml
  9. 10
      esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml
  10. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
  11. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  12. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
  13. 10
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java
  14. 19
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java
  15. 2
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java
  16. 2
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
  17. 6
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
  18. 6
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
  19. 8
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
  20. 11
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java
  21. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java
  22. 3
      esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysMailLogServiceImpl.java
  23. 7
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
  24. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
  25. 4
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
  26. 22
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
  27. 3
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
  28. 10
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyAuthenticationFailedServiceImpl.java
  29. 50
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
  30. 4
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserTagServiceImpl.java
  31. 11
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyAuthenticationFailedDao.xml
  32. 74
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
  33. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

7
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java

@ -17,9 +17,6 @@
package com.elink.esua.epdc.dto; package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; 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.commons.tools.validator.group.UpdateGroup;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
@ -29,6 +26,8 @@ import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
/** /**
@ -135,7 +134,7 @@ public class SysAnalysisMenuDTO implements Serializable {
/** /**
* 模块名称 * 模块名称
*/ */
private String modelname; private String modelName;
/** /**
* 绑定菜单id * 绑定菜单id

1
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysParamsEntity.java

@ -10,6 +10,7 @@ package com.elink.esua.epdc.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
import lombok.Data; import lombok.Data;

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

@ -77,7 +77,7 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
QueryWrapper<SysDictEntity> wrapper = new QueryWrapper<>(); QueryWrapper<SysDictEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid)); wrapper.eq(StringUtils.isNotBlank(pid), "pid", Long.parseLong(pid));
wrapper.eq(StringUtils.isNotBlank(dictType), "dict_type", dictType); wrapper.like(StringUtils.isNotBlank(dictType), "dict_type", dictType);
wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName); wrapper.like(StringUtils.isNotBlank(dictName), "dict_name", dictName);
wrapper.like(StringUtils.isNotBlank(dictValue), "dict_value", dictValue); wrapper.like(StringUtils.isNotBlank(dictValue), "dict_value", dictValue);

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

@ -14,7 +14,11 @@
LEFT JOIN sys_user u ON u.id = ru.user_id LEFT JOIN sys_user u ON u.id = ru.user_id
WHERE WHERE
r.type_key = #{roleType} AND u.id != '' r.type_key = #{roleType} AND u.id != ''
AND d.id in (<foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>) <if test="deptIdList.size>0 and deptIdList!=null">
AND d.id in (
<foreach collection="deptIdList" item="item" separator=",">#{item}</foreach>
)
</if>
GROUP BY GROUP BY
d.id d.id
</select> </select>

14
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorDutyCategoryDao.java

@ -20,6 +20,8 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity; import com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/** /**
* 职责分类管理 * 职责分类管理
* *
@ -28,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface GridOperatorDutyCategoryDao extends BaseDao<GridOperatorDutyCategoryEntity> { public interface GridOperatorDutyCategoryDao extends BaseDao<GridOperatorDutyCategoryEntity> {
/**
} * @Description: 判断权限编码是否重复
* @Param: [dutyCategoryName]
* @return: java.util.List<com.elink.esua.epdc.modules.consult.entity.GridOperatorDutyCategoryEntity>
* @Author: wk
* @Date: 2020/7/28
*/
List<GridOperatorDutyCategoryEntity> seleCategoryName(String dutyCategoryName);
}

20
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorDutyCategoryServiceImpl.java

@ -89,6 +89,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save(GridOperatorDutyCategoryDTO dto) { public void save(GridOperatorDutyCategoryDTO dto) {
GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class); GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class);
//判断权限编码是否重复dutyCategoryName权限编码
repetitionName(entity.getDutyCategoryName());
insert(entity); insert(entity);
} }
@ -96,6 +98,8 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(GridOperatorDutyCategoryDTO dto) { public void update(GridOperatorDutyCategoryDTO dto) {
GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class); GridOperatorDutyCategoryEntity entity = ConvertUtils.sourceToTarget(dto, GridOperatorDutyCategoryEntity.class);
//判断权限编码是否重复dutyCategoryName权限编码
repetitionName(entity.getDutyCategoryName());
updateById(entity); updateById(entity);
} }
@ -109,5 +113,19 @@ public class GridOperatorDutyCategoryServiceImpl extends BaseServiceImpl<GridOpe
} }
baseDao.deleteBatchIds(Arrays.asList(ids)); baseDao.deleteBatchIds(Arrays.asList(ids));
} }
/**
* @Description: 判断权限编码是否重复
* @Param: [dutyCategoryName]
* @return: void
* @Author: wk
* @Date: 2020/7/28
*/
public void repetitionName(String dutyCategoryName){
List<GridOperatorDutyCategoryEntity> list = baseDao.seleCategoryName(dutyCategoryName);
if (null!=list && list.size()>0){
throw new RenException("网格专员职责类别名称重复");
}
}
} }

14
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java

@ -44,14 +44,18 @@ public class EvaluateOfficerExcel {
@Excel(name = "单位职务") @Excel(name = "单位职务")
private String position; private String position;
@Excel(name = "创建时间")
private String createTime;
@Excel(name = "排序") @Excel(name = "排序")
private Integer sort; private Integer sort;
@Excel(name = "点赞次数")
private Integer likesCount;
@Excel(name = "被踩次数") // @Excel(name = "点赞次数")
private Integer opposeCount; // private Integer likesCount;
//
// @Excel(name = "被踩次数")
// private Integer opposeCount;
/* @Excel(name = "乐观锁") /* @Excel(name = "乐观锁")
private Integer revision; private Integer revision;
@ -72,4 +76,4 @@ public class EvaluateOfficerExcel {
private Date updatedTime;*/ private Date updatedTime;*/
} }

11
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorDutyCategoryDao.xml

@ -13,6 +13,15 @@
<result property="updatedBy" column="UPDATED_BY"/> <result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/> <result property="updatedTime" column="UPDATED_TIME"/>
</resultMap> </resultMap>
<select id="seleCategoryName" parameterType="java.lang.String" resultMap="gridOperatorDutyCategoryMap">
SELECT
*
FROM
epdc_grid_operator_duty_category
WHERE
DEL_FLAG = 0
AND DUTY_CATEGORY_NAME = #{dutyCategoryName}
</select>
</mapper> </mapper>

10
esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml

@ -62,11 +62,11 @@
dept.DEPT_ID, dept.DEPT_ID,
dept.DEPT_NAME, dept.DEPT_NAME,
dept.OFFICER_COUNT, dept.OFFICER_COUNT,
evaluatePeopleCount, IFNULL(evaluatePeopleCount,0) AS evaluatePeopleCount,
beEvaluatedCount, IFNULL(beEvaluatedCount,0) AS beEvaluatedCount,
evaluateCount, IFNULL(evaluateCount,0) AS evaluateCount,
likeCount, IFNULL(likeCount,0) AS likeCount,
opposeCount IFNULL(opposeCount,0) AS opposeCount
FROM FROM
epdc_evaluate_dept dept epdc_evaluate_dept dept
LEFT JOIN ( LEFT JOIN (

5
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java

@ -30,6 +30,11 @@ public class ItemPendingHandleDTO implements Serializable {
* 提交人 * 提交人
*/ */
private String nickName; private String nickName;
/**
* 手机号
*/
private String mobile;
/** /**
* 项目满意度 * 项目满意度
*/ */

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

@ -6,7 +6,7 @@
SELECT SELECT
issue.ID, issue.ID,
issue.ISSUE_CONTENT AS issueContent, issue.ISSUE_CONTENT AS issueContent,
e.CREATED_TIME AS createdTime, issue.CREATED_TIME AS createdTime,
e.NICK_NAME AS nickName, e.NICK_NAME AS nickName,
e.APPROVE_NUM AS approveNum, e.APPROVE_NUM AS approveNum,
e.OPPOSE_NUM AS opposeNum, e.OPPOSE_NUM AS opposeNum,

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

@ -394,6 +394,7 @@
item.ITEM_CODE, item.ITEM_CODE,
item.CREATED_TIME, item.CREATED_TIME,
item.NICK_NAME, item.NICK_NAME,
item.MOBILE,
CASE item.EVALUATION_SCORE CASE item.EVALUATION_SCORE
WHEN 0 THEN '不满意' WHEN 0 THEN '不满意'
WHEN 1 THEN '基本满意' WHEN 1 THEN '基本满意'

10
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/controller/GroupController.java

@ -47,7 +47,7 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("group") @RequestMapping("group")
public class GroupController { public class GroupController {
@Autowired @Autowired
private GroupService groupService; private GroupService groupService;
@ -145,7 +145,11 @@ public class GroupController {
*/ */
@GetMapping("groupList") @GetMapping("groupList")
public Result<List<GroupListDTO>> groupList() { public Result<List<GroupListDTO>> groupList() {
List<GroupListDTO> data = groupService.listOfGroupByGridId(SecurityUser.getDeptId()); String deptId = SecurityUser.getUser().getDeptId().toString();
if(null ==deptId){
deptId = null;
}
List<GroupListDTO> data = groupService.listOfGroupByGridId(deptId);
return new Result<List<GroupListDTO>>().ok(data); return new Result<List<GroupListDTO>>().ok(data);
} }
@ -181,4 +185,4 @@ public class GroupController {
return new Result<PageData<GroupMemberDTO>>().ok(page); return new Result<PageData<GroupMemberDTO>>().ok(page);
} }
} }

19
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/GroupDao.java

@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
import com.elink.esua.epdc.modules.group.entity.GroupEntity; import com.elink.esua.epdc.modules.group.entity.GroupEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -114,7 +115,7 @@ public interface GroupDao extends BaseDao<GroupEntity> {
* @author liuchuang * @author liuchuang
* @since 2019/11/12 9:35 * @since 2019/11/12 9:35
*/ */
List<GroupListDTO> selectListOfGroupByGridId(Long deptId); List<GroupListDTO> selectListOfGroupByGridId(@Param("deptId") String deptId);
/** /**
* *
@ -157,14 +158,14 @@ public interface GroupDao extends BaseDao<GroupEntity> {
* @Date 2019/12/19 13:08 * @Date 2019/12/19 13:08
**/ **/
List<String> listPartyMemberGridId(); List<String> listPartyMemberGridId();
/** /**
* @Description: 根据社群id查询群主手机号 * @Description: 根据社群id查询群主手机号
* @Param: [groupId] * @Param: [groupId]
* @return: java.lang.String * @return: java.lang.String
* @Author: zy * @Author: zy
* @Date: 2020-01-08 * @Date: 2020-01-08
*/ */
String queryGroupUserMOBILE(String groupId); String queryGroupUserMOBILE(String groupId);
/** /**

2
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/GroupService.java

@ -228,7 +228,7 @@ public interface GroupService extends BaseService<GroupEntity> {
* @author liuchuang * @author liuchuang
* @since 2019/11/12 9:33 * @since 2019/11/12 9:33
*/ */
List<GroupListDTO> listOfGroupByGridId(Long deptId); List<GroupListDTO> listOfGroupByGridId(String deptId);
/** /**
* *

2
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@ -369,7 +369,7 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
} }
@Override @Override
public List<GroupListDTO> listOfGroupByGridId(Long deptId) { public List<GroupListDTO> listOfGroupByGridId(String deptId) {
return baseDao.selectListOfGroupByGridId(deptId); return baseDao.selectListOfGroupByGridId(deptId);
} }

6
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@ -271,7 +271,7 @@ ORDER BY
AND gp.ID = #{id} AND gp.ID = #{id}
</select> </select>
<select id="selectListOfGroupByGridId" resultType="com.elink.esua.epdc.dto.group.GroupListDTO"> <select id="selectListOfGroupByGridId" resultType="com.elink.esua.epdc.dto.group.GroupListDTO">
SELECT SELECT
ID AS groupId, ID AS groupId,
GROUP_NAME AS groupName GROUP_NAME AS groupName
@ -280,7 +280,9 @@ ORDER BY
WHERE WHERE
DEL_FLAG = '0' DEL_FLAG = '0'
AND STATE IN ( 10, 15, 20 ) AND STATE IN ( 10, 15, 20 )
AND GRID_ID = #{deptId} <if test="deptId!=null">
AND GRID_ID = #{deptId}
</if>
</select> </select>
<select id="selectListOfGroupOrderByActivity" resultType="com.elink.esua.epdc.dto.group.GroupActivityDTO"> <select id="selectListOfGroupOrderByActivity" resultType="com.elink.esua.epdc.dto.group.GroupActivityDTO">

6
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java

@ -128,6 +128,12 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(ActPhraseDTO dto) { public void update(ActPhraseDTO dto) {
String categoryCode = dto.getCode();
if (StringUtils.isNotBlank(categoryCode)) {
if (getCodeCount(dto) > 0) {
throw new RenException("您输入的编码已存在");
}
}
ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class); ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class);
updateById(entity); updateById(entity);

8
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml

@ -92,10 +92,10 @@
AND relation.STATUS = #{status} AND relation.STATUS = #{status}
</if> </if>
<if test="mobile != null and mobile != ''"> <if test="mobile != null and mobile != ''">
AND relation.MOBILE = #{mobile} AND relation.MOBILE like '%${mobile}%'
</if> </if>
<if test="realName != null and realName != ''"> <if test="realName != null and realName != ''">
AND relation.REAL_NAME = #{realName} AND relation.REAL_NAME like '%${realName}%'
</if> </if>
<if test="actId != null and actId != ''"> <if test="actId != null and actId != ''">
AND relation.ACT_ID = #{actId} AND relation.ACT_ID = #{actId}
@ -168,10 +168,10 @@
AND relation.STATUS = #{status} AND relation.STATUS = #{status}
</if> </if>
<if test="mobile != null and mobile != ''"> <if test="mobile != null and mobile != ''">
AND relation.MOBILE = #{mobile} AND relation.MOBILE like '%${mobile}%'
</if> </if>
<if test="realName != null and realName != ''"> <if test="realName != null and realName != ''">
AND relation.REAL_NAME = #{realName} AND relation.REAL_NAME like '%${realName}%'
</if> </if>
<if test="actId != null and actId != ''"> <if test="actId != null and actId != ''">
AND relation.ACT_ID = #{actId} AND relation.ACT_ID = #{actId}

11
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java

@ -11,6 +11,7 @@ package com.elink.esua.epdc.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.entity.ScheduleJobEntity; import com.elink.esua.epdc.entity.ScheduleJobEntity;
import com.elink.esua.epdc.utils.ScheduleUtils; import com.elink.esua.epdc.utils.ScheduleUtils;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@ -66,11 +67,15 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl<ScheduleJobDao, Sche
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save(ScheduleJobDTO dto) { public void save(ScheduleJobDTO dto) {
ScheduleJobEntity entity = ConvertUtils.sourceToTarget(dto, ScheduleJobEntity.class); ScheduleJobEntity entity = ConvertUtils.sourceToTarget(dto, ScheduleJobEntity.class);
entity.setStatus(ScheduleStatusEnum.NORMAL.value()); entity.setStatus(ScheduleStatusEnum.NORMAL.value());
this.insert(entity); try{
ScheduleUtils.createScheduleJob(scheduler, entity);
this.insert(entity);
}catch (Exception e){
throw new RenException("请输入正确的表达式");
}
ScheduleUtils.createScheduleJob(scheduler, entity);
} }
@Override @Override

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java

@ -53,7 +53,7 @@ public class KpiRuleSaveOrUpdateFormDTO implements Serializable {
/** /**
* 考核部门类别 * 考核部门类别
*/ */
@NotBlank(message = "考核部门类别不能为空") // @NotBlank(message = "考核部门类别不能为空")
private String deptTypeKey; private String deptTypeKey;

3
esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SysMailLogServiceImpl.java

@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
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.constant.Constant;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dao.SysMailLogDao; import com.elink.esua.epdc.dao.SysMailLogDao;
@ -43,7 +42,7 @@ public class SysMailLogServiceImpl extends BaseServiceImpl<SysMailLogDao, SysMai
String status = (String)params.get("status"); String status = (String)params.get("status");
QueryWrapper<SysMailLogEntity> wrapper = new QueryWrapper<>(); QueryWrapper<SysMailLogEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(templateId),"template_id", templateId); wrapper.like(StringUtils.isNotBlank(templateId),"template_id", templateId);
wrapper.like(StringUtils.isNotBlank(mailTo), "mail_to", mailTo); wrapper.like(StringUtils.isNotBlank(mailTo), "mail_to", mailTo);
wrapper.eq(StringUtils.isNotBlank(status),"status", status); wrapper.eq(StringUtils.isNotBlank(status),"status", status);

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

@ -17,11 +17,10 @@
package com.elink.esua.epdc.dto; package com.elink.esua.epdc.dto;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
import lombok.Data;
/** /**
@ -56,6 +55,8 @@ public class PartyMembersDTO implements Serializable {
private String registFlag; private String registFlag;
private String registName;
private Date registTime; private Date registTime;
private String streetName; private String streetName;

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

@ -160,7 +160,7 @@ public class PartyMembersController {
@GetMapping("hasAuthenticationexport") @GetMapping("hasAuthenticationexport")
// @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false) // @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
public void hasAuthenticationexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void hasAuthenticationexport(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExport(params), PartyMembersExcel.class); ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.optimizeHasAuthenticationPartyExportNew(params), PartyMembersExcel.class);
} }
/*** /***

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

@ -22,9 +22,7 @@ import com.elink.esua.epdc.dto.PartyMembersDTO;
import com.elink.esua.epdc.entity.PartyMembersEntity; import com.elink.esua.epdc.entity.PartyMembersEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.PathVariable;
import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -85,6 +83,8 @@ public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List<String> userIdList); List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfo(@Param("userIdList") List<String> userIdList);
List<PartyMembersDTO> optimizeHasAuthenticationPartyPageInfoNew(@Param("userIdList") List<String> userIdList);
/*** /***
* 删除时校验党员是否被认证 * 删除时校验党员是否被认证
* @param IdentityNo * @param IdentityNo

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

@ -34,20 +34,14 @@ public class PartyMembersExcel {
@Excel(name = "姓名") @Excel(name = "姓名")
private String realName; private String realName;
@Excel(name = "联系电话") @Excel(name = "手机号")
private String mobile; private String mobile;
@Excel(name = "身份证号") @Excel(name = "身份证号")
private String identityNo; private String identityNo;
@Excel(name = "职务") @Excel(name = "注册状态")
private String post; private String registName;
@Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"})
private String cadreFlag;
@Excel(name = "是否注册", replace = {"是_1", "否_0"})
private String registFlag;
@Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss")
private Date registTime; private Date registTime;
@ -57,4 +51,14 @@ public class PartyMembersExcel {
@Excel(name = "街道-社区-网格") @Excel(name = "街道-社区-网格")
private String allDeptNames; private String allDeptNames;
@Excel(name = "职务")
private String post;
@Excel(name = "干部下沉", replace = {"下沉_1", "不下沉_0"})
private String cadreFlag;
@Excel(name = "是否注册", replace = {"是_1", "否_0"})
private String registFlag;
} }

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

@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.dto.PartyMembersDTO;
import com.elink.esua.epdc.entity.PartyMembersEntity; import com.elink.esua.epdc.entity.PartyMembersEntity;
import com.elink.esua.epdc.entity.UserEntity; import com.elink.esua.epdc.entity.UserEntity;
import com.elink.esua.epdc.excel.PartyMembersExcel;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -123,6 +122,8 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
List<PartyMembersDTO> optimizeHasAuthenticationPartyExport(Map<String, Object> params); List<PartyMembersDTO> optimizeHasAuthenticationPartyExport(Map<String, Object> params);
List<PartyMembersDTO> optimizeHasAuthenticationPartyExportNew(Map<String, Object> params);
/*** /***
* 通过身份证校验此党员是否被认证 * 通过身份证校验此党员是否被认证
* @param IdentityNo * @param IdentityNo

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

@ -20,7 +20,6 @@ package com.elink.esua.epdc.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@ -31,7 +30,6 @@ import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
import com.elink.esua.epdc.service.PartyAuthenticationFailedService; import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
import com.elink.esua.epdc.util.AppUserUtils; import com.elink.esua.epdc.util.AppUserUtils;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -55,10 +53,10 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
public PageData<PartyAuthenticationFailedDTO> page(Map<String, Object> params) { public PageData<PartyAuthenticationFailedDTO> page(Map<String, Object> params) {
String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"}; String[] paramKeys = new String[]{"realName", "identityNo", "startTime", "endTime", "mobile"};
if (AppUserUtils.isDefaultQuery(params, paramKeys)) { // if (AppUserUtils.isDefaultQuery(params, paramKeys)) {
List<PartyAuthenticationFailedDTO> userDtoList = Lists.newArrayList(); // List<PartyAuthenticationFailedDTO> userDtoList = Lists.newArrayList();
return new PageData<>(userDtoList, NumConstant.ZERO); // return new PageData<>(userDtoList, NumConstant.ZERO);
} // }
// 党员认证失败页面 查询条件:姓名, 手机号, 身份证号, 后端处理前后空格 // 党员认证失败页面 查询条件:姓名, 手机号, 身份证号, 后端处理前后空格
paramKeys = new String[]{"realName", "identityNo", "mobile"}; paramKeys = new String[]{"realName", "identityNo", "mobile"};

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

@ -111,9 +111,9 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
List<PartyMembersDTO> list = Lists.newArrayList(); List<PartyMembersDTO> list = Lists.newArrayList();
// 是否是进入页面时的默认查询 // 是否是进入页面时的默认查询
if (isDefaultQuery(params)) { // if (isDefaultQuery(params)) {
return new PageData<>(list, NumConstant.ZERO); // return new PageData<>(list, NumConstant.ZERO);
} // }
params = trimParamValue(params); params = trimParamValue(params);
IPage<PartyMembersDTO> page = getPage(params); IPage<PartyMembersDTO> page = getPage(params);
@ -181,6 +181,15 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save(PartyMembersDTO dto) { public void save(PartyMembersDTO dto) {
List<PartyMembersEntity> partyMembersEntityList = baseDao.selectList(new QueryWrapper<PartyMembersEntity>());
// 去空格
List<PartyMembersExcel> partyList = new ArrayList<>();
// 校验数据
String message = this.checkExcelNew(dto, partyMembersEntityList);
if (StringUtils.isNotBlank(message)) {
throw new RenException(message);
}
PartyMembersEntity entity = new PartyMembersEntity(); PartyMembersEntity entity = new PartyMembersEntity();
entity.setCadreFlag(dto.getCadreFlag()); entity.setCadreFlag(dto.getCadreFlag());
entity.setRealName(dto.getRealName()); entity.setRealName(dto.getRealName());
@ -216,6 +225,27 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
} }
} }
private String checkExcelNew(PartyMembersDTO dto, List<PartyMembersEntity> partyMembersEntityList) {
// 不匹配信息
String result = null;
EpdcPartyErroyResultDTO errorLineinfoDto;
if (StringUtils.isBlank(dto.getRealName())) {
result = "姓名为空";
}
if (StringUtils.isBlank(dto.getIdentityNo())) {
result = "身份证号为空";
}
for (PartyMembersEntity item : partyMembersEntityList) {
if (StringUtils.isNotBlank(item.getMobile()) && item.getMobile().equals(dto.getMobile())) {
result = "手机号已存在";
}
if (item.getIdentityNo().equals(dto.getIdentityNo())) {
result = "身份证号已存在";
}
}
return result;
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(PartyMembersDTO dto) { public void update(PartyMembersDTO dto) {
@ -533,6 +563,20 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
} }
@Override
public List<PartyMembersDTO> optimizeHasAuthenticationPartyExportNew(Map<String, Object> params) {
params.put("deptIdList", SecurityUser.getUser().getDeptIdList());
// IPage<String> page = getPage(params);
List<String> userIds = baseDao.optimizeHasAuthenticationPartyPage(params);
if (userIds.size() > 0) {
List<PartyMembersDTO> partyMembersDTOList = baseDao.optimizeHasAuthenticationPartyPageInfoNew(userIds);
return partyMembersDTOList;
} else {
return new ArrayList<PartyMembersDTO>();
}
}
@Override @Override
public Integer checkCertificationByIdentityNo(String IdentityNo) { public Integer checkCertificationByIdentityNo(String IdentityNo) {
return baseDao.selectCountByIdentity(IdentityNo); return baseDao.selectCountByIdentity(IdentityNo);

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

@ -88,8 +88,8 @@ public class UserTagServiceImpl extends BaseServiceImpl<UserTagDao, UserTagEntit
wrapper.eq(StringUtils.isNotBlank(dto.getTagCode()), "TAG_CODE", dto.getTagCode()) wrapper.eq(StringUtils.isNotBlank(dto.getTagCode()), "TAG_CODE", dto.getTagCode())
.ne(StringUtils.isNotBlank(dto.getId()), "id", dto.getId()); .ne(StringUtils.isNotBlank(dto.getId()), "id", dto.getId());
List<UserTagEntity> list = baseDao.selectList(wrapper); List<UserTagEntity> list = baseDao.selectList(wrapper);
if (null != list || list.size() > 0) { if (null != list && list.size() > 0) {
return new Result().error("编码已存在"); return new Result().error("编码已存在");
} }
UserTagEntity entity = ConvertUtils.sourceToTarget(dto, UserTagEntity.class); UserTagEntity entity = ConvertUtils.sourceToTarget(dto, UserTagEntity.class);

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

@ -45,12 +45,11 @@
FROM epdc_party_authentication_failed epaf FROM epdc_party_authentication_failed epaf
WHERE WHERE
epaf.del_flag = '0' epaf.del_flag = '0'
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' ">and DATE_FORMAT( epaf.created_time, '%Y-%m-%d' ) >= #{startTime}</if>
and epaf.created_time between #{startTime} and #{endTime} <if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(epaf.created_time,'%Y-%m-%d') <= ]]> #{endTime}</if>
</if> <if test="identityNo != '' and identityNo != null"> and epaf.IDENTITY_NO like '%${identityNo}%'</if>
<if test="identityNo != '' and identityNo != null"> and epaf.IDENTITY_NO = #{identityNo}</if> <if test="realName != '' and realName != null"> and epaf.real_name like '%${realName}%'</if>
<if test="realName != '' and realName != null"> and epaf.real_name = #{realName}</if> <if test="mobile != '' and mobile != null"> and epaf.mobile like '%${mobile}%'</if>
<if test="mobile != '' and mobile != null"> and epaf.mobile = #{mobile}</if>
ORDER BY ORDER BY
epaf.CREATED_TIME desc epaf.CREATED_TIME desc
</select> </select>

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

@ -75,10 +75,10 @@
and pm.POST_ID = #{postId} and pm.POST_ID = #{postId}
</if> </if>
<if test="startTime != null and startTime != '' "> <if test="startTime != null and startTime != '' ">
and pm.REGIST_TIME >= #{startTime} and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') >= #{startTime}
</if> </if>
<if test="endTime != null and endTime != '' "> <if test="endTime != null and endTime != '' ">
<![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime} <![CDATA[ and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') <= ]]> #{endTime}
</if> </if>
GROUP BY GROUP BY
pm.ID pm.ID
@ -100,13 +100,13 @@
AND ut.DEL_FLAG = '0' AND ut.DEL_FLAG = '0'
WHERE WHERE
eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0' eu.PARTY_FLAG = '1' and eu.DEL_FLAG = '0'
<if test="realName != null and realName != '' ">and pm.REAL_NAME = #{realName}</if> <if test="realName != null and realName != '' ">and pm.REAL_NAME like '%${realName}%'</if>
<if test="mobile != null and mobile != '' ">and pm.MOBILE = #{mobile}</if> <if test="mobile != null and mobile != '' ">and pm.MOBILE like '%${mobile}%'</if>
<if test="identityNo != null and identityNo != '' ">and pm.IDENTITY_NO = #{identityNo}</if> <if test="identityNo != null and identityNo != '' ">and pm.IDENTITY_NO like '%${identityNo}%'</if>
<if test="registFlag != null and registFlag != '' ">and pm.REGIST_FLAG = #{registFlag}</if> <if test="registFlag != null and registFlag != '' ">and pm.REGIST_FLAG = #{registFlag}</if>
<if test="postId != null and postId != '' ">and pm.POST_ID = #{postId}</if> <if test="postId != null and postId != '' ">and pm.POST_ID = #{postId}</if>
<if test="startTime != null and startTime != '' ">and pm.REGIST_TIME >= #{startTime}</if> <if test="startTime != null and startTime != '' ">and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') >= #{startTime}</if>
<if test="endTime != null and endTime != '' "> <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}</if> <if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>
<if test="streetId != '' and streetId != null"> <if test="streetId != '' and streetId != null">
AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS)) AND (find_in_set(#{streetId},eu.PARENT_DEPT_IDS) OR find_in_set(#{streetId},eu.ALL_DEPT_IDS))
</if> </if>
@ -213,7 +213,7 @@
WHERE WHERE
DEL_FLAG = '0' DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_TYPE IN ( '0', '1' )
<if test="endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime} and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
AND USER_ID = uu.ID AND USER_ID = uu.ID
@ -230,7 +230,7 @@
WHERE WHERE
DEL_FLAG = '0' DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_TYPE IN ( '0', '1' )
<if test="endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime} and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
AND USER_ID = uu.ID AND USER_ID = uu.ID
@ -248,7 +248,7 @@
DEL_FLAG = '0' DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_TYPE IN ( '0', '1' )
AND AUTHENTICATED_FLAG = '1' AND AUTHENTICATED_FLAG = '1'
<if test="endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime} and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
AND USER_ID = uu.ID AND USER_ID = uu.ID
@ -326,6 +326,60 @@
ORDER BY ORDER BY
allu.registTime DESC allu.registTime DESC
</select> </select>
<select id="optimizeHasAuthenticationPartyPageInfoNew" resultType="com.elink.esua.epdc.dto.PartyMembersDTO">
SELECT
pm.CADRE_FLAG,
pm.CREATED_BY,
pm.DEPT_ID,
pm.ID,
pm.POST,
pm.POST_VALUE,
pm.REGIST_FLAG,
CASE pm.REGIST_FLAG
WHEN '0' THEN
'未认证'
WHEN '1' THEN
'自动认证'
WHEN '2' THEN
'手动认证'
ELSE
'未认证'
END REGIST_NAME,
GROUP_CONCAT(ut.TAG_NAME) TAG_NAME,
allu.CREATED_TIME,
allu.IDENTITY_NO,
allu.MOBILE,
allu.REAL_NAME,
allu.registTime,
allu.ALL_DEPT_NAMES
FROM
(
SELECT
eu.ID,
eu.CREATED_TIME,
eu.IDENTITY_NO,
eu.MOBILE,
eu.REAL_NAME,
eu.REGISTER_TIME as registTime,
eu.ALL_DEPT_NAMES
FROM
epdc_user eu
WHERE
eu.ID IN
<foreach collection="userIdList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
) allu
LEFT JOIN epdc_party_members pm ON pm.IDENTITY_NO = allu.IDENTITY_NO
AND pm.REAL_NAME = allu.REAL_NAME
LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
AND ut.DEL_FLAG = '0'
GROUP BY
allu.ID
ORDER BY
allu.registTime DESC
</select>
<!--删除党员时候校验是否被认证--> <!--删除党员时候校验是否被认证-->
<select id="selectCountByIdentity" resultType="Integer"> <select id="selectCountByIdentity" resultType="Integer">
SELECT SELECT

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

@ -1211,7 +1211,7 @@
WHERE WHERE
DEL_FLAG = '0' DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_TYPE IN ( '0', '1' )
<if test="endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime} and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
AND USER_ID = uu.ID AND USER_ID = uu.ID
@ -1228,7 +1228,7 @@
WHERE WHERE
DEL_FLAG = '0' DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_TYPE IN ( '0', '1' )
<if test="endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime} and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
AND USER_ID = uu.ID AND USER_ID = uu.ID
@ -1246,7 +1246,7 @@
DEL_FLAG = '0' DEL_FLAG = '0'
AND AUTHENTICATED_TYPE IN ( '0', '1' ) AND AUTHENTICATED_TYPE IN ( '0', '1' )
AND AUTHENTICATED_FLAG = '1' AND AUTHENTICATED_FLAG = '1'
<if test="endTime != ''"> <if test="endTime != null and endTime != ''">
and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime} and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
</if> </if>
AND USER_ID = uu.ID AND USER_ID = uu.ID
@ -1262,7 +1262,8 @@
FROM FROM
epdc_user uu epdc_user uu
where uu.DEL_FLAG = '0' where uu.DEL_FLAG = '0'
<if test="startTime != '' and endTime != ''">and DATE_FORMAT(uu.CREATED_TIME,'%Y-%m-%d') between #{startTime} and #{endTime}</if> <if test="startTime != null and startTime != '' ">and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') >= #{startTime}</if>
<if test="endTime != null and endTime != '' "> <![CDATA[ and DATE_FORMAT(uu.UPDATED_TIME,'%Y-%m-%d') <= ]]> #{endTime}</if>
<if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if> <if test="realName != '' and realName != null">and uu.real_name like '%${realName}%'</if>
<if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if> <if test="nickname != '' and nickname != null">and uu.NICKNAME like '%${nickname}%'</if>
<if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if> <if test="mobile != '' and mobile != null">and uu.mobile like '%${mobile}%'</if>

Loading…
Cancel
Save