From 357ec1da1260e0ef85dcf126fd3615fdb4393274 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 09:40:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/HomeMonthTotalFormDTO.java | 41 ++++++++++++++++ .../result/HomeMonthTotalResultDTO.java | 28 +++++++++++ .../controller/IcPartyActController.java | 20 +++++++- .../partyOrg/service/IcPartyActService.java | 10 ++++ .../service/impl/IcPartyActServiceImpl.java | 47 +++++++++++++++++++ 5 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java new file mode 100644 index 0000000000..74f392a890 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 08:59 + * @DESC + */ +@Data +public class HomeMonthTotalFormDTO implements Serializable { + + private static final long serialVersionUID = 1128815856169903825L; + + public interface HomeMonthTotalForm{} + + /** + * 年份ID + */ + @NotBlank(message = "yearId不能为空",groups = HomeMonthTotalForm.class) + private String yearId; + + /** + * 党支部ID + */ + @NotBlank(message = "orgId不能为空",groups = HomeMonthTotalForm.class) + private String orgId; + + /** + * 是否本人创建的活动，1：是；0：否 + */ + @NotBlank(message = "isSelf不能为空",groups = HomeMonthTotalForm.class) + private String isSelf; + + private String staffId; + + private String customerId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java new file mode 100644 index 0000000000..f3ba554fd6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 08:57 + * @DESC + */ +@Data +public class HomeMonthTotalResultDTO implements Serializable { + + private static final long serialVersionUID = -4647982500373510830L; + + private String monthId; + + private Integer count; + + public HomeMonthTotalResultDTO() { + this.monthId = ""; + this.count = NumConstant.ZERO; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2c2c2cacd3..5d58f8396d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -3,10 +3,14 @@ package com.epmet.modules.partyOrg.controller; import com.epmet.commons.tools.annotation.LoginUser; 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.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; @@ -37,7 +41,19 @@ public class IcPartyActController { return new Result>().ok(list); } -// @PostMapping("homeMonthTotal") -// public Result + /** + * Desc: 【党建日历】首页-获取每月总数 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/19 09:05 + */ + @PostMapping("homeMonthTotal") + public Result> getHomeMonthTotal(@LoginUser TokenDto tokenDto,@RequestBody HomeMonthTotalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, HomeMonthTotalFormDTO.HomeMonthTotalForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.getHomeMonthTotal(formDTO)); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 86aaf9f015..0be952a650 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -3,6 +3,8 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; @@ -20,4 +22,12 @@ public interface IcPartyActService extends BaseService { * @return */ List actTypeList(String customerId); + + /** + * Desc: 【党建日历】首页-获取每月总数 + * @param formDTO + * @author zxc + * @date 2022/8/19 09:05 + */ + List getHomeMonthTotal(HomeMonthTotalFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2a75432068..d6c41ded06 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -2,13 +2,20 @@ 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.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.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; import java.util.List; /** @@ -38,4 +45,44 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { + List result = constructMonthData(formDTO.getYearId()); + + return result; + } + + /** + * Desc: 构造结果集 + * @param yearId + * @author zxc + * @date 2022/8/19 09:31 + */ + public List constructMonthData(String yearId){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(yearId)){ + String[] array = new String[NumConstant.TWELVE]; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM"); + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR,Integer.parseInt(yearId)); + cal.set(Calendar.MONTH, NumConstant.ZERO); + for(int i=NumConstant.ZERO; i