暂提

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.resi.partymember.dto.partyOrg.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/19 13:52
+ * @DESC
+ */
+@Data
+public class ActAndScheduleListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -6776882545589530612L;
+
+    private String startDate;
+    private String endDate;
+    private String dateId;
+
+    /**
+     * 是否本人创建的活动，1：是；0：否
+     */
+    private String isSelf;
+
+    /**
+     * 党组织ID
+     */
+    private String orgId;
+
+    private String customerId;
+    private String staffId;
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java

@@ -0,0 +1,53 @@
+package com.epmet.resi.partymember.dto.partyOrg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/8/19 13:41
+ * @DESC
+ */
+@Data
+public class ActAndScheduleListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 7378300105829566449L;
+
+    private Integer scheduleTotal;
+    private Integer activityTotal;
+    private String dateId;
+
+    private List<ActivityListDTO> activityList;
+
+    private List<ScheduleListDTO> scheduleList;
+
+
+    @Data
+    public static class ActivityListDTO implements Serializable{
+
+        private static final long serialVersionUID = -9050507457068805831L;
+
+        private String activityId;
+        private String topic;
+        private String address;
+        private String holdTime;
+        private String type;
+        private String isPublicValue;
+        private String joinTypeValue;
+        private Boolean isMe;
+
+    }
+
+    public static class ScheduleListDTO implements Serializable{
+
+        private static final long serialVersionUID = 5372167729733804267L;
+
+        private String scheduleId;
+        private String title;
+        private String remindTime;
+        private String remark;
+        private Boolean isMe;
+    }
+}

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

@@ -11,7 +11,9 @@ 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.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,5 +107,33 @@ public class IcPartyActController {
         formDTO.setStaffId(tokenDto.getUserId());
         return new Result<List<HomeMonthTotalResultDTO>>().ok(icPartyActService.getHomeMonthTotal(formDTO));
     }
+
+    /**
+     * Desc:【党建日历】活动、日程列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/8/19 13:57
+     */
+    @PostMapping("actAndScheduleList")
+    public Result<ActAndScheduleListResultDTO> getActAndScheduleList(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<ActAndScheduleListResultDTO>().ok(icPartyActService.getActAndScheduleList(formDTO));
+    }
+
+    /**
+     * Desc:【党建日历】某月/天数据搜索列表
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/8/19 14:00
+     */
+    @PostMapping("homeSearch")
+    public Result<List<ActAndScheduleListResultDTO>> homeSearch(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){
+        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        return new Result<List<ActAndScheduleListResultDTO>>().ok(icPartyActService.homeSearch(formDTO));
+    }
     
 }

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

@@ -8,7 +8,9 @@ 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.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
 
 import java.util.List;
@@ -59,4 +61,20 @@ public interface IcPartyActService extends BaseService<IcPartyActEntity> {
      * @return
      */
     IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId);
+
+    /**
+     * Desc: 【党建日历】活动、日程列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/19 13:57
+     */
+    ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO);
+
+    /**
+     * Desc: 【党建日历】某月/天数据搜索列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/19 14:01
+     */
+    List<ActAndScheduleListResultDTO> homeSearch(ActAndScheduleListFormDTO formDTO);
 }

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

@@ -4,18 +4,15 @@ 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.dto.result.CustomerStaffInfoCacheResult;
-import com.epmet.commons.tools.exception.EpmetException;
-import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.modules.partyOrg.dao.IcPartyActDao;
-import com.epmet.modules.partyOrg.dao.IcScheduleDao;
 import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao;
+import com.epmet.modules.partyOrg.dao.IcScheduleDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActEntity;
 import com.epmet.modules.partyOrg.service.IcPartyActService;
 import com.epmet.modules.partyOrg.service.IcPartyOrgService;
@@ -25,7 +22,9 @@ 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.IcPartyOrgDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -181,4 +180,26 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         //todo
         return null;
     }
+
+    /**
+     * Desc: 【党建日历】活动、日程列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/19 13:57
+     */
+    @Override
+    public ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO) {
+        return null;
+    }
+
+    /**
+     * Desc: 【党建日历】某月/天数据搜索列表
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/19 14:01
+     */
+    @Override
+    public List<ActAndScheduleListResultDTO> homeSearch(ActAndScheduleListFormDTO formDTO) {
+        return null;
+    }
 }