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:
zyx.net
2022-12-29 15:28:11 +08:00
parent 40f1fbec1e fe129e8621
commit eef54b1e6a
4 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+55 -1
View File
@@ -1160,6 +1160,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
map.put("db_field_id", paramsManifestEO.getReferencesColId());
map.put("references_col", true);
} else {
continue;
@@ -1230,6 +1232,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
paramsConfigDataEO.setParamsCollectManifestId(paramsCollectManifestId);
paramsConfigDataEO.setParamsConfigId(paramsConfigEOId);
ParamsConfigEO paramsConfigEO = this.paramsConfigEOService.queryById(paramsConfigEOId);
if(Objects.isNull(paramsConfigEO)){
continue;
}
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
boolean appendFlag = false; // 拼接标识
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
@@ -5395,7 +5400,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 配置数据重构后入库
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
/*for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
StringBuilder referencesColBuilder = new StringBuilder();
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
@@ -5427,6 +5432,55 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
}
}*/
for (ParamsCollectManifestEO paramsCollectManifestEO : paramsCollectManifestEOList) {
// 参考列值设置为空标识
boolean referencesColIsNullFlag = true;
for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
if (StringUtils.equals(paramsCollectManifestEO.getNioNumber(),paramsReportConfigDataEO.getNioNumber())) {
// 控件类型相同 才能引用
if (paramsCollectManifestEO.getControlType().equals(paramsReportConfigDataEO.getControlType())) {
StringBuilder referencesColBuilder = new StringBuilder();
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
} else {
referencesColBuilder.append(" ").append("#");
}
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getPullData())) {
referencesColBuilder.append(paramsReportConfigDataEO.getPullData()).append("#");
} else {
referencesColBuilder.append(" ").append("#");
}
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
referencesColBuilder.append(paramsReportConfigDataEO.getFileConnectId()).append("#");
} else {
referencesColBuilder.append(" ").append("#");
}
String referencesCol = referencesColBuilder.toString();
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(paramsCollectManifestEO.getId());
updateCollectManifestEO.setReferencesCol(referencesCol);
updateEOList.add(updateCollectManifestEO);
referencesColIsNullFlag = false;
break;
}
}
}
if(referencesColIsNullFlag){
// 如果根据nio编号没有匹配到数据，将参考列的值设置为空
LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();
manifestUpdateWrap.eq(ParamsCollectManifestEO::getId,paramsCollectManifestEO.getId());
manifestUpdateWrap.set(ParamsCollectManifestEO::getReferencesCol,null);
this.update(manifestUpdateWrap);
}
}
// 修改参数清单的参考列名称
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+1 -1
View File
@@ -594,7 +594,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
if(CutEnum.CN.getValue().equals(cut)){
map.put("db_field_txt","操作");
}else{
map.put("db_field_txt","操作");
map.put("db_field_txt","Operator");
}
map.put("click4", true);
map.put("orderNum", orderNumStart);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+9 -10
View File
@@ -252,17 +252,16 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
@Override
public IPage<DummyInventoryBaseEO> getPageInfo(Page<DummyInventoryBaseEO> page, QueryWrapper<DummyInventoryBaseEO> queryWrapper) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//下面注释掉的代码，是用于区分权限的，2022-12-29变更的时候注释掉的，后面如果要是需要添加权限的时候，再将一下注释的几行代码放开即可-----------------------------------
//系统管理
boolean administrator = sysUserService.isAdministrator();
if(!administrator){
queryWrapper.and(query->{
query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
.or().in("state",InventoryStateEnum.ISSUE.getValue());
});
}
// queryWrapper.or(query->{
// query.in("state",InventoryStateEnum.ISSUE.getValue());
// });
// boolean administrator = sysUserService.isAdministrator();
// if(!administrator){
// queryWrapper.and(query->{
// query.in("create_by",sysUser.getUsername()).in("state",InventoryStateEnum.DRAFT.getValue())
// .or().in("state",InventoryStateEnum.ISSUE.getValue());
// });
// }
//--------------------------------------------------------------------------------------------------------------------------------------------------
IPage<DummyInventoryBaseEO> pageList = this.page(page, queryWrapper);
if (pageList.getRecords().size() != 0) {
List<DummyInventoryBaseEO> records = pageList.getRecords();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+14 -12
View File
@@ -438,18 +438,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
}
//选择了其他工程师
if(StringUtils.isNotBlank(certificationEngineer)){
for (String id : original.getCertificationEngineer().split(",")) {
if (!certificationEngineer.contains(id)) {
//如果原来的认证工程师被删除了，则需要同步删除当前项目的相关人员名单中该认证工程师权限
QueryWrapper<ProjectUserPermission> delWrapper = new QueryWrapper<>();
delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
projectUserPermissionService.remove(delWrapper);
//如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限
QueryWrapper<ProjectUserPermission> delLawInventoryWrapper = new QueryWrapper<>();
delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
projectUserPermissionService.remove(delLawInventoryWrapper);
if(StringUtils.isNotEmpty(original.getCertificationEngineer())){
for (String id : original.getCertificationEngineer().split(",")) {
if (!certificationEngineer.contains(id)) {
//如果原来的认证工程师被删除了，则需要同步删除当前项目的相关人员名单中该认证工程师权限
QueryWrapper<ProjectUserPermission> delWrapper = new QueryWrapper<>();
delWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
eq("belong", ProjectUserLocationEnum.PROJECT_DETAIL_RELEVANT_PERSONNEL_CERTIFICATION.getValue());
projectUserPermissionService.remove(delWrapper);
//如果原来的认证工程师被删除了，则需要同步删除当前项目的法规清单中该认证工程师权限
QueryWrapper<ProjectUserPermission> delLawInventoryWrapper = new QueryWrapper<>();
delLawInventoryWrapper.eq("project_id", projectLibraryBase.getId()).eq("user_id",id).
eq("belong", ProjectUserLocationEnum.PROJECT_LAWS_INVENTORY_HOMOLOGATION.getValue());
projectUserPermissionService.remove(delLawInventoryWrapper);
}
}
}