Преглед на файлове

Merge branch '20230821_ls2_gov_project_collection' of http://git.ningdatech.com/liushuai/project-management into dev

 Conflicts:
	pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
tags/24080901
PoffyZhang преди 1 година
родител
ревизия
fe48824908
променени са 52 файла, в които са добавени 2874 реда и са изтрити 10 реда
  1. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BizConst.java
  2. +62
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java
  3. +319
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
  4. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApplyMapper.java
  5. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectApproveMapper.java
  6. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectBaseinfoMapper.java
  7. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectCimplementMapper.java
  8. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectMimplementMapper.java
  9. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovBizProjectProcureMapper.java
  10. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovProjectDictionaryMapper.java
  11. +133
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java
  12. +86
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java
  13. +99
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java
  14. +102
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java
  15. +96
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectMimplementDTO.java
  16. +91
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectProcureDTO.java
  17. +48
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectSaveDTO.java
  18. +140
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApply.java
  19. +93
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectApprove.java
  20. +107
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectBaseinfo.java
  21. +109
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectCimplement.java
  22. +103
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectMimplement.java
  23. +98
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovBizProjectProcure.java
  24. +46
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovProjectDictionary.java
  25. +135
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApplyVO.java
  26. +88
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectApproveVO.java
  27. +101
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectBaseinfoVO.java
  28. +104
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectCimplementVO.java
  29. +45
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectDetailVO.java
  30. +47
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectListVO.java
  31. +98
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectMimplementVO.java
  32. +93
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovBizProjectProcureVO.java
  33. +41
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/model/vo/GovProjectDictionaryVO.java
  34. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApplyService.java
  35. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectApproveService.java
  36. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectBaseinfoService.java
  37. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectCimplementService.java
  38. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectMimplementService.java
  39. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovBizProjectProcureService.java
  40. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovProjectDictionaryService.java
  41. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApplyServiceImpl.java
  42. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectApproveServiceImpl.java
  43. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectBaseinfoServiceImpl.java
  44. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectCimplementServiceImpl.java
  45. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectMimplementServiceImpl.java
  46. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovBizProjectProcureServiceImpl.java
  47. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovProjectDictionaryServiceImpl.java
  48. +3
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/performance/manage/IndicatorConfigManage.java
  49. +3
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/portrait/manage/TagManage.java
  50. +3
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ApplicationManage.java
  51. +3
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectCollectionManage.java
  52. +2
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/safety/manage/SafetyRiskManage.java

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

+ 62
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/controller/GovProjectCollectionController.java Целия файл

@@ -0,0 +1,62 @@
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.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;
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.*;

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 GovProjectCollectionManage collectionManage;

@GetMapping("/dictionary")
@ApiOperation("字典")
public List<GovProjectDictionaryVO> dictionary(@RequestParam(value = "type", required = false) String type) {
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);
}
}

+ 319
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java Целия файл

@@ -0,0 +1,319 @@
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.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;

/**
* @author zpf
* @date 2023/8/21 下午2:27
*/

@Component
@RequiredArgsConstructor
public class GovProjectCollectionManage {

private final IGovProjectDictionaryService dictionaryService;

private final IGovBizProjectApplyService projectApplyService;

private final IGovBizProjectBaseinfoService baseinfoService;

private final IGovBizProjectApproveService approveService;

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)
.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());
}

/**
* 分页查 项目归集
* @param req
* @return
*/
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 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 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("项目名重复");
}
}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 133
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApplyDTO.java Целия файл

@@ -0,0 +1,133 @@
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 = "GovBizProjectApply对象", description = "项目申报表")
public class GovBizProjectApplyDTO 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 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;
}

+ 86
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectApproveDTO.java Целия файл

@@ -0,0 +1,86 @@
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 = "GovBizProjectBaseinfo对象", description = "项目审核信息表")
public class GovBizProjectApproveDTO 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 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;
}

+ 99
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectBaseinfoDTO.java Целия файл

@@ -0,0 +1,99 @@
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 = "GovBizProjectBaseinfo对象", description = "项目基本信息表")
public class GovBizProjectBaseinfoDTO implements Serializable {

private static final long serialVersionUID = 1L;

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

+ 102
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/model/dto/GovBizProjectCimplementDTO.java Целия файл

@@ -0,0 +1,102 @@
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 = "GovBizProjectCimplement对象", description = "项目实施信息表")
public class GovBizProjectCimplementDTO 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 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;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 16
- 0
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> {

}

+ 21
- 0
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 {

}

+ 21
- 0
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 {

}

+ 21
- 0
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 {

}

+ 21
- 0
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 {

}

+ 21
- 0
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 {

}

+ 21
- 0
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 {

}

+ 21
- 0
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 {

}

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

/**


+ 3
- 2
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) {


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

/**


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

/**


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

Loading…
Отказ
Запис