Merge remote-tracking branch 'remotes/origin/dev' into release

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.42
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.43
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.42</version>
+    <version>0.0.43</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java

@@ -25,13 +25,13 @@ public class WorkActUserController {
 
     @Autowired
     private WorkActUserService workActUserService;
-    
+
     /**
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.work.AuditingActUserResultDTO>>
      * @param formDTO
      * @author yinzuomei
      * @description 报名审核-待审核列表
-     * @Date 2020/7/21 22:24 
+     * @Date 2020/7/21 22:24
      **/
     @PostMapping("auditinglist")
     public Result<List<AuditingActUserResultDTO>> getAuditingList(@RequestBody ActIdFormDTO formDTO){
@@ -45,7 +45,7 @@ public class WorkActUserController {
      * @param formDTO
      * @author yinzuomei
      * @description 报名审核-已通过列表
-     * @Date 2020/7/22 15:16 
+     * @Date 2020/7/22 15:16
      **/
     @PostMapping("passedlist")
     public Result<List<PassedActUserResultDTO>> getPassedList(@RequestBody ActIdFormDTO formDTO){
@@ -58,7 +58,7 @@ public class WorkActUserController {
      * @param formDTO
      * @author yinzuomei
      * @description 报名审核-已拒绝列表
-     * @Date 2020/7/22 15:49 
+     * @Date 2020/7/22 15:49
      **/
     @PostMapping("rejectedlist")
     public Result<List<RejectedActUserResultDTO>> getRejectedlist(@RequestBody ActIdFormDTO formDTO){
@@ -123,7 +123,7 @@ public class WorkActUserController {
      * @param formDTO
      * @author yinzuomei
      * @description 报名审核-审核通过
-     * @Date 2020/7/23 17:31 
+     * @Date 2020/7/23 17:31
      **/
     @PostMapping("auditpass")
     public Result  auditPass(@RequestBody AuditUserFormDTO formDTO){
@@ -137,7 +137,7 @@ public class WorkActUserController {
      * @param formDTO
      * @author yinzuomei
      * @description 报名审核-拒绝报名
-     * @Date 2020/7/23 18:08 
+     * @Date 2020/7/23 18:08
      **/
     @PostMapping("auditrefuse")
     public Result  auditrefuse(@RequestBody AuditUserFormDTO formDTO){
@@ -150,8 +150,8 @@ public class WorkActUserController {
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>>
      * @param formDTO
      * @author yinzuomei
-     * @description 已结束-已参加人员列表
-     * @Date 2020/7/24 10:17 
+     * @description 已结束-已参加人员列表(审核中、审核通过)
+     * @Date 2020/7/24 10:17
      **/
     @PostMapping("joinuserlist")
     public Result<List<JoinedUserResultDTO>> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){
@@ -164,7 +164,7 @@ public class WorkActUserController {
      * @param formDTO
      * @author yinzuomei
      * @description 已结束-已取消报名人员列表
-     * @Date 2020/7/24 10:53 
+     * @Date 2020/7/24 10:53
      **/
     @PostMapping("canceleduserlist")
     public Result<List<CanceledUserResultDTO>> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@@ -218,4 +218,13 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
      * @Date 15:59 2020-07-30
      **/
     String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author zhangyong
+     * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合
+     * @Date 2020/7/21 22:44
+     **/
+    List<String> getSignUpUserIdList(@Param("actId") String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java

@@ -151,4 +151,13 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
      * @Date 17:14 2020-07-30
      **/
     Result<ResiActRegistrationResultDTO> registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO);
+
+    /**
+     * @return java.util.List<java.lang.String>
+     * @param actId
+     * @author zhangyong
+     * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合
+     * @Date 2020/7/21 22:44
+     **/
+    List<String> getSignUpUserIdList(@Param("actId") String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java

@@ -38,15 +38,12 @@ import com.epmet.dao.ActSignInRecDao;
 import com.epmet.dao.ActUserRelationDao;
 import com.epmet.dto.ActSignInRecDTO;
 import com.epmet.dto.ActUserRelationDTO;
-import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
 import com.epmet.dto.form.resi.ResiActSignInFormDTO;
 import com.epmet.entity.ActSignInPicEntity;
 import com.epmet.entity.ActSignInRecEntity;
-import com.epmet.redis.ActSignInRecRedis;
 import com.epmet.service.ActLiveRecService;
 import com.epmet.service.ActSignInRecService;
-import com.epmet.service.HeartUserInfoService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,9 +63,6 @@ import java.util.UUID;
 @Service
 public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, ActSignInRecEntity> implements ActSignInRecService {
 
-    @Autowired
-    private ActSignInRecRedis actSignInRecRedis;
-
     @Autowired
     private ActUserRelationDao actUserRelationDao;
 
@@ -78,9 +72,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
     @Autowired
     private ActLiveRecService actLiveRecService;
 
-//    @Autowired
-//    private HeartUserInfoService heartUserInfoService;
-
     private Logger logger = LogManager.getLogger(ActSignInRecServiceImpl.class);
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
@@ -129,13 +120,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
                 actSignInPicDao.insert(actLivePicEntity);
             }
         }
-
-        // 用户信息表，实际参与活动个数（签到+1）
-        // 暂时注释掉，将（实际参与活动个数）字段，放在活动结束后进行统计
-//        HeartUserInfoDTO heartUserInfoDTO = new HeartUserInfoDTO();
-//        heartUserInfoDTO.setUserId(formDTO.getUserId());
-//        heartUserInfoDTO.setParticipationNum(NumConstant.ONE);
-//        heartUserInfoService.updateHeartUserInfoByUserId(heartUserInfoDTO);
         return new Result();
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java

@@ -238,6 +238,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         return new Result();
     }
 
+    @Override
+    public List<String> getSignUpUserIdList(String actId) {
+        return baseDao.getSignUpUserIdList(actId);
+    }
+
     /**
      * 开始报名活动
      *

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -529,8 +529,8 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         }
         List<JoinedUserResultDTO> list=actInfoDao.queryJoinUserList(formDTO.getActId());
         if(null!=list&&list.size()>0){
-            //查询已通过审核的人员id集合
-            List<String> userIdList=actUserRelationService.getUserIdList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED);
+            //查询已报名(审核中、审核通过)的人员id集合
+            List<String> userIdList=actUserRelationService.getSignUpUserIdList(formDTO.getActId());
             //根据已通过的人员集合，查询出用户基本信息
             List<UserBaseInfoResultDTO> userInfoList=this.queryUserBaseInfoList(userIdList);
             for(JoinedUserResultDTO joinedUserResultDTO:list){

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -145,7 +145,7 @@
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId}
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         --  活动开始时间 <= 当前时间 进行中
         AND <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
@@ -171,7 +171,7 @@
             IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
         FROM act_info i
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId}
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
         AND i.ACT_STATUS = 'finished'
         AND i.CUSTOMER_ID = #{customerId}

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@@ -319,4 +319,17 @@
             AND aur.USER_ID = #{userId}
             AND aur.ACT_ID = #{actId}
     </select>
+
+    <!--    根据活动id，当前状态（已报名/待审核auditing，审核通过passed）返回用户id集合 -->
+    <select id="getSignUpUserIdList" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            distinct aur.USER_ID as userIds
+        FROM
+            act_user_relation aur
+        WHERE
+            aur.DEL_FLAG = '0'
+            AND ( aur.STATUS = 'auditing' OR aur.`STATUS` = 'passed' )
+            AND aur.ACT_ID = #{actId}
+            order by aur.CREATED_TIME desc
+    </select>
 </mapper>

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.68
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.67</version>
+    <version>0.3.68</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@@ -35,15 +35,13 @@
         WHEN DC.AUDIT_STATUS="null" then ""
         else dc.AUDIT_STATUS
         end ) as AUDIT_STATUS,
-        dc.AUDIT_STATUS as "AUDIT_STATUS原来的值",
         (
         CASE WHEN dc.AUDIT_REASON IS NULL THEN ""
         WHEN dc.AUDIT_REASON<=1 THEN ""
         WHEN dc.AUDIT_REASON="null" then ""
         else dc.AUDIT_REASON
         end
-        )as AUDIT_REASON,
-        dc.AUDIT_REASON as "AUDIT_REASON原来的值"
+        )as AUDIT_REASON
         FROM
         draft_content dc
         WHERE
@@ -65,7 +63,6 @@
         ELSE PUBLISHER_ID
         END
         ) AS PUBLISHER,
-        PUBLISHER_ID as "PUBLISHER_ID原来的值",
         (
         case when PUBLISHER_NAME is NULL THEN ""
         when LENGTH(PUBLISHER_NAME)<=1 THEN ""
@@ -73,7 +70,6 @@
         ELSE PUBLISHER_NAME
         END
         )as PUBLISHER_NAME,
-        PUBLISHER_NAME as "PUBLISHER_NAME原来的值",
         (CASE
         WHEN PUBLISH_DATE IS NULL THEN CURDATE()
         ELSE PUBLISH_DATE
@@ -86,7 +82,6 @@
         ELSE PUBLISH_RANGE_DESC
         END
         )AS PUBLISH_RANGE_DESC,
-        PUBLISH_RANGE_DESC as "PUBLISH_RANGE_DESC原来的值",
         (
         CASE WHEN PUBLISHER_TYPE IS NULL THEN ""
         WHEN LENGTH(PUBLISHER_TYPE) <=1 THEN ""
@@ -94,15 +89,13 @@
         ELSE PUBLISHER_TYPE
         END
         )AS PUBLISHER_TYPE,
-        PUBLISHER_TYPE as "PUBLISHER_TYPE原来的值",
         (
         CASE when TAGS IS NULL THEN ""
         WHEN LENGTH(TAGS)<=1 THEN ""
         when TAGS="null" then ""
         ELSE TAGS
         END
-        )TAGS,
-        TAGS as "TAGS原来的值"
+        )TAGS
         FROM
         draft
         WHERE