预审申报 PDF换字段

pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java

@@ -1,7 +1,11 @@
 package com.ningdatech.pmapi.common.util;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ningdatech.basic.util.StrPool;
+import com.ningdatech.file.entity.vo.result.FileResultVO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeNewEnum;
 import org.apache.commons.lang3.StringUtils;
@@ -143,4 +147,10 @@ public class BizUtils {
         return BigDecimal.valueOf((numa - numb) * 100.0).divide(BigDecimal.valueOf(numb),2, RoundingMode.CEILING)
                 .stripTrailingZeros().toPlainString();
     }
+
+    public static String buildFileJson(FileResultVO resultVo) {
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.add(resultVo);
+        return JSON.toJSONString(jsonArray);
+    }
 }

pmapi/src/main/java/com/ningdatech/pmapi/gov/mapper/GovOperationProjectTobePushMapper.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.GovOperationProjectTobePush;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface GovOperationProjectTobePushMapper extends BaseMapper<GovOperationProjectTobePush> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/model/entity/GovOperationProjectTobePush.java

@@ -0,0 +1,147 @@
+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;
+
+/**
+ * @Classname GovBizProjectDraft
+ * @Description
+ * @Date 2023/9/5 11:05
+ * @Author PoffyZhang
+ */
+@Data
+@TableName("gov_operation_project_tobe_push")
+@ApiModel(value = "GovOperationProjectTobePush", description = "待推送申报项目和运维项目")
+public class GovOperationProjectTobePush implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String baseProjId;
+    private String baseProjName;
+    private String baseAreaName;
+    private String baseAreaCode;
+    private String baseProjIsConfidentiality;
+    private String baseProjType;
+    private String baseConstructionType;
+    private String baseProjSetProg;
+    private String isEffective;
+
+    @ApiModelProperty("是否省级 1省级 2非省级")
+    private Integer baseProvManDeprtType;
+
+    private String baseProvManDeprt;
+    private String baseProvManDeprtDing;
+    private String baseManDeprt;
+    private String baseManDeprtDing;
+    private String baseManDepartUsci;
+    private String baseBuildDeprt;
+    private String baseBuildDeprtDing;
+    private String baseBuildDepartUsci;
+    private String baseProjPrincipal;
+    private String baseProjPrincipalCall;
+    private String baseProjContacts;
+    private String baseProjContactsCall;
+    private Boolean deleted;
+
+    private String baseDevelopCode;
+    private String setProjCodeFinan;
+    private String baseHistorProjName;
+    private String baseHistorProjId;
+    private String baseHistorProjYear;
+    private String baseProjSys;
+    private String baseProjSysCode;
+    private String baseAccountAppName;
+    private String baseBrainName;
+    private String baseCoreBusiness;
+    private String baseCoreBusinessCode;
+    private LocalDateTime baseProjStartTime;
+    private LocalDateTime baseProjEndTime;
+    private LocalDateTime baseProjDuration;
+    private String baseProjSetYear;
+    private String baseProjAmountOri;
+    private String baseBasisAmountOri;
+    private BigDecimal baseProjTotalAmount;
+    private BigDecimal baseProjDeclAmount;
+    private String baseProjConsClass;
+    private String baseLowestLevel;
+    private String baseProjBasis;
+    private String baseBasisEstablish;
+    private String baseProjBasisFile;
+    private String baseProjIntro;
+    private String beseExpectedResults;
+    private String baseResearchReportFile;
+    private String baseProjApplyFile;
+    private String baseOperatMaintenFile;
+    private String baseProjOtherFile;
+    private String baseProjRemark;
+
+    private String baseReviewResults;
+    private String baseReviewOpinion;
+    private String baseReviewCommentsFile;
+    private BigDecimal baseExpertTotalMoney;
+    private BigDecimal baseExpertYearMoney;
+    private String approvalFile;
+    private BigDecimal baseInitialReviewTotalMoney;
+    private BigDecimal baseProjReplyAmount;
+    private String equalProtectionLevel;
+    private String preliminaryDesignScheme;
+    private String preliminaryDesignFile;
+    private BigDecimal releaseYearMoney;
+
+    private String baseBidCode;
+    private String baseBidName;
+
+    private String baseInitialOpinionFile;
+    private String baseInforLevelFileCimplement;
+    private String basePasswAssessFileCimplement;
+    private String baseThirdAcceptFileCimplement;
+    private String baseCheckFile;
+    private String baseFinanlAuditFile;
+    private String baseUserConsFileCimplement;
+    private String baseEstaSummFileCimplement;
+    private String baseIrsTestRunFile;
+    private String baseSummReportFile;
+    private String baseLogAggregationCimplement;
+    private String baseBusinessMetricsCimplement;
+    private String baseFinalExpertOpinionFileCimplement;
+    private String baseEngineerPostpoFileCimplement;
+    private String baseChangeFormFile;
+    private String baseChanFileCimplement;
+
+    private String baseInforLevelFileMimplement;
+    private String basePasswAssessFileMimplement;
+    private String baseThirdAcceptFileMimplement;
+    private String baseUserConsFileMimplement;
+    private String baseEstaSummFileMimplement;
+    private String baseOperatMaintenSummFile;
+    private String baseLogAggregationMimplement;
+    private String baseBusinessMetricsMimplement;
+    private String baseFinalExpertOpinionFileMimplement;
+    private String baseEngineerPostpoFileMimplement;
+    private String baseEngineerAlterFile;
+    private String baseChanFileMimplement;
+
+    @ApiModelProperty("是否确实历史项目")
+    private Boolean missing;
+
+    private String procure;
+
+    private String areaCode;
+    private LocalDateTime bizTime;
+    private String op;
+    private LocalDateTime tongTime;
+    private LocalDateTime updateOn;
+    private String updateBy;
+    private Long createId;
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IGovOperationProjectTobePushService.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.GovOperationProjectTobePush;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-08-23
+ */
+public interface IGovOperationProjectTobePushService extends IService<GovOperationProjectTobePush> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/GovOperationProjectTobePushServiceImpl.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.GovOperationProjectTobePushMapper;
+import com.ningdatech.pmapi.gov.model.entity.GovOperationProjectTobePush;
+import com.ningdatech.pmapi.gov.service.IGovOperationProjectTobePushService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author zpf
+ * @since 2023-10-25
+ */
+@Service
+public class GovOperationProjectTobePushServiceImpl extends
+        ServiceImpl<GovOperationProjectTobePushMapper, GovOperationProjectTobePush> implements IGovOperationProjectTobePushService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -28,6 +28,7 @@ import com.ningdatech.pmapi.common.constant.RegionConst;
 import com.ningdatech.pmapi.common.enumeration.CommonEnum;
 import com.ningdatech.pmapi.common.helper.UserInfoHelper;
 import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter;
+import com.ningdatech.pmapi.common.util.BizUtils;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
 import com.ningdatech.pmapi.irs.sign.IRSAPIRequest;
 import com.ningdatech.pmapi.performance.service.IProjectCoreBusinessIndicatorsService;
@@ -531,8 +532,8 @@ public class TodoCenterManage {
         // 根据模版名称判断是预审申请单还是建设方案申请单
         if (TodoCenterConstant.SealTemplate.CITY_TEMPLATE.equals(templateName) ||
                 TodoCenterConstant.SealTemplate.COUNTRY_TEMPLATE.equals(templateName)) {
-            declaredProject.setPretrialFileId(resultVo.getId());
-            declaredProject.setPretrialFileName(resultVo.getOriginalFileName());
+            //放到项目申报书字段
+            declaredProject.setProjectApplicationForm(BizUtils.buildFileJson(resultVo));
             declaredProject.setUpdateOn(LocalDateTime.now());
         } else if (TodoCenterConstant.SealTemplate.CONSTRUCT_TEMPLATE.equals(templateName)) {
             declaredProject.setConstructFileId(resultVo.getId());
@@ -1622,7 +1623,7 @@ public class TodoCenterManage {
         // 获取本年计划投资金额
         BigDecimal yearPlanInvest = project.getAnnualPlanAmount();
         paramsMap.put("yearPlanInvest", yearPlanInvest);
-        // TODO 根据地区编码获取当地大数据局(中心)的名称
+        // 根据地区编码获取当地大数据局(中心)的名称
         paramsMap.put("bigDataBureauName", null);
         // 备注模块如果为空
         if (Objects.isNull(pdfGenerateDTO.getProjectRemarks())) {

pmapi/src/test/java/com/ningdatech/pmapi/projectCollection/ProjectRemoveTest.java

@@ -109,7 +109,7 @@ public class ProjectRemoveTest extends AppTests {
 
     @Test
     public void test(){
-        List<String> projectCodes = Lists.newArrayList("33112600020230100005","33112600020230100004","33112600020230100003","33112600020230100002","33112300020240100004","33112300020240100002","33112300020240100003","33112300020230100006","33112300020240100001","33112300020230100005","33112300020230100004","33112300020230100003","33112300020230100002","33112300020230100001");
+        List<String> projectCodes = Lists.newArrayList("33112600020240100001");
 
         for(String projectCode : projectCodes){
             //项目