项目归集 新版

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 = "保存失败";
 }

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);
+    }
 }

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("项目名重复");
     }
 }

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> {
+
+}

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> {
+
+}

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;

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;
 

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;
 

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;
 

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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> {
+
+}

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> {
+
+}

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 {
+
+}

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 {
+
+}

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);
     }
 
     /**

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) {

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;
     }
 
     /**

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;
     }
 
     /**

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 + "条";
     }
 }