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

Merge branch 'master' into 'fix_uat_20230719'

Browse Source 
Master

See merge request laws-nio/laws-weilai!355
This commit is contained in:
高嵩
2023-07-27 06:24:03 +00:00
parent e3936a5eb0 ddd703792f
commit 9c1539b314
8 changed files with 105 additions and 27 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
+1 -1
View File
@@ -3376,7 +3376,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
for (ParamsConfigDataEO configDataEO : configDataEOList) {
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
// addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
addReportConfigDataEO.setId(UUID.randomUUID().toString().replace("-", ""));
addReportConfigDataEO.setParamsConfigId(configIdMap.get(configEO.getId()));
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+27 -2
View File
@@ -25,6 +25,7 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.ISysDictItemService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -152,13 +153,37 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> paramsConfigDataVO = new HashMap<>();
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
// ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据
List<ParamsConfigDataHistoryEO> configDataEOList = paramsConfigDataEOList.stream().filter(e -> paramsConfigId.equals(e.getParamsConfigId()) && paramsCollectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList());
// List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据
if(CollectionUtils.isNotEmpty(configDataEOList)){
// 匿名比较器排序
Collections.sort(configDataEOList, new Comparator<ParamsConfigDataHistoryEO>() {
@Override
public int compare(ParamsConfigDataHistoryEO p1, ParamsConfigDataHistoryEO p2) {
if (p2.getOrderNum() == null || p1.getOrderNum() == null) {
return 0;
}
return p1.getOrderNum().compareTo(p2.getOrderNum());
}
});
for (ParamsConfigDataHistoryEO paramsConfigDataEO : configDataEOList) {
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList);
}
}else{
ParamsConfigDataHistoryEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
String key = UUID.randomUUID().toString().replaceAll("-", "");
paramsConfigDataVO.put("0+" + key, paramsConfigDataVOList);
}
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
configMap.put("paramsConfigData",paramsConfigDataVO);
manifestMap.put(paramsConfigEO.getId(), configMap);
configIdList.add(paramsConfigEO.getId());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+1 -1
View File
@@ -577,7 +577,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
List<SysConfig> sysConfigs = iSysConfigService.queryList();
if(org.apache.commons.collections.CollectionUtils.isNotEmpty(sysConfigs)){
for (SysConfig sysConfig : sysConfigs) {
if(sysConfig.getConfigName().equals("domainWebImgURL")){
if(sysConfig.getConfigName().equals("domianWebImgURL")){
String pcUrl = sysConfig.getConfig();
String phoneUrl = sysConfig.getPhoneConfig();
if(ObjectUtils.isNotEmpty(problemKnowledgeBaseEO) && StringUtils.isNotBlank(problemKnowledgeBaseEO.getContent())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
+49 -9
View File
@@ -1,11 +1,17 @@
package com.jero.modules.project.service.editImpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.util.DateUtils;
import com.jero.modules.feishu.enums.TemplateInfoEnum2;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
import com.jero.modules.project.enums.InventoryAffirmNodeEnum;
import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
import com.jero.modules.todoCenter.entity.ProcessInfoEO;
import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum;
@@ -20,9 +26,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -38,6 +42,10 @@ public class ProjectLawsInventoryEOEditServiceImpl {
private IProcessInfoDetailEOService processInfoDetailEOService;
@Autowired
private IProcessInfoEOService processInfoEOService;
@Autowired
ProjectLibraryBaseServiceImpl projectLibraryBaseService;
@Autowired
private ISysUserService sysUserService;
/**
* 处理编辑了法规工程师的逻辑
@@ -87,8 +95,8 @@ public class ProjectLawsInventoryEOEditServiceImpl {
List<ProcessInfoDetailEO> qdqrPidEoList = pidEoList.stream().filter(pidEo -> {
boolean flag = (
StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.QDQR.getValue())
&& StringUtils.equals(pidEo.getTaskDefinitionKey(), InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey())
&& StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue())
&& StringUtils.equals(pidEo.getTaskDefinitionKey(), InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey())
&& StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue())
);
return flag;
}).collect(Collectors.toList());
@@ -103,8 +111,8 @@ public class ProjectLawsInventoryEOEditServiceImpl {
List<ProcessInfoDetailEO> designFlowPidEoList = pidEoList.stream().filter(pidEo -> {
boolean flag = (
StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue())
&& StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue())
&& StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue())
&& StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue())
&& StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue())
);
return flag;
}).collect(Collectors.toList());
@@ -121,8 +129,8 @@ public class ProjectLawsInventoryEOEditServiceImpl {
List<ProcessInfoDetailEO> verifyFlowPidEoList = pidEoList.stream().filter(pidEo -> {
boolean flag = (
StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue())
&& StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue())
&& StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue())
&& StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue())
&& StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue())
);
return flag;
}).collect(Collectors.toList());
@@ -134,6 +142,38 @@ public class ProjectLawsInventoryEOEditServiceImpl {
taskIdList.addAll(verifyFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList()));
}
// String regulationOwnerId = oldPliEo.getRegulationOwnerId();
// // 给旧的法规工程师发消息
// String endTime = "";
// if (newPliEo.getInventoryAffirmDueDate() != null) {
// endTime = DateUtils.formatDate(newPliEo.getInventoryAffirmDueDate());
// }
// Map<String, Object> params = new HashMap<>();
// params.put("contentCn", "您好，您以下任务已被发起人撤回。");
// params.put("contentEn", "Hello! Your task has been withdrawn by the initiator.");
// params.put("projectLibraryId", oldPliEo.getProjectLibraryId());
// params.put("endTime", endTime);
// params.put("userIdList", Arrays.asList(regulationOwnerId.split(",")));
// params.put("serialNumbers", oldPliEo.getSerialNumber());
//
// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPliEo.getProjectLibraryId());
// if (ObjectUtils.isNotEmpty(projectLibraryBase)) {
// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
// String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// // 获取待办中心 - 飞书跳转链接
// Map<String, Object> todoCenterParams = new HashMap<>();
// todoCenterParams.put("projectNameCn", PRN_CN);
// todoCenterParams.put("projectNameEn", PRN_EN);
// Map<String, Object> hrefFeishuMap = projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
// params.put("hrefFeishu_CN", hrefFeishuMap.get("hrefFeishu_CN"));
// params.put("hrefFeishu_EN", hrefFeishuMap.get("hrefFeishu_EN"));
// params.put("hrefFeishu_CN_P", hrefFeishuMap.get("hrefFeishu_CN_P"));
//
// List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
// String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
// params.put("Initiator", regulationOwnerUserName);
// projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params);
// }
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+7 -2
View File
@@ -3893,9 +3893,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
// 根据选择调取的数据法规编号，跟当前项目中 法规清单数据法规编号对比，如果有，则加入，如果没有，则不加入。
List<ProjectLawsInventoryEO> lawsInventoryEOListTemp = projectLawsInventoryEOList.stream().filter(lawsInventoryEO -> {
boolean flag = false;
if (StringUtils.equals(authDummyInventoryInfoEO.getSerialNumber(), lawsInventoryEO.getSerialNumber())) {
flag = true;
String adiSn = authDummyInventoryInfoEO.getSerialNumber();
BussDocumentLibraryEO bl = iBussDocumentLibraryEOService.getBySerialNumber(adiSn);
if(ObjectUtils.isNotEmpty(bl)){
if (StringUtils.equals(bl.getId(), lawsInventoryEO.getStandId())) {
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java
+5 -2
View File
@@ -249,8 +249,11 @@ public class FileUnZip {
String filenameOne = "";
String filenameTwo = "";
if(filename.contains("/")){
filenameOne = filename.split("/")[0];
filenameTwo = filename.split("/")[1];
String[] strs = filename.split("/");
if(strs.length >= 2){
filenameOne = strs[0];
filenameTwo = strs[1];
}
}
List<File> resultlist = new ArrayList<>();
if (StringUtil.isNotEmpty(path)){