From baef00643cdd3f52efb74fba8181c10ac60c1c46 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Mon, 21 Aug 2023 15:45:38 +0800
Subject: [PATCH 01/34] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-?=
 =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/convert/PerformanceAppraisalConveter.java      |  4 ++--
 .../performance/manage/PerformanceAppraisalPlanManage.java     |  5 ++---
 .../ningdatech/pmapi/performance/manage/ReAppraisalManage.java | 10 ++++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java
index 06ecefe..2f41f51 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java
@@ -59,8 +59,8 @@ public class PerformanceAppraisalConveter {
                 vo.setAppId(a.getApplicationId());
                 if(map.containsKey(a.getApplicationId())){
                     ProjectApplication application = map.get(a.getApplicationId());
-                    vo.setApplicationName(StringUtils.isNotBlank(application.getApplicationName())?
-                            application.getApplicationName() : application.getRelatedExistsApplication());
+                    vo.setApplicationName(StringUtils.isNotBlank(application.getRelatedExistsApplication())?
+                            application.getRelatedExistsApplication() : application.getApplicationName());
                     vo.setApplicationType(application.getApplicationType());
                     vo.setBizDomain(application.getBizDomain());
                     vo.setBuildOrgName(application.getBuildOrgName());
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index 3d54932..cc1b93d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -92,9 +92,8 @@ public class PerformanceAppraisalPlanManage {
      * @return
      */
     public PageVo<PerformanceAppraisalVO> list(PerformanceAppraisalListReq req) {
-        UserInfoDetails userDetail = LoginUserUtil.loginUserDetail();
-        String regionCode = userDetail.getRegionCode();
         Page<PerformanceAppraisal> page = req.page();
+        String regionCode = req.getRegionCode();
         LambdaQueryWrapper<PerformanceAppraisal> wrapper = Wrappers.lambdaQuery(PerformanceAppraisal.class)
                 .like(StringUtils.isNotBlank(req.getPlanName()),PerformanceAppraisal::getName,req.getPlanName())
                 .ge(Objects.nonNull(req.getStart()),PerformanceAppraisal::getCreateOn,req.getStart())
@@ -909,7 +908,7 @@ public class PerformanceAppraisalPlanManage {
             vo.setAppId(r.getId());
             vo.setAppraisalProjectId(r.getProjectId());
             vo.setAppraisalProjectCode(r.getProjectCode());
-            vo.setApplicationName(Objects.nonNull(r.getApplicationName()) ? r.getApplicationName() : r.getRelatedExistsApplication());
+            vo.setApplicationName(Objects.nonNull(r.getRelatedExistsApplication()) ? r.getRelatedExistsApplication() : r.getApplicationName());
             vo.setBuildOrgName(r.getBuildOrgName());
             vo.setApplicationType(r.getApplicationType());
             vo.setBizDomain(r.getBizDomain());
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
index fbc2ac2..6900e8f 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
@@ -490,4 +490,14 @@ public class ReAppraisalManage {
             throw new BizException(e.getMessage());
         }
     }
+
+    public static void main(String[] args) {
+        Integer lastCount = 2;
+        List<Integer> accidents = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+        List<Integer> accidentList = accidents.stream()
+                .skip(lastCount)
+                .limit(accidents.size() - lastCount)
+                .collect(Collectors.toList());
+        System.out.println(accidentList);
+    }
 }

From c4cbb185efce1228c05b3ff79687ad6da482c192 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Mon, 21 Aug 2023 15:46:29 +0800
Subject: [PATCH 02/34] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-?=
 =?UTF-8?q?=E5=BE=85=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/performance/manage/ReAppraisalManage.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
index 6900e8f..fbc2ac2 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/ReAppraisalManage.java
@@ -490,14 +490,4 @@ public class ReAppraisalManage {
             throw new BizException(e.getMessage());
         }
     }
-
-    public static void main(String[] args) {
-        Integer lastCount = 2;
-        List<Integer> accidents = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        List<Integer> accidentList = accidents.stream()
-                .skip(lastCount)
-                .limit(accidents.size() - lastCount)
-                .collect(Collectors.toList());
-        System.out.println(accidentList);
-    }
 }

From bc6f70b9e36208aab3232868cc814201f18a9d3b Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Mon, 21 Aug 2023 15:54:43 +0800
Subject: [PATCH 03/34] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-?=
 =?UTF-8?q?=E5=BE=85=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/performance/manage/PerformanceAppraisalPlanManage.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index cc1b93d..21c7b21 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -1007,6 +1007,9 @@ public class PerformanceAppraisalPlanManage {
         List<PerformanceAppraisalProject> appraisalProjectList = performanceAppraisalProjectService.list(Wrappers.lambdaQuery(PerformanceAppraisalProject.class)
                 .eq(PerformanceAppraisalProject::getAppraisalId, appraisalId));
         List<String> projectCodes = appraisalProjectList.stream().map(PerformanceAppraisalProject::getProjectCode).collect(Collectors.toList());
+        if (CollUtil.isEmpty(projectCodes)){
+            return PageVo.empty();
+        }
         LambdaQueryWrapper<Project> wrapper = Wrappers.lambdaQuery(Project.class)
                 .in(Project::getProjectCode, projectCodes)
                 .eq(Project::getNewest, Boolean.TRUE);

From 678672559e8f0e03482cb485c401d2e4ac1d5700 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Mon, 21 Aug 2023 18:41:19 +0800
Subject: [PATCH 04/34] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=85=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PerformanceAppraisalPlanController.java        |  7 ++
 .../manage/PerformanceAppraisalPlanManage.java     | 80 +++++++++++++++++++++-
 .../pmapi/projectlib/helper/ProjectHelper.java     |  2 +
 .../pmapi/projectlib/model/req/ProjectListReq.java |  3 +
 4 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/PerformanceAppraisalPlanController.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/PerformanceAppraisalPlanController.java
index 094c921..d204c5f 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/PerformanceAppraisalPlanController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/controller/PerformanceAppraisalPlanController.java
@@ -12,6 +12,7 @@ import com.ningdatech.pmapi.performance.model.vo.PerformanceAppraisalApplication
 import com.ningdatech.pmapi.performance.model.vo.PerformanceAppraisalProjectGroupVO;
 import com.ningdatech.pmapi.performance.model.vo.PerformanceAppraisalProjectVO;
 import com.ningdatech.pmapi.performance.model.vo.PerformanceAppraisalVO;
+import com.ningdatech.pmapi.projectlib.model.vo.ProjectApplicationVO;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,6 +61,12 @@ public class PerformanceAppraisalPlanController {
         return performanceAppraisalPlanManage.finalProjectList(req);
     }
 
+    @GetMapping("/final-application-list")
+    @ApiOperation("评价计划-终验应用列表")
+    public PageVo<ProjectApplicationVO> finalApplicationList(PerformanceAppraisalListReq req) {
+        return performanceAppraisalPlanManage.finalApplicationList(req);
+    }
+
     @PostMapping("/addProject")
     @ApiOperation("评价计划-添加待评价项目")
     @WebLog("评价计划-添加待评价项目")
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index 21c7b21..3b2c0e1 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -9,7 +9,10 @@ import com.ningdatech.pmapi.performance.service.*;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
+import com.ningdatech.pmapi.projectlib.model.vo.ProjectApplicationVO;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
+import com.wflow.workflow.bean.vo.ProcessTaskVo;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -85,6 +88,7 @@ public class PerformanceAppraisalPlanManage {
     private final IPerformanceAppraisalScoreInfoService performanceAppraisalScoreInfoService;
     private final IPerformanceAppraisalAppScoreInfoService performanceAppraisalAppScoreInfoService;
     private final ProjectLibManage projectLibManage;
+    private final IProjectApplicationService projectApplicationService;
 
     /**
      * 绩效列表
@@ -1055,8 +1059,8 @@ public class PerformanceAppraisalPlanManage {
         param.setBuildOrgName(buildOrgName);
         param.setProjectType(projectType);
         param.setProjectYear(projectYear);
+        param.setRegionCode(user.getRegionCode());
         param.setStatus(ProjectStatusEnum.ACCEPTED.getCode());
-        PageVo<ProjectLibListItemVO> resList = projectLibManage.projectLibListWithPermission(param, user);
         // 获取已添加到评价计划中的项目
         List<String> projectCodes = performanceAppraisalProjectService.list().stream()
                 .map(PerformanceAppraisalProject::getProjectCode).collect(Collectors.toList());
@@ -1070,7 +1074,77 @@ public class PerformanceAppraisalPlanManage {
             }
         }
         // 过滤掉已经添加到评价计划中的项目(如果是编辑评价计划，保留当前计划已添加的项目)
-        List<ProjectLibListItemVO> result = resList.getRecords().stream().filter(r -> !projectCodes.contains(r.getProjectCode())).collect(Collectors.toList());
-        return PageVo.of(result,result.size());
+        param.setProjectCodes(projectCodes);
+        return  projectLibManage.projectLibListWithPermission(param, user);
+    }
+
+    public PageVo<ProjectApplicationVO> finalApplicationList(PerformanceAppraisalListReq req) {
+        UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId());
+        String regionCode = user.getRegionCode();
+        Long appraisalId = req.getAppraisalId();
+
+        Page<ProjectApplication> page = req.page();
+        LambdaQueryWrapper<ProjectApplication> wrapper = Wrappers.lambdaQuery(ProjectApplication.class)
+                .like(StringUtils.isNotBlank(req.getBuildOrgName()), ProjectApplication::getBuildOrgName, req.getBuildOrgName());
+
+        if (StringUtils.isNotBlank(req.getApplicationName())) {
+            wrapper.and(q1 -> q1.like(ProjectApplication::getApplicationName, req.getApplicationName())
+                    .or(q2 -> q2.like(ProjectApplication::getRelatedExistsApplication, req.getApplicationName())));
+        }
+        // 获取本区域已验收的项目关联的应用
+        List<Project> projectList = projectService.list(Wrappers.lambdaQuery(Project.class)
+                .eq(Project::getAreaCode, regionCode)
+                .eq(Project::getNewest,Boolean.TRUE)
+                .eq(Project::getStatus, ProjectStatusEnum.ACCEPTED.getCode()));
+        List<String> projectCodeList = projectList.stream().map(Project::getProjectCode).collect(Collectors.toList());
+        List<Integer> projectVersionList = projectList.stream().map(Project::getVersion).collect(Collectors.toList());
+        wrapper.in(ProjectApplication::getProjectCode,projectCodeList);
+        wrapper.in(ProjectApplication::getProjectVersion,projectVersionList);
+        wrapper.orderByDesc(ProjectApplication::getUpdateOn);
+        List<ProjectApplication> appList = projectApplicationService.list(wrapper);
+
+        List<ProjectApplication> applicationList = Lists.newArrayList();
+        // 按项目编号+应用名称+IRS关联应用名称分组，获取最新版本的应用
+        Map<String, List<ProjectApplication>> appMap = appList.stream().collect(Collectors.groupingBy(p -> p.getProjectCode() + p.getRelatedExistsApplication() + p.getApplicationName()));
+        for (Map.Entry<String, List<ProjectApplication>> entry : appMap.entrySet()) {
+            List<ProjectApplication> applications = entry.getValue();
+            Optional<ProjectApplication> max = applications.stream().max(Comparator.comparingInt(ProjectApplication::getProjectVersion));
+            if (max.isPresent()){
+                ProjectApplication application = max.get();
+                applicationList.add(application);
+            }
+        }
+        if (CollUtil.isEmpty(applicationList)){
+            return PageVo.empty();
+        }
+        // 获取已添加到评价计划中的应用
+        List<Long> applicationIdList = performanceAppraisalApplicationService.list().stream()
+                .map(PerformanceAppraisalApplication::getApplicationId).collect(Collectors.toList());
+        // 如果是编辑评价计划，保留当前计划已添加的应用
+        if (Objects.nonNull(appraisalId)) {
+            List<PerformanceAppraisalApplication> projectApplications = performanceAppraisalApplicationService.list(Wrappers.lambdaQuery(PerformanceAppraisalApplication.class)
+                    .eq(PerformanceAppraisalApplication::getAppraisalId, appraisalId));
+            if (CollUtil.isNotEmpty(projectApplications)){
+                List<Long> appIdList = projectApplications.stream().map(PerformanceAppraisalApplication::getApplicationId).collect(Collectors.toList());
+                applicationIdList.removeAll(appIdList);
+            }
+        }
+        List<ProjectApplication> resList = applicationList.stream().filter(a -> !applicationIdList.contains(a.getId())).collect(Collectors.toList());
+        if (CollUtil.isEmpty(resList)){
+            return PageVo.empty();
+        }
+
+        Integer pageNumber = req.getPageNumber();
+        Integer pageSize = req.getPageSize();
+        List<ProjectApplication> resultList = resList.stream()
+                .skip((long) (pageNumber - 1) * pageSize)
+                .limit(pageSize)
+                .collect(Collectors.toList());
+
+        List<ProjectApplicationVO> res = resultList.stream()
+                .map(app -> BeanUtil.copyProperties(app, ProjectApplicationVO.class))
+                .collect(Collectors.toList());
+
+        return PageVo.of(res, resList.size());
     }
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/helper/ProjectHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/helper/ProjectHelper.java
index 0ce4d34..890ddfa 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/helper/ProjectHelper.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/helper/ProjectHelper.java
@@ -60,6 +60,8 @@ public class ProjectHelper {
             .in(CollUtil.isNotEmpty(req.getStatusList()),Project::getStatus,req.getStatusList())
             //实例code
             .in(CollUtil.isNotEmpty(req.getInstCodes()),Project::getInstCode,req.getInstCodes())
+            //已添加评价计划的项目code
+            .notIn(CollUtil.isNotEmpty(req.getProjectCodes()),Project::getProjectCode,req.getProjectCodes())
             .orderByDesc(Project::getCreateOn);
         return query;
     }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java
index 0259e92..15495fe 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java
@@ -96,6 +96,9 @@ public class ProjectListReq extends PagePo {
     @ApiModelProperty("实例code 多个")
     private List<String> instCodes;
 
+    @ApiModelProperty("项目code 多个")
+    private List<String> projectCodes;
+
     @ApiModelProperty("导出选项")
     private List<ExportOptionEnum> exportOptionList;
 }

From 48bbd841791f9ee56bcb9c1d172df9b323cb7e91 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Mon, 21 Aug 2023 19:46:06 +0800
Subject: [PATCH 05/34] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-?=
 =?UTF-8?q?=E5=BE=85=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/PerformanceAppraisalPlanManage.java           | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index 3b2c0e1..c4efade 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -1083,7 +1083,6 @@ public class PerformanceAppraisalPlanManage {
         String regionCode = user.getRegionCode();
         Long appraisalId = req.getAppraisalId();
 
-        Page<ProjectApplication> page = req.page();
         LambdaQueryWrapper<ProjectApplication> wrapper = Wrappers.lambdaQuery(ProjectApplication.class)
                 .like(StringUtils.isNotBlank(req.getBuildOrgName()), ProjectApplication::getBuildOrgName, req.getBuildOrgName());
 
@@ -1133,7 +1132,20 @@ public class PerformanceAppraisalPlanManage {
         if (CollUtil.isEmpty(resList)){
             return PageVo.empty();
         }
-
+        //List<ProjectApplication> relatedAppList = Lists.newArrayList();
+        //// TODO 对IRS关联应用是否按照应用名称和应用code进行去重(在不同项目中,已经在IRS注册过的同一个应用只显示一个)？
+        //List<ProjectApplication> relatedList = resList.stream().filter(r -> StringUtils.isNotBlank(r.getRelatedExistsApplication())).collect(Collectors.toList());
+        //if (CollUtil.isNotEmpty(relatedList)) {
+        //    resList.removeAll(relatedList);
+        //    Map<String, List<ProjectApplication>> relatedAppMap = relatedList.stream()
+        //            .collect(Collectors.groupingBy(r -> r.getRelatedExistsApplication() + r.getRelatedExistsApplicationCode()));
+        //    for (Map.Entry<String, List<ProjectApplication>> entry : relatedAppMap.entrySet()) {
+        //        List<ProjectApplication> value = entry.getValue();
+        //        relatedAppList.add(value.get(0));
+        //    }
+        //    resList.addAll(relatedAppList);
+        //}
+        //// TODO 对初次建设应用,是否根据建设方案申报时填写的应用名称、应用类型、发布端、应用简介、等保级别、密评级别 去重？
         Integer pageNumber = req.getPageNumber();
         Integer pageSize = req.getPageSize();
         List<ProjectApplication> resultList = resList.stream()

From 257448df0a5f8b2d343d4597d8d6145a877e33ab Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Tue, 22 Aug 2023 10:27:50 +0800
Subject: [PATCH 06/34] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/manage/PerformanceAppraisalPlanManage.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index c4efade..b7609bc 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -292,12 +292,16 @@ public class PerformanceAppraisalPlanManage {
         pa.setUpdateOn(LocalDateTime.now());
         pa.setUpdateBy(user.getUsername());
         performanceAppraisalService.updateById(pa);
-
-        if(CollUtil.isNotEmpty(editDTO.getProjects())){
+        String target = editDTO.getTarget();
+        if(StringUtils.isNotBlank(target) &&
+                target.contains(EvalObjectEnum.PROJECT.getCode()) &&
+                CollUtil.isNotEmpty(editDTO.getProjects())){
             saveProjects(editDTO,user);
         }
 
-        if(CollUtil.isNotEmpty(editDTO.getApplicationIds())){
+        if(StringUtils.isNotBlank(target) &&
+                target.contains(EvalObjectEnum.APP.getCode()) &&
+                CollUtil.isNotEmpty(editDTO.getApplicationIds())){
             saveApplications(editDTO,user);
         }
 

From 8e1e0689eb4d278a24f65cda8b8f82432ebfdc60 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Tue, 22 Aug 2023 10:58:38 +0800
Subject: [PATCH 07/34] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/manage/PerformanceAppraisalPlanManage.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index b7609bc..f2327a9 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -293,6 +293,18 @@ public class PerformanceAppraisalPlanManage {
         pa.setUpdateBy(user.getUsername());
         performanceAppraisalService.updateById(pa);
         String target = editDTO.getTarget();
+        // 如果新编辑的评价计划不包含项目，删除原计划添加的评价项目信息
+        if (StringUtils.isNotBlank(target) && !target.contains(EvalObjectEnum.PROJECT.getCode())){
+            performanceAppraisalProjectService.remove(Wrappers.lambdaQuery(PerformanceAppraisalProject.class)
+                    .eq(PerformanceAppraisalProject::getAppraisalId,editDTO.getId()));
+        }
+
+        // 如果新编辑的评价计划不包含应用，删除原计划添加的评价应用信息
+        if (StringUtils.isNotBlank(target) && !target.contains(EvalObjectEnum.APP.getCode())){
+            performanceAppraisalApplicationService.remove(Wrappers.lambdaQuery(PerformanceAppraisalApplication.class)
+                    .eq(PerformanceAppraisalApplication::getAppraisalId,editDTO.getId()));
+        }
+
         if(StringUtils.isNotBlank(target) &&
                 target.contains(EvalObjectEnum.PROJECT.getCode()) &&
                 CollUtil.isNotEmpty(editDTO.getProjects())){

From 2e6d324ecc33e8268f99790d83b91ff755bdfeec Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Tue, 22 Aug 2023 14:38:04 +0800
Subject: [PATCH 08/34] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AF=84=E4=BB=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/manage/AppAppraisalManage.java     | 63 ++--------------------
 1 file changed, 3 insertions(+), 60 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/AppAppraisalManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/AppAppraisalManage.java
index 1076adf..868d0e0 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/AppAppraisalManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/AppAppraisalManage.java
@@ -63,7 +63,6 @@ public class AppAppraisalManage {
      */
     public PageVo<PerformanceAppraisalVO> list(PerformanceAppraisalListReq req) {
         UserInfoDetails user = LoginUserUtil.loginUserDetail();
-        String employeeCode = user.getEmployeeCode();
         // 获取当前登录用户的角色列表，只有绩效复评人员才能查看该列表
         List<Role> userRoleList = user.getUserRoleList();
         List<Long> roleIdList = userRoleList.stream().map(Role::getId).collect(Collectors.toList());
@@ -85,46 +84,13 @@ public class AppAppraisalManage {
             return PageVo.empty();
         }
         Set<Long> paIds = paas.stream().map(PerformanceAppraisalApplication::getAppraisalId).collect(Collectors.toSet());
-
-        // 获取评价计划关联的分组信息
-        List<PerformanceAppraisalProjectGroup> groups = groupService.list(Wrappers.lambdaQuery(PerformanceAppraisalProjectGroup.class)
-                .in(PerformanceAppraisalProjectGroup::getAppraisalId, paIds));
-        // 获取当前登录复评员所在的分组信息
-        List<PerformanceAppraisalProjectGroup> groupList = groups.stream().filter(g -> {
-            String reAppraisalUsers = g.getReAppraisalUsers();
-            List<String> empCodeList = Lists.newArrayList();
-            if (reAppraisalUsers.contains(StrPool.COMMA)) {
-                empCodeList.addAll(Arrays.asList(reAppraisalUsers.split(StrPool.COMMA)));
-            }else {
-                empCodeList.add(reAppraisalUsers);
-            }
-            if (empCodeList.contains(employeeCode)) {
-                return true;
-            }
-            return false;
-        }).collect(Collectors.toList());
-        // 当前登录复评员用户，没有参加评价计划
-        if (CollUtil.isEmpty(groupList)){
-            return PageVo.empty();
-        }
-        // 因为一个复评用户只能出现在一个计划的一个分组中 所以可以将分组信息按评价计划分组
-        Map<Long, PerformanceAppraisalProjectGroup> groupMap = groupList.stream().collect(Collectors.toMap(PerformanceAppraisalProjectGroup::getAppraisalId, g -> g));
-        // 获取分组所在的评价计划ID
-        List<Long> appraisalIds = groupList.stream().map(PerformanceAppraisalProjectGroup::getAppraisalId).collect(Collectors.toList());
-
-        // 获取复评计划列表
         Page<PerformanceAppraisal> page = req.page();
         LambdaQueryWrapper<PerformanceAppraisal> wrapper = Wrappers.lambdaQuery(PerformanceAppraisal.class)
-                .in(PerformanceAppraisal::getId,appraisalIds)
+                .in(PerformanceAppraisal::getId,paIds)
                 .orderByDesc(PerformanceAppraisal::getUpdateOn);
         performanceAppraisalService.page(page,wrapper);
         List<PerformanceAppraisalVO> res = page.getRecords().stream()
-                .map(p -> {
-                    PerformanceAppraisalVO vo = BeanUtil.copyProperties(p, PerformanceAppraisalVO.class);
-                    PerformanceAppraisalProjectGroup group = groupMap.get(p.getId());
-                    vo.setReAppraisalGroupId(group.getId());
-                    return vo;
-                })
+                .map(p -> BeanUtil.copyProperties(p, PerformanceAppraisalVO.class))
                 .collect(Collectors.toList());
         return PageVo.of(res,page.getTotal());
     }
@@ -137,18 +103,6 @@ public class AppAppraisalManage {
         PerformanceAppraisal plan = performanceAppraisalService.getById(planId);
         VUtils.isTrue(Objects.isNull(plan)).throwMessage("该评价计划不存在!");
 
-        // 判断当前评价计划分组是否存在
-        List<PerformanceAppraisalProjectGroup> projectGroups = groupService.list(Wrappers.lambdaQuery(PerformanceAppraisalProjectGroup.class)
-                .eq(PerformanceAppraisalProjectGroup::getAppraisalId, planId));
-        if (CollUtil.isEmpty(projectGroups)){
-            throw new BizException("当前应用所在评价计划的分组信息不存在");
-        }
-        // 判断分组内是否添加复评人员
-        List<String> reUsers = projectGroups.stream().map(PerformanceAppraisalProjectGroup::getReAppraisalUsers).collect(Collectors.toList());
-        if (CollUtil.isEmpty(reUsers)){
-            throw new BizException("当前评价计划分组内未添加复评人员!");
-        }
-
         // 获取分组所在评价计划添加的未完成评价的应用信息
         List<PerformanceAppraisalApplication> paas = performanceAppraisalApplicationService.list(Wrappers.lambdaQuery(PerformanceAppraisalApplication.class)
                 .eq(PerformanceAppraisalApplication::getAppraisalId, planId)
@@ -206,18 +160,7 @@ public class AppAppraisalManage {
         PerformanceAppraisal plan = performanceAppraisalService.getById(planId);
         VUtils.isTrue(Objects.isNull(plan)).throwMessage("该评价计划不存在!");
 
-        // 判断当前评价计划分组是否存在
-        List<PerformanceAppraisalProjectGroup> projectGroups = groupService.list(Wrappers.lambdaQuery(PerformanceAppraisalProjectGroup.class)
-                .eq(PerformanceAppraisalProjectGroup::getAppraisalId, planId));
-        if (CollUtil.isEmpty(projectGroups)){
-            throw new BizException("当前应用所在评价计划的分组信息不存在");
-        }
-        // 判断分组内是否添加复评人员
-        List<String> reUsers = projectGroups.stream().map(PerformanceAppraisalProjectGroup::getReAppraisalUsers).collect(Collectors.toList());
-        if (CollUtil.isEmpty(reUsers)){
-            throw new BizException("当前评价计划分组内未添加复评人员!");
-        }
-        // 获取分组所在评价计划添加的已完成评价的应用信息
+        // 获取评价计划添加的已完成评价的应用信息
         List<PerformanceAppraisalApplication> paas = performanceAppraisalApplicationService.list(Wrappers.lambdaQuery(PerformanceAppraisalApplication.class)
                 .eq(PerformanceAppraisalApplication::getAppraisalId, planId)
                 .eq(PerformanceAppraisalApplication::getIsCompleteAppraisal, Boolean.TRUE));

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 09/34] =?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;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @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<GovBusinessStripVO> 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 10/34] =?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<GovBusinessStripVO> getGovBusinessStripList(@RequestParam(value = "type", required = false) String type) {
-        return belongOrgManage.getGovBusinessStripList(type);
+    @ApiOperation("字典")
+    public List<GovProjectDictionaryVO> 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<GovProjectDictionaryVO> dictionary(String type) {
+
+        List<GovProjectDictionary> 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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovProjectDictionaryMapper extends BaseMapper<GovProjectDictionary> {
+
+}
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;
+
+/**
+ * <p>
+ * 项目字典表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目字典表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovProjectDictionaryService extends IService<GovProjectDictionary> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovProjectDictionaryServiceImpl extends
+        ServiceImpl<GovProjectDictionaryMapper, GovProjectDictionary> 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 11/34] =?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<GovProjectDictionaryVO> dictionary(@RequestParam(value = "type", required = false) String type) {
         return collectionManage.dictionary(type);
     }
-
-    @GetMapping("/business-strip/expert/analysis")
-    @ApiOperation("分析专家数据")
-    public void analysisExpertOrg() {
-        belongOrgManage.analysisExpertOrg();
-    }
-
 }

From 605d430384c1601be2351c01297abca9c5419c05 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 23 Aug 2023 11:12:35 +0800
Subject: [PATCH 12/34] =?UTF-8?q?debug=20=E5=91=98=E5=B7=A5code=20?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java
index 49d5e0f..56c1d7b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CommonLogTask.java
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.log.mapper.OptLogMapper;
 import com.ningdatech.log.model.domain.OptLog;
+import com.ningdatech.pmapi.common.constant.BizConst;
 import com.ningdatech.pmapi.organization.mapper.DingEmployeeInfoMapper;
 import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo;
 import com.ningdatech.pmapi.scheduler.task.model.CommonLog;
@@ -79,7 +80,8 @@ public class CommonLogTask {
                String employeeCode = userInfo.getEmployeeCode();
                if (StringUtils.isNotBlank(employeeCode)){
                    DingEmployeeInfo dingEmployeeInfo = dingEmployeeInfoMapper.selectOne(new LambdaQueryWrapper<DingEmployeeInfo>()
-                           .eq(DingEmployeeInfo::getEmployeeCode,employeeCode));
+                           .eq(DingEmployeeInfo::getEmployeeCode,employeeCode)
+                           .last(BizConst.LIMIT_1));
                    if (dingEmployeeInfo != null){
                        commonLog.setUserId(String.valueOf(dingEmployeeInfo.getAccountId()));
                    }

From 8510abdd7f3d2cb01e416f2414d9e06caedeb9d8 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Wed, 23 Aug 2023 11:31:05 +0800
Subject: [PATCH 13/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=9C=BA=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            |   1 +
 syn-data-task/pom.xml                              | 210 ++++++++++++++++++
 .../com/ningdatech/syndataapi/SynDataTaskApp.java  |  29 +++
 .../scheduler/mapper/ProjectApplyMapper.java       |  16 ++
 .../scheduler/mapper/ProjectApplyMapper.xml        |   5 +
 .../scheduler/mapper/ProjectApproveMapper.java     |  16 ++
 .../scheduler/mapper/ProjectApproveMapper.xml      |   5 +
 .../scheduler/mapper/ProjectBaseInfoMapper.java    |  16 ++
 .../scheduler/mapper/ProjectBaseInfoMapper.xml     |   5 +
 .../scheduler/mapper/ProjectCimplementMapper.java  |  16 ++
 .../scheduler/mapper/ProjectCimplementMapper.xml   |   5 +
 .../scheduler/mapper/ProjectMimplementMapper.java  |  16 ++
 .../scheduler/mapper/ProjectMimplementMapper.xml   |   5 +
 .../scheduler/mapper/ProjectProcureMapper.java     |  16 ++
 .../scheduler/mapper/ProjectProcureMapper.xml      |   5 +
 .../scheduler/model/entity/ProjectApply.java       | 138 ++++++++++++
 .../scheduler/model/entity/ProjectApprove.java     |  90 ++++++++
 .../scheduler/model/entity/ProjectBaseInfo.java    | 105 +++++++++
 .../scheduler/model/entity/ProjectCimplement.java  | 108 +++++++++
 .../scheduler/model/entity/ProjectMimplement.java  |  96 ++++++++
 .../scheduler/model/entity/ProjectProcure.java     |  96 ++++++++
 .../scheduler/service/IProjectApplyService.java    |  16 ++
 .../scheduler/service/IProjectApproveService.java  |  16 ++
 .../scheduler/service/IProjectBaseInfoService.java |  16 ++
 .../service/IProjectCimplementService.java         |  16 ++
 .../service/IProjectMimplementService.java         |  16 ++
 .../scheduler/service/IProjectProcureService.java  |  16 ++
 .../impl/IProjectCimplementServiceImpl.java        |  21 ++
 .../service/impl/ProjectApplyServiceImpl.java      |  20 ++
 .../service/impl/ProjectApproveServiceImpl.java    |  21 ++
 .../service/impl/ProjectBaseInfoServiceImpl.java   |  21 ++
 .../service/impl/ProjectMimplementServiceImpl.java |  21 ++
 .../service/impl/ProjectProcureServiceImpl.java    |  21 ++
 .../syndataapi/scheduler/task/SynDataTask.java     | 245 +++++++++++++++++++++
 .../src/main/resources/application-dev.yml         |  81 +++++++
 .../src/main/resources/application-pre.yml         |  79 +++++++
 syn-data-task/src/main/resources/application.yml   |   3 +
 .../src/main/resources/logback-spring.xml          |  68 ++++++
 38 files changed, 1696 insertions(+)
 create mode 100644 syn-data-task/pom.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.xml
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApply.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApprove.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectBaseInfo.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectCimplement.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectMimplement.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectProcure.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApplyService.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApproveService.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectBaseInfoService.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectCimplementService.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectMimplementService.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectProcureService.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/IProjectCimplementServiceImpl.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApplyServiceImpl.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApproveServiceImpl.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectBaseInfoServiceImpl.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectMimplementServiceImpl.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectProcureServiceImpl.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
 create mode 100644 syn-data-task/src/main/resources/application-dev.yml
 create mode 100644 syn-data-task/src/main/resources/application-pre.yml
 create mode 100644 syn-data-task/src/main/resources/application.yml
 create mode 100644 syn-data-task/src/main/resources/logback-spring.xml

diff --git a/pom.xml b/pom.xml
index f390a92..a8b900d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,5 +209,6 @@
     <modules>
         <module>pmapi</module>
         <module>ningda-generator</module>
+        <module>syn-data-task</module>
     </modules>
 </project>
diff --git a/syn-data-task/pom.xml b/syn-data-task/pom.xml
new file mode 100644
index 0000000..558e758
--- /dev/null
+++ b/syn-data-task/pom.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>project-management</artifactId>
+        <groupId>com.ningdatech</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>syn-data-task</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.5</version>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!--lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <!-- mybatis plus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <!--实现springboot的热加载-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <optional>true</optional>
+            <scope>true</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <!--cache-->
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+
+        <!--引入jwt-->
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>3.10.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.ningdatech</groupId>
+            <artifactId>nd-log-starter</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ningdatech</groupId>
+            <artifactId>nd-basic</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.ningdatech</groupId>
+            <artifactId>nd-swagger2-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+    <!-- 打包 -->
+    <!--配置环境的profile-->
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!--使用${environment}获取值-->
+                <environment>dev</environment>
+            </properties>
+        </profile>
+        <profile>
+            <id>test</id>
+            <properties>
+                <environment>test</environment>
+            </properties>
+        </profile>
+        <profile>
+            <id>pre</id>
+            <properties>
+                <environment>pre</environment>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <environment>prod</environment>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/lib</directory>
+                <targetPath>BOOT-INF/lib/</targetPath>
+                <includes>
+                    <include>**/*.jar</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <targetPath>BOOT-INF/classes/</targetPath>
+            </resource>
+        </resources>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.6.8</version>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- 跳过单元测试 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
new file mode 100644
index 0000000..f4d4f1c
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
@@ -0,0 +1,29 @@
+package com.ningdatech.syndataapi;
+
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @author CMM
+ * @since 2023/08/22 18:14
+ */
+@SpringBootApplication
+@EnableAsync
+@MapperScan(SynDataTaskApp.MAPPER_PACKAGES)
+@EnableScheduling
+@EnableTransactionManagement
+@EnableAspectJAutoProxy(exposeProxy = true)
+public class SynDataTaskApp {
+
+    protected static final String MAPPER_PACKAGES = "com.ningdatech.syndataapi.**.mapper";
+
+    public static void main(String[] args) {
+        SpringApplication.run(SynDataTaskApp.class, args);
+    }
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.java
new file mode 100644
index 0000000..eb26c2a
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.mapper;
+
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 项目申报信息 Mapper 接口
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface ProjectApplyMapper extends BaseMapper<ProjectApply> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.xml b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.xml
new file mode 100644
index 0000000..7aa861e
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApplyMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.syndataapi.scheduler.mapper.ProjectApplyMapper">
+
+</mapper>
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.java
new file mode 100644
index 0000000..7cd8fe8
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectApprove;
+
+/**
+ * <p>
+ * 项目立项评审信息 Mapper 接口
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface ProjectApproveMapper extends BaseMapper<ProjectApprove> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.xml b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.xml
new file mode 100644
index 0000000..5693a15
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectApproveMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.syndataapi.scheduler.mapper.ProjectApproveMapper">
+
+</mapper>
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.java
new file mode 100644
index 0000000..289ddc6
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectBaseInfo;
+
+/**
+ * <p>
+ * 项目基本信息 Mapper 接口
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface ProjectBaseInfoMapper extends BaseMapper<ProjectBaseInfo> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.xml b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.xml
new file mode 100644
index 0000000..b6a2ec2
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectBaseInfoMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.syndataapi.scheduler.mapper.ProjectBaseInfoMapper">
+
+</mapper>
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.java
new file mode 100644
index 0000000..1374124
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectCimplement;
+
+/**
+ * <p>
+ * 建设项目实施信息 Mapper 接口
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface ProjectCimplementMapper extends BaseMapper<ProjectCimplement> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.xml b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.xml
new file mode 100644
index 0000000..da44170
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectCimplementMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.syndataapi.scheduler.mapper.ProjectCimplementMapper">
+
+</mapper>
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.java
new file mode 100644
index 0000000..824b749
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectMimplement;
+
+/**
+ * <p>
+ * 运维项目实施信息 Mapper 接口
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface ProjectMimplementMapper extends BaseMapper<ProjectMimplement> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.xml b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.xml
new file mode 100644
index 0000000..86e8f61
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectMimplementMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.syndataapi.scheduler.mapper.ProjectMimplementMapper">
+
+</mapper>
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.java
new file mode 100644
index 0000000..6c159a7
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectProcure;
+
+/**
+ * <p>
+ * 项目采购信息 Mapper 接口
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface ProjectProcureMapper extends BaseMapper<ProjectProcure> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.xml b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.xml
new file mode 100644
index 0000000..ba61ab8
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/mapper/ProjectProcureMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ningdatech.syndataapi.scheduler.mapper.ProjectProcureMapper">
+
+</mapper>
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApply.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApply.java
new file mode 100644
index 0000000..d956d14
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApply.java
@@ -0,0 +1,138 @@
+package com.ningdatech.syndataapi.scheduler.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 项目申报信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_apply")
+@ApiModel(value = "SzlsDaBiz331100ProjectApply对象", description = "项目申报信息")
+public class ProjectApply implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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 baseProjSysCode;
+
+    @ApiModelProperty("一本账重大应用名称")
+    private String baseAccountAppName;
+
+    @ApiModelProperty("“领域大脑”一本账名称")
+    private String baseBrainName;
+
+    @ApiModelProperty("单位核心业务名称")
+    private String baseCoreBusiness;
+
+    @ApiModelProperty("单位核心业务编码")
+    private String baseCoreBusinessCode;
+
+    @ApiModelProperty("项目起始时间")
+    private String baseProjStartTime;
+
+    @ApiModelProperty("项目终止时间")
+    private String baseProjEndTime;
+
+    @ApiModelProperty("项目期限")
+    private String baseProjDuration;
+
+    @ApiModelProperty("预算年度")
+    private String baseProjSetYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
+
+    @ApiModelProperty("项目总投资")
+    private String baseProjTotalAmount;
+
+    @ApiModelProperty("申报年度预算")
+    private String 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("数据来源")
+    private String areaCode;
+
+    @ApiModelProperty("出生产库时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("数据入库时间")
+    private LocalDateTime tongTime;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApprove.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApprove.java
new file mode 100644
index 0000000..fe760eb
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectApprove.java
@@ -0,0 +1,90 @@
+package com.ningdatech.syndataapi.scheduler.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 项目立项评审信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_approve")
+@ApiModel(value = "SzlsDaBiz331100ProjectApprove对象", description = "项目立项评审信息")
+public class ProjectApprove implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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 baseReviewCommentsFile;
+
+    @ApiModelProperty("建议总投资")
+    private String baseExpertTotalMoney;
+
+    @ApiModelProperty("建议年度预算")
+    private String baseExpertYearMoney;
+
+    @ApiModelProperty("立项批复文件")
+    private String approvalFile;
+
+    @ApiModelProperty("建议批复总投资")
+    private String baseInitialReviewTotalMoney;
+
+    @ApiModelProperty("建议批复年度预算")
+    private String baseProjReplyAmount;
+
+    @ApiModelProperty("等保定级")
+    private String equalProtectionLevel;
+
+    @ApiModelProperty("初步设计方案")
+    private String preliminaryDesignScheme;
+
+    @ApiModelProperty("初步设计方案批复函")
+    private String preliminaryDesignFile;
+
+    @ApiModelProperty("年度预算下达金额")
+    private String releaseYearMoney;
+
+    @ApiModelProperty("数据来源")
+    private String areaCode;
+
+    @ApiModelProperty("出生产库时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("数据入库时间")
+    private LocalDateTime tongTime;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectBaseInfo.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectBaseInfo.java
new file mode 100644
index 0000000..6b0fda9
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectBaseInfo.java
@@ -0,0 +1,105 @@
+package com.ningdatech.syndataapi.scheduler.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 项目基本信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_baseinfo")
+@ApiModel(value = "SzlsDaBiz331100ProjectBaseinfo对象", description = "项目基本信息")
+public class ProjectBaseInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("所属区划")
+    private String baseAreaName;
+
+    @ApiModelProperty("所属区划编码")
+    private String baseAreaCode;
+
+    @ApiModelProperty("是否涉密")
+    private String baseProjIsConfidentiality;
+
+    @ApiModelProperty("项目类型")
+    private String baseProjType;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
+    @ApiModelProperty("项目状态")
+    private String baseProjSetProg;
+
+    @ApiModelProperty("信息是否有效")
+    private String isEffective;
+
+    @ApiModelProperty("上级主管单位")
+    private String baseProvManDeprt;
+
+    @ApiModelProperty("上级主管单位浙政钉ID")
+    private String baseProvManDeprtDing;
+
+    @ApiModelProperty("本级主管单位")
+    private String baseManDeprt;
+
+    @ApiModelProperty("本级主管单位浙政钉ID")
+    private String baseManDeprtDing;
+
+    @ApiModelProperty("本级主管单位统一社会信用代码")
+    private String baseManDepartUsci;
+
+    @ApiModelProperty("建设单位（申报单位）")
+    private String baseBuildDeprt;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String baseBuildDeprtDing;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String baseBuildDepartUsci;
+
+    @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;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectCimplement.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectCimplement.java
new file mode 100644
index 0000000..98bbd31
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectCimplement.java
@@ -0,0 +1,108 @@
+package com.ningdatech.syndataapi.scheduler.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 建设项目实施信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_cimplement")
+@ApiModel(value = "SzlsDaBiz331100ProjectCimplement对象", description = "建设项目实施信息")
+public class ProjectCimplement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("标段代码")
+    private String baseBidCode;
+
+    @ApiModelProperty("标段名称")
+    private String baseBidName;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @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;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectMimplement.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectMimplement.java
new file mode 100644
index 0000000..b87994d
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectMimplement.java
@@ -0,0 +1,96 @@
+package com.ningdatech.syndataapi.scheduler.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 运维项目实施信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_mimplement")
+@ApiModel(value = "SzlsDaBiz331100ProjectMimplement对象", description = "运维项目实施信息")
+public class ProjectMimplement implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("标段代码")
+    private String baseBidCode;
+
+    @ApiModelProperty("标段名称")
+    private String baseBidName;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("发改项目代码")
+    private String baseDevelopCode;
+
+    @ApiModelProperty("关联IRS应用编码")
+    private String baseProjSysCode;
+
+    @ApiModelProperty("信息安全等级保护测评报告")
+    private String baseInforLevelFile;
+
+    @ApiModelProperty("商业密码应用评估报告")
+    private String basePasswAssessFile;
+
+    @ApiModelProperty("第三方验收测试报告")
+    private String baseThirdAcceptFile;
+
+    @ApiModelProperty("用户使用报告")
+    private String baseUserConsFile;
+
+    @ApiModelProperty("监理总结报告")
+    private String baseEstaSummFile;
+
+    @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;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectProcure.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectProcure.java
new file mode 100644
index 0000000..c32439a
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/entity/ProjectProcure.java
@@ -0,0 +1,96 @@
+package com.ningdatech.syndataapi.scheduler.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 项目采购信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_procure")
+@ApiModel(value = "SzlsDaBiz331100ProjectProcure对象", description = "项目采购信息")
+public class ProjectProcure implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("标段代码")
+    private String baseBidCode;
+
+    @ApiModelProperty("标段名称")
+    private String baseBidName;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @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 String baseWinningBidTime;
+
+    @ApiModelProperty("中标（成交）金额")
+    private String baseProjPurchaseAmount;
+
+    @ApiModelProperty("中标（成交）通知书")
+    private String biddingFile;
+
+    @ApiModelProperty("中标（成交）供应商名称")
+    private String baseConsDeprt;
+
+    @ApiModelProperty("中标（成交）供应商统一社会信用代码")
+    private String baseConsDeprtUsci;
+
+    @ApiModelProperty("采购合同")
+    private String purchaseContract;
+
+    @ApiModelProperty("项目款支付时间")
+    private String basePaymentTime;
+
+    @ApiModelProperty("项目款支付金额")
+    private String paymentProgress;
+
+    @ApiModelProperty("数据来源")
+    private String areaCode;
+
+    @ApiModelProperty("出生产库时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("数据入库时间")
+    private LocalDateTime tongTime;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApplyService.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApplyService.java
new file mode 100644
index 0000000..367235b
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApplyService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.service;
+
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectApply;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 项目申报信息 服务类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface IProjectApplyService extends IService<ProjectApply> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApproveService.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApproveService.java
new file mode 100644
index 0000000..3658447
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectApproveService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectApprove;
+
+/**
+ * <p>
+ * 项目立项评审信息 服务类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface IProjectApproveService extends IService<ProjectApprove> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectBaseInfoService.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectBaseInfoService.java
new file mode 100644
index 0000000..06ce785
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectBaseInfoService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectBaseInfo;
+
+/**
+ * <p>
+ * 项目基本信息 服务类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface IProjectBaseInfoService extends IService<ProjectBaseInfo> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectCimplementService.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectCimplementService.java
new file mode 100644
index 0000000..3b29574
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectCimplementService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectCimplement;
+
+/**
+ * <p>
+ * 建设项目实施信息 服务类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface IProjectCimplementService extends IService<ProjectCimplement> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectMimplementService.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectMimplementService.java
new file mode 100644
index 0000000..8c2e026
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectMimplementService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectMimplement;
+
+/**
+ * <p>
+ * 运维项目实施信息 服务类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface IProjectMimplementService extends IService<ProjectMimplement> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectProcureService.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectProcureService.java
new file mode 100644
index 0000000..a1bdbe7
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/IProjectProcureService.java
@@ -0,0 +1,16 @@
+package com.ningdatech.syndataapi.scheduler.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectProcure;
+
+/**
+ * <p>
+ * 项目采购信息 服务类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+public interface IProjectProcureService extends IService<ProjectProcure> {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/IProjectCimplementServiceImpl.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/IProjectCimplementServiceImpl.java
new file mode 100644
index 0000000..2c6efd8
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/IProjectCimplementServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.syndataapi.scheduler.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.syndataapi.scheduler.mapper.ProjectCimplementMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectCimplement;
+import com.ningdatech.syndataapi.scheduler.service.IProjectCimplementService;
+
+/**
+ * <p>
+ * 建设项目实施信息 服务实现类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Service
+public class IProjectCimplementServiceImpl extends ServiceImpl<ProjectCimplementMapper, ProjectCimplement> implements IProjectCimplementService {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApplyServiceImpl.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApplyServiceImpl.java
new file mode 100644
index 0000000..7559bae
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApplyServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ningdatech.syndataapi.scheduler.service.impl;
+
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectApply;
+import com.ningdatech.syndataapi.scheduler.mapper.ProjectApplyMapper;
+import com.ningdatech.syndataapi.scheduler.service.IProjectApplyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目申报信息 服务实现类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Service
+public class ProjectApplyServiceImpl extends ServiceImpl<ProjectApplyMapper, ProjectApply> implements IProjectApplyService {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApproveServiceImpl.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApproveServiceImpl.java
new file mode 100644
index 0000000..af5d641
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectApproveServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.syndataapi.scheduler.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.syndataapi.scheduler.mapper.ProjectApproveMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectApprove;
+import com.ningdatech.syndataapi.scheduler.service.IProjectApproveService;
+
+/**
+ * <p>
+ * 项目立项评审信息 服务实现类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Service
+public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper, ProjectApprove> implements IProjectApproveService {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectBaseInfoServiceImpl.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectBaseInfoServiceImpl.java
new file mode 100644
index 0000000..6c03809
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectBaseInfoServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.syndataapi.scheduler.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.syndataapi.scheduler.mapper.ProjectBaseInfoMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectBaseInfo;
+import com.ningdatech.syndataapi.scheduler.service.IProjectBaseInfoService;
+
+/**
+ * <p>
+ * 项目基本信息 服务实现类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Service
+public class ProjectBaseInfoServiceImpl extends ServiceImpl<ProjectBaseInfoMapper, ProjectBaseInfo> implements IProjectBaseInfoService {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectMimplementServiceImpl.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectMimplementServiceImpl.java
new file mode 100644
index 0000000..c0c880c
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectMimplementServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.syndataapi.scheduler.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.syndataapi.scheduler.mapper.ProjectMimplementMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectMimplement;
+import com.ningdatech.syndataapi.scheduler.service.IProjectMimplementService;
+
+/**
+ * <p>
+ * 运维项目实施信息 服务实现类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Service
+public class ProjectMimplementServiceImpl extends ServiceImpl<ProjectMimplementMapper, ProjectMimplement> implements IProjectMimplementService {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectProcureServiceImpl.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectProcureServiceImpl.java
new file mode 100644
index 0000000..f7d2df1
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/service/impl/ProjectProcureServiceImpl.java
@@ -0,0 +1,21 @@
+package com.ningdatech.syndataapi.scheduler.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.syndataapi.scheduler.mapper.ProjectProcureMapper;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectProcure;
+import com.ningdatech.syndataapi.scheduler.service.IProjectProcureService;
+
+/**
+ * <p>
+ * 项目采购信息 服务实现类
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Service
+public class ProjectProcureServiceImpl extends ServiceImpl<ProjectProcureMapper, ProjectProcure> implements IProjectProcureService {
+
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
new file mode 100644
index 0000000..655aa69
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
@@ -0,0 +1,245 @@
+package com.ningdatech.syndataapi.scheduler.task;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import com.alibaba.fastjson.JSON;
+import com.ningdatech.syndataapi.scheduler.model.entity.*;
+import com.ningdatech.syndataapi.scheduler.service.*;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author CMM
+ * @since 2023/08/22 18:16
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class SynDataTask {
+
+    private final IProjectApplyService projectApplyService;
+
+    private final IProjectApproveService projectApproveService;
+
+    private final IProjectBaseInfoService projectBaseInfoService;
+
+    private final IProjectCimplementService projectCimplementService;
+
+    private final IProjectMimplementService projectMimplementService;
+
+    private final IProjectProcureService projectProcureService;
+
+    @Value("${task.switch.is-open}")
+    private boolean flag;
+
+    @Value("${task.host}")
+    public String HOST;
+
+    // 测试数据
+    private static final String PROJECT_BASE_INFO_TEST_DATA = "{\n" +
+            "    \"baseProjId\":\"33112322013096900000\",\n" +
+            "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseAreaName\":\"遂昌县\",\n" +
+            "    \"baseAreaCode\":\"331123000\",\n" +
+            "    \"baseProjIsConfidentiality\":\"01\",\n" +
+            "    \"baseProjType\":\"01\",\n" +
+            "    \"baseConstructionType\":\"01\",\n" +
+            "    \"baseProjSetProg\":\"05\",\n" +
+            "    \"isEffective\":\"02\",\n" +
+            "    \"baseProvManDeprt\":\"遂昌县大数据和金融发展中心\",\n" +
+            "    \"baseProvManDeprtDing\":\"GO_9a7dce7fbaf54787998fa004f1b7c0e1\",\n" +
+            "    \"baseManDeprt\":\"遂昌县大数据和金融发展中心\",\n" +
+            "    \"baseManDeprtDing\":\"GO_9a7dce7fbaf54787998fa004f1b7c0e1\",\n" +
+            "    \"baseManDepartUsci\":\"12332527MB1D48606A\",\n" +
+            "    \"baseBuildDeprt\":\"遂昌县大数据和金融发展中心\",\n" +
+            "    \"baseBuildDeprtDing\":\"GO_9a7dce7fbaf54787998fa004f1b7c0e1\",\n" +
+            "    \"baseBuildDepartUsci\":\"12332527MB1D48606A\",\n" +
+            "    \"baseProjPrincipal\":\"蒋国海\",\n" +
+            "    \"baseProjPrincipalCall\":\"13884366607\",\n" +
+            "    \"baseProjContacts\":\"毛以林\",\n" +
+            "    \"baseProjContactsCall\":\"13857049999\"\n" +
+            "}";
+
+
+    private static final String PROJECT_APPLY_TEST_DATA = "{\n" +
+            "    \"baseProjId\":\"33112322013096900000\",\n" +
+            "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseDevelopCode\":\"否\",\n" +
+            "    \"setProjCodeFinan\":\"331123220130969000000\",\n" +
+            "    \"baseHistorProjName\":\"无\",\n" +
+            "    \"baseHistorProjId\":\"000000\",\n" +
+            "    \"baseAccountAppName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseBrainName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseProjStartTime\":\"2023—03—08\",\n" +
+            "    \"baseProjEndTime\":\"2023—12—08\",\n" +
+            "    \"baseProjDuration\":\"9月\",\n" +
+            "    \"baseProjSetYear\":\"2023\",\n" +
+            "    \"baseProjAmountOri\":\"02\",\n" +
+            "    \"baseBasisAmountOri\":\"\",\n" +
+            "    \"baseProjTotalAmount\":\"300\",\n" +
+            "    \"baseProjDeclAmount\":\"300\",\n" +
+            "    \"baseProjConsClass\":\"c\",\n" +
+            "    \"baseLowestLevel\":\"c\",\n" +
+            "    \"baseProjBasis\":\"01:02：03\",\n" +
+            "    \"baseBasisEstablish\":\"丽水市中共遂昌县委组织部新时代挺进师战斗力指数应用解决了县级干部考评普遍存在考评指标模糊、展示界面缺乏、考核过程不规范、考评流程繁杂等问题，采用C/S架构，即客户端/服务器架构，包含五维考评、挂帅争先、村级红黑榜、天工考评、交办工作等考评模块，面向领导干部、乡干部、村干部等三类人员，实现了链条、全过程追溯每个班子、每名干部实绩的功能。\",\n" +
+            "    \"baseProjBasisFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseProjIntro\":\"丽水市中共遂昌县委组织部新时代挺进师战斗力指数应用解决了县级干部考评普遍存在考评指标模糊、展示界面缺乏、考核过程不规范、考评流程繁杂等问题，采用C/S架构，即客户端/服务器架构，包含五维考评、挂帅争先、村级红黑榜、天工考评、交办工作等考评模块，面向领导干部、乡干部、村干部等三类人员，实现了链条、全过程追溯每个班子、每名干部实绩的功能。\",\n" +
+            "    \"beseExpectedResults\":\"省项管系统项目的主要内容为项目全生命周期管理，业务对象为全省电子政务项目，预期成效指标有 项目数据归集覆盖11个地市和90个区县和项目信息完整率达98%以上\",\n" +
+            "    \"baseResearchReportFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseProjApplyFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseOperatMaintenFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseProjOtherFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseProjRemark\":\"丽水市中共遂昌县委组织部新时代挺进师战斗力指数应用解决了县级干部考评普遍存在考评指标模糊、展示界面缺乏、考核过程不规范、考评流程繁杂等问题，采用C/S架构，即客户端/服务器架构，包含五维考评、挂帅争先、村级红黑榜、天工考评、交办工作等考评模块，面向领导干部、乡干部、村干部等三类人员，实现了链条、全过程追溯每个班子、每名干部实绩的功能。\"\n" +
+            "}";
+
+    private static final String PROJECT_APPROVE_TEST_DATA = "{\n" +
+            "    \"baseProjId\":\"33112322013096900000\",\n" +
+            "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseDevelopCode\":\"否\",\n" +
+            "    \"setProjCodeFinan\":\"331123220130969000000\",\n" +
+            "    \"baseReviewResults\":\"01\",\n" +
+            "    \"baseReviewOpinion\":\"通过\",\n" +
+            "    \"baseReviewCommentsFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseExpertTotalMoney\":\"300\",\n" +
+            "    \"baseExpertYearMoney\":\"300\",\n" +
+            "    \"approvalFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseInitialReviewTotalMoney\":\"300\",\n" +
+            "    \"baseProjReplyAmount\":\"300\",\n" +
+            "    \"equalProtectionLevel\":\"03\",\n" +
+            "    \"preliminaryDesignScheme\":\"否\",\n" +
+            "    \"preliminaryDesignFile\":\"否\",\n" +
+            "    \"releaseYearMoney\":\"300\"\n" +
+            "}";
+
+    private static final String PROJECT_PROCURE_TEST_DATA = "{\n" +
+            "    \"baseProjId\":\"33112322013096900000\",\n" +
+            "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"setProjCodeFinan\":\"331123220130969000000\",\n" +
+            "    \"baseBidCode\":\"33112322013096900000—01\",\n" +
+            "    \"baseBidName\":\"标段一\",\n" +
+            "    \"baseProjPurchaseWay\":\"01\",\n" +
+            "    \"basePurchaseCode\":\"否\",\n" +
+            "    \"purchaseFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"basePurchasingAgencies\":\"测试代理机构\",\n" +
+            "    \"baseUnifiedCreditCode\":\"91330108MA2H2JUB3G\",\n" +
+            "    \"baseWinningBidTime\":\"2022—03—08\",\n" +
+            "    \"baseProjPurchaseAmount\":\"300\",\n" +
+            "    \"biddingFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseConsDeprt\":\"测试供应商\",\n" +
+            "    \"baseConsDeprtUsci\":\"91330108MA2H2JUB3G\",\n" +
+            "    \"purchaseContract\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"basePaymentTime\":\"2023—03—08\",\n" +
+            "    \"paymentProgress\":\"300\"\n" +
+            "}";
+
+    private static final String PROJECT_CIMPLEMENT_TEST_DATA = "{\n" +
+            "    \"baseProjId\":\"33112322013096900000\",\n" +
+            "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseDevelopCode\":\"否\",\n" +
+            "    \"baseInitialOpinionFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseInforLevelFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"basePasswAssessFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseThirdAcceptFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseCheckFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseFinanlAuditFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseUserConsFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseEstaSummFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseIrsTestRunFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseSummReportFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseLogAggregation\":\"2\",\n" +
+            "    \"baseBusinessMetrics\":\"核心业务1+实际成效指标1+100\",\n" +
+            "    \"baseFinalExpertOpinionFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseEngineerPostpoFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseChangeFormFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseChanFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"areaCode\":\"331100\"\n" +
+            "}";
+
+    private static final String PROJECT_MIMPLEMENT_TEST_DATA = "{\n" +
+            "    \"baseProjId\":\"33112322013096900000\",\n" +
+            "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
+            "    \"baseDevelopCode\":\"否\",\n" +
+            "    \"baseInforLevelFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"basePasswAssessFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseThirdAcceptFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseUserConsFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseEstaSummFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseOperatMaintenSummFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseLogAggregation\":\"1\",\n" +
+            "    \"baseBusinessMetrics\":\"核心业务1+实际成效指标1+100\",\n" +
+            "    \"baseFinalExpertOpinionFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseEngineerPostpoFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseEngineerAlterFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"baseChanFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
+            "    \"areaCode\":\"331100\"\n" +
+            "}";
+
+
+
+    /**
+     * 定时同步前置机数据 每天3点开始执行一次
+     *
+     */
+    @Scheduled(cron = "0 20 11 * * ?")
+    public void doTask() throws UnknownHostException {
+        if (flag && HOST.equals(InetAddress.getLocalHost().getHostName())) {
+            // 先删除表中的所有数据,再插入数据,测试数据只有一条，这里只插入一条
+            List<ProjectBaseInfo> baseInfos = projectBaseInfoService.list();
+            if (CollUtil.isNotEmpty(baseInfos)) {
+                projectBaseInfoService.removeBatchByIds(baseInfos);
+            }
+
+            // 项目基本信息
+            ProjectBaseInfo projectBaseInfo = JSON.parseObject(PROJECT_BASE_INFO_TEST_DATA, ProjectBaseInfo.class);
+            projectBaseInfoService.save(projectBaseInfo);
+
+            List<ProjectApply> applies = projectApplyService.list();
+            if (CollUtil.isNotEmpty(applies)){
+                projectApplyService.removeBatchByIds(applies);
+            }
+            // 项目申报信息
+            ProjectApply projectApply = JSON.parseObject(PROJECT_APPLY_TEST_DATA, ProjectApply.class);
+            projectApplyService.save(projectApply);
+
+            List<ProjectApprove> approves = projectApproveService.list();
+            if (CollUtil.isNotEmpty(approves)){
+                projectApproveService.removeBatchByIds(approves);
+            }
+            // 项目立项评审信息
+            ProjectApprove projectApprove = JSON.parseObject(PROJECT_APPROVE_TEST_DATA, ProjectApprove.class);
+            projectApproveService.save(projectApprove);
+
+            List<ProjectProcure> procures = projectProcureService.list();
+            if (CollUtil.isNotEmpty(procures)){
+                projectProcureService.removeBatchByIds(procures);
+            }
+            // 项目采购信息
+            ProjectProcure projectProcure = JSON.parseObject(PROJECT_PROCURE_TEST_DATA, ProjectProcure.class);
+            projectProcureService.save(projectProcure);
+
+            List<ProjectCimplement> cimplements = projectCimplementService.list();
+            if (CollUtil.isNotEmpty(cimplements)){
+                projectCimplementService.removeBatchByIds(cimplements);
+            }
+            // 建设项目实施信息
+            ProjectCimplement projectCimplement = JSON.parseObject(PROJECT_CIMPLEMENT_TEST_DATA, ProjectCimplement.class);
+            projectCimplementService.save(projectCimplement);
+
+            List<ProjectMimplement> mimplements = projectMimplementService.list();
+            if (CollUtil.isNotEmpty(mimplements)){
+                projectCimplementService.removeBatchByIds(cimplements);
+            }
+            // 运维项目实施信息
+            ProjectMimplement projectMimplement = JSON.parseObject(PROJECT_MIMPLEMENT_TEST_DATA, ProjectMimplement.class);
+            projectMimplementService.save(projectMimplement);
+        }
+    }
+}
diff --git a/syn-data-task/src/main/resources/application-dev.yml b/syn-data-task/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..397e0b2
--- /dev/null
+++ b/syn-data-task/src/main/resources/application-dev.yml
@@ -0,0 +1,81 @@
+server:
+  port: 38888
+  servlet:
+    context-path: /pm
+spring:
+  application:
+    name: syn-data-task
+  jackson:
+    default-property-inclusion: non_null
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  jpa:
+    properties:
+      hibernate:
+        default_schema: PUBLIC
+        hbm2ddl:
+          auto: update
+        show_sql: true
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://47.98.125.47:3306/szls_da_lsxmss_sjgx?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false
+    username: root
+    password: NingdaKeji123!
+    # 数据源
+    hikari:
+      # 是客户端等待连接池连接的最大毫秒数
+      connection-timeout: 30000
+      # 是允许连接在连接池中空闲的最长时间
+      minimum-idle: 5
+      # 配置最大池大小
+      maximum-pool-size: 20
+      # 是允许连接在连接池中空闲的最长时间（以毫秒为单位）
+      idle-timeout: 60000
+      # 池中连接关闭后的最长生命周期（以毫秒为单位）
+      max-lifetime: 600000
+      # 配置从池返回的连接的默认自动提交行为。默认值为true。
+      auto-commit: true
+      # 开启连接监测泄露
+      leak-detection-threshold: 5000
+      # 测试连接数据库
+      connection-test-query: SELECT 1
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      logic-delete-value: true
+      logic-not-delete-value: false
+logging:
+  config: classpath:logback-spring.xml
+  #日志配置
+  level:
+    root: info
+  file:
+    path: logs
+# 日志文件配置
+log:
+  path: ./logs
+  info:
+    file-size: 50MB
+    max-size: 5
+    total-size: 200MB
+  error:
+    file-size: 10MB
+    max-size: 5
+    total-size: 50MB
+
+swagger:
+  enabled: true
+
+task:
+  host: iZbp13nwyvib53j4j1p2xoZ
+  switch:
+    is-open: true #开关
+
+
+
diff --git a/syn-data-task/src/main/resources/application-pre.yml b/syn-data-task/src/main/resources/application-pre.yml
new file mode 100644
index 0000000..3770573
--- /dev/null
+++ b/syn-data-task/src/main/resources/application-pre.yml
@@ -0,0 +1,79 @@
+server:
+  port: 38888
+  servlet:
+    context-path: /pm
+spring:
+  application:
+    name: syn-data-task
+  jackson:
+    default-property-inclusion: non_null
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  jpa:
+    properties:
+      hibernate:
+        default_schema: PUBLIC
+        hbm2ddl:
+          auto: update
+        show_sql: true
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://10.53.129.228:63306/szls_da_lsxmss_sjgx?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false
+      username: szls_da_lsxmss
+      password: 1Lzo6XqF
+    # 数据源
+    hikari:
+      # 是客户端等待连接池连接的最大毫秒数
+      connection-timeout: 30000
+      # 是允许连接在连接池中空闲的最长时间
+      minimum-idle: 10
+      # 配置最大池大小
+      maximum-pool-size: 20
+      # 是允许连接在连接池中空闲的最长时间（以毫秒为单位）
+      idle-timeout: 60000
+      # 池中连接关闭后的最长生命周期（以毫秒为单位）
+      max-lifetime: 600000
+      # 配置从池返回的连接的默认自动提交行为。默认值为true。
+      auto-commit: true
+      # 开启连接监测泄露
+      leak-detection-threshold: 5000
+      # 测试连接数据库
+      connection-test-query: SELECT 1
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      logic-delete-value: true
+      logic-not-delete-value: false
+logging:
+  config: classpath:logback-spring.xml
+  #日志配置
+  level:
+    root: info
+  file:
+    path: logs
+# 日志文件配置
+log:
+  path: ./logs
+  info:
+    file-size: 50MB
+    max-size: 5
+    total-size: 200MB
+  error:
+    file-size: 10MB
+    max-size: 5
+    total-size: 50MB
+
+swagger:
+  enabled: true
+
+task:
+  host: iZ6mx01asxnsmennpzoxooZ
+  switch:
+    is-open: true #开关
+
diff --git a/syn-data-task/src/main/resources/application.yml b/syn-data-task/src/main/resources/application.yml
new file mode 100644
index 0000000..3d7808a
--- /dev/null
+++ b/syn-data-task/src/main/resources/application.yml
@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev
diff --git a/syn-data-task/src/main/resources/logback-spring.xml b/syn-data-task/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..75f5472
--- /dev/null
+++ b/syn-data-task/src/main/resources/logback-spring.xml
@@ -0,0 +1,68 @@
+<configuration scan="true" scanPeriod="10 seconds">
+    <springProperty name="logPath" scope="context" source="log.path" defaultValue="./logs"/>
+    <springProperty name="infoFileSize" scope="context" source="log.info.file-size"/>
+    <springProperty name="infoMaxSize" scope="context" source="log.info.max-size"/>
+    <springProperty name="infoTotalSize" scope="context" source="log.info.total-size"/>
+    <springProperty name="errorFileSize" scope="context" source="log.error.file-size"/>
+    <springProperty name="errorMaxSize" scope="context" source="log.error.max-size"/>
+    <springProperty name="errorTotalSize" scope="context" source="log.error.total-size"/>
+
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>${logPath}/info.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logPath}/info-%d{yyyyMMdd}-%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>${infoFileSize}</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>${infoMaxSize}</maxHistory>
+            <totalSizeCap>${infoTotalSize}</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+                </Pattern>
+            </layout>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+        <File>${logPath}/error.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${logPath}/error-%d{yyyyMMdd}-%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>${errorFileSize}</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <maxHistory>${errorMaxSize}</maxHistory>
+            <totalSizeCap>${errorTotalSize}</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+                </Pattern>
+            </layout>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>
+                %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%msg%n
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>DEBUG</level>
+        </filter>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="INFO_FILE"/>
+        <appender-ref ref="ERROR_FILE"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>

From 021174d423794dc64f6c954745196206d62ae346 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Wed, 23 Aug 2023 11:33:00 +0800
Subject: [PATCH 14/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=9C=BA=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 syn-data-task/src/main/resources/application-dev.yml | 5 +----
 syn-data-task/src/main/resources/application-pre.yml | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/syn-data-task/src/main/resources/application-dev.yml b/syn-data-task/src/main/resources/application-dev.yml
index 397e0b2..6c8e1ba 100644
--- a/syn-data-task/src/main/resources/application-dev.yml
+++ b/syn-data-task/src/main/resources/application-dev.yml
@@ -1,7 +1,4 @@
-server:
-  port: 38888
-  servlet:
-    context-path: /pm
+
 spring:
   application:
     name: syn-data-task
diff --git a/syn-data-task/src/main/resources/application-pre.yml b/syn-data-task/src/main/resources/application-pre.yml
index 3770573..51dfc34 100644
--- a/syn-data-task/src/main/resources/application-pre.yml
+++ b/syn-data-task/src/main/resources/application-pre.yml
@@ -1,7 +1,4 @@
-server:
-  port: 38888
-  servlet:
-    context-path: /pm
+
 spring:
   application:
     name: syn-data-task

From dcc56e4aa34dca16c7f2bf98ca3cccf19d317fa1 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Wed, 23 Aug 2023 14:31:53 +0800
Subject: [PATCH 15/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86?=
 =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=9C=BA=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java    | 4 +++-
 syn-data-task/src/main/resources/application-dev.yml                  | 3 ++-
 syn-data-task/src/main/resources/application-pre.yml                  | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
index 655aa69..ed69447 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
@@ -188,9 +188,10 @@ public class SynDataTask {
      * 定时同步前置机数据 每天3点开始执行一次
      *
      */
-    @Scheduled(cron = "0 20 11 * * ?")
+    @Scheduled(cron = "0 24 14 * * ?")
     public void doTask() throws UnknownHostException {
         if (flag && HOST.equals(InetAddress.getLocalHost().getHostName())) {
+            log.info("数据同步任务开始");
             // 先删除表中的所有数据,再插入数据,测试数据只有一条，这里只插入一条
             List<ProjectBaseInfo> baseInfos = projectBaseInfoService.list();
             if (CollUtil.isNotEmpty(baseInfos)) {
@@ -240,6 +241,7 @@ public class SynDataTask {
             // 运维项目实施信息
             ProjectMimplement projectMimplement = JSON.parseObject(PROJECT_MIMPLEMENT_TEST_DATA, ProjectMimplement.class);
             projectMimplementService.save(projectMimplement);
+            log.info("数据同步任务结束");
         }
     }
 }
diff --git a/syn-data-task/src/main/resources/application-dev.yml b/syn-data-task/src/main/resources/application-dev.yml
index 6c8e1ba..7019ec0 100644
--- a/syn-data-task/src/main/resources/application-dev.yml
+++ b/syn-data-task/src/main/resources/application-dev.yml
@@ -1,4 +1,5 @@
-
+server:
+  port: 38088
 spring:
   application:
     name: syn-data-task
diff --git a/syn-data-task/src/main/resources/application-pre.yml b/syn-data-task/src/main/resources/application-pre.yml
index 51dfc34..5834028 100644
--- a/syn-data-task/src/main/resources/application-pre.yml
+++ b/syn-data-task/src/main/resources/application-pre.yml
@@ -1,4 +1,5 @@
-
+server:
+  port: 38088
 spring:
   application:
     name: syn-data-task

From 111dad35454127b8ff4519ce3fbc334a25d2304e Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Wed, 23 Aug 2023 14:46:31 +0800
Subject: [PATCH 16/34] =?UTF-8?q?=E7=BB=A9=E6=95=88=E8=AF=84=E4=BB=B7-?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E3=80=81=E7=BC=96=E8=BE=91=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/performance/manage/PerformanceAppraisalPlanManage.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index f2327a9..4332e96 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -449,7 +449,8 @@ public class PerformanceAppraisalPlanManage {
             throw new BizException(names + CommonConst.APP_REPEAT);
         }
 
-        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class).in(ProjectApplication::getId, applicationIds)).stream()
+        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                        .in(ProjectApplication::getId, applicationIdList)).stream()
                 .collect(Collectors.toMap(ProjectApplication::getId, a -> a));
         for(Long applicationId : applicationIdList){
             PerformanceAppraisalApplication paa = new PerformanceAppraisalApplication();
@@ -532,10 +533,10 @@ public class PerformanceAppraisalPlanManage {
                 .eq(PerformanceAppraisalAppScoreInfo::getAppraisalId,editDTO.getId())
                 .in(PerformanceAppraisalAppScoreInfo::getApplicationId,applicationIdList));
 
-        List<Long> applicationIds = editDTO.getApplicationIds();
-        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class).in(ProjectApplication::getId, applicationIds)).stream()
+        Map<Long, ProjectApplication> applicationMap = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                        .in(ProjectApplication::getId, applicationIdList)).stream()
                 .collect(Collectors.toMap(ProjectApplication::getId, a -> a));
-        for(Long applicationId : applicationIds){
+        for(Long applicationId : applicationIdList){
             PerformanceAppraisalApplication paa = new PerformanceAppraisalApplication();
             paa.setAppraisalId(editDTO.getId());
             paa.setApplicationId(applicationId);

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 17/34] =?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<GovProjectDictionaryVO> dictionary(@RequestParam(value = "type", required = false) String type) {
         return collectionManage.dictionary(type);
     }
+
+    @GetMapping("/list")
+    @ApiOperation("项目归集列表")
+    public PageVo<GovBizProjectApplyVO> 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<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> 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<GovBizProjectApplyVO> 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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectApplyMapper extends BaseMapper<GovBizProjectApply> {
+
+}
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;
+
+/**
+ * <p>
+ * 项目申报信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目申报信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目申报信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectApplyService extends IService<GovBizProjectApply> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectApplyServiceImpl extends
+        ServiceImpl<GovBizProjectApplyMapper, GovBizProjectApply> implements IGovBizProjectApplyService {
+
+}

From 3d9fc7426a89b65114f6f0bd9fa7ffc66fdfa609 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Wed, 23 Aug 2023 17:02:45 +0800
Subject: [PATCH 18/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java  | 2 ++
 .../com/ningdatech/syndataapi/scheduler/task/SynDataTask.java    | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
index f4d4f1c..7d274a9 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
@@ -4,6 +4,7 @@ package com.ningdatech.syndataapi;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -19,6 +20,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @EnableTransactionManagement
 @EnableAspectJAutoProxy(exposeProxy = true)
+@ComponentScan(basePackages = {"com.ningdatech.syndataapi.scheduler"})
 public class SynDataTaskApp {
 
     protected static final String MAPPER_PACKAGES = "com.ningdatech.syndataapi.**.mapper";
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
index ed69447..d8afca4 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
@@ -53,7 +53,6 @@ public class SynDataTask {
             "    \"baseProjType\":\"01\",\n" +
             "    \"baseConstructionType\":\"01\",\n" +
             "    \"baseProjSetProg\":\"05\",\n" +
-            "    \"isEffective\":\"02\",\n" +
             "    \"baseProvManDeprt\":\"遂昌县大数据和金融发展中心\",\n" +
             "    \"baseProvManDeprtDing\":\"GO_9a7dce7fbaf54787998fa004f1b7c0e1\",\n" +
             "    \"baseManDeprt\":\"遂昌县大数据和金融发展中心\",\n" +
@@ -141,9 +140,12 @@ public class SynDataTask {
             "}";
 
     private static final String PROJECT_CIMPLEMENT_TEST_DATA = "{\n" +
+            "    \"baseBidCode\":\"33112322013096900000—01\",\n" +
+            "    \"baseBidName\":\"标段一\",\n" +
             "    \"baseProjId\":\"33112322013096900000\",\n" +
             "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
             "    \"baseDevelopCode\":\"否\",\n" +
+            "    \"baseProjSysCode\":\"\",\n" +
             "    \"baseInitialOpinionFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
             "    \"baseInforLevelFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
             "    \"basePasswAssessFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
@@ -164,9 +166,12 @@ public class SynDataTask {
             "}";
 
     private static final String PROJECT_MIMPLEMENT_TEST_DATA = "{\n" +
+            "    \"baseBidCode\":\"33112322013096900000—01\",\n" +
+            "    \"baseBidName\":\"标段一\",\n" +
             "    \"baseProjId\":\"33112322013096900000\",\n" +
             "    \"baseProjName\":\"遂昌县大数据和金融发展中心天工系统\",\n" +
             "    \"baseDevelopCode\":\"否\",\n" +
+            "    \"baseProjSysCode\":\"\",\n" +
             "    \"baseInforLevelFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
             "    \"basePasswAssessFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
             "    \"baseThirdAcceptFile\":\"http://60.188.225.145/pm/file/download?fileId=951\",\n" +
@@ -188,7 +193,7 @@ public class SynDataTask {
      * 定时同步前置机数据 每天3点开始执行一次
      *
      */
-    @Scheduled(cron = "0 24 14 * * ?")
+    @Scheduled(cron = "0 0 3 * * ?")
     public void doTask() throws UnknownHostException {
         if (flag && HOST.equals(InetAddress.getLocalHost().getHostName())) {
             log.info("数据同步任务开始");

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 19/34] =?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<GovBizProjectApplyVO> 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<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> 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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectApproveMapper extends BaseMapper<GovBizProjectApprove> {
+
+}
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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectBaseinfoMapper extends BaseMapper<GovBizProjectBaseinfo> {
+
+}
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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectCimplementMapper extends BaseMapper<GovBizProjectCimplement> {
+
+}
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;
+
+/**
+ * <p>
+ * 项目审核信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目基本信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目实施信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目审核信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目基本信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目实施信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目审核信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目基本信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目实施信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectApproveService extends IService<GovBizProjectApprove> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectBaseinfoService extends IService<GovBizProjectBaseinfo> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectCimplementService extends IService<GovBizProjectCimplement> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectApproveServiceImpl extends
+        ServiceImpl<GovBizProjectApproveMapper, GovBizProjectApprove> 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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectBaseinfoServiceImpl extends
+        ServiceImpl<GovBizProjectBaseinfoMapper, GovBizProjectBaseinfo> 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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectCimplementServiceImpl extends
+        ServiceImpl<GovBizProjectCimplementMapper, GovBizProjectCimplement> implements IGovBizProjectCimplementService {
+
+}

From 280ca0747af334793a09ee8a96e46e35d6b64022 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Thu, 24 Aug 2023 09:19:28 +0800
Subject: [PATCH 20/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 syn-data-task/pom.xml                              | 48 ----------------------
 .../com/ningdatech/syndataapi/SynDataTaskApp.java  |  4 +-
 .../syndataapi/scheduler/task/SynDataTask.java     |  2 +-
 .../src/main/resources/application-pre.yml         |  8 ++--
 4 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/syn-data-task/pom.xml b/syn-data-task/pom.xml
index 558e758..e9a6fba 100644
--- a/syn-data-task/pom.xml
+++ b/syn-data-task/pom.xml
@@ -42,10 +42,6 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
@@ -59,10 +55,6 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
@@ -80,37 +72,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-        <!--cache-->
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-        </dependency>
-
-        <!--引入jwt-->
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>3.10.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.ningdatech</groupId>
-            <artifactId>nd-log-starter</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ningdatech</groupId>
-            <artifactId>nd-basic</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.ningdatech</groupId>
             <artifactId>nd-swagger2-starter</artifactId>
@@ -121,7 +82,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>
 
     <!-- 打包 -->
@@ -197,14 +157,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- 跳过单元测试 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skipTests>true</skipTests>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
index 7d274a9..39d9615 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
@@ -3,7 +3,9 @@ package com.ningdatech.syndataapi;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -14,7 +16,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @author CMM
  * @since 2023/08/22 18:14
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {SecurityAutoConfiguration.class })
 @EnableAsync
 @MapperScan(SynDataTaskApp.MAPPER_PACKAGES)
 @EnableScheduling
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
index d8afca4..669211c 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
@@ -193,7 +193,7 @@ public class SynDataTask {
      * 定时同步前置机数据 每天3点开始执行一次
      *
      */
-    @Scheduled(cron = "0 0 3 * * ?")
+    @Scheduled(cron = "0 55 19 * * ?")
     public void doTask() throws UnknownHostException {
         if (flag && HOST.equals(InetAddress.getLocalHost().getHostName())) {
             log.info("数据同步任务开始");
diff --git a/syn-data-task/src/main/resources/application-pre.yml b/syn-data-task/src/main/resources/application-pre.yml
index 5834028..db1bc9a 100644
--- a/syn-data-task/src/main/resources/application-pre.yml
+++ b/syn-data-task/src/main/resources/application-pre.yml
@@ -19,10 +19,10 @@ spring:
       ddl-auto: update
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://10.53.129.228:63306/szls_da_lsxmss_sjgx?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false
-      username: szls_da_lsxmss
-      password: 1Lzo6XqF
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.53.129.228:63306/szls_da_lsxmss_sjgx?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false
+    username: szls_da_lsxmss
+    password: 1Lzo6XqF
     # 数据源
     hikari:
       # 是客户端等待连接池连接的最大毫秒数

From 095c96be6541ee0fb8ec3e2c266e85bcaad1ea3e Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Thu, 24 Aug 2023 10:15:45 +0800
Subject: [PATCH 21/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/syndataapi/SynDataTaskApp.java  |  2 +-
 .../syndataapi/scheduler/task/SynDataTask.java     | 28 ++--------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
index 39d9615..cad2a6f 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
@@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * @author CMM
  * @since 2023/08/22 18:14
  */
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class })
+@SpringBootApplication
 @EnableAsync
 @MapperScan(SynDataTaskApp.MAPPER_PACKAGES)
 @EnableScheduling
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
index 669211c..6b0773e 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
@@ -193,56 +193,32 @@ public class SynDataTask {
      * 定时同步前置机数据 每天3点开始执行一次
      *
      */
-    @Scheduled(cron = "0 55 19 * * ?")
+    @Scheduled(cron = "0 15 10 * * ?")
     public void doTask() throws UnknownHostException {
         if (flag && HOST.equals(InetAddress.getLocalHost().getHostName())) {
             log.info("数据同步任务开始");
-            // 先删除表中的所有数据,再插入数据,测试数据只有一条，这里只插入一条
-            List<ProjectBaseInfo> baseInfos = projectBaseInfoService.list();
-            if (CollUtil.isNotEmpty(baseInfos)) {
-                projectBaseInfoService.removeBatchByIds(baseInfos);
-            }
+            // 前置机每天晚上10点自动清空，测试数据只有一条，这里只插入一条
 
             // 项目基本信息
             ProjectBaseInfo projectBaseInfo = JSON.parseObject(PROJECT_BASE_INFO_TEST_DATA, ProjectBaseInfo.class);
             projectBaseInfoService.save(projectBaseInfo);
 
-            List<ProjectApply> applies = projectApplyService.list();
-            if (CollUtil.isNotEmpty(applies)){
-                projectApplyService.removeBatchByIds(applies);
-            }
             // 项目申报信息
             ProjectApply projectApply = JSON.parseObject(PROJECT_APPLY_TEST_DATA, ProjectApply.class);
             projectApplyService.save(projectApply);
 
-            List<ProjectApprove> approves = projectApproveService.list();
-            if (CollUtil.isNotEmpty(approves)){
-                projectApproveService.removeBatchByIds(approves);
-            }
             // 项目立项评审信息
             ProjectApprove projectApprove = JSON.parseObject(PROJECT_APPROVE_TEST_DATA, ProjectApprove.class);
             projectApproveService.save(projectApprove);
 
-            List<ProjectProcure> procures = projectProcureService.list();
-            if (CollUtil.isNotEmpty(procures)){
-                projectProcureService.removeBatchByIds(procures);
-            }
             // 项目采购信息
             ProjectProcure projectProcure = JSON.parseObject(PROJECT_PROCURE_TEST_DATA, ProjectProcure.class);
             projectProcureService.save(projectProcure);
 
-            List<ProjectCimplement> cimplements = projectCimplementService.list();
-            if (CollUtil.isNotEmpty(cimplements)){
-                projectCimplementService.removeBatchByIds(cimplements);
-            }
             // 建设项目实施信息
             ProjectCimplement projectCimplement = JSON.parseObject(PROJECT_CIMPLEMENT_TEST_DATA, ProjectCimplement.class);
             projectCimplementService.save(projectCimplement);
 
-            List<ProjectMimplement> mimplements = projectMimplementService.list();
-            if (CollUtil.isNotEmpty(mimplements)){
-                projectCimplementService.removeBatchByIds(cimplements);
-            }
             // 运维项目实施信息
             ProjectMimplement projectMimplement = JSON.parseObject(PROJECT_MIMPLEMENT_TEST_DATA, ProjectMimplement.class);
             projectMimplementService.save(projectMimplement);

From db573c0cb02c8ec2227971aafd149f9b5bfdb372 Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Thu, 24 Aug 2023 10:35:11 +0800
Subject: [PATCH 22/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=97=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
index 6b0773e..cbe2d85 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/task/SynDataTask.java
@@ -190,14 +190,15 @@ public class SynDataTask {
 
 
     /**
-     * 定时同步前置机数据 每天3点开始执行一次
+     * 前置机每天晚上10点自动清空，第二天早上6点获取数据
+     * 定时同步前置机数据 每天1点开始执行一次
      *
      */
-    @Scheduled(cron = "0 15 10 * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void doTask() throws UnknownHostException {
         if (flag && HOST.equals(InetAddress.getLocalHost().getHostName())) {
             log.info("数据同步任务开始");
-            // 前置机每天晚上10点自动清空，测试数据只有一条，这里只插入一条
+            // 测试数据只有一条，这里只插入一条
 
             // 项目基本信息
             ProjectBaseInfo projectBaseInfo = JSON.parseObject(PROJECT_BASE_INFO_TEST_DATA, ProjectBaseInfo.class);

From ec68c32a567629332dbdd2c018beaaa370531d1c Mon Sep 17 00:00:00 2001
From: CMM <2198256324@qq.com>
Date: Thu, 24 Aug 2023 11:28:19 +0800
Subject: [PATCH 23/34] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8C=BA=E5=9F=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/performance/manage/PerformanceAppraisalPlanManage.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
index 4332e96..7c54e31 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/PerformanceAppraisalPlanManage.java
@@ -102,8 +102,9 @@ public class PerformanceAppraisalPlanManage {
                 .like(StringUtils.isNotBlank(req.getPlanName()),PerformanceAppraisal::getName,req.getPlanName())
                 .ge(Objects.nonNull(req.getStart()),PerformanceAppraisal::getCreateOn,req.getStart())
                 .le(Objects.nonNull(req.getEnd()),PerformanceAppraisal::getCreateOn,req.getEnd())
-                .eq(PerformanceAppraisal::getRegionCode,regionCode)
+                .eq(StringUtils.isNotBlank(regionCode), PerformanceAppraisal::getRegionCode,regionCode)
                 .orderByDesc(PerformanceAppraisal::getUpdateOn);
+        // 如果登录用户是区域管理员，能看到本区域的评价计划
         performanceAppraisalService.page(page,wrapper);
         if(0L == page.getTotal()){
             return PageVo.empty();

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 24/34] =?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<GovBizProjectListVO> 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<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -54,16 +66,254 @@ public class GovProjectCollectionManage {
      * @param req
      * @return
      */
-    public PageVo<GovBizProjectApplyVO> list(ProjectListReq req) {
-        return PageVo.empty();
+    public PageVo<GovBizProjectListVO> list(ProjectListReq req) {
+        Page<GovBizProjectBaseinfo> page = req.page();
+        LambdaQueryWrapper<GovBizProjectBaseinfo> 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<String> projIds = page.getRecords().stream()
+                .filter(p -> Objects.nonNull(p) && StringUtils.isNotBlank(p.getBaseProjId()))
+                .map(GovBizProjectBaseinfo::getBaseProjId).collect(Collectors.toList());
+
+        Map<String,GovBizProjectApply> applyMap = Maps.newHashMap();
+        if(CollUtil.isNotEmpty(projIds)){
+            List<GovBizProjectApply> applys = projectApplyService.list(Wrappers.lambdaQuery(GovBizProjectApply.class)
+                    .in(GovBizProjectApply::getBaseProjId,projIds));
+            applyMap = applys.stream().collect(Collectors.toMap(GovBizProjectApply::getBaseProjId,a -> a));
+        }
+
+        Map<String, GovBizProjectApply> finalApplyMap = applyMap;
+        List<GovBizProjectListVO> 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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectMimplementMapper extends BaseMapper<GovBizProjectMimplement> {
+
+}
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;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovBizProjectProcureMapper extends BaseMapper<GovBizProjectProcure> {
+
+}
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;
+
+/**
+ * <p>
+ * 运维项目实施信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目采购信息
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目归集总VO
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 运维项目实施信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目采购信息
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目归集总VO
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目归集列表VO
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 运维项目实施信息表
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 项目采购信息
+ * </p>
+ *
+ * @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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectMimplementService extends IService<GovBizProjectMimplement> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovBizProjectProcureService extends IService<GovBizProjectProcure> {
+
+}
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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectMimplementServiceImpl extends
+        ServiceImpl<GovBizProjectMimplementMapper, GovBizProjectMimplement> 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;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+@Service
+public class GovBizProjectProcureServiceImpl extends
+        ServiceImpl<GovBizProjectProcureMapper, GovBizProjectProcure> 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<PersonSafetyInfoDTO> dtos) {
@@ -219,6 +219,6 @@ public class SafetyRiskManage {
             }
         }
 
-        return "保存成功" + sucessNum + "条";
+        return BizConst.SAVE_SUCCESS + sucessNum + "条";
     }
 }

From bd2d444b76b60bf17959d1d74a23a22bea0cc691 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 14:24:50 +0800
Subject: [PATCH 25/34] =?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

---
 .../com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java
index f9539dd..268abdb 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/handler/GlobalResponseHandler.java
@@ -35,7 +35,8 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
         "com.ningdatech.pmapi.portrait.controller",
         "com.ningdatech.pmapi.irs.controller",
         "com.ningdatech.pmapi.dashboard.controller",
-        "com.ningdatech.pmapi.wps.controller"
+        "com.ningdatech.pmapi.wps.controller",
+        "com.ningdatech.pmapi.gov.controller"
 })
 public class GlobalResponseHandler implements ResponseBodyAdvice<Object> {
 

From 709f07a234144b38e905215242c26eafaa598d79 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 24 Aug 2023 16:18:38 +0800
Subject: [PATCH 26/34] =?UTF-8?q?=E6=9D=A1=E7=BA=BF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=8D=E9=89=B4=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pmapi/src/main/resources/security/auth-dev.yml  | 2 ++
 pmapi/src/main/resources/security/auth-pre.yml  | 2 ++
 pmapi/src/main/resources/security/auth-prod.yml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/pmapi/src/main/resources/security/auth-dev.yml b/pmapi/src/main/resources/security/auth-dev.yml
index 5c76021..4672696 100644
--- a/pmapi/src/main/resources/security/auth-dev.yml
+++ b/pmapi/src/main/resources/security/auth-dev.yml
@@ -37,6 +37,7 @@ security:
       - /api/v1/zwdd/pull/**
       - /api/v1/irs/**
       - /api/v1/wps-convert/**
+      - /api/v1/belong-org/business-strip/list
     ignore-csrf-urls:
       - /api/v1/user/auth/**
       - /v2/api-docs
@@ -66,6 +67,7 @@ security:
       - /api/v1/zwdd/pull/**
       - /api/v1/irs/**
       - /api/v1/wps-convert/**
+      - /api/v1/belong-org/business-strip/list
     role-map:
       "engineer":
       "project_manager":
diff --git a/pmapi/src/main/resources/security/auth-pre.yml b/pmapi/src/main/resources/security/auth-pre.yml
index 5c76021..4672696 100644
--- a/pmapi/src/main/resources/security/auth-pre.yml
+++ b/pmapi/src/main/resources/security/auth-pre.yml
@@ -37,6 +37,7 @@ security:
       - /api/v1/zwdd/pull/**
       - /api/v1/irs/**
       - /api/v1/wps-convert/**
+      - /api/v1/belong-org/business-strip/list
     ignore-csrf-urls:
       - /api/v1/user/auth/**
       - /v2/api-docs
@@ -66,6 +67,7 @@ security:
       - /api/v1/zwdd/pull/**
       - /api/v1/irs/**
       - /api/v1/wps-convert/**
+      - /api/v1/belong-org/business-strip/list
     role-map:
       "engineer":
       "project_manager":
diff --git a/pmapi/src/main/resources/security/auth-prod.yml b/pmapi/src/main/resources/security/auth-prod.yml
index 5c76021..4672696 100644
--- a/pmapi/src/main/resources/security/auth-prod.yml
+++ b/pmapi/src/main/resources/security/auth-prod.yml
@@ -37,6 +37,7 @@ security:
       - /api/v1/zwdd/pull/**
       - /api/v1/irs/**
       - /api/v1/wps-convert/**
+      - /api/v1/belong-org/business-strip/list
     ignore-csrf-urls:
       - /api/v1/user/auth/**
       - /v2/api-docs
@@ -66,6 +67,7 @@ security:
       - /api/v1/zwdd/pull/**
       - /api/v1/irs/**
       - /api/v1/wps-convert/**
+      - /api/v1/belong-org/business-strip/list
     role-map:
       "engineer":
       "project_manager":

From 8417cac87ff1adb85b189295fa5c33484ef900ba Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 17:14:52 +0800
Subject: [PATCH 27/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=20?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov/manage/GovProjectCollectionManage.java     |  9 +++++
 .../pmapi/gov/model/dto/GovBizProjectSaveDTO.java  |  1 -
 .../utils/GenerateProjectCodeUtil.java             | 38 +++++++++++++++++++---
 3 files changed, 42 insertions(+), 6 deletions(-)

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 897c693..887d3c2 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
@@ -13,6 +13,7 @@ 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.projectdeclared.utils.GenerateProjectCodeUtil;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +49,8 @@ public class GovProjectCollectionManage {
 
     private final IGovBizProjectProcureService procureService;
 
+    private final GenerateProjectCodeUtil generateProjectCodeUtil;
+
     public List<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -182,6 +185,12 @@ public class GovProjectCollectionManage {
      */
     public String save(GovBizProjectSaveDTO saveDTO) {
         String baseProjId = saveDTO.getBaseProjId();
+
+        //如果是新增的话 要生成 项目编号
+        if(StringUtils.isBlank(baseProjId)){
+            baseProjId = generateProjectCodeUtil.generateProjectCode(saveDTO);
+        }
+
         String baseProjName = saveDTO.getBaseProjName();
 
         //1.保存基本信息
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
index 43a680c..6d81244 100644
--- 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
@@ -22,7 +22,6 @@ public class GovBizProjectSaveDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("项目编号")
-    @NotBlank(message = "项目编号不能为空")
     private String baseProjId;
 
     @ApiModelProperty("基本项目名称")
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java
index 166e8ec..72f816a 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java
@@ -1,12 +1,18 @@
 package com.ningdatech.pmapi.projectdeclared.utils;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ningdatech.pmapi.fiscal.service.ICompanyFiscalCodeService;
+import com.ningdatech.basic.function.VUtils;
+import com.ningdatech.pmapi.common.constant.BizConst;
+import com.ningdatech.pmapi.gov.model.dto.GovBizProjectApplyDTO;
+import com.ningdatech.pmapi.gov.model.dto.GovBizProjectBaseinfoDTO;
+import com.ningdatech.pmapi.gov.model.dto.GovBizProjectSaveDTO;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
+import com.ningdatech.pmapi.gov.model.entity.GovBizProjectBaseinfo;
+import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
 import com.ningdatech.pmapi.projectdeclared.contants.ProjectCodeContant;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.entity.ProjectCollection;
-import com.ningdatech.pmapi.projectlib.service.IProjectCollectionService;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,14 +27,12 @@ import java.util.Objects;
  */
 @Component
 public class GenerateProjectCodeUtil {
-    @Autowired
-    private ICompanyFiscalCodeService companyFiscalCodeService;
 
     @Autowired
     private IProjectService projectService;
 
     @Autowired
-    private IProjectCollectionService projectCollectionService;
+    private IGovBizProjectApplyService applyService;
 
     public String generateProjectCode(ProjectDTO project){
         // 获取所属行政区划代码(9位)
@@ -65,4 +69,28 @@ public class GenerateProjectCodeUtil {
         // 生成20位的项目编号
         return areaCode + year + projectType + serialNumber;
     }
+
+    public String generateProjectCode(GovBizProjectSaveDTO dto){
+        // 获取所属行政区划代码(9位)
+        GovBizProjectBaseinfoDTO baseinfo = dto.getBaseinfo();
+        GovBizProjectApplyDTO apply = dto.getApply();
+
+        VUtils.isTrue(Objects.isNull(baseinfo)).throwMessage("没有项目基本信息 无法生成项目编号!");
+        VUtils.isTrue(Objects.isNull(apply)).throwMessage("没有项目申报信息 无法生成项目编号!");
+
+
+        String areaCode = baseinfo.getBaseAreaCode() + BizConst.NINE_AREA_CODE_LAST;
+        // 获取建设年度 (10-13)
+        String year = Objects.nonNull(apply.getBaseProjSetYear()) ? apply.getBaseProjSetYear()
+                : String.valueOf(LocalDateTime.now().getYear());
+        // 14-15 项目类型
+        String projectType = baseinfo.getBaseProjType();
+        // 16-20 项目序号00001
+        Long max = applyService.count(Wrappers.lambdaQuery(GovBizProjectApply.class)
+                .eq(GovBizProjectApply::getBaseProjSetYear,apply.getBaseProjSetYear()));
+        Long maxCurrent = max + 1;
+        String serialNumber = String.format(ProjectCodeContant.SHUZI_5,maxCurrent);
+        // 生成20位的项目编号
+        return areaCode + year + projectType + serialNumber;
+    }
 }

From d3e2ba0d35f9e1a19d79a1a410c27fdfc7ebc39b Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 17:48:57 +0800
Subject: [PATCH 28/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/common/constant/BizConst.java |  2 +-
 .../controller/GovProjectCollectionController.java | 10 ++++++++-
 .../gov/manage/GovProjectCollectionManage.java     | 26 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

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 0b5acfe..5e4f337 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
@@ -95,6 +95,6 @@ public interface BizConst {
     String PROD = "prod";
 
     String SAVE_SUCCESS = "保存成功";
-
+    String OP_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 e4dfa02..d0c76a8 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
@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -56,7 +57,14 @@ public class GovProjectCollectionController {
     @PostMapping("/save")
     @ApiOperation("项目归集保存")
     @WebLog("项目归集保存")
-    public String save(@RequestBody GovBizProjectSaveDTO saveDTO) {
+    public String save(@Valid @RequestBody GovBizProjectSaveDTO saveDTO) {
         return collectionManage.save(saveDTO);
     }
+
+    @PostMapping("/remove/{projId}")
+    @ApiOperation("项目归集删除")
+    @WebLog("项目归集删除")
+    public String remove(@PathVariable String projId) {
+        return collectionManage.remove(projId);
+    }
 }
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 887d3c2..b90baae 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
@@ -319,6 +319,32 @@ public class GovProjectCollectionManage {
         return BizConst.SAVE_SUCCESS;
     }
 
+    /**
+     * 删除项目归集
+     * @param projId
+     * @return
+     */
+    public String remove(String projId) {
+        GovBizProjectBaseinfo baseinfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
+                .eq(GovBizProjectBaseinfo::getBaseProjId, projId)
+                .last(BizConst.LIMIT_1));
+        
+        VUtils.isTrue(Objects.isNull(baseinfo)).throwMessage("项目不存在！");
+
+        baseinfoService.removeById(baseinfo);
+        projectApplyService.remove(Wrappers.lambdaQuery(GovBizProjectApply.class)
+                .eq(GovBizProjectApply::getBaseProjId,projId));
+        approveService.remove(Wrappers.lambdaQuery(GovBizProjectApprove.class)
+                .eq(GovBizProjectApprove::getBaseProjId,projId));
+        cimplementService.remove(Wrappers.lambdaQuery(GovBizProjectCimplement.class)
+                .eq(GovBizProjectCimplement::getBaseProjId,projId));
+        mimplementService.remove(Wrappers.lambdaQuery(GovBizProjectMimplement.class)
+                .eq(GovBizProjectMimplement::getBaseProjId,projId));
+        procureService.remove(Wrappers.lambdaQuery(GovBizProjectProcure.class)
+                .eq(GovBizProjectProcure::getBaseProjId,projId));
+        return BizConst.OP_SUCCESS;
+    }
+
     private void checkName(String baseProjName, String baseProjId) {
         VUtils.isTrue(baseinfoService.count(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
                 .eq(GovBizProjectBaseinfo::getBaseProjName,baseProjName)

From f209fb2d57ba241f34643aac8453b106a9ad6bfb Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 18:01:28 +0800
Subject: [PATCH 29/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java    | 2 +-
 .../com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java    | 2 +-
 .../java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 40f9f7f..ac13a1d 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
@@ -50,7 +50,7 @@ public class GovBizProjectBaseinfoDTO implements Serializable {
     private String isEffective;
 
     @ApiModelProperty("上级主管单位")
-    private String baseProvManDeprtName;
+    private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
     private String baseProvManDeprtDing;
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
index 63f6dfa..e6ce63b 100644
--- 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
@@ -58,7 +58,7 @@ public class GovBizProjectBaseinfo implements Serializable {
     private String isEffective;
 
     @ApiModelProperty("上级主管单位")
-    private String baseProvManDeprtName;
+    private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
     private String baseProvManDeprtDing;
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
index 8c8b170..b945692 100644
--- 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
@@ -52,7 +52,7 @@ public class GovBizProjectBaseinfoVO implements Serializable {
     private String isEffective;
 
     @ApiModelProperty("上级主管单位")
-    private String baseProvManDeprtName;
+    private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
     private String baseProvManDeprtDing;

From 2a827e2f9cf89fc3d17635356becc0f0ba6910de Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 18:02:29 +0800
Subject: [PATCH 30/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java    | 2 +-
 .../com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java    | 2 +-
 .../java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 40f9f7f..ac13a1d 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
@@ -50,7 +50,7 @@ public class GovBizProjectBaseinfoDTO implements Serializable {
     private String isEffective;
 
     @ApiModelProperty("上级主管单位")
-    private String baseProvManDeprtName;
+    private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
     private String baseProvManDeprtDing;
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
index 63f6dfa..e6ce63b 100644
--- 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
@@ -58,7 +58,7 @@ public class GovBizProjectBaseinfo implements Serializable {
     private String isEffective;
 
     @ApiModelProperty("上级主管单位")
-    private String baseProvManDeprtName;
+    private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
     private String baseProvManDeprtDing;
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
index 8c8b170..b945692 100644
--- 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
@@ -52,7 +52,7 @@ public class GovBizProjectBaseinfoVO implements Serializable {
     private String isEffective;
 
     @ApiModelProperty("上级主管单位")
-    private String baseProvManDeprtName;
+    private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
     private String baseProvManDeprtDing;

From 2e84e9bd1edfe98ba81c2ce198d518b03c79e077 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 24 Aug 2023 18:10:00 +0800
Subject: [PATCH 31/34] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86debug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java  | 4 ++--
 .../com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java  | 4 ++--
 .../com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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 ac13a1d..a144226 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
@@ -62,7 +62,7 @@ public class GovBizProjectBaseinfoDTO implements Serializable {
     private String baseManDeprtDing;
 
     @ApiModelProperty("本级主管单位社会统一信用代码")
-    private String baseManDeprtDingUsci;
+    private String baseManDepartUsci;
 
     @ApiModelProperty("建设单位")
     private String baseBuildDeprt;
@@ -71,7 +71,7 @@ public class GovBizProjectBaseinfoDTO implements Serializable {
     private String baseBuildDeprtDing;
 
     @ApiModelProperty("建设单位社会统一信用代码")
-    private String baseBuildDeprtUsci;
+    private String baseBuildDepartUsci;
 
     @ApiModelProperty("项目负责人")
     private String baseProjPrincipal;
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
index e6ce63b..a2a7b35 100644
--- 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
@@ -70,7 +70,7 @@ public class GovBizProjectBaseinfo implements Serializable {
     private String baseManDeprtDing;
 
     @ApiModelProperty("本级主管单位社会统一信用代码")
-    private String baseManDeprtDingUsci;
+    private String baseManDepartUsci;
 
     @ApiModelProperty("建设单位")
     private String baseBuildDeprt;
@@ -79,7 +79,7 @@ public class GovBizProjectBaseinfo implements Serializable {
     private String baseBuildDeprtDing;
 
     @ApiModelProperty("建设单位社会统一信用代码")
-    private String baseBuildDeprtUsci;
+    private String baseBuildDepartUsci;
 
     @ApiModelProperty("项目负责人")
     private String baseProjPrincipal;
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
index b945692..b964c66 100644
--- 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
@@ -55,7 +55,7 @@ public class GovBizProjectBaseinfoVO implements Serializable {
     private String baseProvManDeprt;
 
     @ApiModelProperty("上级主管单位钉id")
-    private String baseProvManDeprtDing;
+    private String baseProvManDepartDing;
 
     @ApiModelProperty("本级主管单位")
     private String baseManDeprt;
@@ -64,7 +64,7 @@ public class GovBizProjectBaseinfoVO implements Serializable {
     private String baseManDeprtDing;
 
     @ApiModelProperty("本级主管单位社会统一信用代码")
-    private String baseManDeprtDingUsci;
+    private String baseManDepartUsci;
 
     @ApiModelProperty("建设单位")
     private String baseBuildDeprt;

From 9a5f181184d5d0674b633d0f8950dab24959ec6e Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 25 Aug 2023 10:37:41 +0800
Subject: [PATCH 32/34] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 syn-data-task/pom.xml                              |  30 +++++
 .../com/ningdatech/syndataapi/SynDataTaskApp.java  |   2 +-
 .../syndataapi/common/constant/BizConst.java       | 100 ++++++++++++++
 .../open/controller/ProjectReceiveController.java  |  32 +++++
 .../open/manage/ProjectReceiveManage.java          | 146 +++++++++++++++++++++
 .../scheduler/model/dto/ProjectSaveDTO.java        |  33 +++++
 6 files changed, 342 insertions(+), 1 deletion(-)
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectSaveDTO.java

diff --git a/syn-data-task/pom.xml b/syn-data-task/pom.xml
index e9a6fba..2f77b2c 100644
--- a/syn-data-task/pom.xml
+++ b/syn-data-task/pom.xml
@@ -82,6 +82,36 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.ningdatech</groupId>
+            <artifactId>nd-basic</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-boot-starter-security</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-security-config</artifactId>
+                    <groupId>org.springframework.security</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-security-web</artifactId>
+                    <groupId>org.springframework.security</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-security-core</artifactId>
+                    <groupId>org.springframework.security</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>mybatis-plus-boot-starter</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <!-- 打包 -->
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
index cad2a6f..0949303 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/SynDataTaskApp.java
@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @EnableTransactionManagement
 @EnableAspectJAutoProxy(exposeProxy = true)
-@ComponentScan(basePackages = {"com.ningdatech.syndataapi.scheduler"})
+@ComponentScan(basePackages = {"com.ningdatech.syndataapi.**"})
 public class SynDataTaskApp {
 
     protected static final String MAPPER_PACKAGES = "com.ningdatech.syndataapi.**.mapper";
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java
new file mode 100644
index 0000000..72592d1
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java
@@ -0,0 +1,100 @@
+package com.ningdatech.syndataapi.common.constant;
+
+import com.ningdatech.basic.model.ApiResponse;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 业务常量
+ * </p>
+ *
+ * @author WendyYang
+ * @since 13:42 2022/12/1
+ */
+public interface BizConst {
+
+    /**
+     * SQL查询一条
+     */
+    String LIMIT_1 = "limit 1";
+
+    String COOKIE_KEY = "ND_PROJECT_MANAGEMENT_JSESSION";
+
+    /**
+     * 一小时秒数
+     **/
+    BigDecimal SECONDS_BY_HOUR = new BigDecimal(60 * 60);
+
+    /**
+     * 十分钟的毫秒数
+     */
+    long MILLS_10_MIN = 1000L * 60 * 10;
+
+    /**
+     * 中国行政区划编码
+     */
+    long ROOT_REGION_CODE = 100000L;
+
+    /**
+     * 一级行政区划数量
+     */
+    int NUM_PROVINCE = 34;
+
+    /**
+     * 默认的父id
+     */
+    long PARENT_ID = 0L;
+
+    /**
+     * 默认树层级
+     */
+    int TREE_GRADE = 0;
+
+    /**
+     * 默认的排序
+     */
+    int SORT_VALUE = 0;
+
+    /**
+     * 浙江省的region_id
+     */
+    long ZJ_REGION_CODE = 330000L;
+    String NINE_AREA_CODE_LAST = "000";
+
+    /**
+     * 省/直辖市 level
+     */
+    int GOV_L1 = 1;
+
+    /**
+     * 市 level
+     */
+    int GOV_L2 = 2;
+
+    /**
+     * 区/县 level
+     */
+    int GOV_L3 = 3;
+
+    /**
+     * 密码正则：长度8-20位且至少包含大写字母、小写字母、数字或特殊符号中的任意三种
+     */
+    String REGEX_PASS = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_]+$)(?![a-z0-9]+$)(?![a-z\\W_]+$)(?![0-9\\W_]+$)[a-zA-Z0-9\\W_]{8,20}$";
+
+    ApiResponse<Void> UNAUTHENTICATED = ApiResponse.of(401, "用户未登录", null);
+
+    int MAX_EXPORT_COUNT = 5000;
+
+    String RESPONSE_KEY_DATA = "data";
+    String ORG_NAME = "organizationName";
+    String ORG_CODE = "organizationCode";
+
+    String DEV = "dev";
+    String PRE = "pre";
+    String PROD = "prod";
+
+    String SAVE_SUCCESS = "保存成功";
+    String OP_SUCCESS = "操作成功";
+    String SAVE_FAIL = "保存失败";
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java
new file mode 100644
index 0000000..4c80e6b
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java
@@ -0,0 +1,32 @@
+package com.ningdatech.syndataapi.open.controller;
+
+import com.ningdatech.basic.model.ApiResponse;
+import com.ningdatech.syndataapi.open.manage.ProjectReceiveManage;
+import com.ningdatech.syndataapi.scheduler.model.dto.ProjectSaveDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @Classname ProjectCollectionController
+ * @Description
+ * @Date 2023/6/25 9:11
+ * @Author PoffyZhang
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "项目归集控制器")
+@RequestMapping("/open/api/v1/project-receive")
+public class ProjectReceiveController {
+
+    private final ProjectReceiveManage receiveManage;
+
+    @PostMapping("/save")
+    @ApiOperation("项目归集接收")
+    public ApiResponse<String> save(@Valid @RequestBody ProjectSaveDTO dto) {
+        return ApiResponse.ofSuccess(receiveManage.save(dto));
+    }
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java
new file mode 100644
index 0000000..c0b040b
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java
@@ -0,0 +1,146 @@
+package com.ningdatech.syndataapi.open.manage;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.basic.function.VUtils;
+import com.ningdatech.syndataapi.common.constant.BizConst;
+import com.ningdatech.syndataapi.scheduler.model.dto.ProjectSaveDTO;
+import com.ningdatech.syndataapi.scheduler.model.entity.*;
+import com.ningdatech.syndataapi.scheduler.service.*;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+
+/**
+ * @Classname ProjectReceiveManage
+ * @Description
+ * @Date 2023/8/25 9:11
+ * @Author PoffyZhang
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class ProjectReceiveManage {
+
+    private final IProjectBaseInfoService baseInfoService;
+
+    private final IProjectApplyService applyService;
+
+    private final IProjectApproveService approveService;
+
+    private final IProjectCimplementService cimplementService;
+
+    private final IProjectMimplementService mimplementService;
+
+    private final IProjectProcureService procureService;
+
+    /**
+     * 接收保存 项目
+     * @param dto
+     * @return
+     */
+    public String save(ProjectSaveDTO dto) {
+
+        //1.保存项目基本信息
+        ProjectBaseInfo baseInfo = dto.getBaseinfo();
+        String baseProjId = baseInfo.getBaseProjId();
+        VUtils.isTrue(StringUtils.isBlank(baseProjId))
+                .throwMessage("项目编号不能为空!");
+
+        ProjectBaseInfo oldBaseInfo = baseInfoService.getOne(Wrappers.lambdaQuery(ProjectBaseInfo.class)
+                .eq(ProjectBaseInfo::getBaseProjId, baseProjId)
+                .last(BizConst.LIMIT_1));
+        ProjectBaseInfo saveBase = BeanUtil.copyProperties(baseInfo,ProjectBaseInfo.class);
+        if(Objects.isNull(oldBaseInfo)){
+            saveBase.setTongTime(LocalDateTime.now());
+        }
+        saveBase.setBizTime(LocalDateTime.now());
+        baseInfoService.saveOrUpdate(saveBase);
+
+        // 2.保存 申报信息
+        ProjectApply apply = dto.getApply();
+
+        ProjectApply oldApply = applyService.getOne(Wrappers.lambdaQuery(ProjectApply.class)
+                .eq(ProjectApply::getBaseProjId, baseProjId)
+                .last(BizConst.LIMIT_1));
+
+        ProjectApply saveApply = BeanUtil.copyProperties(apply,ProjectApply.class);
+        saveApply.setBaseProjId(baseProjId);
+        if(Objects.isNull(oldApply)){
+            saveApply.setTongTime(LocalDateTime.now());
+        }
+        saveApply.setBizTime(LocalDateTime.now());
+        applyService.saveOrUpdate(saveApply);
+
+
+        // 3.保存 审批信息
+        ProjectApprove approve = dto.getApprove();
+
+        ProjectApprove oldApprove = approveService.getOne(Wrappers.lambdaQuery(ProjectApprove.class)
+                .eq(ProjectApprove::getBaseProjId, baseProjId)
+                .last(BizConst.LIMIT_1));
+
+        ProjectApprove saveApprove = BeanUtil.copyProperties(approve,ProjectApprove.class);
+        saveApprove.setBaseProjId(baseProjId);
+        if(Objects.isNull(oldApprove)){
+            saveApprove.setTongTime(LocalDateTime.now());
+        }
+        saveApprove.setBizTime(LocalDateTime.now());
+        approveService.saveOrUpdate(saveApprove);
+
+
+        // 4.保存 建设项目 实施信息
+        ProjectCimplement cimplement = dto.getCimplement();
+        if(Objects.nonNull(cimplement)){
+            ProjectCimplement oldCimplement = cimplementService.getOne(Wrappers.lambdaQuery(ProjectCimplement.class)
+                    .eq(ProjectCimplement::getBaseProjId, baseProjId)
+                    .last(BizConst.LIMIT_1));
+
+            ProjectCimplement saveCimplement = BeanUtil.copyProperties(cimplement,ProjectCimplement.class);
+            saveCimplement.setBaseProjId(baseProjId);
+            if(Objects.isNull(oldCimplement)){
+                saveCimplement.setTongTime(LocalDateTime.now());
+            }
+            saveCimplement.setBizTime(LocalDateTime.now());
+            cimplementService.saveOrUpdate(saveCimplement);
+        }
+
+        // 5.保存 运维项目 实施信息
+        ProjectMimplement mimplement = dto.getMimplement();
+        if(Objects.nonNull(mimplement)){
+            ProjectMimplement oldMimplement = mimplementService.getOne(Wrappers.lambdaQuery(ProjectMimplement.class)
+                    .eq(ProjectMimplement::getBaseProjId, baseProjId)
+                    .last(BizConst.LIMIT_1));
+
+            ProjectMimplement saveMimplement = BeanUtil.copyProperties(mimplement,ProjectMimplement.class);
+            saveMimplement.setBaseProjId(baseProjId);
+            if(Objects.isNull(oldMimplement)){
+                saveMimplement.setTongTime(LocalDateTime.now());
+            }
+            saveMimplement.setBizTime(LocalDateTime.now());
+            mimplementService.saveOrUpdate(saveMimplement);
+        }
+
+        // 6.保存 采购信息
+        ProjectProcure procure = dto.getProcure();
+        if(Objects.nonNull(procure)){
+            ProjectProcure oldProcure = procureService.getOne(Wrappers.lambdaQuery(ProjectProcure.class)
+                    .eq(ProjectProcure::getBaseProjId, baseProjId)
+                    .last(BizConst.LIMIT_1));
+
+            ProjectProcure saveProcure = BeanUtil.copyProperties(procure,ProjectProcure.class);
+            saveProcure.setBaseProjId(baseProjId);
+            if(Objects.isNull(oldProcure)){
+                saveProcure.setTongTime(LocalDateTime.now());
+            }
+            saveProcure.setBizTime(LocalDateTime.now());
+            procureService.saveOrUpdate(saveProcure);
+        }
+
+        return BizConst.SAVE_SUCCESS;
+    }
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectSaveDTO.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectSaveDTO.java
new file mode 100644
index 0000000..95e7109
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectSaveDTO.java
@@ -0,0 +1,33 @@
+package com.ningdatech.syndataapi.scheduler.model.dto;
+
+import com.ningdatech.syndataapi.scheduler.model.entity.*;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Classname ProjectSaveDTO
+ * @Description
+ * @Date 2023/8/25 9:45
+ * @Author PoffyZhang
+ */
+@Data
+@ApiModel(value = "SProjectSaveDTO", description = "项目保存")
+public class ProjectSaveDTO {
+
+    @NotNull(message = "项目基本信息不能为空")
+    private ProjectBaseInfo baseinfo;
+
+    @NotNull(message = "项目申报信息不能为空")
+    private ProjectApply apply;
+
+    @NotNull(message = "项目审批信息不能为空")
+    private ProjectApprove approve;
+
+    private ProjectCimplement cimplement;
+
+    private ProjectMimplement mimplement;
+
+    private ProjectProcure procure;
+}

From b7415791871699bb5fd525461528b607b1a5bf29 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 25 Aug 2023 13:53:29 +0800
Subject: [PATCH 33/34] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/gov/contants/BizProjectContant.java      |  22 ++++
 .../pmapi/gov/convert/ProjectConvert.java          | 114 +++++++++++++++++
 .../gov/manage/GovProjectCollectionManage.java     |  60 ++++++++-
 .../pmapi/gov/model/req/ProjectApplyReq.java       | 139 +++++++++++++++++++++
 .../pmapi/gov/model/req/ProjectApproveReq.java     |  91 ++++++++++++++
 .../pmapi/gov/model/req/ProjectBaseInfoReq.java    | 106 ++++++++++++++++
 .../pmapi/gov/model/req/ProjectCimplementReq.java  | 109 ++++++++++++++++
 .../pmapi/gov/model/req/ProjectMimplementReq.java  |  97 ++++++++++++++
 .../pmapi/gov/model/req/ProjectProcureReq.java     |  97 ++++++++++++++
 .../pmapi/gov/model/req/ProjectPushReq.java        |  32 +++++
 .../syndataapi/common/constant/BizConst.java       |   1 +
 .../open/controller/ProjectReceiveController.java  |   8 ++
 .../open/manage/ProjectReceiveManage.java          |  22 ++++
 .../scheduler/model/dto/ProjectBaseInfoDTO.java    | 103 +++++++++++++++
 14 files changed, 1000 insertions(+), 1 deletion(-)
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApplyReq.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApproveReq.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectBaseInfoReq.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectCimplementReq.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectMimplementReq.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectProcureReq.java
 create mode 100644 pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectPushReq.java
 create mode 100644 syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectBaseInfoDTO.java

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java
new file mode 100644
index 0000000..49f8d24
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java
@@ -0,0 +1,22 @@
+package com.ningdatech.pmapi.gov.contants;
+
+/**
+ * @Classname BizProjectContant
+ * @Description
+ * @Date 2023/8/25 11:03
+ * @Author PoffyZhang
+ */
+public interface BizProjectContant {
+
+    String PUSH_URL = "http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/save";
+    String NOT_EFFECTIVE_URL = "http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/not-effective";
+    String NOT_EFFECTIVE_CODE = "1";
+
+    class ProjectCollection {
+        //有效
+        public static final String IS_EFFECTIVE = "02";
+        //有效
+        public static final String NOT_EFFECTIVE = "01";
+    }
+
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
new file mode 100644
index 0000000..230e389
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
@@ -0,0 +1,114 @@
+package com.ningdatech.pmapi.gov.convert;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ningdatech.pmapi.gov.model.dto.*;
+import com.ningdatech.pmapi.gov.model.req.*;
+
+import java.util.Objects;
+
+/**
+ * @Classname ProjectConvert
+ * @Description
+ * @Date 2023/8/25 11:53
+ * @Author PoffyZhang
+ */
+public class ProjectConvert {
+
+    /**
+     * 6个 转换方法
+     * @param saveDTO
+     * @return
+     */
+    public static ProjectPushReq convert(GovBizProjectSaveDTO saveDTO) {
+        ProjectPushReq req = new ProjectPushReq();
+        req.setBaseinfo(convertBase(saveDTO.getBaseinfo()));
+        req.setApply(convertApply(saveDTO.getApply()));
+        req.setApprove(convertApprove(saveDTO.getApprove()));
+        req.setCimplement(convertCimplement(saveDTO.getCimplement()));
+        req.setMimplement(convertMimplement(saveDTO.getMimplement()));
+        req.setProcure(convertProcure(saveDTO.getProcure()));
+        return req;
+    }
+
+    private static ProjectProcureReq convertProcure(GovBizProjectProcureDTO procure) {
+        ProjectProcureReq req = BeanUtil.copyProperties(procure,ProjectProcureReq.class);
+        return req;
+    }
+
+    private static ProjectMimplementReq convertMimplement(GovBizProjectMimplementDTO mimplement) {
+        ProjectMimplementReq req = BeanUtil.copyProperties(mimplement,ProjectMimplementReq.class);
+        return req;
+    }
+
+    public static ProjectCimplementReq convertCimplement(GovBizProjectCimplementDTO cimplement) {
+        ProjectCimplementReq req = BeanUtil.copyProperties(cimplement,ProjectCimplementReq.class);
+        return req;
+    }
+
+    public static ProjectApproveReq convertApprove(GovBizProjectApproveDTO approve) {
+        ProjectApproveReq req = new ProjectApproveReq();
+        req.setBaseProjId(approve.getBaseProjId());
+        req.setBaseProjName(approve.getBaseProjName());
+        req.setOp(approve.getOp());
+        req.setApprovalFile(approve.getApprovalFile());
+        req.setBaseReviewCommentsFile(approve.getBaseReviewCommentFile());
+        req.setPreliminaryDesignFile(approve.getPreliminaryDesignFile());
+        req.setAreaCode(approve.getAreaCode());
+        req.setBaseDevelopCode(approve.getBaseDevelopCode());
+        req.setBaseExpertTotalMoney(String.valueOf(approve.getBaseExpertTotalMoney()));
+        req.setBaseExpertYearMoney(String.valueOf(approve.getBaseExpertYearMoney()));
+        req.setReleaseYearMoney(String.valueOf(approve.getReleaseYearMoney()));
+        req.setBaseInitialReviewTotalMoney(String.valueOf(approve.getBaseInitialReviewTotalMoney()));
+        req.setBaseReviewOpinion(approve.getBaseReviewOpinion());
+        req.setBaseReviewResults(approve.getBaseReviewResults());
+        req.setEqualProtectionLevel(approve.getEqualProtectionLevel());
+        req.setPreliminaryDesignScheme(approve.getPreliminaryDesignScheme());
+        req.setSetProjCodeFinan(approve.getSetProjCodeFinan());
+        return req;
+    }
+
+    public static ProjectApplyReq convertApply(GovBizProjectApplyDTO apply) {
+        ProjectApplyReq req = new ProjectApplyReq();
+        if(Objects.isNull(apply)){
+            return req;
+        }
+        req.setOp(apply.getOp());
+        req.setBaseProjId(apply.getBaseProjId());
+        req.setBaseProjName(apply.getBaseProjName());
+        req.setAreaCode(apply.getAreaCode());
+        req.setBaseAccountAppName(apply.getBaseAccountAppName());
+        req.setBaseBasisEstablish(apply.getBaseBasisEstablish());
+        req.setBaseCoreBusiness(apply.getBaseCoreBusiness());
+        req.setBaseCoreBusinessCode(apply.getBaseCoreBusinessCode());
+        req.setBaseBrainName(apply.getBaseBrainName());
+        req.setBaseDevelopCode(apply.getBaseDevelopCode());
+        req.setBaseLowestLevel(apply.getBaseLowestLevel());
+        req.setBaseHistorProjId(apply.getBaseHistorProjId());
+        req.setBaseHistorProjName(apply.getBaseHistorProjName());
+        req.setBaseOperatMaintenFile(apply.getBaseOperatMaintenFile());
+        req.setBaseProjApplyFile(apply.getBaseProjApplyFile());
+        req.setBaseProjBasisFile(apply.getBaseProjBasisFile());
+        req.setBaseProjOtherFile(apply.getBaseProjOtherFile());
+        req.setBaseResearchReportFile(apply.getBaseResearchReportFile());
+        req.setBaseProjConsClass(apply.getBaseProjConsClass());
+        req.setBaseProjDuration(String.valueOf(apply.getBaseProjDuration()));
+        req.setBaseProjIntro(apply.getBaseProjIntro());
+        req.setBaseProjStartTime(String.valueOf(apply.getBaseProjStartTime()));
+        req.setBaseProjEndTime(String.valueOf(apply.getBaseProjEndTime()));
+        req.setBaseProjSetYear(apply.getBaseProjSetYear());
+        req.setBaseProjSys(apply.getBaseProjSys());
+        req.setBaseProjSysCode(apply.getBaseDevelopCode());
+        req.setBaseProjDeclAmount(String.valueOf(apply.getBaseProjDeclAmount()));
+        req.setBaseProjTotalAmount(String.valueOf(apply.getBaseProjTotalAmount()));
+        req.setBaseBasisAmountOri(apply.getBaseBasisAmountOri());
+        req.setBaseProjAmountOri(apply.getBaseProjAmountOri());
+        req.setBaseProjRemark(apply.getBaseProjRemark());
+        req.setBeseExpectedResults(apply.getBeseExpectedResults());
+        return req;
+    }
+
+    public static ProjectBaseInfoReq convertBase(GovBizProjectBaseinfoDTO baseinfo) {
+        ProjectBaseInfoReq req = BeanUtil.copyProperties(baseinfo,ProjectBaseInfoReq.class);
+        return req;
+    }
+}
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 b90baae..8bc45a8 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
@@ -9,15 +9,23 @@ import com.google.common.collect.Maps;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.pmapi.common.constant.BizConst;
+import com.ningdatech.pmapi.gov.contants.BizProjectContant;
+import com.ningdatech.pmapi.gov.convert.ProjectConvert;
 import com.ningdatech.pmapi.gov.model.dto.*;
 import com.ningdatech.pmapi.gov.model.entity.*;
+import com.ningdatech.pmapi.gov.model.req.ProjectApplyReq;
+import com.ningdatech.pmapi.gov.model.req.ProjectBaseInfoReq;
+import com.ningdatech.pmapi.gov.model.req.ProjectPushReq;
 import com.ningdatech.pmapi.gov.model.vo.*;
 import com.ningdatech.pmapi.gov.service.*;
 import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
 
 import java.time.LocalDateTime;
 import java.util.Collections;
@@ -33,6 +41,7 @@ import java.util.stream.Collectors;
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class GovProjectCollectionManage {
 
     private final IGovProjectDictionaryService dictionaryService;
@@ -51,6 +60,8 @@ public class GovProjectCollectionManage {
 
     private final GenerateProjectCodeUtil generateProjectCodeUtil;
 
+    private final RestTemplate restTemplate;
+
     public List<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -195,7 +206,8 @@ public class GovProjectCollectionManage {
 
         //1.保存基本信息
         GovBizProjectBaseinfoDTO baseinfo = saveDTO.getBaseinfo();
-
+        baseinfo.setBaseProjId(baseProjId);
+        baseinfo.setBaseProjName(baseProjName);
         GovBizProjectBaseinfo oldBaseInfo = baseinfoService.getOne(Wrappers.lambdaQuery(GovBizProjectBaseinfo.class)
                 .eq(GovBizProjectBaseinfo::getBaseProjId, baseProjId)
                 .last(BizConst.LIMIT_1));
@@ -205,6 +217,7 @@ public class GovProjectCollectionManage {
         GovBizProjectBaseinfo saveBase = BeanUtil.copyProperties(baseinfo,GovBizProjectBaseinfo.class);
         saveBase.setBaseProjId(baseProjId);
         saveBase.setBaseProjName(baseProjName);
+        saveBase.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE);
         if(Objects.nonNull(oldBaseInfo)){
             saveBase.setId(oldBaseInfo.getId());
         }else{
@@ -218,6 +231,8 @@ public class GovProjectCollectionManage {
 
         // 2.保存 申报信息
         GovBizProjectApplyDTO apply = saveDTO.getApply();
+        apply.setBaseProjId(baseProjId);
+        apply.setBaseProjName(baseProjName);
         if(Objects.nonNull(apply)){
             GovBizProjectApply oldApply = projectApplyService.getOne(Wrappers.lambdaQuery(GovBizProjectApply.class)
                     .eq(GovBizProjectApply::getBaseProjId, baseProjId)
@@ -238,6 +253,8 @@ public class GovProjectCollectionManage {
 
         // 3.保存 审批信息
         GovBizProjectApproveDTO approve = saveDTO.getApprove();
+        approve.setBaseProjId(baseProjId);
+        approve.setBaseProjName(baseProjName);
         if(Objects.nonNull(approve)){
             GovBizProjectApprove oldApprove = approveService.getOne(Wrappers.lambdaQuery(GovBizProjectApprove.class)
                     .eq(GovBizProjectApprove::getBaseProjId, baseProjId)
@@ -258,6 +275,8 @@ public class GovProjectCollectionManage {
 
         // 4.保存 建设项目 实施信息
         GovBizProjectCimplementDTO cimplement = saveDTO.getCimplement();
+        cimplement.setBaseProjId(baseProjId);
+        cimplement.setBaseProjName(baseProjName);
         if(Objects.nonNull(cimplement)){
             GovBizProjectCimplement oldCimplement = cimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectCimplement.class)
                     .eq(GovBizProjectCimplement::getBaseProjId, baseProjId)
@@ -278,6 +297,8 @@ public class GovProjectCollectionManage {
 
         // 5.保存 运维项目 实施信息
         GovBizProjectMimplementDTO mimplement = saveDTO.getMimplement();
+        mimplement.setBaseProjId(baseProjId);
+        mimplement.setBaseProjName(baseProjName);
         if(Objects.nonNull(mimplement)){
             GovBizProjectMimplement oldMimplement = mimplementService.getOne(Wrappers.lambdaQuery(GovBizProjectMimplement.class)
                     .eq(GovBizProjectMimplement::getBaseProjId, baseProjId)
@@ -298,6 +319,8 @@ public class GovProjectCollectionManage {
 
         // 6.保存 采购信息
         GovBizProjectProcureDTO procure = saveDTO.getProcure();
+        procure.setBaseProjId(baseProjId);
+        procure.setBaseProjName(baseProjName);
         if(Objects.nonNull(procure)){
             GovBizProjectProcure oldProcure = procureService.getOne(Wrappers.lambdaQuery(GovBizProjectProcure.class)
                     .eq(GovBizProjectProcure::getBaseProjId, baseProjId)
@@ -316,6 +339,9 @@ public class GovProjectCollectionManage {
             procureService.saveOrUpdate(saveProcure);
         }
 
+        //7. 推送数据
+        pushProject(saveDTO);
+
         return BizConst.SAVE_SUCCESS;
     }
 
@@ -342,6 +368,7 @@ public class GovProjectCollectionManage {
                 .eq(GovBizProjectMimplement::getBaseProjId,projId));
         procureService.remove(Wrappers.lambdaQuery(GovBizProjectProcure.class)
                 .eq(GovBizProjectProcure::getBaseProjId,projId));
+        notEffectiveProject(BeanUtil.copyProperties(baseinfo,GovBizProjectBaseinfoDTO.class));
         return BizConst.OP_SUCCESS;
     }
 
@@ -351,4 +378,35 @@ public class GovProjectCollectionManage {
                 .ne(GovBizProjectBaseinfo::getBaseProjId,baseProjId)) > 0L)
                 .throwMessage("项目名重复");
     }
+
+    /**
+     * 推送项目
+     * @param saveDTO
+     */
+    private void pushProject(GovBizProjectSaveDTO saveDTO) {
+        String url = BizProjectContant.PUSH_URL;
+        ProjectPushReq req = ProjectConvert.convert(saveDTO);
+        try{
+            ResponseEntity<String> response = restTemplate.postForEntity(url, null, String.class, req);
+            log.info("推送结果  {} :{}",saveDTO.getBaseProjId(),response);
+        }catch (Exception e){
+            log.info("推送失败,{}",e.getMessage());
+        }
+    }
+
+    /**
+     * 把项目置为无效
+     * @param baseinfo
+     */
+    private void notEffectiveProject(GovBizProjectBaseinfoDTO baseinfo) {
+        String url = BizProjectContant.NOT_EFFECTIVE_URL;
+        baseinfo.setIsEffective(BizProjectContant.NOT_EFFECTIVE_CODE);
+        ProjectBaseInfoReq req = ProjectConvert.convertBase(baseinfo);
+        try{
+            ResponseEntity<String> response = restTemplate.postForEntity(url, null, String.class, req);
+            log.info("推送结果  {} :{}",baseinfo.getBaseProjId(),response);
+        }catch (Exception e){
+            log.info("推送失败,{}",e.getMessage());
+        }
+    }
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApplyReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApplyReq.java
new file mode 100644
index 0000000..1b9eef8
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApplyReq.java
@@ -0,0 +1,139 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+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;
+
+/**
+ * <p>
+ * 项目申报信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_apply")
+@ApiModel(value = "SzlsDaBiz331100ProjectApply对象", description = "项目申报信息")
+public class ProjectApplyReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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 baseProjSysCode;
+
+    @ApiModelProperty("一本账重大应用名称")
+    private String baseAccountAppName;
+
+    @ApiModelProperty("“领域大脑”一本账名称")
+    private String baseBrainName;
+
+    @ApiModelProperty("单位核心业务名称")
+    private String baseCoreBusiness;
+
+    @ApiModelProperty("单位核心业务编码")
+    private String baseCoreBusinessCode;
+
+    @ApiModelProperty("项目起始时间")
+    private String baseProjStartTime;
+
+    @ApiModelProperty("项目终止时间")
+    private String baseProjEndTime;
+
+    @ApiModelProperty("项目期限")
+    private String baseProjDuration;
+
+    @ApiModelProperty("预算年度")
+    private String baseProjSetYear;
+
+    @ApiModelProperty("预算来源")
+    private String baseProjAmountOri;
+
+    @ApiModelProperty("预算来源说明")
+    private String baseBasisAmountOri;
+
+    @ApiModelProperty("项目总投资")
+    private String baseProjTotalAmount;
+
+    @ApiModelProperty("申报年度预算")
+    private String 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("数据来源")
+    private String areaCode;
+
+    @ApiModelProperty("出生产库时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("数据入库时间")
+    private LocalDateTime tongTime;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApproveReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApproveReq.java
new file mode 100644
index 0000000..2689d9f
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectApproveReq.java
@@ -0,0 +1,91 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+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;
+
+/**
+ * <p>
+ * 项目立项评审信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_approve")
+@ApiModel(value = "SzlsDaBiz331100ProjectApprove对象", description = "项目立项评审信息")
+public class ProjectApproveReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @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 baseReviewCommentsFile;
+
+    @ApiModelProperty("建议总投资")
+    private String baseExpertTotalMoney;
+
+    @ApiModelProperty("建议年度预算")
+    private String baseExpertYearMoney;
+
+    @ApiModelProperty("立项批复文件")
+    private String approvalFile;
+
+    @ApiModelProperty("建议批复总投资")
+    private String baseInitialReviewTotalMoney;
+
+    @ApiModelProperty("建议批复年度预算")
+    private String baseProjReplyAmount;
+
+    @ApiModelProperty("等保定级")
+    private String equalProtectionLevel;
+
+    @ApiModelProperty("初步设计方案")
+    private String preliminaryDesignScheme;
+
+    @ApiModelProperty("初步设计方案批复函")
+    private String preliminaryDesignFile;
+
+    @ApiModelProperty("年度预算下达金额")
+    private String releaseYearMoney;
+
+    @ApiModelProperty("数据来源")
+    private String areaCode;
+
+    @ApiModelProperty("出生产库时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("数据入库时间")
+    private LocalDateTime tongTime;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectBaseInfoReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectBaseInfoReq.java
new file mode 100644
index 0000000..a68fbf7
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectBaseInfoReq.java
@@ -0,0 +1,106 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+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;
+
+/**
+ * <p>
+ * 项目基本信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_baseinfo")
+@ApiModel(value = "SzlsDaBiz331100ProjectBaseinfo对象", description = "项目基本信息")
+public class ProjectBaseInfoReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("所属区划")
+    private String baseAreaName;
+
+    @ApiModelProperty("所属区划编码")
+    private String baseAreaCode;
+
+    @ApiModelProperty("是否涉密")
+    private String baseProjIsConfidentiality;
+
+    @ApiModelProperty("项目类型")
+    private String baseProjType;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
+    @ApiModelProperty("项目状态")
+    private String baseProjSetProg;
+
+    @ApiModelProperty("信息是否有效")
+    private String isEffective;
+
+    @ApiModelProperty("上级主管单位")
+    private String baseProvManDeprt;
+
+    @ApiModelProperty("上级主管单位浙政钉ID")
+    private String baseProvManDeprtDing;
+
+    @ApiModelProperty("本级主管单位")
+    private String baseManDeprt;
+
+    @ApiModelProperty("本级主管单位浙政钉ID")
+    private String baseManDeprtDing;
+
+    @ApiModelProperty("本级主管单位统一社会信用代码")
+    private String baseManDepartUsci;
+
+    @ApiModelProperty("建设单位（申报单位）")
+    private String baseBuildDeprt;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String baseBuildDeprtDing;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String baseBuildDepartUsci;
+
+    @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;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectCimplementReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectCimplementReq.java
new file mode 100644
index 0000000..47e5c3d
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectCimplementReq.java
@@ -0,0 +1,109 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+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;
+
+/**
+ * <p>
+ * 建设项目实施信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_cimplement")
+@ApiModel(value = "SzlsDaBiz331100ProjectCimplement对象", description = "建设项目实施信息")
+public class ProjectCimplementReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("标段代码")
+    private String baseBidCode;
+
+    @ApiModelProperty("标段名称")
+    private String baseBidName;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @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;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectMimplementReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectMimplementReq.java
new file mode 100644
index 0000000..5458e31
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectMimplementReq.java
@@ -0,0 +1,97 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+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;
+
+/**
+ * <p>
+ * 运维项目实施信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_mimplement")
+@ApiModel(value = "SzlsDaBiz331100ProjectMimplement对象", description = "运维项目实施信息")
+public class ProjectMimplementReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("标段代码")
+    private String baseBidCode;
+
+    @ApiModelProperty("标段名称")
+    private String baseBidName;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("发改项目代码")
+    private String baseDevelopCode;
+
+    @ApiModelProperty("关联IRS应用编码")
+    private String baseProjSysCode;
+
+    @ApiModelProperty("信息安全等级保护测评报告")
+    private String baseInforLevelFile;
+
+    @ApiModelProperty("商业密码应用评估报告")
+    private String basePasswAssessFile;
+
+    @ApiModelProperty("第三方验收测试报告")
+    private String baseThirdAcceptFile;
+
+    @ApiModelProperty("用户使用报告")
+    private String baseUserConsFile;
+
+    @ApiModelProperty("监理总结报告")
+    private String baseEstaSummFile;
+
+    @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;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectProcureReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectProcureReq.java
new file mode 100644
index 0000000..72f9561
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectProcureReq.java
@@ -0,0 +1,97 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+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;
+
+/**
+ * <p>
+ * 项目采购信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@TableName("szls_da_biz_331100_project_procure")
+@ApiModel(value = "SzlsDaBiz331100ProjectProcure对象", description = "项目采购信息")
+public class ProjectProcureReq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("标段代码")
+    private String baseBidCode;
+
+    @ApiModelProperty("标段名称")
+    private String baseBidName;
+
+    @ApiModelProperty("项目代码")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @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 String baseWinningBidTime;
+
+    @ApiModelProperty("中标（成交）金额")
+    private String baseProjPurchaseAmount;
+
+    @ApiModelProperty("中标（成交）通知书")
+    private String biddingFile;
+
+    @ApiModelProperty("中标（成交）供应商名称")
+    private String baseConsDeprt;
+
+    @ApiModelProperty("中标（成交）供应商统一社会信用代码")
+    private String baseConsDeprtUsci;
+
+    @ApiModelProperty("采购合同")
+    private String purchaseContract;
+
+    @ApiModelProperty("项目款支付时间")
+    private String basePaymentTime;
+
+    @ApiModelProperty("项目款支付金额")
+    private String paymentProgress;
+
+    @ApiModelProperty("数据来源")
+    private String areaCode;
+
+    @ApiModelProperty("出生产库时间")
+    private LocalDateTime bizTime;
+
+    @ApiModelProperty("操作标记")
+    private String op;
+
+    @ApiModelProperty("数据入库时间")
+    private LocalDateTime tongTime;
+
+    @ApiModelProperty("发送端自增列")
+    @TableId(value = "tongID", type = IdType.AUTO)
+    private Integer tongID;
+}
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectPushReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectPushReq.java
new file mode 100644
index 0000000..8ed8f9c
--- /dev/null
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/model/req/ProjectPushReq.java
@@ -0,0 +1,32 @@
+package com.ningdatech.pmapi.gov.model.req;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Classname ProjectPushReq
+ * @Description
+ * @Date 2023/8/25 9:45
+ * @Author PoffyZhang
+ */
+@Data
+@ApiModel(value = "ProjectPushReq", description = "项目保存")
+public class ProjectPushReq {
+
+    @NotNull(message = "项目基本信息不能为空")
+    private ProjectBaseInfoReq baseinfo;
+
+    @NotNull(message = "项目申报信息不能为空")
+    private ProjectApplyReq apply;
+
+    @NotNull(message = "项目审批信息不能为空")
+    private ProjectApproveReq approve;
+
+    private ProjectCimplementReq cimplement;
+
+    private ProjectMimplementReq mimplement;
+
+    private ProjectProcureReq procure;
+}
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java
index 72592d1..d9666a6 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/common/constant/BizConst.java
@@ -97,4 +97,5 @@ public interface BizConst {
     String SAVE_SUCCESS = "保存成功";
     String OP_SUCCESS = "操作成功";
     String SAVE_FAIL = "保存失败";
+    String NOT_EFFECTIVE = "1";
 }
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java
index 4c80e6b..e8655ca 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/controller/ProjectReceiveController.java
@@ -2,7 +2,9 @@ package com.ningdatech.syndataapi.open.controller;
 
 import com.ningdatech.basic.model.ApiResponse;
 import com.ningdatech.syndataapi.open.manage.ProjectReceiveManage;
+import com.ningdatech.syndataapi.scheduler.model.dto.ProjectBaseInfoDTO;
 import com.ningdatech.syndataapi.scheduler.model.dto.ProjectSaveDTO;
+import com.ningdatech.syndataapi.scheduler.model.entity.ProjectBaseInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -29,4 +31,10 @@ public class ProjectReceiveController {
     public ApiResponse<String> save(@Valid @RequestBody ProjectSaveDTO dto) {
         return ApiResponse.ofSuccess(receiveManage.save(dto));
     }
+
+    @PostMapping("/not-effective")
+    @ApiOperation("项目归集置为无效")
+    public ApiResponse<String> notEffective(@Valid @RequestBody ProjectBaseInfoDTO baseinfo) {
+        return ApiResponse.ofSuccess(receiveManage.notEffective(baseinfo));
+    }
 }
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java
index c0b040b..3c13301 100644
--- a/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/open/manage/ProjectReceiveManage.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.basic.function.VUtils;
 import com.ningdatech.syndataapi.common.constant.BizConst;
+import com.ningdatech.syndataapi.scheduler.model.dto.ProjectBaseInfoDTO;
 import com.ningdatech.syndataapi.scheduler.model.dto.ProjectSaveDTO;
 import com.ningdatech.syndataapi.scheduler.model.entity.*;
 import com.ningdatech.syndataapi.scheduler.service.*;
@@ -143,4 +144,25 @@ public class ProjectReceiveManage {
 
         return BizConst.SAVE_SUCCESS;
     }
+
+    /**
+     * 置为无效
+     * @param dto
+     * @return
+     */
+    public String notEffective(ProjectBaseInfoDTO dto) {
+        ProjectBaseInfo oldBaseInfo = baseInfoService.getOne(Wrappers.lambdaQuery(ProjectBaseInfo.class)
+                .eq(ProjectBaseInfo::getBaseProjId, dto.getBaseProjId())
+                .last(BizConst.LIMIT_1));
+
+        ProjectBaseInfo saveBaseinfo = BeanUtil.copyProperties(dto,ProjectBaseInfo.class);
+        saveBaseinfo.setIsEffective(BizConst.NOT_EFFECTIVE);
+        if(Objects.isNull(oldBaseInfo)){
+            saveBaseinfo.setTongTime(LocalDateTime.now());
+        }
+        saveBaseinfo.setBizTime(LocalDateTime.now());
+        baseInfoService.saveOrUpdate(saveBaseinfo);
+
+        return BizConst.OP_SUCCESS;
+    }
 }
diff --git a/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectBaseInfoDTO.java b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectBaseInfoDTO.java
new file mode 100644
index 0000000..208513d
--- /dev/null
+++ b/syn-data-task/src/main/java/com/ningdatech/syndataapi/scheduler/model/dto/ProjectBaseInfoDTO.java
@@ -0,0 +1,103 @@
+package com.ningdatech.syndataapi.scheduler.model.dto;
+
+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 javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 项目基本信息
+ * </p>
+ *
+ * @author CMM
+ * @since 2023-08-22
+ */
+@Data
+@ApiModel(value = "SzlsDaBiz331100ProjectBaseinfo对象", description = "项目基本信息")
+public class ProjectBaseInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("项目代码")
+    @NotBlank(message = "项目编号不能为空")
+    private String baseProjId;
+
+    @ApiModelProperty("项目名称")
+    private String baseProjName;
+
+    @ApiModelProperty("所属区划")
+    private String baseAreaName;
+
+    @ApiModelProperty("所属区划编码")
+    private String baseAreaCode;
+
+    @ApiModelProperty("是否涉密")
+    private String baseProjIsConfidentiality;
+
+    @ApiModelProperty("项目类型")
+    private String baseProjType;
+
+    @ApiModelProperty("内容类别")
+    private String baseConstructionType;
+
+    @ApiModelProperty("项目状态")
+    private String baseProjSetProg;
+
+    @ApiModelProperty("信息是否有效")
+    private String isEffective;
+
+    @ApiModelProperty("上级主管单位")
+    private String baseProvManDeprt;
+
+    @ApiModelProperty("上级主管单位浙政钉ID")
+    private String baseProvManDeprtDing;
+
+    @ApiModelProperty("本级主管单位")
+    private String baseManDeprt;
+
+    @ApiModelProperty("本级主管单位浙政钉ID")
+    private String baseManDeprtDing;
+
+    @ApiModelProperty("本级主管单位统一社会信用代码")
+    private String baseManDepartUsci;
+
+    @ApiModelProperty("建设单位（申报单位）")
+    private String baseBuildDeprt;
+
+    @ApiModelProperty("建设单位浙政钉ID")
+    private String baseBuildDeprtDing;
+
+    @ApiModelProperty("建设单位统一社会信用代码")
+    private String baseBuildDepartUsci;
+
+    @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;
+}

From 394dae06d2f8d0f85231079161c52bddf829a469 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 25 Aug 2023 14:14:07 +0800
Subject: [PATCH 34/34] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=BD=92=E9=9B=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov/manage/GovProjectCollectionManage.java     | 12 +++-
 .../utils/GenerateProjectCodeUtil.java             |  1 -
 .../pmapi/projectlib/model/req/ProjectListReq.java |  1 -
 pmapi/src/main/resources/application-dev.yml       |  3 +
 pmapi/src/main/resources/application-pre.yml       |  3 +
 pmapi/src/main/resources/application-prod.yml      |  3 +
 pmapi/src/test/resources/application-dev.yml       | 73 +++++++------------
 pmapi/src/test/resources/application-pre.yml       | 72 +++++++------------
 pmapi/src/test/resources/application-prod.yml      | 83 +++++++++-------------
 9 files changed, 104 insertions(+), 147 deletions(-)

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 8bc45a8..d0d9fe0 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
@@ -13,7 +13,6 @@ import com.ningdatech.pmapi.gov.contants.BizProjectContant;
 import com.ningdatech.pmapi.gov.convert.ProjectConvert;
 import com.ningdatech.pmapi.gov.model.dto.*;
 import com.ningdatech.pmapi.gov.model.entity.*;
-import com.ningdatech.pmapi.gov.model.req.ProjectApplyReq;
 import com.ningdatech.pmapi.gov.model.req.ProjectBaseInfoReq;
 import com.ningdatech.pmapi.gov.model.req.ProjectPushReq;
 import com.ningdatech.pmapi.gov.model.vo.*;
@@ -23,6 +22,7 @@ import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -62,6 +62,12 @@ public class GovProjectCollectionManage {
 
     private final RestTemplate restTemplate;
 
+    @Value("${project.push-url}")
+    private String pushUrl;
+
+    @Value("${project.no-effective-url}")
+    private String noEffectiveUrl;
+
     public List<GovProjectDictionaryVO> dictionary(String type) {
 
         List<GovProjectDictionary> dictionaries = dictionaryService.list(Wrappers.lambdaQuery(GovProjectDictionary.class)
@@ -384,7 +390,7 @@ public class GovProjectCollectionManage {
      * @param saveDTO
      */
     private void pushProject(GovBizProjectSaveDTO saveDTO) {
-        String url = BizProjectContant.PUSH_URL;
+        String url = pushUrl;
         ProjectPushReq req = ProjectConvert.convert(saveDTO);
         try{
             ResponseEntity<String> response = restTemplate.postForEntity(url, null, String.class, req);
@@ -399,7 +405,7 @@ public class GovProjectCollectionManage {
      * @param baseinfo
      */
     private void notEffectiveProject(GovBizProjectBaseinfoDTO baseinfo) {
-        String url = BizProjectContant.NOT_EFFECTIVE_URL;
+        String url = noEffectiveUrl;
         baseinfo.setIsEffective(BizProjectContant.NOT_EFFECTIVE_CODE);
         ProjectBaseInfoReq req = ProjectConvert.convertBase(baseinfo);
         try{
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java
index 72f816a..9e9dd42 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/utils/GenerateProjectCodeUtil.java
@@ -7,7 +7,6 @@ import com.ningdatech.pmapi.gov.model.dto.GovBizProjectApplyDTO;
 import com.ningdatech.pmapi.gov.model.dto.GovBizProjectBaseinfoDTO;
 import com.ningdatech.pmapi.gov.model.dto.GovBizProjectSaveDTO;
 import com.ningdatech.pmapi.gov.model.entity.GovBizProjectApply;
-import com.ningdatech.pmapi.gov.model.entity.GovBizProjectBaseinfo;
 import com.ningdatech.pmapi.gov.service.IGovBizProjectApplyService;
 import com.ningdatech.pmapi.projectdeclared.contants.ProjectCodeContant;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java
index 15495fe..4477a72 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java
@@ -2,7 +2,6 @@ package com.ningdatech.pmapi.projectlib.model.req;
 
 import com.ningdatech.basic.model.PagePo;
 import com.ningdatech.pmapi.common.enumeration.ExportOptionEnum;
-import com.ningdatech.pmapi.projectlib.enumeration.ProjectLibFlagEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
diff --git a/pmapi/src/main/resources/application-dev.yml b/pmapi/src/main/resources/application-dev.yml
index 2e4e1ea..c22d9c3 100644
--- a/pmapi/src/main/resources/application-dev.yml
+++ b/pmapi/src/main/resources/application-dev.yml
@@ -230,6 +230,9 @@ irs:
     request-token-url: https://interface.ls.local/a/api/requestTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
     refresh-token-url: https://interface.ls.local/a/api/refreshTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
 hostname: iZbp13nwyvib53j4j1p2xoZ
+project:
+  push-url: http://120.26.44.207:38088/syn-data-task/open/api/v1/project-receive/save
+  no-effective-url: http://120.26.44.207:38088/syn-data-task/open/api/v1/project-receive/not-effective
 
 login:
   phone-verify-code:
diff --git a/pmapi/src/main/resources/application-pre.yml b/pmapi/src/main/resources/application-pre.yml
index 12fd35d..96290d9 100644
--- a/pmapi/src/main/resources/application-pre.yml
+++ b/pmapi/src/main/resources/application-pre.yml
@@ -233,6 +233,9 @@ irs:
     request-token-url: https://interface.ls.local/a/api/requestTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
     refresh-token-url: https://interface.ls.local/a/api/refreshTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
 hostname: iZ6mx01asxnsmennpzoxooZ
+project:
+  push-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/save
+  no-effective-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/not-effective
 login:
   phone-verify-code:
     skip: true
diff --git a/pmapi/src/main/resources/application-prod.yml b/pmapi/src/main/resources/application-prod.yml
index 48fae2a..2d0e9a9 100644
--- a/pmapi/src/main/resources/application-prod.yml
+++ b/pmapi/src/main/resources/application-prod.yml
@@ -233,6 +233,9 @@ irs:
     request-token-url: https://interface.ls.local/a/api/requestTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
     refresh-token-url: https://interface.ls.local/a/api/refreshTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
 hostname: iZ6mx01gyeodd80imxd2gbZ
+project:
+  push-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/save
+  no-effective-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/not-effective
 login:
   phone-verify-code:
     skip: true
diff --git a/pmapi/src/test/resources/application-dev.yml b/pmapi/src/test/resources/application-dev.yml
index f1cf086..c22d9c3 100644
--- a/pmapi/src/test/resources/application-dev.yml
+++ b/pmapi/src/test/resources/application-dev.yml
@@ -41,53 +41,29 @@ spring:
     hibernate:
       ddl-auto: update
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.zaxxer.hikari.HikariDataSource
     driverClassName: com.kingbase8.Driver
+    url: jdbc:kingbase8://120.26.44.207:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+    username: SYSTEM
+    password: Ndkj1234
     # 数据源
-    druid:
-      url: jdbc:kingbase8://120.26.44.207:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
-      username: SYSTEM
-      password: Ndkj1234
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      #mysql使用：SELECT 1 FROM DUAL
-      validationQuery: SELECT 1
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: admin
-        login-password: admin
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
+    hikari:
+      # 是客户端等待连接池连接的最大毫秒数
+      connection-timeout: 30000
+      # 是允许连接在连接池中空闲的最长时间
+      minimum-idle: 5
+      # 配置最大池大小
+      maximum-pool-size: 20
+      # 是允许连接在连接池中空闲的最长时间（以毫秒为单位）
+      idle-timeout: 60000
+      # 池中连接关闭后的最长生命周期（以毫秒为单位）
+      max-lifetime: 600000
+      # 配置从池返回的连接的默认自动提交行为。默认值为true。
+      auto-commit: true
+      # 开启连接监测泄露
+      leak-detection-threshold: 5000
+      # 测试连接数据库
+      connection-test-query: SELECT 1
   #设置上传 单个文件的大小
   servlet:
     multipart:
@@ -182,7 +158,7 @@ organization:
     - GO_ff70e47bae684fdba0d64f4acab85661
 
 yxt:
-  #  wsdl-url: http://115.239.137.23:9501/ws/v1?wsdl
+#  wsdl-url: http://115.239.137.23:9501/ws/v1?wsdl
   wsdl-url: classpath:/wsdl.xml
   #账号
   user-code: hzndkj
@@ -194,7 +170,7 @@ yxt:
 
 #省局联审 请求信息
 provincial:
-  #  host: http://zj.ningdatech.com/prometheus-zhejiang_foreign
+#  host: http://zj.ningdatech.com/prometheus-zhejiang_foreign
   host: http://223.4.72.75/prometheus-zhejiang_foreign
   pushUrl: /api/v1/foreign/importantPro
   detailUrl: /api/v1/foreign/importantProView
@@ -254,6 +230,9 @@ irs:
     request-token-url: https://interface.ls.local/a/api/requestTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
     refresh-token-url: https://interface.ls.local/a/api/refreshTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
 hostname: iZbp13nwyvib53j4j1p2xoZ
+project:
+  push-url: http://120.26.44.207:38088/syn-data-task/open/api/v1/project-receive/save
+  no-effective-url: http://120.26.44.207:38088/syn-data-task/open/api/v1/project-receive/not-effective
 
 login:
   phone-verify-code:
diff --git a/pmapi/src/test/resources/application-pre.yml b/pmapi/src/test/resources/application-pre.yml
index 6319487..96290d9 100644
--- a/pmapi/src/test/resources/application-pre.yml
+++ b/pmapi/src/test/resources/application-pre.yml
@@ -40,53 +40,29 @@ spring:
     hibernate:
       ddl-auto: update
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.zaxxer.hikari.HikariDataSource
     driverClassName: com.kingbase8.Driver
+    url: jdbc:kingbase8://10.53.168.41:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&nullCatalogMeansCurrent=true
+    username: SYSTEM
+    password: Ndkj1234
     # 数据源
-    druid:
-      url: jdbc:kingbase8://10.53.168.41:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&nullCatalogMeansCurrent=true
-      username: SYSTEM
-      password: Ndkj1234
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      #mysql使用：SELECT 1 FROM DUAL
-      validationQuery: SELECT 1
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: admin
-        login-password: admin
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
+    hikari:
+      # 是客户端等待连接池连接的最大毫秒数
+      connection-timeout: 30000
+      # 是允许连接在连接池中空闲的最长时间
+      minimum-idle: 10
+      # 配置最大池大小
+      maximum-pool-size: 20
+      # 是允许连接在连接池中空闲的最长时间（以毫秒为单位）
+      idle-timeout: 60000
+      # 池中连接关闭后的最长生命周期（以毫秒为单位）
+      max-lifetime: 600000
+      # 配置从池返回的连接的默认自动提交行为。默认值为true。
+      auto-commit: true
+      # 开启连接监测泄露
+      leak-detection-threshold: 5000
+      # 测试连接数据库
+      connection-test-query: SELECT 1
   #设置上传 单个文件的大小
   servlet:
     multipart:
@@ -145,7 +121,7 @@ flowable:
   async-executor-activate: true
   #关闭一些不需要的功能服务
   rest-api-enabled: false
-  #  database-schema-update: false
+#  database-schema-update: false
   idm:
     enabled: false
   common:
@@ -257,6 +233,10 @@ irs:
     request-token-url: https://interface.ls.local/a/api/requestTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
     refresh-token-url: https://interface.ls.local/a/api/refreshTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
 hostname: iZ6mx01asxnsmennpzoxooZ
+project:
+  push-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/save
+  no-effective-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/not-effective
 login:
   phone-verify-code:
     skip: true
+  url: http://60.188.225.145:8080/login
diff --git a/pmapi/src/test/resources/application-prod.yml b/pmapi/src/test/resources/application-prod.yml
index 17f34d4..2d0e9a9 100644
--- a/pmapi/src/test/resources/application-prod.yml
+++ b/pmapi/src/test/resources/application-prod.yml
@@ -13,9 +13,9 @@ spring:
       namespace: "spring:session"
   redis:
     timeout: 5000
-    host: 47.98.125.47
-    port: 26379
-    database: 4
+    host: localhost
+    port: 6379
+    database: 0
     password: Ndkj1234
     jedis:
       pool:
@@ -40,53 +40,29 @@ spring:
     hibernate:
       ddl-auto: update
   datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.zaxxer.hikari.HikariDataSource
     driverClassName: com.kingbase8.Driver
+    url: jdbc:kingbase8://10.53.172.221:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&nullCatalogMeansCurrent=true
+    username: SYSTEM
+    password: Ndkj1234
     # 数据源
-    druid:
-      url: jdbc:kingbase8://10.53.172.221:54321/nd_project_management?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&nullCatalogMeansCurrent=true
-      username: SYSTEM
-      password: Ndkj1234
-      # 初始连接数
-      initialSize: 5
-      # 最小连接池数量
-      minIdle: 10
-      # 最大连接池数量
-      maxActive: 20
-      # 配置获取连接等待超时的时间
-      maxWait: 60000
-      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-      timeBetweenEvictionRunsMillis: 60000
-      # 配置一个连接在池中最小生存的时间，单位是毫秒
-      minEvictableIdleTimeMillis: 300000
-      # 配置一个连接在池中最大生存的时间，单位是毫秒
-      maxEvictableIdleTimeMillis: 900000
-      # 配置检测连接是否有效
-      #mysql使用：SELECT 1 FROM DUAL
-      validationQuery: SELECT 1
-      testWhileIdle: true
-      testOnBorrow: false
-      testOnReturn: false
-      webStatFilter:
-        enabled: true
-      statViewServlet:
-        enabled: true
-        # 设置白名单，不填则允许所有访问
-        allow:
-        url-pattern: /druid/*
-        # 控制台管理用户名和密码
-        login-username: admin
-        login-password: admin
-      filter:
-        stat:
-          enabled: true
-          # 慢SQL记录
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
+    hikari:
+      # 是客户端等待连接池连接的最大毫秒数
+      connection-timeout: 30000
+      # 是允许连接在连接池中空闲的最长时间
+      minimum-idle: 10
+      # 配置最大池大小
+      maximum-pool-size: 20
+      # 是允许连接在连接池中空闲的最长时间（以毫秒为单位）
+      idle-timeout: 60000
+      # 池中连接关闭后的最长生命周期（以毫秒为单位）
+      max-lifetime: 600000
+      # 配置从池返回的连接的默认自动提交行为。默认值为true。
+      auto-commit: true
+      # 开启连接监测泄露
+      leak-detection-threshold: 5000
+      # 测试连接数据库
+      connection-test-query: SELECT 1
   #设置上传 单个文件的大小
   servlet:
     multipart:
@@ -145,7 +121,7 @@ flowable:
   async-executor-activate: true
   #关闭一些不需要的功能服务
   rest-api-enabled: false
-#  database-schema-update: false
+  #  database-schema-update: false
   idm:
     enabled: false
   common:
@@ -209,6 +185,11 @@ provincial:
 #天印服务器接口信息
 irs:
   is-search-app: true
+  digital-resource-indicators:
+    url: https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/dataSharing/99E2bic31KdXzaa7.htm
+    interfaceName: 99E2bic31KdXzaa7
+    app-key: A331101453557202109017383
+    app-secret: 496f0f2a19994f76b4fd9dae087366c7
   seal-platform:
     project-id: 330001110
     project-secret: 70e512d40c8f440484db4acab181570a
@@ -252,6 +233,10 @@ irs:
     request-token-url: https://interface.ls.local/a/api/requestTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
     refresh-token-url: https://interface.ls.local/a/api/refreshTokenKey?appKey={appKey}&requestTime={requestTime}&sign={sign}
 hostname: iZ6mx01gyeodd80imxd2gbZ
+project:
+  push-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/save
+  no-effective-url: http://10.53.168.41:38088/syn-data-task/open/api/v1/project-receive/not-effective
 login:
   phone-verify-code:
     skip: true
+  url: http://60.188.225.145/login