WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

Browse Source
This commit is contained in:
wangzhijiang
2022-12-30 17:47:26 +08:00
parent 0fa7d983d9 eed32438fd
commit cae323e674
135 changed files with 1479 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+13 -13
View File
@@ -33,7 +33,7 @@ ALTER TABLE `laws_weilai`.`params_manifest`
ALTER TABLE `laws_weilai`.`params_manifest_history`
ADD COLUMN `project_version_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目相关版本对应的项目id' AFTER `explanation`;
-- 项目库添加字段(技术领域补充(中文),技术领域补充(英文))--------2022-12-05 未同步生产环境
-- 项目库添加字段(技术领域补充(中文),技术领域补充(英文))--------2022-12-05 已同步生产环境
ALTER TABLE `laws_weilai`.`laws_monthly_report_write`
ADD COLUMN `technology_territory_cn` varchar(500) NULL COMMENT '技术领域补充(中文)' AFTER `memories_chapter_one`,
ADD COLUMN `technology_territory_en` varchar(500) NULL COMMENT '技术领域补充(英文)' AFTER `technology_territory_cn`;
@@ -85,7 +85,7 @@ ALTER TABLE `laws_weilai`.`params_info_publish`
-- 上报库历史表，增加备注字段 2022-12-12 已同步生产环境
ALTER TABLE `laws_weilai`.`params_report_detail_log`
ADD COLUMN `remarks` varchar(4000) NULL COMMENT '备注' AFTER `params_report_detail_id`;
-- 创建用户项目权限表
-- 创建用户项目权限表 已同步生产环境
CREATE TABLE `project_user_permission` (
`id` varchar(36) NOT NULL COMMENT '主键',
`create_by` varchar(50) DEFAULT NULL COMMENT '创建人',
@@ -99,7 +99,7 @@ CREATE TABLE `project_user_permission` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 创建用户品牌表
-- 创建用户品牌表 已同步生产环境
CREATE TABLE `project_user_brand` (
`id` varchar(36) NOT NULL,
`user_id` varchar(255) DEFAULT NULL COMMENT '用户id',
@@ -107,7 +107,7 @@ CREATE TABLE `project_user_brand` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 创建用户责任领域表
-- 创建用户责任领域表 已同步生产环境
CREATE TABLE `project_user_duty_territory` (
`id` varchar(36) NOT NULL,
`user_id` varchar(255) DEFAULT NULL COMMENT '用户id',
@@ -115,23 +115,23 @@ CREATE TABLE `project_user_duty_territory` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 项目库基础表添加字段
-- 项目库基础表添加字段 已同步生产环境
ALTER TABLE `project_library_base`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `flag`;
-- 法规技术评估表添加字段
-- 法规技术评估表添加字段 已同步生产环境
ALTER TABLE `laws_technology_evaluation`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `prc_num`;
-- 法规意见收集表添加字段
-- 法规意见收集表添加字段 已同步生产环境
ALTER TABLE `laws_opinion_gather`
ADD COLUMN `brand` varchar(255) NULL COMMENT '品牌' AFTER `evaluator_ids`;
-- 参数导出模板管理添加字段 2022-12-19(未同步生产库)
-- 参数导出模板管理添加字段 2022-12-19(已同步生产环境)
ALTER TABLE `params_export_template`
ADD COLUMN `region` varchar(1000) NULL COMMENT '适用地区' AFTER `file_connect_id`;
-- 参数收集清单-操作记录(历史日志) 2022-12-26 未同步生产环境
-- 参数收集清单-操作记录(历史日志) 2022-12-26 已同步生产环境
CREATE TABLE `laws_weilai`.`params_collect_manifest_log` (
`id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
@@ -147,15 +147,15 @@ CREATE TABLE `laws_weilai`.`params_collect_manifest_log` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数收集清单-操作记录(历史日志)' ROW_FORMAT = Dynamic;
-- 参数清单-增加参考列配置id 2022-12-29 未同步生产环境
-- 参数清单-增加参考列配置id 2022-12-29 已同步生产环境
ALTER TABLE `laws_weilai`.`params_manifest`
ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`;
-- 参数清单历史-增加参考列配置id 2022-12-29 未同步生产环境
-- 参数清单历史-增加参考列配置id 2022-12-29 已同步生产环境
ALTER TABLE `laws_weilai`.`params_manifest_history`
ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`;
-- 上报库备注列字段长度修改 2022-12-29 未同步生产环境
-- 上报库备注列字段长度修改 2022-12-29 已同步生产环境
ALTER TABLE `laws_weilai`.`params_report_detail`
MODIFY COLUMN `remarks` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `title_default_value`;
-- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 未同步生产环境
-- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境
UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937'
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -1592,7 +1592,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
map.put("value", CollectManifestUserTypeEnum.GUEST.getValue());
userTypeList.add(map);
return userTypeList;
//return userTypeList;
}
if (homoList.contains(loginUserName)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java
+2
View File
@@ -48,7 +48,9 @@ public class ProjectUserPermissionController extends JeroController<ProjectUserP
@ApiOperation(value="权限同步接口", notes="权限同步接口")
@PostMapping(value = "/sync")
public void sync(){
log.info("=================== 权限同步开始 ======================");
projectUserPermissionService.sync();
log.info("=================== 权限同步完毕 ======================");
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+3 -3
View File
@@ -142,7 +142,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
for (NcrTrackVO trackVO : infoList) {
String projectName = trackVO.getProjectName();
String yearName = trackVO.getYearName();
String market = getMarket(targetMarketList, trackVO);
String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
String projectVersion = trackVO.getProjectVersion();
if(StringUtils.isNotBlank(projectVersion)){
trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
@@ -296,7 +296,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
}
}
private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO) {
private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
//目标市场
List<DictModel> dictModelList = new ArrayList<>();
for (String s : trackVO.getTargetMarket().split(",")) {
@@ -308,7 +308,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
if(dictModelList.size() != 0){
StringBuilder sb = new StringBuilder();
for (DictModel dictModel : dictModelList) {
if(CutEnum.CN.getValue().equals(trackVO.getCut())){
if(CutEnum.CN.getValue().equals(cut)){
sb.append(dictModel.getText()+",");
}else{
sb.append(dictModel.getTextEn()+",");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+38 -5
View File
@@ -4,23 +4,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ConditionAssessmentEO;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.enums.CertificationProgressEnum;
import com.jero.modules.project.enums.CurrentProjectStatusEnum;
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
import com.jero.modules.project.enums.ReviewResultEnum;
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
import com.jero.modules.project.enums.*;
import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
import com.jero.modules.project.service.IConditionAssessmentEOService;
import com.jero.modules.project.service.IProjectStatusBoardService;
import com.jero.modules.project.vo.TimeNodeVO;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.mapper.SysRoleMapper;
import com.jero.modules.system.service.IProjectUserBrandService;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import lombok.SneakyThrows;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -49,6 +51,14 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
private ProjectTaskInventoryEOServiceImpl projectTaskInventoryEOService;
@Autowired
private SysDictItemServiceImpl sysDictItemServiceImpl;
@Autowired
private SysRoleMapper sysRoleMapper;
@Autowired
private ProjectUserPermissionMapper projectUserPermissionMapper;
@Autowired
private IProjectUserBrandService projectUserBrandService;
@Autowired
private ISysUserService sysUserService;
/**
@@ -153,6 +163,26 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
*/
@Override
public List<Map<String,Object>> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
Set<String> projectIds = new HashSet<>();
//根据项目用户权限表筛选有权访问的项目
Set<String> permissionProjectIds = projectUserPermissionMapper.queryProjectIdsByUserId(loginUser.getId());
if (ObjectUtils.isNotEmpty(permissionProjectIds)) {
projectIds.addAll(permissionProjectIds);
}
if (isViewer > 0) {
//如果是Viewer，根据配置的品牌筛选可访问的项目
List<String> brandTypes = projectUserBrandService.queryBrandByUserId(loginUser.getId());
if (ObjectUtils.isNotEmpty(brandTypes)) {
QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
queryWrapper.in("brand",brandTypes);
if (ObjectUtils.isNotEmpty(projectLibraryBaseService.list(queryWrapper))) {
projectIds.addAll(projectLibraryBaseService.list(queryWrapper).stream().map(ProjectLibraryBase::getId).collect(Collectors.toSet()));
}
}
}
if(StringUtils.isNotBlank(projectLibraryBase.getProjectName())){
projectLibraryBase.setProjectName(projectLibraryBase.getProjectName().replace("*",""));
}
@@ -163,6 +193,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
// //项目库信息
// List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper);
List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
if (!sysUserService.isAdministrator()) {
projectLibraryBaseList = projectLibraryBaseList.stream().filter(project -> projectIds.contains(project.getId())).collect(Collectors.toList());
}
List<Map<String,Object>> result = new ArrayList<>();
if(projectLibraryBaseList.size() != 0){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java
+2
View File
@@ -34,6 +34,7 @@ import java.util.Date;
import java.util.Set;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
/**
* @Description: 项目权限表
@@ -42,6 +43,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @Version: V1.0
*/
@Service
@Transactional
public class ProjectUserPermissionServiceImpl extends ServiceImpl<ProjectUserPermissionMapper, ProjectUserPermission> implements IProjectUserPermissionService {
@Autowired