From 7a02b65d6be046fb540707f4a71c385dc6d7808f Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 23 Aug 2023 09:38:39 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ding/controller/DingInfoPullController.java | 2 +-
.../controller/GovProjectCollectionController.java | 48 ++++++++++++++++++++++
.../gov/manage/GovProjectCollectionManage.java | 15 +++++++
.../ningdatech/pmapi/irs/manage/AppIrsManage.java | 4 +-
4 files changed, 66 insertions(+), 3 deletions(-)
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java
index f5d3233..89c9f91 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java
@@ -149,7 +149,7 @@ public class DingInfoPullController {
projectDto.setProjectCode(row.getCell(0).toString());
projectDto.setProjectName(row.getCell(1).toString());
projectDto.setArea(row.getCell(2).toString());
- projectDto.setAreaCode(row.getCell(3).toString());
+ projectDto.setAreaCode("331123000");
String baseProjType = String.valueOf(row.getCell(4));
if(StringUtils.isNotBlank(baseProjType) && baseProjType.contains(".")){
baseProjType = baseProjType.substring(0,
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
new file mode 100644
index 0000000..56e0dd3
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -0,0 +1,48 @@
+package com.ningdatech.pmapi.gov.controller;
+
+
+import com.ningdatech.pmapi.gov.manage.BelongOrgManage;
+import com.ningdatech.pmapi.gov.model.vo.GovBusinessStripVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author zpf
+ * @since 2023-08-21
+ */
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@Api(value = "GovProjectCollectionController", tags = "电子政务规范项目归集控制器")
+@RequestMapping("/api/v1/gov-project-collection")
+public class GovProjectCollectionController {
+
+ private final BelongOrgManage belongOrgManage;
+
+ @GetMapping("/dictionary")
+ @ApiOperation("获取条线列表")
+ public List getGovBusinessStripList(@RequestParam(value = "type", required = false) String type) {
+ return belongOrgManage.getGovBusinessStripList(type);
+ }
+
+ @GetMapping("/business-strip/expert/analysis")
+ @ApiOperation("分析专家数据")
+ public void analysisExpertOrg() {
+ belongOrgManage.analysisExpertOrg();
+ }
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
new file mode 100644
index 0000000..8c8400c
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -0,0 +1,15 @@
+package com.ningdatech.pmapi.gov.manage;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zpf
+ * @date 2023/8/21 下午2:27
+ */
+
+@Component
+@RequiredArgsConstructor
+public class GovProjectCollectionManage {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
index 89386af..17451b4 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
@@ -323,13 +323,13 @@ public class AppIrsManage {
String baseConstructionType = projectDto.getBaseConstructionType();//"01"
String baseProjType = projectDto.getBaseProjType();//"1"
String baseProjContacts = projectDto.getContactName();//"毛以林"
- String isEffective = "1";
+ String isEffective = "02";
String baseConsDeprtDing = projectDto.getBuildOrgCode();//"GO_9a7dce7fbaf54787998fa004f1b7c0e1";
String baseProjSetProg = projectDto.getBaseProjSetProg();//"04"
String baseProjContactsCall = projectDto.getContactPhone();//"13857049999"
String baseProjName = projectDto.getProjectName();//"遂昌县大数据和金融发展中心天工系统"
String baseProjConsClass = projectDto.getBaseProjConsClass();//"C"
- String areaCode = projectDto.getAreaCode() + "000";//"331123000"
+ String areaCode = projectDto.getAreaCode();//"331123000"
String baseAreaName = projectDto.getArea();//"遂昌县";
String baseManDeprtDing = projectDto.getSuperOrgCode();//"GO_9a7dce7fbaf54787998fa004f1b7c0e1";
String baseProvManDeprtDing = projectDto.getHigherSuperOrgCode();//"GO_6c383c049d95461f9a0df780140ceb32";
From 18e3100ad6e0859728177322e0d268ef0a25c309 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 23 Aug 2023 10:30:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=81=82=E6=98=8C?=
=?UTF-8?q?=E5=8E=BF=E9=A1=B9=E7=9B=AE=20=E4=BB=A3=E7=A0=81debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/GovProjectCollectionController.java | 14 +++----
.../gov/manage/GovProjectCollectionManage.java | 25 ++++++++++++
.../gov/mapper/GovProjectDictionaryMapper.java | 16 ++++++++
.../gov/model/entity/GovProjectDictionary.java | 46 ++++++++++++++++++++++
.../pmapi/gov/model/vo/GovProjectDictionaryVO.java | 41 +++++++++++++++++++
.../gov/service/IGovProjectDictionaryService.java | 16 ++++++++
.../impl/GovProjectDictionaryServiceImpl.java | 21 ++++++++++
7 files changed, 171 insertions(+), 8 deletions(-)
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovProjectDictionaryMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovProjectDictionaryVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovProjectDictionaryService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovProjectDictionaryServiceImpl.java
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
index 56e0dd3..cd2c897 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -1,8 +1,7 @@
package com.ningdatech.pmapi.gov.controller;
-
-import com.ningdatech.pmapi.gov.manage.BelongOrgManage;
-import com.ningdatech.pmapi.gov.model.vo.GovBusinessStripVO;
+import com.ningdatech.pmapi.gov.manage.GovProjectCollectionManage;
+import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-
import java.util.List;
/**
@@ -31,12 +29,12 @@ import java.util.List;
@RequestMapping("/api/v1/gov-project-collection")
public class GovProjectCollectionController {
- private final BelongOrgManage belongOrgManage;
+ private final GovProjectCollectionManage collectionManage;
@GetMapping("/dictionary")
- @ApiOperation("获取条线列表")
- public List getGovBusinessStripList(@RequestParam(value = "type", required = false) String type) {
- return belongOrgManage.getGovBusinessStripList(type);
+ @ApiOperation("字典")
+ public List dictionary(@RequestParam(value = "type", required = false) String type) {
+ return collectionManage.dictionary(type);
}
@GetMapping("/business-strip/expert/analysis")
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 8c8400c..8b6216d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -1,8 +1,19 @@
package com.ningdatech.pmapi.gov.manage;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
+import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
+import com.ningdatech.pmapi.gov.service.IGovProjectDictionaryService;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
/**
* @author zpf
* @date 2023/8/21 下午2:27
@@ -12,4 +23,18 @@ import org.springframework.stereotype.Component;
@RequiredArgsConstructor
public class GovProjectCollectionManage {
+ private final IGovProjectDictionaryService dictionaryService;
+
+ public List dictionary(String type) {
+
+ List dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
+ .eq(StringUtils.isNotBlank(type), GovProjectDictionary::getType, type));
+
+ if(CollUtil.isEmpty(dictionaries)){
+ return Collections.emptyList();
+ }
+
+ return dictionaries.stream().map(d -> BeanUtil.copyProperties(d,GovProjectDictionaryVO.class))
+ .collect(Collectors.toList());
+ }
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovProjectDictionaryMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovProjectDictionaryMapper.java
new file mode 100644
index 0000000..0a7fd35
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovProjectDictionaryMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovProjectDictionaryMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java
new file mode 100644
index 0000000..eeeacde
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java
@@ -0,0 +1,46 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目字典表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_project_dictionary")
+@ApiModel(value = "GovProjectDictionary对象", description = "项目字典表")
+public class GovProjectDictionary implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ private String createBy;
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("类型")
+ private String type;
+
+ @ApiModelProperty("值")
+ private String value;
+
+ @ApiModelProperty("展示值")
+ private String label;
+
+ @ApiModelProperty("备注")
+ private String remark;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovProjectDictionaryVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovProjectDictionaryVO.java
new file mode 100644
index 0000000..d940080
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovProjectDictionaryVO.java
@@ -0,0 +1,41 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目字典表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovProjectDictionaryVO", description = "项目字典表")
+public class GovProjectDictionaryVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ private String createBy;
+ private LocalDateTime createOn;
+
+ @ApiModelProperty("类型")
+ private String type;
+
+ @ApiModelProperty("值")
+ private String value;
+
+ @ApiModelProperty("展示值")
+ private String label;
+
+ @ApiModelProperty("备注")
+ private String remark;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovProjectDictionaryService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovProjectDictionaryService.java
new file mode 100644
index 0000000..01852cf
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovProjectDictionaryService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovProjectDictionaryService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovProjectDictionaryServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovProjectDictionaryServiceImpl.java
new file mode 100644
index 0000000..4e6b74d
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovProjectDictionaryServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovProjectDictionaryMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
+import com.ningdatech.pmapi.gov.service.IGovProjectDictionaryService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovProjectDictionaryServiceImpl extends
+ ServiceImpl implements IGovProjectDictionaryService {
+
+}
From 67200349e7fdda39794f9a45806b72523a9567d2 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 23 Aug 2023 10:31:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pmapi/gov/controller/GovProjectCollectionController.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
index cd2c897..a54573e 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -36,11 +36,4 @@ public class GovProjectCollectionController {
public List dictionary(@RequestParam(value = "type", required = false) String type) {
return collectionManage.dictionary(type);
}
-
- @GetMapping("/business-strip/expert/analysis")
- @ApiOperation("分析专家数据")
- public void analysisExpertOrg() {
- belongOrgManage.analysisExpertOrg();
- }
-
}
From 5fcd9b2bcdd7a279f9c89192b243fe5537114360 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 23 Aug 2023 14:55:10 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=20?=
=?UTF-8?q?=E6=96=B0=E7=89=88=20=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/GovProjectCollectionController.java | 23 +++-
.../gov/manage/GovProjectCollectionManage.java | 24 ++++
.../pmapi/gov/mapper/GovBizProjectApplyMapper.java | 16 +++
.../pmapi/gov/model/dto/GovBizProjectApplyDTO.java | 135 ++++++++++++++++++++
.../pmapi/gov/model/entity/GovBizProjectApply.java | 140 +++++++++++++++++++++
.../pmapi/gov/model/vo/GovBizProjectApplyVO.java | 135 ++++++++++++++++++++
.../gov/service/IGovBizProjectApplyService.java | 16 +++
.../impl/GovBizProjectApplyServiceImpl.java | 21 ++++
8 files changed, 505 insertions(+), 5 deletions(-)
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApplyMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApply.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApplyVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApplyService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApplyServiceImpl.java
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
index a54573e..04ebb04 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -1,16 +1,17 @@
package com.ningdatech.pmapi.gov.controller;
+import com.ningdatech.basic.model.PageVo;
import com.ningdatech.pmapi.gov.manage.GovProjectCollectionManage;
+import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
import java.util.List;
/**
@@ -25,7 +26,7 @@ import java.util.List;
@Validated
@RestController
@RequiredArgsConstructor
-@Api(value = "GovProjectCollectionController", tags = "电子政务规范项目归集控制器")
+@Api(value = "GovProjectCollectionController", tags = "新项目归集")
@RequestMapping("/api/v1/gov-project-collection")
public class GovProjectCollectionController {
@@ -36,4 +37,16 @@ public class GovProjectCollectionController {
public List dictionary(@RequestParam(value = "type", required = false) String type) {
return collectionManage.dictionary(type);
}
+
+ @GetMapping("/list")
+ @ApiOperation("项目归集列表")
+ public PageVo list(ProjectListReq req) {
+ return collectionManage.list(req);
+ }
+
+ @GetMapping("/detail/{id}")
+ @ApiOperation("项目归集详情")
+ public GovBizProjectApplyVO detail(@PathVariable Long id) {
+ return collectionManage.detail(id);
+ }
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 8b6216d..9c1b659 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -3,9 +3,13 @@ package com.ningdatech.pmapi.gov.manage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.basic.model.PageVo;
import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
+import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
import com.ningdatech.pmapi.gov.service.IGovProjectDictionaryService;
+import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -25,6 +29,8 @@ public class GovProjectCollectionManage {
private final IGovProjectDictionaryService dictionaryService;
+ private final IGovBizProjectApplyService projectApplyService;
+
public List dictionary(String type) {
List dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -37,4 +43,22 @@ public class GovProjectCollectionManage {
return dictionaries.stream().map(d -> BeanUtil.copyProperties(d,GovProjectDictionaryVO.class))
.collect(Collectors.toList());
}
+
+ /**
+ * 分页查 项目归集
+ * @param req
+ * @return
+ */
+ public PageVo list(ProjectListReq req) {
+ return PageVo.empty();
+ }
+
+ /**
+ * 项目归集详情
+ * @param id
+ * @return
+ */
+ public GovBizProjectApplyVO detail(Long id) {
+ return null;
+ }
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApplyMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApplyMapper.java
new file mode 100644
index 0000000..fef1bea
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApplyMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectApplyMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
new file mode 100644
index 0000000..9d5bd2f
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
@@ -0,0 +1,135 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目申报信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectApply对象", description = "项目申报表")
+public class GovBizProjectApplyDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("发改委项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("财政项目代码")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("历年项目名称")
+ private String baseHistorProjName;
+
+ @ApiModelProperty("'历年项目编码'")
+ private String baseHistorProjId;
+
+ @ApiModelProperty("关联IRS应用名称")
+ private String baseProjSys;
+
+ @ApiModelProperty("关联IRS应用编号")
+ private String baseProjSysCpde;
+
+ @ApiModelProperty("一本账重大应用名称")
+ private String baseAccountAppName;
+
+ @ApiModelProperty("领域大脑 一本账名称")
+ private String baseBrainName;
+
+ @ApiModelProperty("单位核心业务名称")
+ private String baseCoreBusiness;
+
+ @ApiModelProperty("单位核心业务编号")
+ private String baseCoreBusinessCode;
+
+ @ApiModelProperty("项目开始时间")
+ private LocalDateTime baseProjStartTime;
+
+ @ApiModelProperty("项目结束时间")
+ private LocalDateTime baseProjEndTime;
+
+ @ApiModelProperty("项目期限")
+ private LocalDateTime baseProjDuration;
+
+ @ApiModelProperty("项目年度")
+ private String baseProjSetYear;
+
+ @ApiModelProperty("预算来源")
+ private String baseProjAmountOri;
+
+ @ApiModelProperty("预算来源说明")
+ private String baseBasisAmountOri;
+
+ @ApiModelProperty("项目总投资")
+ private BigDecimal baseProjTotalAmount;
+
+ @ApiModelProperty("申报年度预算")
+ private BigDecimal baseProjDeclAmount;
+
+ @ApiModelProperty("建设层级")
+ private String baseProjConsClass;
+
+ @ApiModelProperty("贯通层级")
+ private String baseLowestLevel;
+
+ @ApiModelProperty("立项依据")
+ private String baseProjBasis;
+
+ @ApiModelProperty("立项依据说明")
+ private String baseBasisEstablish;
+
+ @ApiModelProperty("立项依据证明材料")
+ private String baseProjBasisFile;
+
+ @ApiModelProperty("项目概述")
+ private String baseProjIntro;
+
+ @ApiModelProperty("项目内容与预期成效")
+ private String beseExpectedResults;
+
+ @ApiModelProperty("可研报告")
+ private String baseResearchReportFile;
+
+ @ApiModelProperty("项目申报书")
+ private String baseProjApplyFile;
+
+ @ApiModelProperty("运维方案")
+ private String baseOperatMaintenFile;
+
+ @ApiModelProperty("其他附件")
+ private String baseProjOtherFile;
+
+ @ApiModelProperty("备注")
+ private String baseProjRemark;
+
+ @ApiModelProperty("数据来源 区域code")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApply.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApply.java
new file mode 100644
index 0000000..de03658
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApply.java
@@ -0,0 +1,140 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目申报信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_apply")
+@ApiModel(value = "GovBizProjectApply对象", description = "项目申报信息表")
+public class GovBizProjectApply implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("发改委项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("财政项目代码")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("历年项目名称")
+ private String baseHistorProjName;
+
+ @ApiModelProperty("'历年项目编码'")
+ private String baseHistorProjId;
+
+ @ApiModelProperty("关联IRS应用名称")
+ private String baseProjSys;
+
+ @ApiModelProperty("关联IRS应用编号")
+ private String baseProjSysCpde;
+
+ @ApiModelProperty("一本账重大应用名称")
+ private String baseAccountAppName;
+
+ @ApiModelProperty("领域大脑 一本账名称")
+ private String baseBrainName;
+
+ @ApiModelProperty("单位核心业务名称")
+ private String baseCoreBusiness;
+
+ @ApiModelProperty("单位核心业务编号")
+ private String baseCoreBusinessCode;
+
+ @ApiModelProperty("项目开始时间")
+ private LocalDateTime baseProjStartTime;
+
+ @ApiModelProperty("项目结束时间")
+ private LocalDateTime baseProjEndTime;
+
+ @ApiModelProperty("项目期限")
+ private LocalDateTime baseProjDuration;
+
+ @ApiModelProperty("项目年度")
+ private String baseProjSetYear;
+
+ @ApiModelProperty("预算来源")
+ private String baseProjAmountOri;
+
+ @ApiModelProperty("预算来源说明")
+ private String baseBasisAmountOri;
+
+ @ApiModelProperty("项目总投资")
+ private BigDecimal baseProjTotalAmount;
+
+ @ApiModelProperty("申报年度预算")
+ private BigDecimal baseProjDeclAmount;
+
+ @ApiModelProperty("建设层级")
+ private String baseProjConsClass;
+
+ @ApiModelProperty("贯通层级")
+ private String baseLowestLevel;
+
+ @ApiModelProperty("立项依据")
+ private String baseProjBasis;
+
+ @ApiModelProperty("立项依据说明")
+ private String baseBasisEstablish;
+
+ @ApiModelProperty("立项依据证明材料")
+ private String baseProjBasisFile;
+
+ @ApiModelProperty("项目概述")
+ private String baseProjIntro;
+
+ @ApiModelProperty("项目内容与预期成效")
+ private String beseExpectedResults;
+
+ @ApiModelProperty("可研报告")
+ private String baseResearchReportFile;
+
+ @ApiModelProperty("项目申报书")
+ private String baseProjApplyFile;
+
+ @ApiModelProperty("运维方案")
+ private String baseOperatMaintenFile;
+
+ @ApiModelProperty("其他附件")
+ private String baseProjOtherFile;
+
+ @ApiModelProperty("备注")
+ private String baseProjRemark;
+
+ @ApiModelProperty("数据来源 区域code")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApplyVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApplyVO.java
new file mode 100644
index 0000000..0b15007
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApplyVO.java
@@ -0,0 +1,135 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目申报信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectApply对象", description = "项目申报表")
+public class GovBizProjectApplyVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("发改委项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("财政项目代码")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("历年项目名称")
+ private String baseHistorProjName;
+
+ @ApiModelProperty("'历年项目编码'")
+ private String baseHistorProjId;
+
+ @ApiModelProperty("关联IRS应用名称")
+ private String baseProjSys;
+
+ @ApiModelProperty("关联IRS应用编号")
+ private String baseProjSysCpde;
+
+ @ApiModelProperty("一本账重大应用名称")
+ private String baseAccountAppName;
+
+ @ApiModelProperty("领域大脑 一本账名称")
+ private String baseBrainName;
+
+ @ApiModelProperty("单位核心业务名称")
+ private String baseCoreBusiness;
+
+ @ApiModelProperty("单位核心业务编号")
+ private String baseCoreBusinessCode;
+
+ @ApiModelProperty("项目开始时间")
+ private LocalDateTime baseProjStartTime;
+
+ @ApiModelProperty("项目结束时间")
+ private LocalDateTime baseProjEndTime;
+
+ @ApiModelProperty("项目期限")
+ private LocalDateTime baseProjDuration;
+
+ @ApiModelProperty("项目年度")
+ private String baseProjSetYear;
+
+ @ApiModelProperty("预算来源")
+ private String baseProjAmountOri;
+
+ @ApiModelProperty("预算来源说明")
+ private String baseBasisAmountOri;
+
+ @ApiModelProperty("项目总投资")
+ private BigDecimal baseProjTotalAmount;
+
+ @ApiModelProperty("申报年度预算")
+ private BigDecimal baseProjDeclAmount;
+
+ @ApiModelProperty("建设层级")
+ private String baseProjConsClass;
+
+ @ApiModelProperty("贯通层级")
+ private String baseLowestLevel;
+
+ @ApiModelProperty("立项依据")
+ private String baseProjBasis;
+
+ @ApiModelProperty("立项依据说明")
+ private String baseBasisEstablish;
+
+ @ApiModelProperty("立项依据证明材料")
+ private String baseProjBasisFile;
+
+ @ApiModelProperty("项目概述")
+ private String baseProjIntro;
+
+ @ApiModelProperty("项目内容与预期成效")
+ private String beseExpectedResults;
+
+ @ApiModelProperty("可研报告")
+ private String baseResearchReportFile;
+
+ @ApiModelProperty("项目申报书")
+ private String baseProjApplyFile;
+
+ @ApiModelProperty("运维方案")
+ private String baseOperatMaintenFile;
+
+ @ApiModelProperty("其他附件")
+ private String baseProjOtherFile;
+
+ @ApiModelProperty("备注")
+ private String baseProjRemark;
+
+ @ApiModelProperty("数据来源 区域code")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApplyService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApplyService.java
new file mode 100644
index 0000000..3ee8e68
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApplyService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectApplyService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApplyServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApplyServiceImpl.java
new file mode 100644
index 0000000..d38edd7
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApplyServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectApplyMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectApplyServiceImpl extends
+ ServiceImpl implements IGovBizProjectApplyService {
+
+}
From b419b4caa841da1631ff902faa5fc4280e193375 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 23 Aug 2023 17:55:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=20?=
=?UTF-8?q?=E6=96=B0=E7=89=88=20=E4=BF=9D=E5=AD=98=204=E5=BC=A0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/GovProjectCollectionController.java | 10 --
.../gov/manage/GovProjectCollectionManage.java | 9 +-
.../gov/mapper/GovBizProjectApproveMapper.java | 16 +++
.../gov/mapper/GovBizProjectBaseinfoMapper.java | 16 +++
.../gov/mapper/GovBizProjectCimplementMapper.java | 16 +++
.../gov/model/dto/GovBizProjectApproveDTO.java | 88 +++++++++++++++++
.../gov/model/dto/GovBizProjectBaseinfoDTO.java | 101 +++++++++++++++++++
.../gov/model/dto/GovBizProjectCimplementDTO.java | 104 ++++++++++++++++++++
.../gov/model/entity/GovBizProjectApprove.java | 93 ++++++++++++++++++
.../gov/model/entity/GovBizProjectBaseinfo.java | 107 ++++++++++++++++++++
.../gov/model/entity/GovBizProjectCimplement.java | 109 +++++++++++++++++++++
.../pmapi/gov/model/vo/GovBizProjectApproveVO.java | 88 +++++++++++++++++
.../gov/model/vo/GovBizProjectBaseinfoVO.java | 101 +++++++++++++++++++
.../gov/model/vo/GovBizProjectCimplementVO.java | 104 ++++++++++++++++++++
.../gov/service/IGovBizProjectApproveService.java | 16 +++
.../gov/service/IGovBizProjectBaseinfoService.java | 16 +++
.../service/IGovBizProjectCimplementService.java | 16 +++
.../impl/GovBizProjectApproveServiceImpl.java | 21 ++++
.../impl/GovBizProjectBaseinfoServiceImpl.java | 21 ++++
.../impl/GovBizProjectCimplementServiceImpl.java | 21 ++++
20 files changed, 1061 insertions(+), 12 deletions(-)
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApproveMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectBaseinfoMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectCimplementMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApprove.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectCimplement.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApproveVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectCimplementVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApproveService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectBaseinfoService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectCimplementService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApproveServiceImpl.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectBaseinfoServiceImpl.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectCimplementServiceImpl.java
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
index 04ebb04..b7c2ede 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -38,15 +38,5 @@ public class GovProjectCollectionController {
return collectionManage.dictionary(type);
}
- @GetMapping("/list")
- @ApiOperation("项目归集列表")
- public PageVo list(ProjectListReq req) {
- return collectionManage.list(req);
- }
- @GetMapping("/detail/{id}")
- @ApiOperation("项目归集详情")
- public GovBizProjectApplyVO detail(@PathVariable Long id) {
- return collectionManage.detail(id);
- }
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 9c1b659..79ce423 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -7,8 +7,7 @@ import com.ningdatech.basic.model.PageVo;
import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
-import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
-import com.ningdatech.pmapi.gov.service.IGovProjectDictionaryService;
+import com.ningdatech.pmapi.gov.service.*;
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
@@ -31,6 +30,12 @@ public class GovProjectCollectionManage {
private final IGovBizProjectApplyService projectApplyService;
+ private final IGovBizProjectBaseinfoService baseinfoService;
+
+ private final IGovBizProjectApproveService approveService;
+
+ private final IGovBizProjectCimplementService cimplementService;
+
public List dictionary(String type) {
List dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApproveMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApproveMapper.java
new file mode 100644
index 0000000..9323e5d
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApproveMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApprove;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectApproveMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectBaseinfoMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectBaseinfoMapper.java
new file mode 100644
index 0000000..9870946
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectBaseinfoMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectBaseinfo;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectBaseinfoMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectCimplementMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectCimplementMapper.java
new file mode 100644
index 0000000..fa8fd7c
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectCimplementMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectCimplement;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectCimplementMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
new file mode 100644
index 0000000..a750eed
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
@@ -0,0 +1,88 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目审核信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectBaseinfo对象", description = "项目审核信息表")
+public class GovBizProjectApproveDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("'发改项目代码'")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("'财政项目代码'")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("评审结果")
+ private String baseReviewResults;
+
+ @ApiModelProperty("评审意见")
+ private String baseReviewOpinion;
+
+ @ApiModelProperty("评审意见附件")
+ private String baseReviewCommentFile;
+
+ @ApiModelProperty("建议总投资")
+ private BigDecimal baseExpertTotalMoney;
+
+ @ApiModelProperty("'建议年度预算'")
+ private BigDecimal baseExpertYearMoney;
+
+ @ApiModelProperty("立项批复文件")
+ private String approvalFile;
+
+ @ApiModelProperty("建议批复总投资")
+ private BigDecimal baseInitialReviewTotalMoney;
+
+ @ApiModelProperty("'建议批复年度预算'")
+ private BigDecimal baseProjReplyAmount;
+
+ @ApiModelProperty("等保定级")
+ private String equalProtectionLevel;
+
+ @ApiModelProperty("初步设计方案")
+ private String preliminaryDesignScheme;
+
+ @ApiModelProperty("初步设计方案批复函")
+ private String preliminaryDesignFile;
+
+ @ApiModelProperty("年度预算下达金额")
+ private BigDecimal releaseYearMoney;
+
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
new file mode 100644
index 0000000..8e8c131
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
@@ -0,0 +1,101 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目基本信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectBaseinfo对象", description = "项目基本信息表")
+public class GovBizProjectBaseinfoDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("基本项目区域code")
+ private String baseAreaCode;
+
+ @ApiModelProperty("基本项目区域名")
+ private String baseAreaName;
+
+ @ApiModelProperty("是否涉密")
+ private String baseProjIsConfidentiality;
+
+ @ApiModelProperty("项目类型")
+ private String baseProjType;
+
+ @ApiModelProperty("内容类别")
+ private String baseConstructionType;
+
+ @ApiModelProperty("项目状态")
+ private String baseProjSetProg;
+
+ @ApiModelProperty("信息是否有效")
+ private String isEffective;
+
+ @ApiModelProperty("上级主管单位")
+ private String baseProvManDeprtName;
+
+ @ApiModelProperty("上级主管单位钉id")
+ private String baseProvManDeprtDing;
+
+ @ApiModelProperty("本级主管单位")
+ private String baseManDeprt;
+
+ @ApiModelProperty("本级主管单位ding code")
+ private String baseManDeprtDing;
+
+ @ApiModelProperty("本级主管单位社会统一信用代码")
+ private String baseManDeprtDingUsci;
+
+ @ApiModelProperty("建设单位")
+ private String baseBuildDeprt;
+
+ @ApiModelProperty("建设单位Ding Code")
+ private String baseBuildDeprtDing;
+
+ @ApiModelProperty("建设单位社会统一信用代码")
+ private String baseBuildDeprtUsci;
+
+ @ApiModelProperty("项目负责人")
+ private String baseProjPrincipal;
+
+ @ApiModelProperty("项目负责人手机号")
+ private String baseProjPrincipalCall;
+
+ @ApiModelProperty("项目联系人")
+ private String baseProjContacts;
+
+ @ApiModelProperty("项目联系人联系方式")
+ private String baseProjContactsCall;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
new file mode 100644
index 0000000..9b68723
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
@@ -0,0 +1,104 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目实施信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectCimplement对象", description = "项目实施信息表")
+public class GovBizProjectCimplementDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("发改项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("关联IRS应用编码")
+ private String baseProjSysCode;
+
+ @ApiModelProperty("初验意见")
+ private String baseInitialOpinionFile;
+
+ @ApiModelProperty("信息安全等级保护测评报告")
+ private String baseInforLevelFile;
+
+ @ApiModelProperty("'商业密码应用评估报告'")
+ private String basePasswAssessFile;
+
+ @ApiModelProperty("第三方验收测试报告")
+ private String baseThirdAcceptFile;
+
+ @ApiModelProperty("建设核查表")
+ private String baseCheckFile;
+
+ @ApiModelProperty("财务审计报告")
+ private String baseFinanlAuditFile;
+
+ @ApiModelProperty("用户使用报告")
+ private String baseUserConsFile;
+
+ @ApiModelProperty("监理总结报告")
+ private String baseEstaSummFile;
+
+ @ApiModelProperty("IRS应用试运行报告")
+ private String baseIrsTestRunFile;
+
+ @ApiModelProperty("项目总结报告")
+ private String baseSummReportFile;
+
+ @ApiModelProperty("'是否完成日志数据归集'")
+ private String baseLogAggregation;
+
+ @ApiModelProperty("实际成效指标")
+ private String baseBusinessMetrics;
+
+ @ApiModelProperty("终审意见")
+ private String baseFinalExpertOpinionFile;
+
+ @ApiModelProperty("项目延期申请表")
+ private String baseEngineerPostpoFile;
+
+ @ApiModelProperty("变更申请单")
+ private String baseChangeFormFile;
+
+ @ApiModelProperty("生产批复文件")
+ private String baseChanFile;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApprove.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApprove.java
new file mode 100644
index 0000000..a756846
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApprove.java
@@ -0,0 +1,93 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目审核信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_approve")
+@ApiModel(value = "GovBizProjectBaseinfo对象", description = "项目审核信息表")
+public class GovBizProjectApprove implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("'发改项目代码'")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("'财政项目代码'")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("评审结果")
+ private String baseReviewResults;
+
+ @ApiModelProperty("评审意见")
+ private String baseReviewOpinion;
+
+ @ApiModelProperty("评审意见附件")
+ private String baseReviewCommentFile;
+
+ @ApiModelProperty("建议总投资")
+ private BigDecimal baseExpertTotalMoney;
+
+ @ApiModelProperty("'建议年度预算'")
+ private BigDecimal baseExpertYearMoney;
+
+ @ApiModelProperty("立项批复文件")
+ private String approvalFile;
+
+ @ApiModelProperty("建议批复总投资")
+ private BigDecimal baseInitialReviewTotalMoney;
+
+ @ApiModelProperty("'建议批复年度预算'")
+ private BigDecimal baseProjReplyAmount;
+
+ @ApiModelProperty("等保定级")
+ private String equalProtectionLevel;
+
+ @ApiModelProperty("初步设计方案")
+ private String preliminaryDesignScheme;
+
+ @ApiModelProperty("初步设计方案批复函")
+ private String preliminaryDesignFile;
+
+ @ApiModelProperty("年度预算下达金额")
+ private BigDecimal releaseYearMoney;
+
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java
new file mode 100644
index 0000000..63f6dfa
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java
@@ -0,0 +1,107 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目基本信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_baseinfo")
+@ApiModel(value = "GovBizProjectBaseinfo对象", description = "项目基本信息表")
+public class GovBizProjectBaseinfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("基本项目区域code")
+ private String baseAreaCode;
+
+ @ApiModelProperty("基本项目区域名")
+ private String baseAreaName;
+
+ @ApiModelProperty("是否涉密")
+ private String baseProjIsConfidentiality;
+
+ @ApiModelProperty("项目类型")
+ private String baseProjType;
+
+ @ApiModelProperty("内容类别")
+ private String baseConstructionType;
+
+ @ApiModelProperty("项目状态")
+ private String baseProjSetProg;
+
+ @ApiModelProperty("信息是否有效")
+ private String isEffective;
+
+ @ApiModelProperty("上级主管单位")
+ private String baseProvManDeprtName;
+
+ @ApiModelProperty("上级主管单位钉id")
+ private String baseProvManDeprtDing;
+
+ @ApiModelProperty("本级主管单位")
+ private String baseManDeprt;
+
+ @ApiModelProperty("本级主管单位ding code")
+ private String baseManDeprtDing;
+
+ @ApiModelProperty("本级主管单位社会统一信用代码")
+ private String baseManDeprtDingUsci;
+
+ @ApiModelProperty("建设单位")
+ private String baseBuildDeprt;
+
+ @ApiModelProperty("建设单位Ding Code")
+ private String baseBuildDeprtDing;
+
+ @ApiModelProperty("建设单位社会统一信用代码")
+ private String baseBuildDeprtUsci;
+
+ @ApiModelProperty("项目负责人")
+ private String baseProjPrincipal;
+
+ @ApiModelProperty("项目负责人手机号")
+ private String baseProjPrincipalCall;
+
+ @ApiModelProperty("项目联系人")
+ private String baseProjContacts;
+
+ @ApiModelProperty("项目联系人联系方式")
+ private String baseProjContactsCall;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectCimplement.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectCimplement.java
new file mode 100644
index 0000000..742a5a9
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectCimplement.java
@@ -0,0 +1,109 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目实施信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_cimplement")
+@ApiModel(value = "GovBizProjectCimplement对象", description = "项目实施信息表")
+public class GovBizProjectCimplement implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("发改项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("关联IRS应用编码")
+ private String baseProjSysCode;
+
+ @ApiModelProperty("初验意见")
+ private String baseInitialOpinionFile;
+
+ @ApiModelProperty("信息安全等级保护测评报告")
+ private String baseInforLevelFile;
+
+ @ApiModelProperty("'商业密码应用评估报告'")
+ private String basePasswAssessFile;
+
+ @ApiModelProperty("第三方验收测试报告")
+ private String baseThirdAcceptFile;
+
+ @ApiModelProperty("建设核查表")
+ private String baseCheckFile;
+
+ @ApiModelProperty("财务审计报告")
+ private String baseFinanlAuditFile;
+
+ @ApiModelProperty("用户使用报告")
+ private String baseUserConsFile;
+
+ @ApiModelProperty("监理总结报告")
+ private String baseEstaSummFile;
+
+ @ApiModelProperty("IRS应用试运行报告")
+ private String baseIrsTestRunFile;
+
+ @ApiModelProperty("项目总结报告")
+ private String baseSummReportFile;
+
+ @ApiModelProperty("'是否完成日志数据归集'")
+ private String baseLogAggregation;
+
+ @ApiModelProperty("实际成效指标")
+ private String baseBusinessMetrics;
+
+ @ApiModelProperty("终审意见")
+ private String baseFinalExpertOpinionFile;
+
+ @ApiModelProperty("项目延期申请表")
+ private String baseEngineerPostpoFile;
+
+ @ApiModelProperty("变更申请单")
+ private String baseChangeFormFile;
+
+ @ApiModelProperty("生产批复文件")
+ private String baseChanFile;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApproveVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApproveVO.java
new file mode 100644
index 0000000..04ef8a1
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApproveVO.java
@@ -0,0 +1,88 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目审核信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectBaseinfo对象", description = "项目审核信息表")
+public class GovBizProjectApproveVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("'发改项目代码'")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("'财政项目代码'")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("评审结果")
+ private String baseReviewResults;
+
+ @ApiModelProperty("评审意见")
+ private String baseReviewOpinion;
+
+ @ApiModelProperty("评审意见附件")
+ private String baseReviewCommentFile;
+
+ @ApiModelProperty("建议总投资")
+ private BigDecimal baseExpertTotalMoney;
+
+ @ApiModelProperty("'建议年度预算'")
+ private BigDecimal baseExpertYearMoney;
+
+ @ApiModelProperty("立项批复文件")
+ private String approvalFile;
+
+ @ApiModelProperty("建议批复总投资")
+ private BigDecimal baseInitialReviewTotalMoney;
+
+ @ApiModelProperty("'建议批复年度预算'")
+ private BigDecimal baseProjReplyAmount;
+
+ @ApiModelProperty("等保定级")
+ private String equalProtectionLevel;
+
+ @ApiModelProperty("初步设计方案")
+ private String preliminaryDesignScheme;
+
+ @ApiModelProperty("初步设计方案批复函")
+ private String preliminaryDesignFile;
+
+ @ApiModelProperty("年度预算下达金额")
+ private BigDecimal releaseYearMoney;
+
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java
new file mode 100644
index 0000000..8c8b170
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java
@@ -0,0 +1,101 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目基本信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectBaseinfo对象", description = "项目基本信息表")
+public class GovBizProjectBaseinfoVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("基本项目区域code")
+ private String baseAreaCode;
+
+ @ApiModelProperty("基本项目区域名")
+ private String baseAreaName;
+
+ @ApiModelProperty("是否涉密")
+ private String baseProjIsConfidentiality;
+
+ @ApiModelProperty("项目类型")
+ private String baseProjType;
+
+ @ApiModelProperty("内容类别")
+ private String baseConstructionType;
+
+ @ApiModelProperty("项目状态")
+ private String baseProjSetProg;
+
+ @ApiModelProperty("信息是否有效")
+ private String isEffective;
+
+ @ApiModelProperty("上级主管单位")
+ private String baseProvManDeprtName;
+
+ @ApiModelProperty("上级主管单位钉id")
+ private String baseProvManDeprtDing;
+
+ @ApiModelProperty("本级主管单位")
+ private String baseManDeprt;
+
+ @ApiModelProperty("本级主管单位ding code")
+ private String baseManDeprtDing;
+
+ @ApiModelProperty("本级主管单位社会统一信用代码")
+ private String baseManDeprtDingUsci;
+
+ @ApiModelProperty("建设单位")
+ private String baseBuildDeprt;
+
+ @ApiModelProperty("建设单位Ding Code")
+ private String baseBuildDeprtDing;
+
+ @ApiModelProperty("建设单位社会统一信用代码")
+ private String baseBuildDeprtUsci;
+
+ @ApiModelProperty("项目负责人")
+ private String baseProjPrincipal;
+
+ @ApiModelProperty("项目负责人手机号")
+ private String baseProjPrincipalCall;
+
+ @ApiModelProperty("项目联系人")
+ private String baseProjContacts;
+
+ @ApiModelProperty("项目联系人联系方式")
+ private String baseProjContactsCall;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectCimplementVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectCimplementVO.java
new file mode 100644
index 0000000..85df69e
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectCimplementVO.java
@@ -0,0 +1,104 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目实施信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectCimplement对象", description = "项目实施信息表")
+public class GovBizProjectCimplementVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("发改项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("关联IRS应用编码")
+ private String baseProjSysCode;
+
+ @ApiModelProperty("初验意见")
+ private String baseInitialOpinionFile;
+
+ @ApiModelProperty("信息安全等级保护测评报告")
+ private String baseInforLevelFile;
+
+ @ApiModelProperty("'商业密码应用评估报告'")
+ private String basePasswAssessFile;
+
+ @ApiModelProperty("第三方验收测试报告")
+ private String baseThirdAcceptFile;
+
+ @ApiModelProperty("建设核查表")
+ private String baseCheckFile;
+
+ @ApiModelProperty("财务审计报告")
+ private String baseFinanlAuditFile;
+
+ @ApiModelProperty("用户使用报告")
+ private String baseUserConsFile;
+
+ @ApiModelProperty("监理总结报告")
+ private String baseEstaSummFile;
+
+ @ApiModelProperty("IRS应用试运行报告")
+ private String baseIrsTestRunFile;
+
+ @ApiModelProperty("项目总结报告")
+ private String baseSummReportFile;
+
+ @ApiModelProperty("'是否完成日志数据归集'")
+ private String baseLogAggregation;
+
+ @ApiModelProperty("实际成效指标")
+ private String baseBusinessMetrics;
+
+ @ApiModelProperty("终审意见")
+ private String baseFinalExpertOpinionFile;
+
+ @ApiModelProperty("项目延期申请表")
+ private String baseEngineerPostpoFile;
+
+ @ApiModelProperty("变更申请单")
+ private String baseChangeFormFile;
+
+ @ApiModelProperty("生产批复文件")
+ private String baseChanFile;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApproveService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApproveService.java
new file mode 100644
index 0000000..a936348
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApproveService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApprove;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectApproveService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectBaseinfoService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectBaseinfoService.java
new file mode 100644
index 0000000..17e592c
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectBaseinfoService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectBaseinfo;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectBaseinfoService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectCimplementService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectCimplementService.java
new file mode 100644
index 0000000..bb37a73
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectCimplementService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectCimplement;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectCimplementService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApproveServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApproveServiceImpl.java
new file mode 100644
index 0000000..af280da
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApproveServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectApproveMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApprove;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectApproveService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectApproveServiceImpl extends
+ ServiceImpl implements IGovBizProjectApproveService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectBaseinfoServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectBaseinfoServiceImpl.java
new file mode 100644
index 0000000..8fd2107
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectBaseinfoServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectBaseinfoMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectBaseinfo;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectBaseinfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectBaseinfoServiceImpl extends
+ ServiceImpl implements IGovBizProjectBaseinfoService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectCimplementServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectCimplementServiceImpl.java
new file mode 100644
index 0000000..8b50f88
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectCimplementServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectCimplementMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectCimplement;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectCimplementService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectCimplementServiceImpl extends
+ ServiceImpl implements IGovBizProjectCimplementService {
+
+}
From 83dcb19f331504965859c28d61bd32630cdaa796 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 14:08:08 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=20?=
=?UTF-8?q?=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ningdatech/pmapi/common/constant/BizConst.java | 5 +
.../controller/GovProjectCollectionController.java | 22 +-
.../gov/manage/GovProjectCollectionManage.java | 266 ++++++++++++++++++++-
.../gov/mapper/GovBizProjectMimplementMapper.java | 16 ++
.../gov/mapper/GovBizProjectProcureMapper.java | 16 ++
.../pmapi/gov/model/dto/GovBizProjectApplyDTO.java | 4 +-
.../gov/model/dto/GovBizProjectApproveDTO.java | 4 +-
.../gov/model/dto/GovBizProjectBaseinfoDTO.java | 4 +-
.../gov/model/dto/GovBizProjectCimplementDTO.java | 4 +-
.../gov/model/dto/GovBizProjectMimplementDTO.java | 96 ++++++++
.../gov/model/dto/GovBizProjectProcureDTO.java | 91 +++++++
.../pmapi/gov/model/dto/GovBizProjectSaveDTO.java | 48 ++++
.../gov/model/entity/GovBizProjectMimplement.java | 103 ++++++++
.../gov/model/entity/GovBizProjectProcure.java | 98 ++++++++
.../pmapi/gov/model/vo/GovBizProjectDetailVO.java | 45 ++++
.../pmapi/gov/model/vo/GovBizProjectListVO.java | 47 ++++
.../gov/model/vo/GovBizProjectMimplementVO.java | 98 ++++++++
.../pmapi/gov/model/vo/GovBizProjectProcureVO.java | 93 +++++++
.../service/IGovBizProjectMimplementService.java | 16 ++
.../gov/service/IGovBizProjectProcureService.java | 16 ++
.../impl/GovBizProjectMimplementServiceImpl.java | 21 ++
.../impl/GovBizProjectProcureServiceImpl.java | 21 ++
.../performance/manage/IndicatorConfigManage.java | 5 +-
.../pmapi/portrait/manage/TagManage.java | 5 +-
.../pmapi/projectlib/manage/ApplicationManage.java | 5 +-
.../projectlib/manage/ProjectCollectionManage.java | 5 +-
.../pmapi/safety/manage/SafetyRiskManage.java | 4 +-
27 files changed, 1127 insertions(+), 31 deletions(-)
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectMimplementMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectProcureMapper.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectMimplementDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectProcureDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectSaveDTO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectMimplement.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectProcure.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectDetailVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectListVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectMimplementVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectProcureVO.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectMimplementService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectProcureService.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectMimplementServiceImpl.java
create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectProcureServiceImpl.java
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java
index 3378b10..0b5acfe 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java
@@ -60,6 +60,7 @@ public interface BizConst {
* 浙江省的region_id
*/
long ZJ_REGION_CODE = 330000L;
+ String NINE_AREA_CODE_LAST = "000";
/**
* 省/直辖市 level
@@ -92,4 +93,8 @@ public interface BizConst {
String DEV = "dev";
String PRE = "pre";
String PROD = "prod";
+
+ String SAVE_SUCCESS = "保存成功";
+
+ String SAVE_FAIL = "保存失败";
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
index b7c2ede..e4dfa02 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
@@ -1,8 +1,11 @@
package com.ningdatech.pmapi.gov.controller;
import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.log.annotation.WebLog;
import com.ningdatech.pmapi.gov.manage.GovProjectCollectionManage;
-import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
+import com.ningdatech.pmapi.gov.model.dto.GovBizProjectSaveDTO;
+import com.ningdatech.pmapi.gov.model.vo.GovBizProjectDetailVO;
+import com.ningdatech.pmapi.gov.model.vo.GovBizProjectListVO;
import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
import io.swagger.annotations.Api;
@@ -38,5 +41,22 @@ public class GovProjectCollectionController {
return collectionManage.dictionary(type);
}
+ @GetMapping("/list")
+ @ApiOperation("项目归集列表")
+ public PageVo list(ProjectListReq req) {
+ return collectionManage.list(req);
+ }
+
+ @GetMapping("/detail/{projId}")
+ @ApiOperation("项目归集详情")
+ public GovBizProjectDetailVO detail(@PathVariable String projId) {
+ return collectionManage.detail(projId);
+ }
+ @PostMapping("/save")
+ @ApiOperation("项目归集保存")
+ @WebLog("项目归集保存")
+ public String save(@RequestBody GovBizProjectSaveDTO saveDTO) {
+ return collectionManage.save(saveDTO);
+ }
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 79ce423..897c693 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -2,19 +2,27 @@ package com.ningdatech.pmapi.gov.manage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Maps;
+import com.ningdatech.basic.function.VUtils;
import com.ningdatech.basic.model.PageVo;
-import com.ningdatech.pmapi.gov.model.entity.GovProjectDictionary;
-import com.ningdatech.pmapi.gov.model.vo.GovBizProjectApplyVO;
-import com.ningdatech.pmapi.gov.model.vo.GovProjectDictionaryVO;
+import com.ningdatech.pmapi.common.constant.BizConst;
+import com.ningdatech.pmapi.gov.model.dto.*;
+import com.ningdatech.pmapi.gov.model.entity.*;
+import com.ningdatech.pmapi.gov.model.vo.*;
import com.ningdatech.pmapi.gov.service.*;
import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -36,6 +44,10 @@ public class GovProjectCollectionManage {
private final IGovBizProjectCimplementService cimplementService;
+ private final IGovBizProjectMimplementService mimplementService;
+
+ private final IGovBizProjectProcureService procureService;
+
public List dictionary(String type) {
List dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -54,16 +66,254 @@ public class GovProjectCollectionManage {
* @param req
* @return
*/
- public PageVo list(ProjectListReq req) {
- return PageVo.empty();
+ public PageVo list(ProjectListReq req) {
+ Page page = req.page();
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
+ .like(StringUtils.isNotBlank(req.getProjectName()),GovBizProjectBaseinfo::getBaseProjName,req.getProjectName())
+ .like(StringUtils.isNotBlank(req.getBuildOrg()),GovBizProjectBaseinfo::getBaseBuildDeprt,req.getBuildOrg())
+ .orderByDesc(GovBizProjectBaseinfo::getBizTime);
+ baseinfoService.page(page,wrapper);
+
+ if(0L == page.getTotal()){
+ return PageVo.empty();
+ }
+
+ List projIds = page.getRecords().stream()
+ .filter(p -> Objects.nonNull(p) && StringUtils.isNotBlank(p.getBaseProjId()))
+ .map(GovBizProjectBaseinfo::getBaseProjId).collect(Collectors.toList());
+
+ Map applyMap = Maps.newHashMap();
+ if(CollUtil.isNotEmpty(projIds)){
+ List applys = projectApplyService.list(Wrappers.lambdaQuery(GovBizProjectApply.class)
+ .in(GovBizProjectApply::getBaseProjId,projIds));
+ applyMap = applys.stream().collect(Collectors.toMap(GovBizProjectApply::getBaseProjId,a -> a));
+ }
+
+ Map finalApplyMap = applyMap;
+ List res = page.getRecords().stream().map(p -> {
+ GovBizProjectListVO vo = new GovBizProjectListVO();
+ vo.setBaseAreaCode(p.getBaseAreaCode());
+ vo.setBaseAreaName(p.getBaseAreaName());
+ vo.setBaseBuildDeprt(p.getBaseBuildDeprt());
+ vo.setBaseBuildDeprtDing(p.getBaseBuildDeprtDing());
+ vo.setBaseProjId(p.getBaseProjId());
+ vo.setBaseProjName(p.getBaseProjName());
+ if(finalApplyMap.containsKey(p.getBaseProjId())){
+ GovBizProjectApply apply = finalApplyMap.get(p.getBaseProjId());
+ vo.setBaseProjDeclAmount(apply.getBaseProjDeclAmount());
+ vo.setBaseProjTotalAmount(apply.getBaseProjTotalAmount());
+ }
+ return vo;
+ }).collect(Collectors.toList());
+
+ return PageVo.of(res,page.getTotal());
}
/**
* 项目归集详情
- * @param id
+ * @param projId
+ * @return
+ */
+ public GovBizProjectDetailVO detail(String projId) {
+ GovBizProjectDetailVO res = new GovBizProjectDetailVO();
+ //1.先查 基本信息
+ GovBizProjectBaseinfo baseinfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
+ .eq(GovBizProjectBaseinfo::getBaseProjId, projId)
+ .orderByDesc(GovBizProjectBaseinfo::getBizTime)
+ .last(BizConst.LIMIT_1));
+
+ if(Objects.isNull(baseinfo)){
+ return res;
+ }
+ res.setBaseProjId(baseinfo.getBaseProjId());
+ res.setBaseProjName(baseinfo.getBaseProjName());
+ res.setBaseinfo(BeanUtil.copyProperties(baseinfo, GovBizProjectBaseinfoVO.class));
+
+ //2.再查 申报信息
+ GovBizProjectApply apply = projectApplyService.getOne(Wrappers.lambdaQuery(GovBizProjectApply.class)
+ .eq(GovBizProjectApply::getBaseProjId, projId)
+ .orderByDesc(GovBizProjectApply::getBizTime)
+ .last(BizConst.LIMIT_1));
+ if(Objects.nonNull(apply)){
+ res.setApply(BeanUtil.copyProperties(apply, GovBizProjectApplyVO.class));
+ }
+
+ //3.再查 审批信息
+ GovBizProjectApprove approve = approveService.getOne(Wrappers.lambdaQuery(GovBizProjectApprove.class)
+ .eq(GovBizProjectApprove::getBaseProjId, projId)
+ .orderByDesc(GovBizProjectApprove::getBizTime)
+ .last(BizConst.LIMIT_1));
+ if(Objects.nonNull(approve)){
+ res.setApprove(BeanUtil.copyProperties(approve, GovBizProjectApproveVO.class));
+ }
+
+ //4 对应查询 实施项目还是运维项目
+ GovBizProjectCimplement cimplement = cimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectCimplement.class)
+ .eq(GovBizProjectCimplement::getBaseProjId, projId)
+ .orderByDesc(GovBizProjectCimplement::getBizTime)
+ .last(BizConst.LIMIT_1));
+ if(Objects.nonNull(cimplement)){
+ res.setCimplement(BeanUtil.copyProperties(cimplement, GovBizProjectCimplementVO.class));
+ }
+ GovBizProjectMimplement mimplement = mimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectMimplement.class)
+ .eq(GovBizProjectMimplement::getBaseProjId, projId)
+ .orderByDesc(GovBizProjectMimplement::getBizTime)
+ .last(BizConst.LIMIT_1));
+ if(Objects.nonNull(mimplement)){
+ res.setMimplement(BeanUtil.copyProperties(mimplement, GovBizProjectMimplementVO.class));
+ }
+
+ //5.最后查询采购信息
+ GovBizProjectProcure procure = procureService.getOne(Wrappers.lambdaQuery(GovBizProjectProcure.class)
+ .eq(GovBizProjectProcure::getBaseProjId, projId)
+ .orderByDesc(GovBizProjectProcure::getBizTime)
+ .last(BizConst.LIMIT_1));
+ if(Objects.nonNull(procure)){
+ res.setProcure(BeanUtil.copyProperties(procure, GovBizProjectProcureVO.class));
+ }
+
+ return res;
+ }
+
+ /**
+ * 项目归集保存
+ * @param saveDTO
* @return
*/
- public GovBizProjectApplyVO detail(Long id) {
- return null;
+ public String save(GovBizProjectSaveDTO saveDTO) {
+ String baseProjId = saveDTO.getBaseProjId();
+ String baseProjName = saveDTO.getBaseProjName();
+
+ //1.保存基本信息
+ GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo();
+
+ GovBizProjectBaseinfo oldBaseInfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
+ .eq(GovBizProjectBaseinfo::getBaseProjId, baseProjId)
+ .last(BizConst.LIMIT_1));
+
+ //项目名去重
+ checkName(baseProjName,baseProjId);
+ GovBizProjectBaseinfo saveBase = BeanUtil.copyProperties(baseinfo,GovBizProjectBaseinfo.class);
+ saveBase.setBaseProjId(baseProjId);
+ saveBase.setBaseProjName(baseProjName);
+ if(Objects.nonNull(oldBaseInfo)){
+ saveBase.setId(oldBaseInfo.getId());
+ }else{
+ if(Objects.nonNull(saveBase.getBaseAreaCode())){
+ saveBase.setBaseAreaCode(saveBase.getBaseAreaCode() + BizConst.NINE_AREA_CODE_LAST);
+ saveBase.setAreaCode(saveBase.getBaseAreaCode());
+ }
+ saveBase.setTongTime(LocalDateTime.now());
+ }
+ baseinfoService.saveOrUpdate(saveBase);
+
+ // 2.保存 申报信息
+ GovBizProjectApplyDTO apply = saveDTO.getApply();
+ if(Objects.nonNull(apply)){
+ GovBizProjectApply oldApply = projectApplyService.getOne(Wrappers.lambdaQuery(GovBizProjectApply.class)
+ .eq(GovBizProjectApply::getBaseProjId, baseProjId)
+ .last(BizConst.LIMIT_1));
+
+ GovBizProjectApply saveApply = BeanUtil.copyProperties(apply,GovBizProjectApply.class);
+ saveApply.setBaseProjId(baseProjId);
+ if(Objects.nonNull(oldApply)){
+ saveApply.setId(oldApply.getId());
+ }else{
+ if(Objects.nonNull(saveBase.getBaseAreaCode())){
+ saveApply.setAreaCode(saveBase.getBaseAreaCode());
+ }
+ saveApply.setTongTime(LocalDateTime.now());
+ }
+ projectApplyService.saveOrUpdate(saveApply);
+ }
+
+ // 3.保存 审批信息
+ GovBizProjectApproveDTO approve = saveDTO.getApprove();
+ if(Objects.nonNull(approve)){
+ GovBizProjectApprove oldApprove = approveService.getOne(Wrappers.lambdaQuery(GovBizProjectApprove.class)
+ .eq(GovBizProjectApprove::getBaseProjId, baseProjId)
+ .last(BizConst.LIMIT_1));
+
+ GovBizProjectApprove saveApprove = BeanUtil.copyProperties(approve,GovBizProjectApprove.class);
+ saveApprove.setBaseProjId(baseProjId);
+ if(Objects.nonNull(oldApprove)){
+ saveApprove.setId(oldApprove.getId());
+ }else{
+ if(Objects.nonNull(saveBase.getBaseAreaCode())){
+ saveApprove.setAreaCode(saveBase.getBaseAreaCode());
+ }
+ saveApprove.setTongTime(LocalDateTime.now());
+ }
+ approveService.saveOrUpdate(saveApprove);
+ }
+
+ // 4.保存 建设项目 实施信息
+ GovBizProjectCimplementDTO cimplement = saveDTO.getCimplement();
+ if(Objects.nonNull(cimplement)){
+ GovBizProjectCimplement oldCimplement = cimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectCimplement.class)
+ .eq(GovBizProjectCimplement::getBaseProjId, baseProjId)
+ .last(BizConst.LIMIT_1));
+
+ GovBizProjectCimplement saveCimplement = BeanUtil.copyProperties(cimplement,GovBizProjectCimplement.class);
+ saveCimplement.setBaseProjId(baseProjId);
+ if(Objects.nonNull(oldCimplement)){
+ saveCimplement.setId(oldCimplement.getId());
+ }else{
+ if(Objects.nonNull(saveBase.getBaseAreaCode())){
+ saveCimplement.setAreaCode(saveBase.getBaseAreaCode());
+ }
+ saveCimplement.setTongTime(LocalDateTime.now());
+ }
+ cimplementService.saveOrUpdate(saveCimplement);
+ }
+
+ // 5.保存 运维项目 实施信息
+ GovBizProjectMimplementDTO mimplement = saveDTO.getMimplement();
+ if(Objects.nonNull(mimplement)){
+ GovBizProjectMimplement oldMimplement = mimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectMimplement.class)
+ .eq(GovBizProjectMimplement::getBaseProjId, baseProjId)
+ .last(BizConst.LIMIT_1));
+
+ GovBizProjectMimplement saveMimplement = BeanUtil.copyProperties(mimplement,GovBizProjectMimplement.class);
+ saveMimplement.setBaseProjId(baseProjId);
+ if(Objects.nonNull(oldMimplement)){
+ saveMimplement.setId(oldMimplement.getId());
+ }else{
+ if(Objects.nonNull(saveBase.getBaseAreaCode())){
+ saveMimplement.setAreaCode(saveBase.getBaseAreaCode());
+ }
+ saveMimplement.setTongTime(LocalDateTime.now());
+ }
+ mimplementService.saveOrUpdate(saveMimplement);
+ }
+
+ // 6.保存 采购信息
+ GovBizProjectProcureDTO procure = saveDTO.getProcure();
+ if(Objects.nonNull(procure)){
+ GovBizProjectProcure oldProcure = procureService.getOne(Wrappers.lambdaQuery(GovBizProjectProcure.class)
+ .eq(GovBizProjectProcure::getBaseProjId, baseProjId)
+ .last(BizConst.LIMIT_1));
+
+ GovBizProjectProcure saveProcure = BeanUtil.copyProperties(procure,GovBizProjectProcure.class);
+ saveProcure.setBaseProjId(baseProjId);
+ if(Objects.nonNull(oldProcure)){
+ saveProcure.setId(oldProcure.getId());
+ }else{
+ if(Objects.nonNull(saveBase.getBaseAreaCode())){
+ saveProcure.setAreaCode(saveBase.getBaseAreaCode());
+ }
+ saveProcure.setTongTime(LocalDateTime.now());
+ }
+ procureService.saveOrUpdate(saveProcure);
+ }
+
+ return BizConst.SAVE_SUCCESS;
+ }
+
+ private void checkName(String baseProjName, String baseProjId) {
+ VUtils.isTrue(baseinfoService.count(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
+ .eq(GovBizProjectBaseinfo::getBaseProjName,baseProjName)
+ .ne(GovBizProjectBaseinfo::getBaseProjId,baseProjId)) > 0L)
+ .throwMessage("项目名重复");
}
}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectMimplementMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectMimplementMapper.java
new file mode 100644
index 0000000..5ec11da
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectMimplementMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectMimplement;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectMimplementMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectProcureMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectProcureMapper.java
new file mode 100644
index 0000000..f876458
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectProcureMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectProcure;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectProcureMapper extends BaseMapper {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
index 9d5bd2f..cc74f9f 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -21,9 +22,6 @@ import java.time.LocalDateTime;
public class GovBizProjectApplyDTO implements Serializable {
private static final long serialVersionUID = 1L;
-
- @ApiModelProperty("主键")
- private Long id;
@ApiModelProperty("项目编号")
private String baseProjId;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
index a750eed..196fe3e 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -22,9 +23,6 @@ public class GovBizProjectApproveDTO implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("主键")
- private Long id;
-
@ApiModelProperty("项目编号")
private String baseProjId;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
index 8e8c131..40f9f7f 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -21,9 +22,6 @@ public class GovBizProjectBaseinfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("主键")
- private Long id;
-
@ApiModelProperty("项目编号")
private String baseProjId;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
index 9b68723..c2fe3fa 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -21,9 +22,6 @@ public class GovBizProjectCimplementDTO implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("主键")
- private Long id;
-
@ApiModelProperty("项目编号")
private String baseProjId;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectMimplementDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectMimplementDTO.java
new file mode 100644
index 0000000..da91ab5
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectMimplementDTO.java
@@ -0,0 +1,96 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 运维项目实施信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectMimplement对象", description = "运维项目实施信息表")
+public class GovBizProjectMimplementDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("发改项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("关联IRS应用编码")
+ private String baseProjSysCode;
+
+ @ApiModelProperty("初验意见")
+ private String baseInitialOpinionFile;
+
+ @ApiModelProperty("信息安全等级保护测评报告")
+ private String baseInforLevelFile;
+
+ @ApiModelProperty("'商业密码应用评估报告'")
+ private String basePasswAssessFile;
+
+ @ApiModelProperty("第三方验收测试报告")
+ private String baseThirdAcceptFile;
+
+ @ApiModelProperty("用户使用报告")
+ private String baseUserConsFile;
+
+ @ApiModelProperty("监理总结报告")
+ private String baseEstaSummFile;
+
+ @ApiModelProperty("IRS应用试运行报告")
+ private String baseIrsTestRunFile;
+
+ @ApiModelProperty("运维总结报告")
+ private String baseOperatMaintenSummFile;
+
+ @ApiModelProperty("'是否完成日志数据归集'")
+ private String baseLogAggregation;
+
+ @ApiModelProperty("实际成效指标")
+ private String baseBusinessMetrics;
+
+ @ApiModelProperty("终审意见")
+ private String baseFinalExpertOpinionFile;
+
+ @ApiModelProperty("项目延期申请表")
+ private String baseEngineerPostpoFile;
+
+ @ApiModelProperty("变更报告")
+ private String baseEngineerAlterFile;
+
+ @ApiModelProperty("变更批复文件")
+ private String baseChanFile;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectProcureDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectProcureDTO.java
new file mode 100644
index 0000000..03001f0
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectProcureDTO.java
@@ -0,0 +1,91 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目采购信息
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectProcure对象", description = "项目采购信息")
+public class GovBizProjectProcureDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("'财政项目代码'")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("采购方式")
+ private String baseProjPurchaseWay;
+
+ @ApiModelProperty("预算执行确认书编号")
+ private String basePurchaseCode;
+
+ @ApiModelProperty("招标（采购）文件")
+ private String purchaseFile;
+
+ @ApiModelProperty("采购代理机构")
+ private String basePurchasingAgencies;
+
+ @ApiModelProperty("采购代理机构统一社会信用代码")
+ private String baseUnifiedCreditCode;
+
+ @ApiModelProperty("中标（成交）时间")
+ private LocalDateTime baseWinningBidTime;
+
+ @ApiModelProperty("中标（成交）金额")
+ private BigDecimal baseProjPurchaseAmount;
+
+ @ApiModelProperty("中标（成交）通知书")
+ private String biddingFile;
+
+ @ApiModelProperty("中标（成交）供应商名称")
+ private String baseConsDeprt;
+
+ @ApiModelProperty("中标（成交）供应商统一社会信用代码")
+ private String baseConsDeprtUsci;
+
+ @ApiModelProperty("采购合同")
+ private String purchaseContract;
+
+ @ApiModelProperty("项目款支付时间")
+ private LocalDateTime basePaymentTime;
+
+ @ApiModelProperty("项目款支付金额")
+ private BigDecimal paymentProgress;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectSaveDTO.java
new file mode 100644
index 0000000..43a680c
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectSaveDTO.java
@@ -0,0 +1,48 @@
+package com.ningdatech.pmapi.gov.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * 项目归集总VO
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectSaveDTO", description = "项目归集总详情DTO")
+public class GovBizProjectSaveDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("项目编号")
+ @NotBlank(message = "项目编号不能为空")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("项目基本信息")
+ private GovBizProjectBaseinfoDTO baseinfo;
+
+ @ApiModelProperty("项目申报信息")
+ private GovBizProjectApplyDTO apply;
+
+ @ApiModelProperty("项目审批信息")
+ private GovBizProjectApproveDTO approve;
+
+ @ApiModelProperty("实施项目实施信息")
+ private GovBizProjectCimplementDTO cimplement;
+
+ @ApiModelProperty("运维项目实施信息")
+ private GovBizProjectMimplementDTO mimplement;
+
+ @ApiModelProperty("项目采购信息")
+ private GovBizProjectProcureDTO procure;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectMimplement.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectMimplement.java
new file mode 100644
index 0000000..ed7e47e
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectMimplement.java
@@ -0,0 +1,103 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 运维项目实施信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_mimplement")
+@ApiModel(value = "GovBizProjectMimplement对象", description = "运维项目实施信息表")
+public class GovBizProjectMimplement implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("发改项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("关联IRS应用编码")
+ private String baseProjSysCode;
+
+ @ApiModelProperty("初验意见")
+ private String baseInitialOpinionFile;
+
+ @ApiModelProperty("信息安全等级保护测评报告")
+ private String baseInforLevelFile;
+
+ @ApiModelProperty("'商业密码应用评估报告'")
+ private String basePasswAssessFile;
+
+ @ApiModelProperty("第三方验收测试报告")
+ private String baseThirdAcceptFile;
+
+ @ApiModelProperty("用户使用报告")
+ private String baseUserConsFile;
+
+ @ApiModelProperty("监理总结报告")
+ private String baseEstaSummFile;
+
+ @ApiModelProperty("IRS应用试运行报告")
+ private String baseIrsTestRunFile;
+
+ @ApiModelProperty("运维总结报告")
+ private String baseOperatMaintenSummFile;
+
+ @ApiModelProperty("'是否完成日志数据归集'")
+ private String baseLogAggregation;
+
+ @ApiModelProperty("实际成效指标")
+ private String baseBusinessMetrics;
+
+ @ApiModelProperty("终审意见")
+ private String baseFinalExpertOpinionFile;
+
+ @ApiModelProperty("项目延期申请表")
+ private String baseEngineerPostpoFile;
+
+ @ApiModelProperty("变更报告")
+ private String baseEngineerAlterFile;
+
+ @ApiModelProperty("变更批复文件")
+ private String baseChanFile;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectProcure.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectProcure.java
new file mode 100644
index 0000000..1a9a3e7
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectProcure.java
@@ -0,0 +1,98 @@
+package com.ningdatech.pmapi.gov.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目采购信息
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@TableName("gov_biz_project_procure")
+@ApiModel(value = "GovBizProjectProcure对象", description = "项目采购信息")
+public class GovBizProjectProcure implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("'财政项目代码'")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("采购方式")
+ private String baseProjPurchaseWay;
+
+ @ApiModelProperty("预算执行确认书编号")
+ private String basePurchaseCode;
+
+ @ApiModelProperty("招标（采购）文件")
+ private String purchaseFile;
+
+ @ApiModelProperty("采购代理机构")
+ private String basePurchasingAgencies;
+
+ @ApiModelProperty("采购代理机构统一社会信用代码")
+ private String baseUnifiedCreditCode;
+
+ @ApiModelProperty("中标（成交）时间")
+ private LocalDateTime baseWinningBidTime;
+
+ @ApiModelProperty("中标（成交）金额")
+ private BigDecimal baseProjPurchaseAmount;
+
+ @ApiModelProperty("中标（成交）通知书")
+ private String biddingFile;
+
+ @ApiModelProperty("中标（成交）供应商名称")
+ private String baseConsDeprt;
+
+ @ApiModelProperty("中标（成交）供应商统一社会信用代码")
+ private String baseConsDeprtUsci;
+
+ @ApiModelProperty("采购合同")
+ private String purchaseContract;
+
+ @ApiModelProperty("项目款支付时间")
+ private LocalDateTime basePaymentTime;
+
+ @ApiModelProperty("项目款支付金额")
+ private BigDecimal paymentProgress;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectDetailVO.java
new file mode 100644
index 0000000..3540156
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectDetailVO.java
@@ -0,0 +1,45 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ *
+ * 项目归集总VO
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectDetailVO", description = "项目归集总详情VO")
+public class GovBizProjectDetailVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("项目基本信息")
+ private GovBizProjectBaseinfoVO baseinfo;
+
+ @ApiModelProperty("项目申报信息")
+ private GovBizProjectApplyVO apply;
+
+ @ApiModelProperty("项目审批信息")
+ private GovBizProjectApproveVO approve;
+
+ @ApiModelProperty("实施项目实施信息")
+ private GovBizProjectCimplementVO cimplement;
+
+ @ApiModelProperty("运维项目实施信息")
+ private GovBizProjectMimplementVO mimplement;
+
+ @ApiModelProperty("项目采购信息")
+ private GovBizProjectProcureVO procure;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectListVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectListVO.java
new file mode 100644
index 0000000..1d58e75
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectListVO.java
@@ -0,0 +1,47 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *
+ * 项目归集列表VO
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectListVO", description = "项目归集列表VO")
+public class GovBizProjectListVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("建设单位")
+ private String baseBuildDeprt;
+
+ @ApiModelProperty("建设单位Ding Code")
+ private String baseBuildDeprtDing;
+
+ @ApiModelProperty("基本项目区域code")
+ private String baseAreaCode;
+
+ @ApiModelProperty("基本项目区域名")
+ private String baseAreaName;
+
+ @ApiModelProperty("项目总投资")
+ private BigDecimal baseProjTotalAmount;
+
+ @ApiModelProperty("申报年度预算")
+ private BigDecimal baseProjDeclAmount;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectMimplementVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectMimplementVO.java
new file mode 100644
index 0000000..c6e6fee
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectMimplementVO.java
@@ -0,0 +1,98 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 运维项目实施信息表
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectMimplement对象", description = "运维项目实施信息表")
+public class GovBizProjectMimplementVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("发改项目代码")
+ private String baseDevelopCode;
+
+ @ApiModelProperty("关联IRS应用编码")
+ private String baseProjSysCode;
+
+ @ApiModelProperty("初验意见")
+ private String baseInitialOpinionFile;
+
+ @ApiModelProperty("信息安全等级保护测评报告")
+ private String baseInforLevelFile;
+
+ @ApiModelProperty("'商业密码应用评估报告'")
+ private String basePasswAssessFile;
+
+ @ApiModelProperty("第三方验收测试报告")
+ private String baseThirdAcceptFile;
+
+ @ApiModelProperty("用户使用报告")
+ private String baseUserConsFile;
+
+ @ApiModelProperty("监理总结报告")
+ private String baseEstaSummFile;
+
+ @ApiModelProperty("IRS应用试运行报告")
+ private String baseIrsTestRunFile;
+
+ @ApiModelProperty("运维总结报告")
+ private String baseOperatMaintenSummFile;
+
+ @ApiModelProperty("'是否完成日志数据归集'")
+ private String baseLogAggregation;
+
+ @ApiModelProperty("实际成效指标")
+ private String baseBusinessMetrics;
+
+ @ApiModelProperty("终审意见")
+ private String baseFinalExpertOpinionFile;
+
+ @ApiModelProperty("项目延期申请表")
+ private String baseEngineerPostpoFile;
+
+ @ApiModelProperty("变更报告")
+ private String baseEngineerAlterFile;
+
+ @ApiModelProperty("变更批复文件")
+ private String baseChanFile;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectProcureVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectProcureVO.java
new file mode 100644
index 0000000..941e777
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectProcureVO.java
@@ -0,0 +1,93 @@
+package com.ningdatech.pmapi.gov.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 项目采购信息
+ *
+ *
+ * @author ZPF
+ * @since 2023-08-02
+ */
+@Data
+@ApiModel(value = "GovBizProjectProcure对象", description = "项目采购信息")
+public class GovBizProjectProcureVO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("主键")
+ private Long id;
+
+ @ApiModelProperty("项目编号")
+ private String baseProjId;
+
+ @ApiModelProperty("基本项目名称")
+ private String baseProjName;
+
+ @ApiModelProperty("标段编号")
+ private String baseBidCode;
+
+ @ApiModelProperty("标段名称")
+ private String baseBidName;
+
+ @ApiModelProperty("'财政项目代码'")
+ private String setProjCodeFinan;
+
+ @ApiModelProperty("采购方式")
+ private String baseProjPurchaseWay;
+
+ @ApiModelProperty("预算执行确认书编号")
+ private String basePurchaseCode;
+
+ @ApiModelProperty("招标（采购）文件")
+ private String purchaseFile;
+
+ @ApiModelProperty("采购代理机构")
+ private String basePurchasingAgencies;
+
+ @ApiModelProperty("采购代理机构统一社会信用代码")
+ private String baseUnifiedCreditCode;
+
+ @ApiModelProperty("中标（成交）时间")
+ private LocalDateTime baseWinningBidTime;
+
+ @ApiModelProperty("中标（成交）金额")
+ private BigDecimal baseProjPurchaseAmount;
+
+ @ApiModelProperty("中标（成交）通知书")
+ private String biddingFile;
+
+ @ApiModelProperty("中标（成交）供应商名称")
+ private String baseConsDeprt;
+
+ @ApiModelProperty("中标（成交）供应商统一社会信用代码")
+ private String baseConsDeprtUsci;
+
+ @ApiModelProperty("采购合同")
+ private String purchaseContract;
+
+ @ApiModelProperty("项目款支付时间")
+ private LocalDateTime basePaymentTime;
+
+ @ApiModelProperty("项目款支付金额")
+ private BigDecimal paymentProgress;
+
+ @ApiModelProperty("数据来源")
+ private String areaCode;
+
+ @ApiModelProperty("生产时间")
+ private LocalDateTime bizTime;
+
+ @ApiModelProperty("操作标记")
+ private String op;
+
+ @ApiModelProperty("入库时间")
+ private LocalDateTime tongTime;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectMimplementService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectMimplementService.java
new file mode 100644
index 0000000..21de314
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectMimplementService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectMimplement;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectMimplementService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectProcureService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectProcureService.java
new file mode 100644
index 0000000..28b4b3e
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectProcureService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.gov.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectProcure;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectProcureService extends IService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectMimplementServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectMimplementServiceImpl.java
new file mode 100644
index 0000000..6ea1b71
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectMimplementServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectMimplementMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectMimplement;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectMimplementService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectMimplementServiceImpl extends
+ ServiceImpl implements IGovBizProjectMimplementService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectProcureServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectProcureServiceImpl.java
new file mode 100644
index 0000000..d3f6fb3
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectProcureServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.gov.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.gov.mapper.GovBizProjectProcureMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectProcure;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectProcureService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectProcureServiceImpl extends
+ ServiceImpl implements IGovBizProjectProcureService {
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/IndicatorConfigManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/IndicatorConfigManage.java
index 1d8cda2..8764e90 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/IndicatorConfigManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/IndicatorConfigManage.java
@@ -10,6 +10,7 @@ import com.ningdatech.basic.exception.BizException;
import com.ningdatech.basic.function.VUtils;
import com.ningdatech.basic.model.PageVo;
import com.ningdatech.basic.util.StrPool;
+import com.ningdatech.pmapi.common.constant.BizConst;
import com.ningdatech.pmapi.common.constant.CommonConst;
import com.ningdatech.pmapi.common.enumeration.CommonEnum;
import com.ningdatech.pmapi.performance.enumration.PerformanceTemplateTypeEnum;
@@ -181,9 +182,9 @@ public class IndicatorConfigManage {
.eq(PerformanceIndicatorProjectTemplateDetail::getIsAdditional,Boolean.TRUE));
analysisAdditionalTemplateDetails(dto.getAdditionalIndexDetails(),template.getId());
}
- return "保存成功";
+ return BizConst.SAVE_SUCCESS;
}
- throw new BizException("保存失败!");
+ throw new BizException(BizConst.SAVE_FAIL);
}
/**
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
index 26f97a8..8b7de53 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ningdatech.basic.function.VUtils;
import com.ningdatech.basic.model.PageVo;
import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.common.constant.BizConst;
import com.ningdatech.pmapi.common.constant.RegionConst;
import com.ningdatech.pmapi.portrait.model.dto.TagDTO;
import com.ningdatech.pmapi.portrait.model.dto.TagToProjectDTO;
@@ -115,7 +116,7 @@ public class TagManage {
entity.setUpdateBy(user.getUsername());
tagService.saveOrUpdate(entity);
- return "保存成功";
+ return BizConst.SAVE_SUCCESS;
}
/**
@@ -158,7 +159,7 @@ public class TagManage {
projectTagService.save(projectTag);
}
- return "保存成功";
+ return BizConst.SAVE_SUCCESS;
}
public String removeTagToProject(TagToProjectDTO dto) {
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java
index 9ca4c15..130d3f9 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java
@@ -11,6 +11,7 @@ import com.ningdatech.basic.exception.BizException;
import com.ningdatech.basic.function.VUtils;
import com.ningdatech.basic.model.ApiResponse;
import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.common.constant.BizConst;
import com.ningdatech.pmapi.common.util.HmacAuthUtil;
import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
import com.ningdatech.pmapi.projectlib.model.dto.ApplicationAppCodeSaveDTO;
@@ -79,9 +80,9 @@ public class ApplicationManage {
app.setUpdateOn(LocalDateTime.now());
app.setUpdateBy(userId);
if(applicationService.updateById(app)){
- return "保存成功";
+ return BizConst.SAVE_SUCCESS;
}
- return "保存失败";
+ return BizConst.SAVE_FAIL;
}
/**
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectCollectionManage.java
index 7014b88..6c070fc 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectCollectionManage.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ningdatech.basic.function.VUtils;
import com.ningdatech.basic.model.PageVo;
+import com.ningdatech.pmapi.common.constant.BizConst;
import com.ningdatech.pmapi.common.constant.RegionConst;
import com.ningdatech.pmapi.common.helper.RegionCacheHelper;
import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil;
@@ -122,9 +123,9 @@ public class ProjectCollectionManage {
projectCollection.setUpdateBy(user.getUsername());
projectCollection.setUpdateOn(LocalDateTime.now());
if(collectionService.saveOrUpdate(projectCollection)){
- return "保存成功";
+ return BizConst.SAVE_SUCCESS;
}
- return "保存失败";
+ return BizConst.SAVE_FAIL;
}
/**
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java
index e1f9b6f..eced4d7 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java
@@ -181,7 +181,7 @@ public class SafetyRiskManage {
}
}
- return "保存成功" + sucessNum + "条";
+ return BizConst.SAVE_SUCCESS + sucessNum + "条";
}
public String personMonitorSave(List dtos) {
@@ -219,6 +219,6 @@ public class SafetyRiskManage {
}
}
- return "保存成功" + sucessNum + "条";
+ return BizConst.SAVE_SUCCESS + sucessNum + "条";
}
}