From 0216e745dc57d021c0fa81115811b74abd815f36 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 20:47:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
start/src/main/resources/application-dev.yml | 2 +-
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 17 +++++++++++++++--
business/src/main/java/com/ycl/domain/vo/ProjectVO.java | 2 ++
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 35 ++++++++++++++++++++++++++++++++++-
4 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index 9a1dfa0..12b2612 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -55,7 +55,7 @@
private String projectStatus;
@ApiModelProperty("璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級")
- private String fundType;
+ private List<String> fundTypeList;
@ApiModelProperty("鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛�")
private String investType;
@@ -79,7 +79,10 @@
private String projectApprovalType;
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
- private String importanceType;
+ private List<String> importanceTypeList;
+
+
+
// @ApiModelProperty("骞村害鎶曡祫璁″垝")
// private String year;
@@ -158,6 +161,16 @@
if(!CollectionUtils.isEmpty(competentDepartmentList)){
entity.setCompetentDepartment(StringUtils.join(competentDepartmentList, ","));
}
+ //璧勯噾绫诲瀷杞崲
+ List<String> fundTypeList = form.getFundTypeList();
+ if(!CollectionUtils.isEmpty(fundTypeList)){
+ entity.setFundType(StringUtils.join(fundTypeList, ","));
+ }
+ //閲嶇偣鍒嗙被杞崲
+ List<String> importanceTypeList = form.getImportanceTypeList();
+ if(!CollectionUtils.isEmpty(importanceTypeList)){
+ entity.setImportanceType(StringUtils.join(importanceTypeList, ","));
+ }
//绠＄悊褰掑彛杞崲
List<String> managementCentralizationList = form.getManagementCentralizationList();
if(!CollectionUtils.isEmpty(managementCentralizationList)){
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index c008fc2..7c7d0f3 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -61,6 +61,7 @@
@ApiModelProperty("璧勯噾绫诲瀷锛�0涓璧勯噾锛�1鍥藉�鸿祫閲戯紝2瓒呴暱鏈熷浗鍊猴紝3鍦版柟鏀垮簻涓撻」鍊猴級")
private String fundType;
+ private List<String> fundTypeList;
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
@ApiModelProperty("鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛�")
private String investType;
@@ -76,6 +77,10 @@
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
@ApiModelProperty("涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id)")
private List<Long> competentDepartmentList;
+
+
+
+
private String competentDepartment;
/** 琛屾斂鍖哄煙 */
@ApiModelProperty("琛屾斂鍖哄煙")
@@ -93,7 +98,7 @@
/** 閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�) */
@ApiModelProperty("閲嶇偣鍒嗙被 (0鐪侀噸鐐归」鐩�, 1閬傚畞甯傞噸鐐归」鐩�, 2.灏勬椽甯傞噸鐐归」鐩�, 3.涓�鑸」鐩�)")
private String importanceType;
-
+ private List<String> importanceTypeList;
// /** 骞村害鎶曡祫璁″垝 */
// @ApiModelProperty("骞村害鎶曡祫璁″垝")
// private String year;
@@ -196,6 +201,7 @@
if(vo == null) {
vo = new ProjectInfoVO();
}
+
BeanUtils.copyProperties(entity, vo);
//涓荤閮ㄩ棬杞垚list
String competentDepartment = entity.getCompetentDepartment();
@@ -210,6 +216,19 @@
if(!StringUtils.isBlank(managementCentralization)){
vo.setManagementCentralizationList(Arrays.asList(managementCentralization.split(",")));
}
+ //
+ //鍒嗙被绫诲瀷杞崲
+ String importanceType = entity.getImportanceType();
+ if (!StringUtils.isBlank(importanceType)) {
+ vo.setImportanceTypeList(Arrays.asList(importanceType.split(",")));
+ }
+
+ //璧勯噾绫诲瀷
+ String fundTypeList = entity.getFundType();
+ if (!StringUtils.isBlank(fundTypeList)) {
+ vo.setFundTypeList(Arrays.asList(fundTypeList.split(",")));
+ }
+
return vo;
}
//杞崲瀛楃涓查泦鍚堝瓧娈�
@@ -227,5 +246,19 @@
if(!StringUtils.isBlank(managementCentralization)){
vo.setManagementCentralizationList(Arrays.asList(managementCentralization.split(",")));
}
+
+ //鍒嗙被绫诲瀷杞崲
+
+ String importanceType = vo.getImportanceType();
+ if (!StringUtils.isBlank(importanceType)) {
+ vo.setImportanceTypeList(Arrays.asList(importanceType.split(",")));
+ }
+
+ //璧勯噾绫诲瀷
+ String fundTypeList = vo.getFundType();
+ if (!StringUtils.isBlank(fundTypeList)) {
+ vo.setFundTypeList(Arrays.asList(fundTypeList.split(",")));
+ }
+
}
}
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectVO.java
index 53f134a..a055b77 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectVO.java
@@ -14,6 +14,8 @@
private String coding;
private List<Long> competentDepartmentList;
private List<String> managementCentralizationList;
+ private List<String> fundTypeList;
+ private List<String> importanceTypeList;
private String remark;
private Long processId;
private String projectOwnerUnitName;
diff --git a/start/src/main/resources/application-dev.yml b/start/src/main/resources/application-dev.yml
index fafad6b..f347d66 100644
--- a/start/src/main/resources/application-dev.yml
+++ b/start/src/main/resources/application-dev.yml
@@ -103,7 +103,7 @@
# 宸ヤ綔娴� Flowable 閰嶇疆锛宖lowable瀹屾暣鐨勯厤缃紝鍙傝锛欯see https://www.flowable.com/open-source/docs/bpmn/ch05a-Spring-Boot/#flowable-application-properties
flowable:
- database-schema-update: true # 鑷姩鏇存柊flowable琛ㄧ粨鏋勶紝绗竴娆¤繛鎺ユ暟鎹簱鏃跺彲浠ヨ缃负true
+ database-schema-update: false # 鑷姩鏇存柊flowable琛ㄧ粨鏋勶紝绗竴娆¤繛鎺ユ暟鎹簱鏃跺彲浠ヨ缃负true
# # 鍏抽棴鍚勪釜妯″潡鐢熸垚琛紝鐩墠鍙娇鐢ㄥ伐浣滄祦鍩虹琛�
idm: # idm鏄痜lowable鐨勮韩浠界鐞嗘ā鍧楋細鍗崇敤鎴枫�佽璇併�佹潈闄愮瓑
enabled: false
--
Gitblit v1.8.0