社区讲坛业务修改

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActivityInfoEntity.java

@@ -67,12 +67,12 @@ public class ActivityInfoEntity extends BaseEpdcEntity {
     /**
      * 报名开始时间
      */
-	private Date signupStartTime;
+	private Date signUpStartTime;
 
     /**
      * 报名截止时间
      */
-	private Date signupEndTime;
+	private Date signUpEndTime;
 
     /**
      * 活动开始时间
@@ -112,7 +112,7 @@ public class ActivityInfoEntity extends BaseEpdcEntity {
     /**
      * 已报名人数
      */
-	private Integer signupNum;
+	private Integer signUpNum;
 
     /**
      * 联系人

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityInfoServiceImpl.java

@@ -28,12 +28,16 @@ import com.elink.esua.epdc.dto.activity.ActivityInfoDTO;
 import com.elink.esua.epdc.modules.activity.entity.ActivityInfoEntity;
 import com.elink.esua.epdc.modules.activity.redis.ActivityInfoRedis;
 import com.elink.esua.epdc.modules.activity.service.ActivityInfoService;
+import com.elink.esua.epdc.modules.section.dao.SectionCategoryDao;
+import com.elink.esua.epdc.modules.section.entity.SectionCategoryEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -49,6 +53,9 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl<ActivityInfoDao, Ac
     @Autowired
     private ActivityInfoRedis activityInfoRedis;
 
+    @Resource
+    private SectionCategoryDao sectionCategoryDao;
+
     @Override
     public PageData<ActivityInfoDTO> page(Map<String, Object> params) {
         IPage<ActivityInfoEntity> page = baseDao.selectPage(
@@ -65,8 +72,8 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl<ActivityInfoDao, Ac
         return ConvertUtils.sourceToTarget(entityList, ActivityInfoDTO.class);
     }
 
-    private QueryWrapper<ActivityInfoEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<ActivityInfoEntity> getWrapper(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<ActivityInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -84,6 +91,10 @@ public class ActivityInfoServiceImpl extends BaseServiceImpl<ActivityInfoDao, Ac
     @Transactional(rollbackFor = Exception.class)
     public void save(ActivityInfoDTO dto) {
         ActivityInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActivityInfoEntity.class);
+        SectionCategoryEntity sectionCategoryEntity = sectionCategoryDao.selectByCode(dto.getCategoryCode());
+        entity.setCategoryCode(sectionCategoryEntity.getCode());
+        entity.setCategoryName(sectionCategoryEntity.getName());
+        entity.setSectionCode(sectionCategoryEntity.getSectionCode());
         insert(entity);
     }
 

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/section/controller/SectionCategoryController.java

@@ -55,6 +55,12 @@ public class SectionCategoryController {
         return new Result<PageData<SectionCategoryDTO>>().ok(page);
     }
 
+    @GetMapping("list")
+    public Result<List<SectionCategoryDTO>> list(@RequestParam Map<String, Object> params){
+        List<SectionCategoryDTO> page = sectionCategoryService.listByParams(params);
+        return new Result<List<SectionCategoryDTO>>().ok(page);
+    }
+
     @GetMapping("{id}")
     public Result<SectionCategoryDTO> get(@PathVariable("id") String id){
         SectionCategoryDTO data = sectionCategoryService.get(id);

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/section/dao/SectionCategoryDao.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.section.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.section.entity.SectionCategoryEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -42,4 +43,15 @@ public interface SectionCategoryDao extends BaseDao<SectionCategoryEntity> {
  * @date: 2020/6/22 10:01
  */
     List<SectionCategoryEntity> selectListOfSectionCategory(Map<String, Object> params);
+
+    /**
+     *
+     * 功能描述: 分类查询
+     *
+     * @param: code
+     * @return: SectionCategoryEntity
+     * @author: zhy
+     * @date: 2020/6/22 10:01
+     */
+    SectionCategoryEntity selectByCode(@Param("code") String code);
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/section/service/SectionCategoryService.java

@@ -43,6 +43,16 @@ public interface SectionCategoryService extends BaseService<SectionCategoryEntit
      */
     PageData<SectionCategoryDTO> page(Map<String, Object> params);
 
+    /**
+     * 查询列表
+     *
+     * @param params
+     * @return List<SectionCategoryDTO>
+     * @author generator
+     * @date 2020-06-22
+     */
+    List<SectionCategoryDTO> listByParams(Map<String, Object> params);
+
     /**
      * 默认查询
      *

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/section/service/impl/SectionCategoryServiceImpl.java

@@ -57,6 +57,12 @@ public class SectionCategoryServiceImpl extends BaseServiceImpl<SectionCategoryD
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public List<SectionCategoryDTO> listByParams(Map<String, Object> params) {
+        List<SectionCategoryEntity> entityList = baseDao.selectListOfSectionCategory(params);
+        return ConvertUtils.sourceToTarget(entityList, SectionCategoryDTO.class);
+    }
+
     @Override
     public List<SectionCategoryDTO> list(Map<String, Object> params) {
         List<SectionCategoryEntity> entityList = baseDao.selectList(getWrapper(params));

epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml

@@ -10,8 +10,8 @@
         <result property="sectionCode" column="SECTION_CODE"/>
         <result property="categoryCode" column="CATEGORY_CODE"/>
         <result property="categoryName" column="CATEGORY_NAME"/>
-        <result property="signupStartTime" column="SIGNUP_START_TIME"/>
+        <result property="signUpStartTime" column="SIGN_UP_START_TIME"/>
-        <result property="signupEndTime" column="SIGNUP_END_TIME"/>
+        <result property="signUpEndTime" column="SIGN_UP_END_TIME"/>
         <result property="actStartTime" column="ACT_START_TIME"/>
         <result property="actEndTime" column="ACT_END_TIME"/>
         <result property="actAddress" column="ACT_ADDRESS"/>
@@ -19,7 +19,7 @@
         <result property="actLatitude" column="ACT_LATITUDE"/>
         <result property="actQuotaFlag" column="ACT_QUOTA_FLAG"/>
         <result property="actQuota" column="ACT_QUOTA"/>
-        <result property="signupNum" column="SIGNUP_NUM"/>
+        <result property="signUpNum" column="SIGNUP_NUM"/>
         <result property="contacts" column="CONTACTS"/>
         <result property="tel" column="TEL"/>
         <result property="requirement" column="REQUIREMENT"/>

epdc-cloud-property/src/main/resources/mapper/section/SectionCategoryDao.xml

@@ -42,4 +42,16 @@
         </if>
         ORDER BY SORT ASC, CREATED_TIME DESC
     </select>
+    <select id="selectByCode" resultType="com.elink.esua.epdc.modules.section.entity.SectionCategoryEntity">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        epdc_section_category s
+        WHERE
+        DEL_FLAG = '0'
+        <if test="code != null and code != ''">
+            AND CODE like CONCAT( '%', #{code}, '%' )
+        </if>
+        ORDER BY SORT ASC, CREATED_TIME DESC
+    </select>
 </mapper>