Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/DocumentationVO.java

@@ -19,6 +19,9 @@ public class DocumentationVO {
     @ApiModelProperty("主键")
     private Long id;
 
+    @ApiModelProperty("文档ID")
+    private Long fileId;
+
     @ApiModelProperty("文件名")
     private String fileName;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/enumeration/CloudTypeEnum.java

@@ -0,0 +1,44 @@
+package com.ningdatech.pmapi.projectlib.enumeration;
+
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * 云类型枚举
+ *
+ * @return
+ * @author CMM
+ * @since 2023/03/16 16:27
+ */
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public enum CloudTypeEnum {
+    /**
+     * 云类型
+     */
+    GOV_CLOUD_NON_LETTER(1, "政务云(非信创)"),
+    GOV_CLOUD_LETTER(2, "数字政府"),
+    OTHER(3,"其他");
+
+
+    private Integer code;
+    private String desc;
+
+    public static String getDescByCode(Integer code) {
+        if (Objects.isNull(code)) {
+            return StringUtils.EMPTY;
+        }
+        for (CloudTypeEnum t : CloudTypeEnum.values()) {
+            if (code.equals(t.getCode())) {
+                return t.desc;
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+}

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

@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.ningdatech.basic.exception.BizException;
-import com.ningdatech.pmapi.projectlib.enumeration.BizDomainEnum;
+import com.ningdatech.pmapi.projectlib.enumeration.*;
 import com.ningdatech.pmapi.todocenter.constant.TodoCenterContant;
 import com.ningdatech.pmapi.todocenter.handle.PassHandle;
 import com.ningdatech.pmapi.todocenter.handle.WithDrawHandle;
@@ -59,9 +59,6 @@ import com.ningdatech.pmapi.common.model.entity.ExcelExportWriter;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
 import com.ningdatech.pmapi.irs.sign.IRSAPIRequest;
 import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage;
-import com.ningdatech.pmapi.projectlib.enumeration.FourSystemEnum;
-import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
-import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
 import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
@@ -1146,6 +1143,7 @@ public class TodoCenterManage {
         paramsMap.put("fourSystems", fourSystem);
         // 获取是否数字化改革项目
         String isDigitalReform = IsOrNotEnum.getDescByCode(project.getIsDigitalReform());
+        paramsMap.put("isDigitalReform",isDigitalReform);
         if (IsOrNotEnum.NOT.getDesc().equals(isDigitalReform)){
             paramsMap.put("bizDomain", null);
         }else {
@@ -1157,7 +1155,9 @@ public class TodoCenterManage {
         if (IsOrNotEnum.NOT.getDesc().equals(isCloud)){
             paramsMap.put("cloudType", null);
         }else {
-            paramsMap.put("cloudType",project.getCloudType());
+            String cloudType = project.getCloudType();
+            String cloudTypeName = CloudTypeEnum.getDescByCode(Integer.valueOf(cloudType));
+            paramsMap.put("cloudType",cloudTypeName);
         }
         // 获取本年计划投资金额
         BigDecimal yearPlanInvest = project.getAnnualPlanAmount();

pmapi/src/main/resources/application-prod.yml

@@ -212,4 +212,4 @@ irs:
 hostname: iZ6mx01gyeodd80imxd2gbZ
 login:
   phone-verify-code:
-    skip: false
+    skip: true