From 25d1cb5f63e95da7702ba2c02231cdb8583f11af Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:43:56 +0800
Subject: [PATCH] 项目审核
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 1 +
business/src/main/resources/mapper/ProjectInfoMapper.xml | 19 ++++++++++++-------
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 3 +++
business/src/main/java/com/ycl/domain/vo/ProjectVO.java | 2 +-
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 23 ++++++++++++-----------
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 2 ++
business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java | 5 ++++-
7 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
index db0f998..5414527 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -148,4 +148,7 @@
@TableField("coding")
/** 缂栫爜 */
private String coding;
+ @TableField("remark")
+ /** 瀹℃牳淇℃伅 */
+ private String remark;
}
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 a817517..3eb74ca 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -127,6 +127,7 @@
@ApiModelProperty("璧嬬爜")
private String coding;
+ private String remark;
public static ProjectInfo getEntityByForm(@NonNull ProjectInfoForm form, ProjectInfo entity) {
if(entity == null) {
entity = new ProjectInfo();
diff --git a/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java b/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
index 2d4acec..9ae1b3a 100644
--- a/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
+++ b/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
@@ -50,7 +50,10 @@
//浠庢湁娌℃湁娴佺▼鍒ゆ柇鏄瓨鍌ㄨ繕鏄棭鏈�
private String reserveOrPrevious;
private Integer role;// 涓氫富锛�0锛屽鏍革細1
- private Long createBy;
+ //鏌ヨ鏉′欢涓氫富鍗曚綅
+ private Long projectOwnerUnit;
private Integer usedStatus;
+ //鏌ヨ鏉′欢涓荤閮ㄩ棬
+ private Long competentDepartment;
}
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 d0dd286..dd484b4 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
@@ -162,6 +162,8 @@
@ApiModelProperty("鏂囦欢")
private List<File> fileList;
+ private Integer usedStatus;
+ private String remark;
private Long processId;
private ProjectInvestmentInfoVO projectInvestmentInfo;
private ProjectInvestmentFundingVO projectInvestmentFunding;
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 bc83743..c2344dc 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,6 @@
private String coding;
private List<Long> competentDepartmentList;
private List<String> managementCentralizationList;
-
+ private String remark;
private Long processId;
}
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index ad712b5..2eb6d63 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -49,6 +49,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
@@ -237,15 +238,17 @@
Long userId = SecurityUtils.getUserId();
String ancestors = sysDeptMapper.selectAncestors(userId);
String[] ancestorArr = ancestors.split(",");
-// for (String ancestor : ancestorArr) {
-// if ("101".equals(ancestor)) { // 涓氫富
-// query.setCreateBy(userId);
-// query.setRole(0);
-// } else if ("102".equals(ancestor)) { // 瀹℃壒
-// query.setUsedStatus(1);
-// query.setRole(1);
-// }
-// }
+ List<String> ancestorList = Arrays.stream(ancestorArr).collect(Collectors.toList());
+ ancestorList.add(SecurityUtils.getDeptId()+"");
+ if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")){
+ query.setProjectOwnerUnit(SecurityUtils.getDeptId());
+ //涓氫富
+ query.setRole(0);
+ }else if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")){
+ query.setCompetentDepartment(SecurityUtils.getDeptId());
+ //瀹℃壒 瀵瑰簲涓荤閮ㄩ棬
+ query.setRole(1);
+ }
IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
baseMapper.getPage(query, page);
@@ -393,8 +396,6 @@
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
.reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鐪�"));
indexCountVO.setImpTypeCountVO(impTypeCountVO);
-
-
return indexCountVO;
}
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index dc8f634..9c04cba 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -45,6 +45,7 @@
TPI.gmt_update,
TPI.update_by,
TPI.create_by,
+ TPI.remark,
TPI.id
FROM
t_project_info TPI
@@ -103,7 +104,7 @@
LEFT JOIN t_project_investment_policy_compliance TPIPC ON TPI.id = TPIPC.project_id and TPIPC.deleted = 0
LEFT JOIN t_project_unit_registration_info TPURI ON TPI.id = TPURI.project_id and TPURI.deleted = 0
LEFT JOIN t_project_process TPP ON TPI.id = TPP.project_id and TPP.deleted = 0
- LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
+-- LEFT JOIN sys_dept d ON d.dept_id = TPI.project_owner_unit
<where>
TPI.deleted = 0
<if test="query.projectName !=null and query.projectName!=''">
@@ -151,21 +152,25 @@
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
and TPP.process_ins_id is not null
</if>
-<!-- <if test="query.projectCategory == null">-->
-<!-- and TPI.used_status = 2-->
-<!-- </if>-->
+ <if test="query.projectCategory != 6">
+ and TPI.used_status = 2
+ </if>
<if test="query.projectCategory == 3">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
</if>
+ <!-- 涓氫富鏁版嵁鏉冮檺 -->
+ <if test="query.role == 0">
+ and TPI.project_owner_unit = #{query.projectOwnerUnit}
+ </if>
<if test="query.projectCategory == 6">
<if test="query.role == 0">
- and TPI.create_by = #{query.createBy}
+ and TPI.used_status != 2
</if>
<if test="query.role == 1">
- and TPI.used_status = #{query.usedStatus}
+ and TPI.used_status = 1 and TPI.competent_department like concat('%',#{query.competentDepartment},'%')
</if>
</if>
- ${query.params.dataScope}
+ <!--${query.params.dataScope}-->
</where>
order by TPI.gmt_create
</select>
--
Gitblit v1.8.0