Merge remote-tracking branch 'origin/dev_party_helper' into dev_party_helper

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.resi.partymember.dto.icpartyact.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/19 9:58
+ */
+@Data
+public class IcPartyActAddOrUpdateFormDTO implements Serializable {
+    private static final long serialVersionUID = -2554822505755122067L;
+    private String customerId;
+    private String publishStaffId;
+}
+

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.resi.partymember.dto.icpartyact.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/19 10:02
+ */
+@Data
+public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable {
+    private static final long serialVersionUID = -8171649039313981541L;
+    private String customerId;
+    private String publishStaffId;
+}
+

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java → epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java

@@ -1,4 +1,4 @@
-package com.epmet.resi.partymember.dto.icpartyact;
+package com.epmet.resi.partymember.dto.icpartyact.result;
 
 import lombok.Data;
 

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.partymember.dto.icpartyact.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/19 10:08
+ */
+@Data
+public class IcPartyActDetailResDTO implements Serializable {
+    private static final long serialVersionUID = -8102085878449811977L;
+}
+

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.partymember.dto.icpartyact.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/8/19 10:06
+ */
+@Data
+public class IcPartyActPageResultDTO implements Serializable {
+    private static final long serialVersionUID = 1414832133227703667L;
+}
+

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java

@@ -1,20 +1,23 @@
 package com.epmet.modules.partyOrg.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.partyOrg.service.IcPartyActService;
-import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -30,6 +33,45 @@ public class IcPartyActController {
     @Autowired
     private IcPartyActService icPartyActService;
 
+    /**
+     * 添加、修改活动
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("addOrUpdate")
+    public Result<Map<String,String>> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setPublishStaffId(tokenDto.getUserId());
+        Map<String,String> map=icPartyActService.addOrUpdate(formDTO);
+        return new Result<Map<String, String>>().ok(map);
+    }
+
+    /**
+     * 活动列表分页
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("page-list")
+    public Result<PageData<IcPartyActPageResultDTO>> pageList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setPublishStaffId(tokenDto.getUserId());
+        return new Result<PageData<IcPartyActPageResultDTO>>().ok(icPartyActService.pageList(formDTO));
+    }
+
+    /**
+     * 活动列表活动详情
+     * @param tokenDto
+     * @param icPartyActId
+     * @return
+     */
+    @PostMapping("act-detail/{icPartyActId}")
+    public Result<IcPartyActDetailResDTO> actDetail(@LoginUser TokenDto tokenDto, @PathVariable("icPartyActId")String icPartyActId){
+        return new Result<IcPartyActDetailResDTO>().ok(icPartyActService.queryActDetail(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActId));
+    }
+
+
     /**
      * 活动类型
      * @param tokenDto

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java

@@ -2,7 +2,7 @@ package com.epmet.modules.partyOrg.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
-import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java

@@ -1,12 +1,18 @@
 package com.epmet.modules.partyOrg.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
-import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 党建组织活动
@@ -30,4 +36,27 @@ public interface IcPartyActService extends BaseService<IcPartyActEntity> {
      * @date 2022/8/19 09:05
      */
     List<HomeMonthTotalResultDTO> getHomeMonthTotal(HomeMonthTotalFormDTO formDTO);
+
+    /**
+     * 添加、修改活动
+     * @param formDTO
+     * @return
+     */
+    Map<String, String> addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO);
+
+    /**
+     * 活动列表-分页查询
+     * @param formDTO
+     * @return
+     */
+    PageData<IcPartyActPageResultDTO> pageList(IcPartyActPageFormDTO formDTO);
+
+    /**
+     * 活动列表活动详情
+     * @param customerId
+     * @param userId
+     * @param icPartyActId
+     * @return
+     */
+    IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -3,10 +3,15 @@ package com.epmet.modules.partyOrg.service.impl;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.partyOrg.dao.IcPartyActDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
 import com.epmet.modules.partyOrg.service.IcPartyActService;
-import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO;
+import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
+import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
 import org.apache.commons.collections4.CollectionUtils;
@@ -17,6 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 党建组织活动
@@ -85,4 +91,42 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         return result;
     }
 
+
+    /**
+     * 添加、修改活动
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public Map<String, String> addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) {
+        //todo
+        return null;
+    }
+
+    /**
+     * 活动列表-分页查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<IcPartyActPageResultDTO> pageList(IcPartyActPageFormDTO formDTO) {
+        //todo
+        return null;
+    }
+
+    /**
+     * 活动列表活动详情
+     *
+     * @param customerId
+     * @param userId
+     * @param icPartyActId
+     * @return
+     */
+    @Override
+    public IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId) {
+        //todo
+        return null;
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.epmet.modules.partyOrg.dao.IcPartyActDao">
 
-    <select id="actTypeList" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO">
+    <select id="actTypeList" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO">
         SELECT
             d.TYPE_KEY as value,
             d.TYPE_NAME as label,