From b6bc09d6a96c452c2377fa43dcf03a1dc89b277e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 20 Mar 2023 10:59:12 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=82=80=E8=AF=B7=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 9700d0c..afc230c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -485,6 +485,7 @@ public class MeetingManage { if (CollUtil.isNotEmpty(randoms)) { randoms.forEach(random -> { RandomInviteRuleVO randomRule = JSON.parseObject(random.getInviteRule(), RandomInviteRuleVO.class); + randomRule.setId(random.getId()); if (randomRule.getExpertTags() != null) { randomRule.getExpertTags().forEach(w -> { List tagNames = CollUtils.convert(w.getTagCodes(), tagCode -> tagCache.getByTagCode(tagCode).getTagName()); @@ -525,6 +526,7 @@ public class MeetingManage { List appoints = groupByType.get(ExpertInviteTypeEnum.APPOINT); ExpertInviteRule appoint = appoints.get(0); AppointInviteRuleDTO appointRule = JSON.parseObject(appoint.getInviteRule(), AppointInviteRuleDTO.class); + appointRule.setId(appoint.getId()); AppointRuleVO vo = new AppointRuleVO(); vo.setInviteDesc(appointRule.getInviteDesc()); vo.setExperts(new ArrayList<>(meetingManageHelper.getExpertBasicInfo(appointRule.getExpertIdList()).values())); From e0b686b14e31dc4c4dcdd1901cb8ffbf88318c10 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 20 Mar 2023 11:39:45 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=B7=B2=E6=8A=BD=E5=8F=96=E4=B8=93?= =?UTF-8?q?=E5=AE=B6=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/meeting/entity/vo/InviteExpertListItemVO.java | 3 +++ .../main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 1 + 2 files changed, 4 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteExpertListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteExpertListItemVO.java index deab3fb..15295e7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteExpertListItemVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteExpertListItemVO.java @@ -26,6 +26,9 @@ public class InviteExpertListItemVO extends ExpertBasicInfoVO { @ApiModelProperty("会议ID") private Long meetingId; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("专家会议ID") private Long expertMeetingId; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index afc230c..839247b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -415,6 +415,7 @@ public class MeetingManage { item.setExpertMeetingId(sme.getId()); item.setMeetingId(sme.getMeetingId()); item.setStatus(sme.getStatus()); + item.setMobile(sme.getMobile()); item.setNoticeTime(sme.getCreateOn()); item.setRuleId(sme.getRuleId()); if (ExpertAttendStatusEnum.NOTICING.eq(sme.getStatus())) { From 25c51b82eb13ee07cbfff777376a806cfb7c9ba1 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 20 Mar 2023 13:50:35 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=82=80=E8=AF=B7=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E9=82=80=E8=AF=B7=E7=8A=B6=E6=80=81=E3=80=81=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java | 9 +++++++++ .../java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 3 +++ 2 files changed, 12 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java index b4c767b..76a98eb 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java @@ -83,4 +83,13 @@ public class MeetingDetailBasicVO { @ApiModelProperty("评审项目信息") private List projects; + @ApiModelProperty("是否已停止邀请") + private Boolean invitedStopped; + + @ApiModelProperty("是否已确认名单") + private Boolean confirmedRoster; + + @ApiModelProperty("邀请类型") + private Integer inviteType; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 839247b..d0c820d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -373,6 +373,9 @@ public class MeetingManage { .createOn(meeting.getCreateOn()) .creator(meeting.getCreator()) .createBy(meeting.getCreator()) + .inviteType(meeting.getInviteType()) + .confirmedRoster(meeting.getConfirmedRoster()) + .invitedStopped(meeting.getInviteStatus()) .build(); if (meeting.getIsInnerProject()) { List innerProjects = meetingInnerProjectService.listByMeetingId(meetingId); From ed2996831d0c5c22d5d6d601f30055a0b6ea105d Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 20 Mar 2023 14:01:04 +0800 Subject: [PATCH 4/9] =?UTF-8?q?debug=20=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provincial/controller/TestController.java | 20 +++++++ .../pmapi/todocenter/manage/TodoCenterManage.java | 13 ++++- .../pmapi/todocenter/mapper/StatisticsMapper.java | 10 ++++ .../pmapi/todocenter/mapper/StatisticsMapper.xml | 5 ++ .../model/vo/TodoCenterStatisticsVO.java | 29 ++++++++++ .../pmapi/todocenter/model/vo/TodoVO.java | 22 ++++++++ .../todocenter/service/StatisticsService.java | 13 +++++ .../service/impl/StatisticsServiceImpl.java | 17 ++++++ .../workbench/controller/WorkbenchController.java | 21 ++++++-- .../pmapi/workbench/manage/WorkbenchManage.java | 27 ++++++++++ .../workbench/model/TodoCenterStatisticsPO.java | 16 ++++++ .../pmapi/workbench/model/vo/WorkbenchVO.java | 62 ++++++++++++++++++++++ 12 files changed, 249 insertions(+), 6 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoCenterStatisticsVO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoVO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/provincial/controller/TestController.java b/pmapi/src/main/java/com/ningdatech/pmapi/provincial/controller/TestController.java index 16ea46e..bbac2e2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/provincial/controller/TestController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/provincial/controller/TestController.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.provincial.controller; +import cn.hutool.core.io.resource.ResourceUtil; import com.ningdatech.basic.model.ApiResponse; import com.ningdatech.pmapi.projectdeclared.manage.ReviewByProvincialDeptManage; import com.ningdatech.pmapi.projectlib.model.entity.Project; @@ -12,6 +13,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.io.IOException; +import java.io.InputStream; /** * @Classname TestController @@ -43,4 +46,21 @@ public class TestController { private ApiResponse detail(@RequestParam String projectId){ return joinReviewProvincialBureauService.processInfo(projectId); } + + @GetMapping("/path") + @ApiOperation("测试获取详情") + private String path() throws IOException { +// String template = ResourceUtil.getResource("template").getPath(); +// return template; + + InputStream in = this.getClass().getResourceAsStream("/template/simsun.ttc"); + StringBuilder sb = new StringBuilder(); + int n; + while ((n=in.read())!=-1){ + sb.append((char)n); + System.out.print((char)n); + } + + return sb.toString(); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 0c53558..b89fe6f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -2,7 +2,6 @@ package com.ningdatech.pmapi.todocenter.manage; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -56,6 +55,8 @@ import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq; import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedExportReq; import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedReq; import com.ningdatech.pmapi.todocenter.model.vo.ResToBeProcessedVO; +import com.ningdatech.pmapi.todocenter.model.vo.TodoCenterStatisticsVO; +import com.ningdatech.pmapi.todocenter.service.StatisticsService; import com.ningdatech.pmapi.todocenter.utils.BuildUserUtils; import com.ningdatech.pmapi.todocenter.utils.PdfUtils; import com.ningdatech.pmapi.user.entity.UserInfo; @@ -1145,4 +1146,14 @@ public class TodoCenterManage { Project declaredProject = projectService.getById(projectId); return getSealedPdf(req, declaredProject); } + + //获取当前登录人的 待办中心统计数据 + public TodoCenterStatisticsVO todoCenterStatistics(Integer year){ + TodoCenterStatisticsVO resVo = new TodoCenterStatisticsVO(); + + //为了查询效率 还是自己去写统计接口 +// statisticsService. + + return resVo; + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java new file mode 100644 index 0000000..178e028 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java @@ -0,0 +1,10 @@ +package com.ningdatech.pmapi.todocenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wflow.bean.entity.WflowDepartments; + +public interface StatisticsMapper extends BaseMapper { + + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml new file mode 100644 index 0000000..64c8506 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoCenterStatisticsVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoCenterStatisticsVO.java new file mode 100644 index 0000000..ce86b82 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoCenterStatisticsVO.java @@ -0,0 +1,29 @@ +package com.ningdatech.pmapi.todocenter.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Classname TodoCenterStatistics + * @Description + * @Date 2023/3/20 11:02 + * @Author PoffyZhang + */ +@Data +public class TodoCenterStatisticsVO { + + @ApiModelProperty("待处理数") + private Integer todoNum; + @ApiModelProperty("已处理数") + private Integer idoNum; + @ApiModelProperty("我发起数") + private Integer mysubmitNum; + @ApiModelProperty("抄送我数") + private Integer ccmeNum; + + @ApiModelProperty("待我处理列表 5个") + private List todoList; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoVO.java new file mode 100644 index 0000000..4d99ce4 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/vo/TodoVO.java @@ -0,0 +1,22 @@ +package com.ningdatech.pmapi.todocenter.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Classname TodoVO + * @Description + * @Date 2023/3/20 11:04 + * @Author PoffyZhang + */ +@Data +public class TodoVO { + + @ApiModelProperty("项目工作流nodeId") + private String nodeId; + @ApiModelProperty("项目ID") + private Long projectId; + @ApiModelProperty("项目名称") + private String projectName; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java new file mode 100644 index 0000000..3d1cd5f --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java @@ -0,0 +1,13 @@ +package com.ningdatech.pmapi.todocenter.service; + +/** + * @Classname StatisticsService + * @Description + * @Date 2023/3/20 11:20 + * @Author PoffyZhang + */ +public interface StatisticsService { + + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java new file mode 100644 index 0000000..b2ff8cc --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java @@ -0,0 +1,17 @@ +package com.ningdatech.pmapi.todocenter.service.impl; + +import com.ningdatech.pmapi.todocenter.service.StatisticsService; +import org.springframework.stereotype.Service; + +/** + * @Classname StatisticsService + * @Description + * @Date 2023/3/20 11:20 + * @Author PoffyZhang + */ +@Service +public class StatisticsServiceImpl implements StatisticsService { + + + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/controller/WorkbenchController.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/controller/WorkbenchController.java index 728af6d..ae38438 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/controller/WorkbenchController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/controller/WorkbenchController.java @@ -1,20 +1,31 @@ package com.ningdatech.pmapi.workbench.controller; +import com.ningdatech.pmapi.workbench.manage.WorkbenchManage; +import com.ningdatech.pmapi.workbench.model.vo.WorkbenchVO; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 工作台前端控制器 - * - * @author CMM + * @author ZPF * @since 2023/03/17 15:35 */ @RestController @AllArgsConstructor @Api(tags = "工作台控制器") -@RequestMapping("/api/v1/todo-center") +@RequestMapping("/api/v1/workbench") public class WorkbenchController { + private WorkbenchManage workbenchManage; + + /** + * @param year + * @return + */ + @GetMapping + public WorkbenchVO workbench(@RequestParam(defaultValue = "2023") Integer year){ + return workbenchManage.getWorkbenchData(year); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java new file mode 100644 index 0000000..88d40de --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java @@ -0,0 +1,27 @@ +package com.ningdatech.pmapi.workbench.manage; + +import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage; +import com.ningdatech.pmapi.workbench.model.vo.WorkbenchVO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * @Classname WorkbenchManage + * @Description + * @Date 2023/3/20 10:56 + * @Author PoffyZhang + */ +@Component +@AllArgsConstructor +public class WorkbenchManage { + + private TodoCenterManage todoCenterManage; + + public WorkbenchVO getWorkbenchData(Integer year){ + //1.待办中心数据 + todoCenterManage.todoCenterStatistics(year); + + return null; + } + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java new file mode 100644 index 0000000..6d5881a --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java @@ -0,0 +1,16 @@ +package com.ningdatech.pmapi.workbench.model; + +import lombok.Data; + +/** + * @Classname TodoCenterStatisticsPO + * @Description + * @Date 2023/3/20 11:51 + * @Author PoffyZhang + */ +@Data +public class TodoCenterStatisticsPO { + +// private + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java new file mode 100644 index 0000000..ffcc9e1 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java @@ -0,0 +1,62 @@ +package com.ningdatech.pmapi.workbench.model.vo; + +import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; +import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO; +import com.ningdatech.pmapi.todocenter.model.vo.TodoCenterStatisticsVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * @Classname WorkbenchVO + * @Description + * @Date 2023/3/20 9:33 + * @Author PoffyZhang + */ +@Data +public class WorkbenchVO implements Serializable { + + @ApiModelProperty("待办中心统计数据 以及代办处理") + public TodoCenterStatisticsVO todoCerter; + + @ApiModelProperty("单位申报管理统计数据") + public DeclaredStatistics orgDeclared; + + @ApiModelProperty("区域申报管理统计数据 只有区域管理员才有数据") + public DeclaredStatistics regionDeclared; + + @ApiModelProperty("项目动态") + public List projects; + + @ApiModelProperty("公告列表") + public NoticeListItemVO noticeList; + + @Data + public static class DeclaredStatistics { + @ApiModelProperty("总项目数") + private Integer totalNum; + @ApiModelProperty("建设项目数") + private Integer buildNum; + @ApiModelProperty("运维项目数") + private Integer operationNum; + + @ApiModelProperty("待立项数") + private Integer notApprovedNum; + @ApiModelProperty("已立项数") + private Integer approvedNum; + @ApiModelProperty("建设中数") + private Integer constructionNum; + @ApiModelProperty("待验收数") + private Integer tobeInspectedNum; + @ApiModelProperty("已归档数") + private Integer archivedNum; + + @ApiModelProperty("申报总金额") + private BigDecimal declaredAmount; + @ApiModelProperty("立项总金额") + private BigDecimal approvalAmount; + } +} From 25a5dc81b084b9a71312cccca2774dc966cd7ddb Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 20 Mar 2023 14:24:12 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=AF=84=E5=AE=A1=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AF=84=E5=AE=A1=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/constant/ReviewResultEnum.java | 34 ++++++++++++++ .../pmapi/expert/manage/ExpertReviewManage.java | 1 - .../pmapi/expert/service/IExpertReviewService.java | 21 +++++++++ .../service/impl/ExpertReviewServiceImpl.java | 21 +++++++++ .../meeting/controller/MeetingController.java | 4 +- .../meeting/entity/vo/MeetingReviewProjectVO.java | 53 ++++++++++++++++++++++ .../pmapi/meeting/manage/MeetingManage.java | 31 +++++++++---- 7 files changed, 153 insertions(+), 12 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/expert/constant/ReviewResultEnum.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/constant/ReviewResultEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/constant/ReviewResultEnum.java new file mode 100644 index 0000000..b62f072 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/constant/ReviewResultEnum.java @@ -0,0 +1,34 @@ +package com.ningdatech.pmapi.expert.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + *

+ * ReviewResultEnum + *

+ * + * @author WendyYang + * @since 14:17 2023/3/20 + */ +@Getter +@AllArgsConstructor +public enum ReviewResultEnum { + + PASSED(1, "通过"), + TO_BE_REVIEWED(2, "需复核"), + REFUSED(3, "不通过"); + + private final int code; + private final String value; + + public static ReviewResultEnum getByCode(int code) { + return Arrays.stream(values()) + .filter(w -> w.getCode() == code) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("无效的审核结果编码")); + } + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java index b070dec..8acd3ac 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertReviewManage.java @@ -62,7 +62,6 @@ public class ExpertReviewManage { try { List reviews = expertReviewService.listByProjectIdAndExpertId(projectId, userId); if (req.getIsFinal()) { - // TODO 判断所有专家是否都已评价 if (reviews.isEmpty()) { throw BizException.wrap("请先填写个人评审意见"); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java index 8a9a650..fe05a21 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java @@ -4,6 +4,7 @@ import com.ningdatech.pmapi.expert.model.entity.ExpertReview; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -25,4 +26,24 @@ public interface IExpertReviewService extends IService { **/ List listByProjectIdAndExpertId(Long projectId, Long expertId); + /** + * 获取最终评审结果 + * + * @param meetingId 会议ID + * @param projectId 项目ID + * @return {@link ExpertReview} + * @author WendyYang + **/ + ExpertReview getFinalReview(Long meetingId, Long projectId); + + /** + * 获取最终评审结果 + * + * @param meetingId 会议ID + * @param projectId 项目ID + * @return {@link ExpertReview} + * @author WendyYang + **/ + Map listFinalReview(Long meetingId); + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java index 0dbb95c..c0accdd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java @@ -3,12 +3,15 @@ package com.ningdatech.pmapi.expert.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.pmapi.common.constant.BizConst; import com.ningdatech.pmapi.expert.mapper.ExpertReviewMapper; import com.ningdatech.pmapi.expert.model.entity.ExpertReview; import com.ningdatech.pmapi.expert.service.IExpertReviewService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** *

@@ -30,4 +33,22 @@ public class ExpertReviewServiceImpl extends ServiceImpl query = Wrappers.lambdaQuery(ExpertReview.class); + query.eq(ExpertReview::getProjectId, projectId); + query.eq(ExpertReview::getMeetingId, meetingId); + query.eq(ExpertReview::getIsFinal, Boolean.TRUE); + query.last(BizConst.LIMIT_1); + return getOne(query); + } + + @Override + public Map listFinalReview(Long meetingId) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(ExpertReview.class); + query.eq(ExpertReview::getMeetingId, meetingId); + query.eq(ExpertReview::getIsFinal, Boolean.TRUE); + return CollUtils.listToMap(list(query), ExpertReview::getProjectId); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java index 1fc83a0..a70a51f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java @@ -177,13 +177,13 @@ public class MeetingController { @GetMapping("/option/project") @ApiOperation("项目列表（创建会议添加项目）") - public PageVo projectList(MeetingOptionProjectReq req) { + public PageVo projectList(MeetingOptionProjectReq req) { return meetingManage.optionProject(req); } @GetMapping("/{meetingId}/projects") @ApiOperation("会议关联项目列表") - public List projectsByMeetingId(@PathVariable Long meetingId) { + public List projectsByMeetingId(@PathVariable Long meetingId) { return meetingManage.projectsByMeetingId(meetingId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java new file mode 100644 index 0000000..1519e06 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingReviewProjectVO.java @@ -0,0 +1,53 @@ +package com.ningdatech.pmapi.meeting.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Tolerate; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * MeetingReviewProjectVO + *

+ * + * @author WendyYang + * @since 13:57 2023/3/20 + */ +@Data +@Builder +public class MeetingReviewProjectVO { + + @Tolerate + public MeetingReviewProjectVO() { + } + + @ApiModelProperty("项目ID") + private Long id; + + @ApiModelProperty("项目名称") + private String projectName; + + @ApiModelProperty("申报金额") + private BigDecimal declaredAmount; + + @ApiModelProperty("项目类型") + private Integer projectType; + + @ApiModelProperty("申报年度") + private Integer projectYear; + + @ApiModelProperty("申报单位") + private String buildOrg; + + @ApiModelProperty("评审结果") + private String reviewResult; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime createOn; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index d0c820d..3ab6456 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -18,8 +18,11 @@ import com.ningdatech.basic.util.StrPool; import com.ningdatech.basic.util.ValidUtil; import com.ningdatech.cache.lock.DistributedLock; import com.ningdatech.pmapi.common.helper.RegionCacheHelper; +import com.ningdatech.pmapi.expert.constant.ReviewResultEnum; import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo; import com.ningdatech.pmapi.expert.helper.PermissionCheckHelper; +import com.ningdatech.pmapi.expert.model.entity.ExpertReview; +import com.ningdatech.pmapi.expert.service.IExpertReviewService; import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; import com.ningdatech.pmapi.meeting.builder.ExpertInviteBuilder; import com.ningdatech.pmapi.meeting.entity.domain.*; @@ -41,7 +44,6 @@ import com.ningdatech.pmapi.organization.service.IDingOrganizationService; import com.ningdatech.pmapi.organization.service.IGovBusinessStripService; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.model.entity.Project; -import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.ningdatech.pmapi.sys.model.dto.RegionDTO; import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; @@ -89,7 +91,7 @@ public class MeetingManage { private final IMeetingOuterProjectService meetingOuterProjectService; private final IGovBusinessStripService businessStripService; private final IDingOrganizationService dingOrganizationService; - + private final IExpertReviewService expertReviewService; private final ExpertInviteHelper expertInviteHelper; private static final String INVITED_RULE_CREATE = "INVITED_RULE_CREATE:"; @@ -728,7 +730,7 @@ public class MeetingManage { return PageVo.of(page.getRecords(), page.getTotal()); } - public PageVo optionProject(MeetingOptionProjectReq req) { + public PageVo optionProject(MeetingOptionProjectReq req) { String meetingType = req.getMeetingType(); LambdaQueryWrapper query = Wrappers.lambdaQuery(Project.class); switch (MeetingReviewTypeEnum.getByCode(meetingType)) { @@ -748,28 +750,38 @@ public class MeetingManage { return PageVo.empty(); } Page page = projectService.page(req.page(), query); - PageVo result = PageVo.of(null, page.getTotal()); + PageVo result = PageVo.of(null, page.getTotal()); if (result.getTotal() > 0) { result.setRecords(CollUtils.convert(page.getRecords(), this::buildProjectList)); } return result; } - public List projectsByMeetingId(Long meetingId) { + public List projectsByMeetingId(Long meetingId) { Meeting meeting = meetingService.getById(meetingId); if (meeting.getIsInnerProject()) { List projects = meetingInnerProjectService.listByMeetingId(meetingId); List projectIdList = CollUtils.fieldList(projects, MeetingInnerProject::getProjectId); List projectList = projectService.listByIds(projectIdList); - return CollUtils.convert(projectList, this::buildProjectList); + Map reviewMap = expertReviewService.listFinalReview(meetingId); + return CollUtils.convert(projectList, w -> { + MeetingReviewProjectVO vo = buildProjectList(w); + ExpertReview review = reviewMap.get(w.getId()); + if (review != null) { + vo.setReviewResult(ReviewResultEnum.getByCode(review.getReviewResult()).getValue()); + } else { + vo.setReviewResult("--"); + } + return vo; + }); } else { List projects = meetingOuterProjectService.listByMeetingId(meetingId); - return BeanUtil.copyToList(projects, ProjectLibListItemVO.class); + return BeanUtil.copyToList(projects, MeetingReviewProjectVO.class); } } - private ProjectLibListItemVO buildProjectList(Project project) { - return ProjectLibListItemVO + private MeetingReviewProjectVO buildProjectList(Project project) { + return MeetingReviewProjectVO .builder() .id(project.getId()) .projectName(project.getProjectName()) @@ -777,6 +789,7 @@ public class MeetingManage { .projectType(project.getProjectType()) .projectYear(project.getProjectYear()) .buildOrg(project.getBuildOrgName()) + .createOn(project.getCreateOn()) .build(); } From 820d6311a296fbccdb384f64c142d0f125d51c5f Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 20 Mar 2023 15:34:04 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/service/IExpertReviewService.java | 12 ++++++++++-- .../pmapi/expert/service/impl/ExpertReviewServiceImpl.java | 9 +++++++-- .../com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java index fe05a21..91074c2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertReviewService.java @@ -40,10 +40,18 @@ public interface IExpertReviewService extends IService { * 获取最终评审结果 * * @param meetingId 会议ID - * @param projectId 项目ID * @return {@link ExpertReview} * @author WendyYang **/ - Map listFinalReview(Long meetingId); + Map listFinalReviewMap(Long meetingId); + + /** + * 获取最终评审结果 + * + * @param meetingId 会议ID + * @return {@link ExpertReview} + * @author WendyYang + **/ + List listFinalReview(Long meetingId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java index c0accdd..e07a0e3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertReviewServiceImpl.java @@ -44,11 +44,16 @@ public class ExpertReviewServiceImpl extends ServiceImpl listFinalReview(Long meetingId) { + public Map listFinalReviewMap(Long meetingId) { + return CollUtils.listToMap(listFinalReview(meetingId), ExpertReview::getProjectId); + } + + @Override + public List listFinalReview(Long meetingId) { LambdaQueryWrapper query = Wrappers.lambdaQuery(ExpertReview.class); query.eq(ExpertReview::getMeetingId, meetingId); query.eq(ExpertReview::getIsFinal, Boolean.TRUE); - return CollUtils.listToMap(list(query), ExpertReview::getProjectId); + return list(query); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 3ab6456..f0f0cd8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -763,7 +763,7 @@ public class MeetingManage { List projects = meetingInnerProjectService.listByMeetingId(meetingId); List projectIdList = CollUtils.fieldList(projects, MeetingInnerProject::getProjectId); List projectList = projectService.listByIds(projectIdList); - Map reviewMap = expertReviewService.listFinalReview(meetingId); + Map reviewMap = expertReviewService.listFinalReviewMap(meetingId); return CollUtils.convert(projectList, w -> { MeetingReviewProjectVO vo = buildProjectList(w); ExpertReview review = reviewMap.get(w.getId()); From 0f6b63ae99fe0f6d4b70df9c08ab89e84efaf0be Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 20 Mar 2023 16:57:47 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E8=AF=84=E5=AE=A1=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pmapi/src/main/java/com/ningdatech/pmapi/App.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/App.java b/pmapi/src/main/java/com/ningdatech/pmapi/App.java index 8bb5ca7..93837f8 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/App.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/App.java @@ -1,8 +1,11 @@ package com.ningdatech.pmapi; +import com.ningdatech.basic.util.SpringUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -22,7 +25,9 @@ public class App { protected static final String MAPPER_PACKAGES = "com.ningdatech.pmapi.**.mapper"; public static void main(String[] args) { - SpringApplication.run(App.class, args); + ApplicationContext context = SpringApplication.run(App.class, args); + // 设置applicationContext + SpringUtils.setApplicationContext(context); } } From 50c1c603191286283c99d077b1d16495659f01db Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 20 Mar 2023 17:41:44 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/handler/GlobalResponseHandler.java | 3 +- .../manage/DefaultDeclaredProjectManage.java | 11 ++++- .../manage/ReviewByDeptJointManage.java | 4 -- .../mapper/DeclaredStatisticsMapper.java | 20 ++++++++ .../mapper/DeclaredStatisticsMapper.xml | 22 +++++++++ .../model/po/DeclaredProjectStatisticsPO.java | 40 +++++++++++++++ .../service/IDeclaredStatisticsService.java | 17 +++++++ .../impl/DeclaredStatisticsServiceImpl.java | 32 ++++++++++++ .../pmapi/sys/enumeration/NoticeTypeEnum.java | 40 +++++++++++++++ .../pmapi/todocenter/manage/TodoCenterManage.java | 14 ++++-- .../pmapi/todocenter/mapper/StatisticsMapper.java | 5 +- .../pmapi/todocenter/mapper/StatisticsMapper.xml | 21 +++++++- .../model/po/TodoCenterStatisticsPO.java | 27 ++++++++++ .../todocenter/service/StatisticsService.java | 6 ++- .../service/impl/StatisticsServiceImpl.java | 10 +++- .../workbench/converter/WorkbenchConverter.java | 43 ++++++++++++++++ .../pmapi/workbench/manage/WorkbenchManage.java | 57 ++++++++++++++++++++-- .../workbench/model/TodoCenterStatisticsPO.java | 16 ------ .../pmapi/workbench/model/vo/WorkbenchVO.java | 2 +- 19 files changed, 351 insertions(+), 39 deletions(-) create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/po/DeclaredProjectStatisticsPO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/sys/enumeration/NoticeTypeEnum.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/po/TodoCenterStatisticsPO.java create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java delete mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java index 8c757c2..d21c29b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java @@ -25,7 +25,8 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; "com.ningdatech.pmapi.user.controller", "com.ningdatech.pmapi.meeting.controller", "com.ningdatech.pmapi.expert.controller", - "com.ningdatech.pmapi.sms.controller" + "com.ningdatech.pmapi.sms.controller", + "com.ningdatech.pmapi.workbench.controller" }) public class GlobalResponseHandler implements ResponseBodyAdvice { diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java index b225a2b..8badd65 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java @@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.function.VUtils; import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; import com.ningdatech.pmapi.common.helper.UserInfoHelper; -import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils; import com.ningdatech.pmapi.organization.model.entity.DingOrganization; import com.ningdatech.pmapi.organization.service.IDingOrganizationService; import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; +import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; +import com.ningdatech.pmapi.projectdeclared.service.IDeclaredStatisticsService; import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; @@ -64,7 +65,7 @@ public class DefaultDeclaredProjectManage { private final IProjectInstService projectInstService; - private final StateMachineUtils stateMachineUtils; + private final IDeclaredStatisticsService statisticsService; //项目名称去重 public void checkDuplication(ProjectDTO project){ @@ -232,4 +233,10 @@ public class DefaultDeclaredProjectManage { throw new BusinessException("提交预审 项目信息修改 错误 :" + e.getMessage()); } } + + public DeclaredProjectStatisticsPO declaredProjectStatistics(Integer year){ + UserInfoDetails userInfo = LoginUserUtil.loginUserDetail(); + //查此人建设单位的项目 + return statisticsService.getStatistics(userInfo.getOrganizationCode(),year); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java index 2107c67..0f87662 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java @@ -6,19 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Maps; import com.ningdatech.basic.function.VUtils; import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; -import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.projectdeclared.model.dto.ProjectConditionDTO; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; import com.ningdatech.pmapi.projectlib.service.IProjectInstService; import com.ningdatech.pmapi.projectlib.service.IProjectService; -import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO; -import com.ningdatech.pmapi.user.util.LoginUserUtil; import com.wflow.bean.entity.WflowModels; import com.wflow.exception.BusinessException; import com.wflow.workflow.bean.dto.OrgInfoDTO; -import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; import com.wflow.workflow.bean.vo.ProcessStartParamsVo; import com.wflow.workflow.service.ProcessInstanceService; import com.wflow.workflow.service.ProcessModelService; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java new file mode 100644 index 0000000..8360f6b --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java @@ -0,0 +1,20 @@ +package com.ningdatech.pmapi.projectdeclared.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.pmapi.projectdeclared.model.entity.ProjectDraft; +import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zpf + * @since 2023-02-05 + */ +public interface DeclaredStatisticsMapper extends BaseMapper { + + DeclaredProjectStatisticsPO getStatistics(@Param("orgCode") String orgCode,@Param("year") Integer year); + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml new file mode 100644 index 0000000..846791f --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/po/DeclaredProjectStatisticsPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/po/DeclaredProjectStatisticsPO.java new file mode 100644 index 0000000..28dbfb8 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/po/DeclaredProjectStatisticsPO.java @@ -0,0 +1,40 @@ +package com.ningdatech.pmapi.projectdeclared.model.po; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Classname DeclaredProjectStatistics + * @Description + * @Date 2023/3/20 16:29 + * @Author PoffyZhang + */ +@Data +public class DeclaredProjectStatisticsPO { + + @ApiModelProperty("总项目数") + private Integer totalNum; + @ApiModelProperty("建设项目数") + private Integer buildNum; + @ApiModelProperty("运维项目数") + private Integer operationNum; + + @ApiModelProperty("待立项数") + private Integer notApprovedNum; + @ApiModelProperty("已立项数") + private Integer approvedNum; + @ApiModelProperty("建设中数") + private Integer constructionNum; + @ApiModelProperty("待验收数") + private Integer tobeInspectedNum; + @ApiModelProperty("已归档数") + private Integer archivedNum; + + @ApiModelProperty("申报总金额") + private BigDecimal declaredAmount; + @ApiModelProperty("立项总金额") + private BigDecimal approvalAmount; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java new file mode 100644 index 0000000..107f75f --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java @@ -0,0 +1,17 @@ +package com.ningdatech.pmapi.projectdeclared.service; + +import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; + +/** + *

+ * 服务类 + *

+ * + * @author zpf + * @since 2023-02-05 + */ +public interface IDeclaredStatisticsService { + + DeclaredProjectStatisticsPO getStatistics(String orgCode,Integer year); + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java new file mode 100644 index 0000000..3fbbdd4 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java @@ -0,0 +1,32 @@ +package com.ningdatech.pmapi.projectdeclared.service.impl; + +import com.ningdatech.pmapi.projectdeclared.mapper.DeclaredStatisticsMapper; +import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; +import com.ningdatech.pmapi.projectdeclared.service.IDeclaredStatisticsService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author zpf + * @since 2023-02-05 + */ +@Service +@AllArgsConstructor +public class DeclaredStatisticsServiceImpl implements IDeclaredStatisticsService { + + private final DeclaredStatisticsMapper declaredStatisticsMapper; + + /** + * 根据userId 去查询 申报项目统计 + * @param orgCode + * @return + */ + @Override + public DeclaredProjectStatisticsPO getStatistics(String orgCode,Integer year) { + return declaredStatisticsMapper.getStatistics(orgCode,year); + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/enumeration/NoticeTypeEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/enumeration/NoticeTypeEnum.java new file mode 100644 index 0000000..51c7206 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/enumeration/NoticeTypeEnum.java @@ -0,0 +1,40 @@ +package com.ningdatech.pmapi.sys.enumeration; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +import java.util.Objects; + +/** + * + * 公告类型枚举 + * @author ZPF + * @since 2023/02/24 16:14 + */ +@Getter +@NoArgsConstructor +@AllArgsConstructor +public enum NoticeTypeEnum { + /** + * 公告类型枚举 + */ + ANNOUNCEMENT(1, "公告"), + HELP_DOCUMENTS(2, "帮助文档"); + + private Integer code; + private String desc; + + public static String getDescByCode(Integer code) { + if (Objects.isNull(code)) { + return StringUtils.EMPTY; + } + for (NoticeTypeEnum t : NoticeTypeEnum.values()) { + if (code.equals(t.getCode())) { + return t.desc; + } + } + return StringUtils.EMPTY; + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index b89fe6f..6179e2d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -1,5 +1,6 @@ package com.ningdatech.pmapi.todocenter.manage; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -49,6 +50,7 @@ import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO; import com.ningdatech.pmapi.todocenter.model.dto.PdfGenerateDTO; import com.ningdatech.pmapi.todocenter.model.dto.SealInfoDTO; import com.ningdatech.pmapi.todocenter.model.dto.SignReqDTO; +import com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO; import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo; import com.ningdatech.pmapi.todocenter.enumeration.IsAppendProjectEnum; import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq; @@ -92,7 +94,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; -import java.net.URL; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -128,6 +129,8 @@ public class TodoCenterManage { private final FileService fileService; private final ICompanySignatureService companySignatureService; + private final StatisticsService statisticsService; + /** * 待办中心待我处理项目列表查询 @@ -1148,12 +1151,13 @@ public class TodoCenterManage { } //获取当前登录人的 待办中心统计数据 - public TodoCenterStatisticsVO todoCenterStatistics(Integer year){ - TodoCenterStatisticsVO resVo = new TodoCenterStatisticsVO(); + public TodoCenterStatisticsVO todoCenterStatistics(){ + Long userId = LoginUserUtil.getUserId(); //为了查询效率 还是自己去写统计接口 -// statisticsService. + TodoCenterStatisticsPO statistics = statisticsService.getStatistics(userId); + TodoCenterStatisticsVO statisticsVO = BeanUtil.copyProperties(statistics,TodoCenterStatisticsVO.class); - return resVo; + return statisticsVO; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java index 178e028..0336c63 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.java @@ -1,10 +1,11 @@ package com.ningdatech.pmapi.todocenter.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wflow.bean.entity.WflowDepartments; +import com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO; +import org.apache.ibatis.annotations.Param; public interface StatisticsMapper extends BaseMapper { - + TodoCenterStatisticsPO getStatistics(@Param("userId") Long userId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml index 64c8506..56e4cdd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml @@ -1,5 +1,24 @@ - + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/po/TodoCenterStatisticsPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/po/TodoCenterStatisticsPO.java new file mode 100644 index 0000000..ab9bfdf --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/model/po/TodoCenterStatisticsPO.java @@ -0,0 +1,27 @@ +package com.ningdatech.pmapi.todocenter.model.po; + +import com.ningdatech.pmapi.todocenter.model.vo.TodoVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Classname TodoCenterStatisticsPO + * @Description + * @Date 2023/3/20 11:51 + * @Author PoffyZhang + */ +@Data +public class TodoCenterStatisticsPO { + + @ApiModelProperty("待处理数") + private Integer todoNum; + @ApiModelProperty("已处理数") + private Integer idoNum; + @ApiModelProperty("我发起数") + private Integer mysubmitNum; + @ApiModelProperty("抄送我数") + private Integer ccmeNum; + +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java index 3d1cd5f..2b1bd7e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/StatisticsService.java @@ -1,5 +1,7 @@ package com.ningdatech.pmapi.todocenter.service; +import com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO; + /** * @Classname StatisticsService * @Description @@ -8,6 +10,6 @@ package com.ningdatech.pmapi.todocenter.service; */ public interface StatisticsService { - - + //根据用户id 去查询 一些统计数据 + TodoCenterStatisticsPO getStatistics(Long userId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java index b2ff8cc..3c77943 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/service/impl/StatisticsServiceImpl.java @@ -1,6 +1,9 @@ package com.ningdatech.pmapi.todocenter.service.impl; +import com.ningdatech.pmapi.todocenter.mapper.StatisticsMapper; +import com.ningdatech.pmapi.todocenter.model.po.TodoCenterStatisticsPO; import com.ningdatech.pmapi.todocenter.service.StatisticsService; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; /** @@ -10,8 +13,13 @@ import org.springframework.stereotype.Service; * @Author PoffyZhang */ @Service +@AllArgsConstructor public class StatisticsServiceImpl implements StatisticsService { - + private final StatisticsMapper mapper; + @Override + public TodoCenterStatisticsPO getStatistics(Long userId) { + return mapper.getStatistics(userId); + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java new file mode 100644 index 0000000..f413173 --- /dev/null +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java @@ -0,0 +1,43 @@ +package com.ningdatech.pmapi.workbench.converter; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; +import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO; +import com.ningdatech.pmapi.todocenter.model.vo.ResToBeProcessedVO; +import com.ningdatech.pmapi.todocenter.model.vo.TodoVO; +import com.ningdatech.pmapi.workbench.model.vo.WorkbenchVO; + +import java.util.Collections; +import java.util.List; + +/** + * @Classname WorkbenchConverter + * @Description + * @Date 2023/3/20 17:23 + * @Author PoffyZhang + */ +public class WorkbenchConverter { + + + public static List converts(List vos) { + if(CollUtil.isNotEmpty(vos)){ + + } + return Collections.emptyList(); + } + + public static WorkbenchVO.DeclaredStatistics convert(DeclaredProjectStatisticsPO po) { + WorkbenchVO.DeclaredStatistics res = BeanUtil.copyProperties(po,WorkbenchVO.DeclaredStatistics.class); + return res; + } + + public static TodoVO convert(ResToBeProcessedVO vo) { + TodoVO res = new TodoVO(); + res.setNodeId(vo.getNodeId()); + res.setProjectId(vo.getProjectId()); + res.setProjectName(vo.getProjectName()); + return res; + } +} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java index 88d40de..d6d8629 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java @@ -1,10 +1,30 @@ package com.ningdatech.pmapi.workbench.manage; +import cn.hutool.core.bean.BeanUtil; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; +import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage; +import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; +import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage; +import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; +import com.ningdatech.pmapi.sys.enumeration.NoticeTypeEnum; +import com.ningdatech.pmapi.sys.manage.NoticeManage; +import com.ningdatech.pmapi.sys.model.req.NoticeListReq; +import com.ningdatech.pmapi.sys.model.vo.NoticeListItemVO; import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage; +import com.ningdatech.pmapi.todocenter.model.req.ToBeProcessedReq; +import com.ningdatech.pmapi.todocenter.model.vo.ResToBeProcessedVO; +import com.ningdatech.pmapi.todocenter.model.vo.TodoCenterStatisticsVO; +import com.ningdatech.pmapi.todocenter.model.vo.TodoVO; +import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails; +import com.ningdatech.pmapi.user.util.LoginUserUtil; +import com.ningdatech.pmapi.workbench.converter.WorkbenchConverter; import com.ningdatech.pmapi.workbench.model.vo.WorkbenchVO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import java.util.stream.Collectors; + /** * @Classname WorkbenchManage * @Description @@ -15,13 +35,42 @@ import org.springframework.stereotype.Component; @AllArgsConstructor public class WorkbenchManage { - private TodoCenterManage todoCenterManage; + private final TodoCenterManage todoCenterManage; + + private final DefaultDeclaredProjectManage defaultDeclaredProjectManage; + + private final DeclaredProjectManage declaredProjectManage; + + private final NoticeManage noticeManage; public WorkbenchVO getWorkbenchData(Integer year){ + UserInfoDetails userInfo = LoginUserUtil.loginUserDetail(); + WorkbenchVO res = new WorkbenchVO(); + //1.待办中心数据 - todoCenterManage.todoCenterStatistics(year); + TodoCenterStatisticsVO statisticsVO = todoCenterManage.todoCenterStatistics(); + ToBeProcessedReq toBeProcessedReq = new ToBeProcessedReq(); + toBeProcessedReq.setPageNumber(1); + toBeProcessedReq.setPageSize(5); + statisticsVO.setTodoList(todoCenterManage.todoProjectList(toBeProcessedReq).getRecords() + .stream().map(v -> WorkbenchConverter.convert(v)).collect(Collectors.toList())); + res.setTodoCerter(statisticsVO); - return null; - } + //2.项目统计数据 + res.setOrgDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage.declaredProjectStatistics(year))); + ProjectListReq projectListReq = new ProjectListReq(); + projectListReq.setPageNumber(1); + projectListReq.setPageSize(5); + projectListReq.setProjectYear(year); + res.setProjects(declaredProjectManage.projectLibList(projectListReq).getRecords().stream().collect(Collectors.toList())); + //3.政策文件 + NoticeListReq noticeListReq = new NoticeListReq(); + noticeListReq.setType(NoticeTypeEnum.HELP_DOCUMENTS.getCode()); + noticeListReq.setPageNumber(1); + noticeListReq.setPageSize(5); + res.setNoticeList(noticeManage.listByManager(noticeListReq).getRecords().stream().collect(Collectors.toList())); + + return res; + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java deleted file mode 100644 index 6d5881a..0000000 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/TodoCenterStatisticsPO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ningdatech.pmapi.workbench.model; - -import lombok.Data; - -/** - * @Classname TodoCenterStatisticsPO - * @Description - * @Date 2023/3/20 11:51 - * @Author PoffyZhang - */ -@Data -public class TodoCenterStatisticsPO { - -// private - -} diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java index ffcc9e1..564f198 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java @@ -32,7 +32,7 @@ public class WorkbenchVO implements Serializable { public List projects; @ApiModelProperty("公告列表") - public NoticeListItemVO noticeList; + public List noticeList; @Data public static class DeclaredStatistics { From 5e26e03cf109ed4e9c0908468f277996670d39f6 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 20 Mar 2023 18:37:56 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/workbench/converter/WorkbenchConverter.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java index f413173..6fcb629 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/converter/WorkbenchConverter.java @@ -20,14 +20,6 @@ import java.util.List; */ public class WorkbenchConverter { - - public static List converts(List vos) { - if(CollUtil.isNotEmpty(vos)){ - - } - return Collections.emptyList(); - } - public static WorkbenchVO.DeclaredStatistics convert(DeclaredProjectStatisticsPO po) { WorkbenchVO.DeclaredStatistics res = BeanUtil.copyProperties(po,WorkbenchVO.DeclaredStatistics.class); return res;