From 051ed17221c2335119e88e5948b551584b5b6447 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 30 Mar 2026 09:09:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BD=9C=E4=B8=9A=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/project/KeyProjectController.java | 24 ++- .../project/KeyProjectCoConvertor.java | 13 +- .../query/project/KeyProjectQueryExe.java | 26 ++- .../project/KeyProjectServiceImpl.java | 20 +- .../api/project/KeyProjectServiceI.java | 12 +- .../dto/clientobject/project/XgfCorpCO.java | 39 ++++ .../project/dto/project/GetXgfCorpQry.java | 43 +++++ .../dto/project/KeyProjectPageQry.java | 5 +- .../project/dto/project/KeyProjectQry.java | 83 ++++++++ .../dataobject/project/XgfCorpDO.java | 34 ++++ .../persistence/mapper/KeyProjectMapper.java | 10 +- .../repository/CorpInfoRepository.java | 3 + .../project/KeyProjectRepositoryImpl.java | 19 +- .../project/KeyProjectRepository.java | 10 +- .../resources/mapper/KeyProjectMapper.xml | 179 ++++++++++++++++++ 15 files changed, 473 insertions(+), 47 deletions(-) create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpCO.java create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/project/GetXgfCorpQry.java create mode 100644 web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java create mode 100644 web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpDO.java diff --git a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java index b4bba93..3443d2f 100644 --- a/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java +++ b/web-adapter/src/main/java/com/zcloud/key/project/web/project/KeyProjectController.java @@ -1,15 +1,13 @@ package com.zcloud.key.project.web.project; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.key.project.api.project.KeyProjectServiceI; import com.zcloud.key.project.domain.enums.KeyProjectApplyStatusEnum; -import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.*; import com.zcloud.key.project.dto.project.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +15,8 @@ import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; + /** * web-adapter * @@ -56,11 +56,11 @@ public class KeyProjectController { return keyProjectService.pageConfirm(qry); } - /*@ApiOperation("所有数据") - @GetMapping("/listAll") - public MultiResponse listAll() { - return MultiResponse.of(new ArrayList()); - }*/ + @ApiOperation("重点作业所有数据") + @PostMapping("/listAll") + public MultiResponse listAll(@RequestBody KeyProjectQry qry) { + return MultiResponse.of( keyProjectService.listAll(qry)); + } @ApiOperation("重点作业详情") @GetMapping("/{id}") @@ -119,7 +119,11 @@ public class KeyProjectController { return keyProjectService.xgfCorpStatistics(qry); } - + @ApiOperation("根据部门获取部门下相关方企业") + @PostMapping("/getXgfCorp") + public MultiResponse getXgfCorp(@RequestBody GetXgfCorpQry qry) { + return MultiResponse.of( keyProjectService.getXgfCorp(qry)); + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java b/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java index d0e5c7f..917f181 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/convertor/project/KeyProjectCoConvertor.java @@ -1,19 +1,14 @@ package com.zcloud.key.project.command.convertor.project; -import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; -import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; +import com.zcloud.key.project.dto.clientobject.project.*; +import com.zcloud.key.project.persistence.dataobject.project.*; import org.apache.commons.lang.StringUtils; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -67,5 +62,7 @@ public interface KeyProjectCoConvertor { .filter(s -> !s.isEmpty()) .collect(Collectors.toList()); } + + List converXgfCorpDOsToCOs(List xgfCorpDOList); } diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index e22fc01..6b88033 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -7,14 +7,8 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor; import com.zcloud.key.project.command.convertor.project.KeyProjectCoConvertor; import com.zcloud.key.project.domain.enums.KeyProjectCameraTypeEnum; -import com.zcloud.key.project.dto.project.CorpStatisticsPageQry; -import com.zcloud.key.project.dto.project.KeyProjectPageQry; -import com.zcloud.key.project.dto.project.XgfCorpStatisticsPageQry; -import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; -import com.zcloud.key.project.dto.project.KeyProjectStatisticsPageQry; -import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.*; +import com.zcloud.key.project.dto.project.*; import com.zcloud.key.project.persistence.dataobject.project.*; import com.zcloud.key.project.persistence.repository.CorpInfoRepository; import com.zcloud.key.project.persistence.repository.project.KeyProjectCameraRepository; @@ -22,6 +16,7 @@ import com.zcloud.key.project.persistence.repository.project.KeyProjectRepositor import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -72,6 +67,13 @@ public class KeyProjectQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + public List listAll(KeyProjectQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List pageResponse = keyProjectRepository.listAll(params); + List examCenterCOS = keyProjectCoConvertor.converDOsToCOs(pageResponse); + return examCenterCOS; + } + public PageResponse pageConfirm(KeyProjectPageQry keyProjectPageQry) { //如果是相关方 Boolean checkCorp = corpInfoRepository.checkCorp(); @@ -185,5 +187,13 @@ public class KeyProjectQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + + public List getXgfCorp(GetXgfCorpQry qry) { + Map params = PageQueryHelper.toHashMap(qry); + List xgfCorpDOList = keyProjectRepository.getXgfCorp(params); + + return keyProjectCoConvertor.converXgfCorpDOsToCOs(xgfCorpDOList); + } } diff --git a/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java index 497ae1f..3823d78 100644 --- a/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/key/project/service/project/KeyProjectServiceImpl.java @@ -7,14 +7,15 @@ import com.zcloud.key.project.command.project.KeyProjectAddExe; import com.zcloud.key.project.command.project.KeyProjectRemoveExe; import com.zcloud.key.project.command.project.KeyProjectUpdateExe; import com.zcloud.key.project.command.query.project.KeyProjectQueryExe; -import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.*; import com.zcloud.key.project.dto.project.*; -import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + /** * web-app * @@ -86,5 +87,16 @@ public class KeyProjectServiceImpl implements KeyProjectServiceI { public PageResponse xgfCorpStatistics(XgfCorpStatisticsPageQry qry) { return keyProjectQueryExe.xgfCorpStatistics(qry); } + + @Override + public List listAll(KeyProjectQry qry) { + return keyProjectQueryExe.listAll(qry); + } + + @Override + public List getXgfCorp(GetXgfCorpQry qry) { + return keyProjectQueryExe.getXgfCorp(qry); + + } } diff --git a/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java index bc5b078..069ba2b 100644 --- a/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java +++ b/web-client/src/main/java/com/zcloud/key/project/api/project/KeyProjectServiceI.java @@ -2,11 +2,11 @@ package com.zcloud.key.project.api.project; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; -import com.zcloud.key.project.dto.clientobject.project.CorpStatisticsCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectCO; -import com.zcloud.key.project.dto.clientobject.project.KeyProjectStatisticsCO; +import com.zcloud.key.project.dto.clientobject.project.*; import com.zcloud.key.project.dto.project.*; -import com.zcloud.key.project.dto.clientobject.project.XgfCorpStatisticsCO; + +import java.util.Collection; +import java.util.List; /** * web-client @@ -37,5 +37,9 @@ public interface KeyProjectServiceI { PageResponse keyProjectStatistics(KeyProjectStatisticsPageQry qry); PageResponse xgfCorpStatistics(XgfCorpStatisticsPageQry qry); + + List listAll(KeyProjectQry qry); + + List getXgfCorp(GetXgfCorpQry qry); } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpCO.java new file mode 100644 index 0000000..58e5e37 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/XgfCorpCO.java @@ -0,0 +1,39 @@ +package com.zcloud.key.project.dto.clientobject.project; + +import com.alibaba.cola.dto.ClientObject; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-16 10:00:38 + */ +@Data +public class XgfCorpCO implements Serializable { + + //相关方企业id + @ApiModelProperty(value = "相关方企业id") + private Long xgfCorpinfoId; + + + @ApiModelProperty(value = "相关方企业名称") + @TableField(exist = false) + private String xgfCorpinfoName; + + @ApiModelProperty(value = "相关方单位负责人名称") + @TableField(exist = false) + private String xgfUserName; + + +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/GetXgfCorpQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/GetXgfCorpQry.java new file mode 100644 index 0000000..7cd59f0 --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/GetXgfCorpQry.java @@ -0,0 +1,43 @@ +package com.zcloud.key.project.dto.project; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-16 10:00:38 + */ +@Data +public class GetXgfCorpQry implements Serializable { + + + + //辖区单位企业id + @ApiModelProperty(value = "辖区单位企业id") + private Long jurisdictionCorpinfoId; + @ApiModelProperty(value = "辖区项目负责部门id") + private Long jurisdictionDepartmentId; + //辖区项目负责人id + @ApiModelProperty(value = "辖区项目负责人id") + private Long jurisdictionUserId; + + //相关方单位负责人id + @ApiModelProperty(value = "相关方单位负责人id") + private Long xgfMasterUserId; + + @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工") + private Integer applyStatus; + + @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工") + private List applyStatusList; +} + diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java index 458bea6..116979c 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectPageQry.java @@ -65,11 +65,14 @@ public class KeyProjectPageQry extends PageQuery { //辖区单位企业id @ApiModelProperty(value = "辖区单位企业id") private Long jurisdictionCorpinfoId; - + @ApiModelProperty(value = "辖区项目负责部门id") + private Long jurisdictionDepartmentId; //辖区项目负责人id @ApiModelProperty(value = "辖区项目负责人id") private Long jurisdictionUserId; + + //相关方单位负责人id @ApiModelProperty(value = "相关方单位负责人id") private Long xgfMasterUserId; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java new file mode 100644 index 0000000..ebde74c --- /dev/null +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectQry.java @@ -0,0 +1,83 @@ +package com.zcloud.key.project.dto.project; + +import com.alibaba.cola.dto.PageQuery; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.time.LocalDate; +import java.util.List; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-16 10:00:38 + */ +@Data +public class KeyProjectQry implements Serializable { + + /** + * 查询条件操作前缀,支持以下几种数据库查询操作： + * - `like`: 模糊匹配查询，对应SQL的LIKE操作符 + * - `eq`: 等值查询，对应SQL的=操作符 + * - `gt`: 大于比较查询 + * - `lt`: 小于比较查询 + * - `ge`: 大于等于比较查询 + * - `le`: 小于等于比较查询 + * - `ne`: 不等比较查询，对应SQL的!=操作符 + */ + @ApiModelProperty(value = "重点作业名称") + private String projectName; + @ApiModelProperty(value = "相关方单位id") + private Long xgfCorpinfoId; + @ApiModelProperty(value = "相关方单位名称") + private String xgfCorpinfoName; + @ApiModelProperty(value = "主管部门id") + private Long masterDepartmentId; + + @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工") + private Integer applyStatus; + + @ApiModelProperty(value = "状态,0:暂存。1:未开工,2:开工申请中,3:已超期,4:进行中,5:完工申请中,6:已完工") + private List applyStatusList; + + @ApiModelProperty(value = "计划工期开始时间", name = "planWorkStartDate", required = true) + @NotEmpty(message = "计划工期开始时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate planWorkStartDate; + + //计划工期结束时间 + @ApiModelProperty(value = "计划工期结束时间") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate planWorkEndDate; + + @ApiModelProperty(value = "创建单位id") + private Integer corpinfoId; + @ApiModelProperty(value = "创建单位名称") + private String corpinfName; + + @ApiModelProperty(value = "project_type") + private String projectType; + + //辖区单位企业id + @ApiModelProperty(value = "辖区单位企业id") + private Long jurisdictionCorpinfoId; + @ApiModelProperty(value = "辖区项目负责部门id") + private Long jurisdictionDepartmentId; + //辖区项目负责人id + @ApiModelProperty(value = "辖区项目负责人id") + private Long jurisdictionUserId; + + + + //相关方单位负责人id + @ApiModelProperty(value = "相关方单位负责人id") + private Long xgfMasterUserId; + + private String menuPath; +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpDO.java new file mode 100644 index 0000000..67fd5a4 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/XgfCorpDO.java @@ -0,0 +1,34 @@ +package com.zcloud.key.project.persistence.dataobject.project; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + + +/** + * web-client + * + * @Author zhaokai + * @Date 2026-03-16 10:00:38 + */ +@Data +public class XgfCorpDO implements Serializable { + + //相关方企业id + @ApiModelProperty(value = "相关方企业id") + private Long xgfCorpinfoId; + + + @ApiModelProperty(value = "相关方企业名称") + @TableField(exist = false) + private String xgfCorpinfoName; + + @ApiModelProperty(value = "相关方单位负责人名称") + @TableField(exist = false) + private String xgfUserName; + + +} + diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java index c810a68..a934045 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/mapper/KeyProjectMapper.java @@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; -import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.*; import org.apache.ibatis.annotations.Mapper; +import java.util.List; import java.util.Map; /** @@ -36,5 +34,9 @@ public interface KeyProjectMapper extends BaseMapper { IPage keyProjectStatistics(IPage iPage, Map params); IPage xgfCorpStatistics(IPage iPage, Map params); + + List listAll(Map params); + + List getXgfCorp(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java index 422ad20..839dc64 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/CorpInfoRepository.java @@ -3,7 +3,9 @@ package com.zcloud.key.project.persistence.repository; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; import com.zcloud.key.project.persistence.dataobject.project.CorpInfoDO; +import com.zcloud.key.project.persistence.dataobject.project.XgfCorpDO; +import java.util.List; import java.util.Map; /** @@ -23,5 +25,6 @@ public interface CorpInfoRepository extends BaseRepository { Boolean checkCorp(); boolean isXgf(); + } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java index d168925..87881dd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/impl/project/KeyProjectRepositoryImpl.java @@ -6,15 +6,14 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.Query; import com.zcloud.key.project.domain.enums.MenuEnum; -import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.*; import com.zcloud.key.project.persistence.mapper.KeyProjectMapper; import com.zcloud.key.project.persistence.repository.project.KeyProjectRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; import java.util.Map; /** @@ -39,6 +38,13 @@ public class KeyProjectRepositoryImpl extends BaseRepositoryImpl listAll(Map params) { + + List result = keyProjectMapper.listAll(params); + return result; + } + @Override public PageResponse pageConfirm(Map params) { IPage iPage = new Query().getPage(params); @@ -75,5 +81,10 @@ public class KeyProjectRepositoryImpl extends BaseRepositoryImpl result = keyProjectMapper.xgfCorpStatistics(iPage, params); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public List getXgfCorp(Map params) { + return keyProjectMapper.getXgfCorp( params); + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java index 84aa55e..811e723 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/repository/project/KeyProjectRepository.java @@ -2,11 +2,9 @@ package com.zcloud.key.project.persistence.repository.project; import com.alibaba.cola.dto.PageResponse; import com.jjb.saas.framework.repository.repo.BaseRepository; -import com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectDO; -import com.zcloud.key.project.persistence.dataobject.project.KeyProjectStatisticsDO; -import com.zcloud.key.project.persistence.dataobject.project.XgfCorpStatisticsDO; +import com.zcloud.key.project.persistence.dataobject.project.*; +import java.util.List; import java.util.Map; /** @@ -27,5 +25,9 @@ public interface KeyProjectRepository extends BaseRepository { PageResponse keyProjectStatistics(Map params); PageResponse xgfCorpStatistics(Map params); + + List listAll(Map params); + + List getXgfCorp(Map params); } diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index dbcc788..fbb8ec8 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -29,6 +29,9 @@ AND kp.jurisdiction_corpinfo_id = #{params.jurisdictionCorpinfoId} + + AND kp.jurisdiction_department_id = #{params.jurisdictionDepartmentId} + AND kp.jurisdiction_user_id = #{params.jurisdictionUserId} @@ -87,6 +90,7 @@ GROUP BY kp.key_project_id ORDER BY kp.apply_status asc, kp.create_time DESC + + + + +