From e9719f559ccaa5ab0689df9331f4d016c0b8c9e6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 20:44:47 +0800
Subject: [PATCH] 项目直接使用项目阶段
---
business/src/main/resources/mapper/ProjectInfoMapper.xml | 25 +--
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 6
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 280 ++++++++++++++++++++++++++++++----------------
common/pom.xml | 13 ++
start/src/main/resources/application.yml | 3
business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java | 2
start/src/main/java/com/ycl/Application.java | 2
system/src/main/resources/mapper/system/SysDeptMapper.xml | 2
8 files changed, 209 insertions(+), 124 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 177a90a..3c2672b 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -62,9 +62,9 @@
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
private String investType;
-// @TableField("project_phase")
-// /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
-// private String projectPhase;
+ @TableField("project_phase")
+ /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
+ private String projectPhase;
@TableField("tag")
/** 鏍囩 */
diff --git a/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java b/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java
index 8667a1f..97b7358 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectInfoMapper.java
@@ -35,7 +35,7 @@
* 鍒嗛〉
*/
@DataScope(deptAlias = "d")
- @InterceptorIgnore(tenantLine = "true")
+// @InterceptorIgnore(tenantLine = "true")
IPage getPage(@Param("query") ProjectInfoQuery query, IPage page);
@DataScope(deptAlias = "d")
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 aa3c90f..ac53878 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.common.config.SysConfig;
@@ -108,8 +109,6 @@
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
-// Long deptId = SecurityUtils.getDeptId();
-// entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
@@ -121,18 +120,28 @@
}
baseMapper.insert(entity);
addPlan(entity.getId()); //娣诲姞璁″垝琛�
- //娣诲姞鏂囦欢
- List<File> fileList = form.getFileList();
- fileList.forEach(item -> {
- item.setBusId(entity.getId());
- item.setType(FileTypeEnum.PROJECT_INFO);
- });
- fileService.saveBatch(fileList);
-
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(), form.getWinUnitList());
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(), form.getYearPlanList());
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
@@ -202,35 +211,39 @@
}
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
- List<File> fileList = form.getFileList();
- fileList.forEach(item -> {
- item.setId(null);
- item.setBusId(entity.getId());
- item.setType(FileTypeEnum.PROJECT_INFO);
- });
- //鍒犻櫎鍘熸湁鏂囦欢
- QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
- fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
- fileQueryWrapper.eq("bus_id", entity.getId());
- fileMapper.delete(fileQueryWrapper);
- //鏇挎崲鎴愮幇鏈�
- fileService.saveBatch(fileList);
-
//淇敼椤圭洰涓爣鍗曚綅
//鍒犻櫎鍘熸暟鎹�
- QueryWrapper<ProjectInfoWinUnit> unitWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id", form.getId());
- projectInfoWinUnitService.remove(unitWrapper);
+ new LambdaUpdateChainWrapper<>(projectInfoWinUnitService.getBaseMapper())
+ .eq(ProjectInfoWinUnit::getProjectInfoId, entity.getId())
+ .remove();
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(), form.getWinUnitList());
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
//淇敼骞村害鎶曡祫璁″垝
//鍒犻櫎鍘熸暟鎹�
- QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id", form.getId());
- projectInfoYearPlanService.remove(yearPlanWrapper);
+ new LambdaUpdateChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, entity.getId())
+ .remove();
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(), form.getYearPlanList());
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
return Result.ok("淇敼鎴愬姛");
}
@@ -311,25 +324,10 @@
if (query.getProjectEndTime() != null) {
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
- String projectCategory = query.getProjectCategory();
- //瀹炴柦闃舵鏈変袱涓�兼斁鍦╯ql澶勭悊
- if (ProjectCategoryEnum.RESERVE.getType().equals(projectCategory)) {
- query.setProjectStatus(ProjectCategoryEnum.RESERVE.getStatus());
- query.setReserveOrPrevious(ProjectCategoryEnum.RESERVE.getCode());
- } else if (ProjectCategoryEnum.PREVIOUS.getType().equals(projectCategory)) {
- query.setProjectStatus(ProjectCategoryEnum.PREVIOUS.getStatus());
- query.setReserveOrPrevious(ProjectCategoryEnum.PREVIOUS.getCode());
- } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
- query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
- } else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
- //TODO
- //鍏堟煡鍑哄紓甯告祦绋嬫垨鑰呭紓甯歌繘搴︽垨鑰呭紓甯歌鍒掔殑projectId鍜屽紓甯哥绫�
- //閫氳繃projectId鏌ュ嚭椤圭洰鏁版嵁
- //琛ュ厖鐩稿簲鐨勫紓甯告暟鎹紙寮傚父绉嶇被銆佸紓甯告祦绋嬭妭鐐圭瓑锛�
- List<ProjectVO> list = new ArrayList<>();
- return Result.ok().data(list).total(0);
+ // 寮傚父椤圭洰鏆傛椂杩斿洖绌�
+ if (ProjectCategoryEnum.EXCEPTION.getType().equals(query.getProjectPhase())) {
+ return Result.ok().data(new ArrayList<>()).total(0);
}
-
Long userId = SecurityUtils.getUserId();
String ancestors = sysDeptMapper.selectAncestors(userId);
String[] ancestorArr = ancestors.split(",");
@@ -339,10 +337,12 @@
query.setProjectOwnerUnit(SecurityUtils.getDeptId());
//涓氫富
query.setRole(0);
- } else if (!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")) {
+ } else if ((!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102"))) {
query.setCompetentDepartment(SecurityUtils.getDeptId());
//瀹℃壒 瀵瑰簲涓荤閮ㄩ棬
query.setRole(1);
+ } else if (SecurityUtils.isAdmin(userId)) {
+ query.setRole(3);
}
IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
@@ -399,9 +399,6 @@
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
fileQueryWrapper.eq("bus_id", vo.getId());
-
- List<File> files = fileMapper.selectList(fileQueryWrapper);
- vo.setFileList(files);
//涓爣鍗曚綅
List<ProjectInfoWinUnitVO> unitVOS = new ArrayList<>();
@@ -815,53 +812,136 @@
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
- projectId = (Long) ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm()).get("data");
+ ProjectInfo entity = ProjectInfoForm.getEntityByForm(form.getProjectInfoForm(), null);
+ Long userId = SecurityUtils.getUserId();
+ entity.setCreateBy(userId);
+ entity.setUpdateBy(userId);
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity,null)){
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ }
+ baseMapper.insert(entity);
+ addPlan(entity.getId()); //娣诲姞璁″垝琛�
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getProjectInfoForm().getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+ //娣诲姞骞村害鎶曡祫璁″垝
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getProjectInfoForm().getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
+ // 鏂板
+ if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
+ form.getProjectInvestmentInfoForm().setProjectId(projectId);
+ projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
+ }
+
+ if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
+ form.getProjectInvestmentFundingForm().setProjectId(projectId);
+ projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
+ }
+
+ if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
+ form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
+ projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
+ }
+
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
+ form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
+ projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
+ }
} else {
//鏇存柊
- ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
- if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
- form.getProjectInvestmentInfoForm().setProjectId(projectId);
- projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
- } else {
- projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
- if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
- form.getProjectInvestmentFundingForm().setProjectId(projectId);
- projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
- } else {
- projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
- if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
- form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
- projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
- } else {
- projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
- if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
- form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
- projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
- } else {
- projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getDocumentInfoForm())) {
- if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())) {
- return Result.error("璇峰厛淇濆瓨鎶曡祫绠＄悊鍩烘湰淇℃伅");
- } else {
- addDoc(form.getDocumentInfoForm());
- }
- }
+ ProjectInfo entity = baseMapper.selectById(form.getProjectInfoForm().getId());
- return Result.ok("鎻愪氦鎴愬姛");
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ ProjectInfoForm.getEntityByForm(form.getProjectInfoForm(), entity);
+ Long userId = SecurityUtils.getUserId();
+ entity.setUpdateBy(userId);
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity, entity.getId())){
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ }
+ //鏇存柊椤圭洰淇℃伅
+ baseMapper.updateById(entity);
+ //淇敼椤圭洰涓爣鍗曚綅
+ //鍒犻櫎鍘熸暟鎹�
+ new LambdaUpdateChainWrapper<>(projectInfoWinUnitService.getBaseMapper())
+ .eq(ProjectInfoWinUnit::getProjectInfoId, entity.getId())
+ .remove();
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getProjectInfoForm().getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+
+ //淇敼骞村害鎶曡祫璁″垝
+ //鍒犻櫎鍘熸暟鎹�
+ new LambdaUpdateChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, entity.getId())
+ .remove();
+ //娣诲姞骞村害鎶曡祫璁″垝
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getProjectInfoForm().getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
+ // 鏇存柊
+ if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
+ projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
+ }
+ if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
+ projectInvestmentFundingServiceImpl.update();
+ }
+ if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
+ projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
+ }
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
+ projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
+ }
+ }
+ }
+ return Result.ok("淇濆瓨鎴愬姛");
}
@Override
diff --git a/business/src/main/resources/mapper/ProjectInfoMapper.xml b/business/src/main/resources/mapper/ProjectInfoMapper.xml
index fffefae..541ef51 100644
--- a/business/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/business/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -132,17 +132,14 @@
<if test="query.projectStatus !=null and query.projectStatus!=''">
and TPI.project_status = #{query.projectStatus}
</if>
- <if test="query.projectPhase !=null and query.projectPhase!=''">
+ <if test="query.projectPhase !=null and query.projectPhase!='' and query.projectPhase!='6' and query.projectPhase!='5'">
and TPI.project_phase = #{query.projectPhase}
</if>
-<!-- <if test=" assignmentStatus !=null and assignmentStatus!=''">-->
-<!-- and TPI.project_phase = #{projectPhase}-->
-<!-- </if>-->
+ <if test="query.projectPhase != '6' and query.projectPhase!='5'">
+ and TPI.used_status = 2
+ </if>
<if test="query.fundType !=null and query.fundType!=''">
and TPI.fund_type = #{query.fundType}
- </if>
- <if test="query.projectPhase !=null and query.projectPhase!=''">
- and TPI.project_phase = #{query.projectPhase}
</if>
<if test="query.investType !=null and query.investType!=''">
and TPI.invest_type = #{query.investType}
@@ -159,22 +156,16 @@
<if test="query.reserveOrPrevious != null and query.reserveOrPrevious == 'previous'">
and TPP.process_ins_id is not null
</if>
- <if test="query.projectCategory != 6">
- and TPI.used_status = 2
- </if>
- <if test="query.projectCategory == 3">
+ <if test="query.projectPhase == '3'">
and (TPI.project_status = 'working' or TPI.project_status = 'stop')
</if>
- <if test="query.projectCategory == 6">
-<!-- <if test="query.role == 0">-->
-<!-- and TPI.used_status != 2-->
-<!-- </if>-->
- <if test="query.role == 1">
+ <if test="query.projectPhase == '6'">
+ <if test="query.role != null and query.role == 1">
and TPI.used_status = 1 and FIND_IN_SET(#{query.competentDepartment}, TPI.competent_department) > 0
</if>
</if>
<!-- 涓氫富鏁版嵁鏉冮檺 -->
- <if test="query.role == 0">
+ <if test="query.role != null and query.role == 0">
${query.params.dataScope}
</if>
</where>
diff --git a/common/pom.xml b/common/pom.xml
index 7ee7272..8d500a4 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,20 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jsqlparser</artifactId>
+ <groupId>com.github.jsqlparser</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
+
+ <dependency>
+ <groupId>com.github.jsqlparser</groupId>
+ <artifactId>jsqlparser</artifactId>
+ <version>4.2</version>
+ </dependency>
+
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/start/src/main/java/com/ycl/Application.java b/start/src/main/java/com/ycl/Application.java
index 89ff8a4..93d6a96 100644
--- a/start/src/main/java/com/ycl/Application.java
+++ b/start/src/main/java/com/ycl/Application.java
@@ -12,7 +12,7 @@
* @author ycl
*/
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class},proxyBeanMethods = false)
-@EnableAspectJAutoProxy(exposeProxy = true)
+//@EnableAspectJAutoProxy(exposeProxy = true)
public class Application
{
public static void main(String[] args)
diff --git a/start/src/main/resources/application.yml b/start/src/main/resources/application.yml
index 5e1ce3d..3f36860 100644
--- a/start/src/main/resources/application.yml
+++ b/start/src/main/resources/application.yml
@@ -7,7 +7,7 @@
configuration:
shrink-whitespaces-in-sql: true #浠嶴QL涓垹闄ゅ浣欑殑绌烘牸瀛楃
default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler # 閫氱敤鏋氫妇澶勭悊鍣�
- # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 鏃ュ織鎵撳嵃
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 鏃ュ織鎵撳嵃
global-config:
db-config:
id-type: auto
@@ -41,6 +41,7 @@
logging:
level:
com.ruoyi: debug
+ com.ycl: debug
org.springframework: warn
org.flowable.engine.impl.persistence.entity.*: debug
org.flowable.task.service.impl.persistence.entity.*: debug
diff --git a/system/src/main/resources/mapper/system/SysDeptMapper.xml b/system/src/main/resources/mapper/system/SysDeptMapper.xml
index 8de6205..c5dd0d0 100644
--- a/system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -94,7 +94,7 @@
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select>
<select id="selectAncestors" resultType="java.lang.String">
- select ancestors
+ select SD.ancestors
from sys_user SU
INNER JOIN sys_dept SD ON SU.dept_id = SD.dept_id
where SU.user_id = #{userId}
--
Gitblit v1.8.0