大屏企业信息管理、大屏企业列表接口 init

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java

@@ -86,7 +86,7 @@ public class ApiActUserRelationController {
         for (String actPeriodId:
              formDto.getActPeriodId()) {
             ActPeriodDTO period = new ActPeriodDTO();
-            period.setActId(actPeriodId);
+            period.setId(actPeriodId);
             periods.add(period);
         }
         actUserRelationDTO.setPeriods(periods);

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java

@@ -125,4 +125,9 @@ public class ActInfoDetailResultDTO implements Serializable {
 	 * 活动新闻稿
 	 */
 	private String actNewsContent;
+
+	/**
+	 * 活动主办方
+	 */
+	private String sponsor;
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java

@@ -62,5 +62,6 @@ public interface ActPeriodDao extends BaseDao<ActPeriodEntity> {
      * @since 2021/9/2 16:29
      */
     List<ActPeriodDTO> selectListOfActPeriodsByActId(String actId);
+    List<ActPeriodDTO> selectActTimeByActId(String actId);
 
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java

@@ -111,7 +111,11 @@ public class ActPeriodServiceImpl extends BaseServiceImpl<ActPeriodDao, ActPerio
 
     @Override
     public List<ActPeriodDTO> listOfActPeriodsByActId(String actId) {
-        return baseDao.selectListOfActPeriodsByActId(actId);
+        List<ActPeriodDTO> data = baseDao.selectListOfActPeriodsByActId(actId);
+        if (CollectionUtil.isEmpty(data)) {
+            data = baseDao.selectActTimeByActId(actId);
+        }
+        return data;
     }
 
 }

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

@@ -34,4 +34,8 @@
             ACT_PERIOD_START_TIME
     </select>
 
+    <select id="selectActTimeByActId" resultType="com.elink.esua.epdc.activity.ActPeriodDTO">
+        SELECT ACT_START_TIME AS actPeriodStartTime, ACT_END_TIME AS actPeriodEndTime FROM epdc_act_info WHERE ID = #{actId}
+    </select>
+
 </mapper>