From 70786c9e4f487d3f20e6a95e5ea1ec28cb85d281 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 13 Aug 2020 17:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiAppActInfoController.java   |  5 ++-
 .../epdc/modules/activity/dao/ActInfoDao.java |  2 +-
 .../service/impl/ActInfoServiceImpl.java      |  2 +-
 .../src/main/resources/logback-spring.xml     | 39 ++++++-------------
 .../resources/mapper/activity/ActInfoDao.xml  | 16 +++++---
 5 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java
index 7abcbc73..d825fc71 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java
@@ -68,14 +68,15 @@ public class ApiAppActInfoController {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:34
      */
-    @GetMapping("detail/{id}")
-    public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
+    @GetMapping("detail")
+    public Result<ActInfoDetailAppResultDTO> detail(String id,String actType, @LoginUser TokenDto tokenDto) {
         if (StringUtils.isBlank(id)) {
             return new Result<ActInfoDetailAppResultDTO>().error("id不能为空");
         }
         ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
         formDto.setId(id);
         formDto.setUserId(tokenDto.getUserId());
+        formDto.setActType(actType);
         return actInfoService.getDetail(formDto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java
index 80cb9c98..87accd27 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java
@@ -94,7 +94,7 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @Description 活动详情
      * @Date 2020/2/5 16:31
      **/
-    ActInfoDetailResultDTO selectActInfoDetailResultDTO(String actId);
+    ActInfoDetailResultDTO selectActInfoDetailResultDTO(ActInfoAppFormDTO formDto);
 
     /**
      * @param actId
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index bfdbca02..1531758d 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -392,7 +392,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
      **/
     @Override
     public Result<ActInfoDetailAppResultDTO> queryActInfoDetail(ActInfoAppFormDTO formDto) {
-        ActInfoDetailResultDTO detailResultDTO = baseDao.selectActInfoDetailResultDTO(formDto.getId());
+        ActInfoDetailResultDTO detailResultDTO = baseDao.selectActInfoDetailResultDTO(formDto);
         // 获取用户报名状态
         String currentUserStatus = getCurrentUserStatus(formDto.getId(), formDto.getUserId());
 
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml
index e357d928..fc66b9e4 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/logback-spring.xml
@@ -127,33 +127,16 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-
-    <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
-        <logger name="org.springframework.web" level="INFO"/>
-        <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.elink.esua.epdc" level="INFO"/>
-        <logger name="com.elink.esua.epdc.dao" level="DEBUG"/>
-        <root level="INFO">
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>
-
     <!-- 生产环境 -->
-    <springProfile name="prod">
-        <logger name="org.springframework.web" level="ERROR"/>
-        <logger name="org.springboot.sample" level="ERROR"/>
-        <logger name="com.elink.esua.epdc" level="ERROR"/>
-        <root level="ERROR">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>
+    <logger name="org.springframework.web" level="INFO"/>
+    <logger name="org.springboot.sample" level="INFO"/>
+    <logger name="com.elink.esua.epdc" level="INFO"/>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="DEBUG_FILE"/>
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="WARN_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+    </root>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 15659f15..cfff372a 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -145,7 +145,10 @@
     <select id="listItemsByApp" resultMap="actAppResultMap">
         select * from (
         SELECT
-        actInfo.ID, actInfo.TITLE, actInfo.HEAD_PIC,
+        actInfo.ID,
+        <if test='actType != null and actType != "" and actType == "0"'>CONCAT(actInfo.TITLE,'招募令') as TITLE,</if>
+        <if test='actType != null and actType != "" and actType == "1"'>CONCAT(actInfo.TITLE,'集锦') as TITLE,</if>
+        actInfo.HEAD_PIC,
         DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i') ACT_START_TIME,
         DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i') ACT_END_TIME,
         actInfo.PUBLISH_TIME,actInfo.ACT_ADDRESS, actInfo.ACT_QUOTA_CATEGORY, actInfo.ACT_QUOTA,
@@ -467,13 +470,13 @@
             id = #{actId}
             AND DEL_FLAG = 0
     </select>
-
-
     <!-- 活动详情   -->
-    <select id="selectActInfoDetailResultDTO" parameterType="java.lang.String"
+    <select id="selectActInfoDetailResultDTO"
             resultType="com.elink.esua.epdc.activity.result.ActInfoDetailResultDTO">
         select eai.ID,
-        eai.TITLE,
+        <if test='actType != null and actType != "" and actType == "0"'>CONCAT(eai.TITLE,'招募令') as TITLE,</if>
+        <if test='actType != null and actType != "" and actType == "1"'>CONCAT(eai.TITLE,'集锦') as TITLE,</if>
+        <if test='actType == null or actType == ""'>eai.TITLE,</if>
         eai.CONTACTS,
         eai.TEL,
         eai.SIGNUP_START_TIME as signupStartTime,
@@ -491,9 +494,10 @@
         ACT_NEWS_CONTENT as actNewsContent
         from epdc_act_info eai
         where eai.DEL_FLAG='0'
-        and eai.id=#{actId}
+        and eai.id= #{id}
     </select>
 
+
     <!--   活动打卡人数+1 -->
     <update id="addClockNum" parameterType="java.lang.String">
         update epdc_act_info eai