【后台BUG修改】-（王童）-2020/07/29

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;
 
-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.UpdateGroup;
 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.NotBlank;
 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

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_NAME,
         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
         epdc_evaluate_dept dept
         LEFT JOIN (

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 mobile;
     /**
      * 项目满意度
      */

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

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

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

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

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

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

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.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.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dao.SysMailLogDao;
@@ -43,7 +42,7 @@ public class SysMailLogServiceImpl extends BaseServiceImpl<SysMailLogDao, SysMai
         String status = (String)params.get("status");
 
         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.eq(StringUtils.isNotBlank(status),"status", status);
 

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.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource;
 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.security.user.SecurityUser;
 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.service.PartyAuthenticationFailedService;
 import com.elink.esua.epdc.util.AppUserUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,10 +53,10 @@ public class PartyAuthenticationFailedServiceImpl extends BaseServiceImpl<PartyA
     public PageData<PartyAuthenticationFailedDTO> page(Map<String, Object> params) {
 
         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"};

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();
         // 是否是进入页面时的默认查询
-        if (isDefaultQuery(params)) {
+//        if (isDefaultQuery(params)) {
-            return new PageData<>(list, NumConstant.ZERO);
+//            return new PageData<>(list, NumConstant.ZERO);
-        }
+//        }
 
         params = trimParamValue(params);
         IPage<PartyMembersDTO> page = getPage(params);

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

@@ -45,9 +45,8 @@
         FROM epdc_party_authentication_failed epaf
         WHERE
           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 DATE_FORMAT( epaf.created_time, '%Y-%m-%d' ) 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="realName != '' and realName != null"> and epaf.real_name like '%${realName}%'</if>
           <if test="mobile != '' and mobile != null"> and epaf.mobile like '%${mobile}%'</if>

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

@@ -75,10 +75,10 @@
             and pm.POST_ID = #{postId}
         </if>
         <if test="startTime != null and startTime != '' ">
-            and pm.REGIST_TIME >= #{startTime}
+            and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') >= #{startTime}
         </if>
         <if test="endTime != null and endTime != '' ">
-            <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}
+            <![CDATA[ and DATE_FORMAT(pm.REGIST_TIME,'%Y-%m-%d') <= ]]> #{endTime}
         </if>
         GROUP BY
         pm.ID
@@ -213,7 +213,7 @@
         WHERE
         DEL_FLAG = '0'
         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}
         </if>
         AND USER_ID = uu.ID
@@ -230,7 +230,7 @@
         WHERE
         DEL_FLAG = '0'
         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}
         </if>
         AND USER_ID = uu.ID
@@ -248,7 +248,7 @@
         DEL_FLAG = '0'
         AND AUTHENTICATED_TYPE IN ( '0', '1' )
         AND AUTHENTICATED_FLAG = '1'
-        <if test="endTime != ''">
+        <if test="endTime != null and endTime != ''">
             and DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') &lt;= #{endTime}
         </if>
         AND USER_ID = uu.ID

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

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