From 1519a7c81e6566dd0cbc6acfb1b5e92c3aaba7df Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 10:53:57 +0800
Subject: [PATCH] 赋码定时任务只判断超时，且用红码时间判断
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 deletions(-)
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 677b8b7..42058b6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -7,9 +7,11 @@
import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
@@ -152,23 +154,20 @@
* @return
*/
public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
- QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+ LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
if (updateId == null) {
-
- queryWrapper.eq("project_name", entity.getProjectName());
- queryWrapper.eq("deleted",0);
- if (StringUtils.isNotEmpty(entity.getProjectCode())) {
- queryWrapper.eq("project_code", entity.getProjectCode());
- }
-
- List<ProjectInfo> project = projectInfoMapper.selectList(queryWrapper);
-
- return project == null || project.isEmpty();
- }else {
-
- List<ProjectInfo> project = projectInfoMapper.checkProjectNameAndIdIsUnique(updateId,entity.getProjectName(),entity.getProjectCode());
-
- return project == null || project.isEmpty();
+ List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectInfo::getProjectName, entity.getProjectName())
+ .eq(ProjectInfo::getProjectCode, entity.getProjectCode())
+ .list();
+ return list == null || list.isEmpty();
+ } else {
+ List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectInfo::getProjectName, entity.getProjectName())
+ .eq(ProjectInfo::getProjectCode, entity.getProjectCode())
+ .ne(ProjectInfo::getId, updateId)
+ .list();
+ return list == null || list.isEmpty();
}
}
@@ -325,6 +324,9 @@
if (query.getProjectEndTime() != null) {
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
+ if (YesOrNo.YES.getCode().equals(query.getCenter())) {
+ query.setProjectPhase("6");
+ }
// 寮傚父椤圭洰鏆傛椂杩斿洖绌�
if (YesOrNo.YES.getCode().equals(query.getExe())) {
return Result.ok().data(new ArrayList<>()).total(0);
@@ -354,8 +356,8 @@
ProjectInfoVO.transform(vo);
ProjectVO projectVO = new ProjectVO();
copyToProjectVO(vo, projectVO);
- List<Long> departmentList = vo.getCompetentDepartmentList();
- projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
+ String competentDepartment = vo.getCompetentDepartment();
+ projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId() + "")));
// 缈昏瘧椤圭洰闃舵
String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectPhase());
projectVO.setProjectPhase(phase);
@@ -395,8 +397,8 @@
ProjectInfo entity = baseMapper.getById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
- List<Long> departmentList = vo.getCompetentDepartmentList();
- vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
+ String competentDepartment = vo.getCompetentDepartment();
+ vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId() + "")));
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
fileQueryWrapper.eq("bus_id", vo.getId());
@@ -466,15 +468,22 @@
finish.add(item);
}
- if (ImportanceTypeEnum.PROVINCIAL_KEY.getType().equals(item.getImportanceType())) {
- province.add(item);
- } else if (ImportanceTypeEnum.SUINING_KEY.getType().equals(item.getImportanceType())) {
- city.add(item);
- } else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
- county.add(item);
- } else // if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType()))
- {
+ if (StringUtils.isBlank(item.getImportanceType())) {
normal.add(item);
+ // 浣跨敤contains锛屽洜涓洪噸鐐瑰垎绫诲彲澶氶�夛紝浣跨敤,鍒嗗壊瀛樺偍鐨�
+ } else {
+ if (item.getImportanceType().contains(ImportanceTypeEnum.PROVINCIAL_KEY.getType())) {
+ province.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.SUINING_KEY.getType())) {
+ city.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.SHEHONG_KEY.getType())) {
+ county.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.NORMAL.getType())) {
+ normal.add(item);
+ }
}
});
//鍗曚綅鍏堥粯璁や负鍏�
@@ -818,7 +827,7 @@
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if ("0".equals(entity.getProjectPhase())) {
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
@@ -863,7 +872,7 @@
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
--
Gitblit v1.8.0