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

Merge branch 'fix_uat_20230719' into 'master'

Browse Source 
Fix uat 20230719

See merge request laws-nio/laws-weilai!357
This commit is contained in:
高嵩
2023-08-10 12:57:17 +00:00
parent 634968d9a2 fbdddef361
commit 01922240a0
21 changed files with 1380 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/ProjectRoleEnum.java
+4
View File
@@ -73,4 +73,8 @@ public enum ProjectRoleEnum {
}
return null;
}
public int getIntValue() {
return Integer.valueOf(value);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java
+4 -2
View File
@@ -116,11 +116,13 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl<ParamsConfigEOMapper,
// saveBatch(addConfigList);
// 修改所有参数项状态为：待发起收集
List<ParamsCollectManifestEO> updateList = paramsCollectManifestEOList.stream()
.filter(e-> !CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
.filter(e -> (!CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
&& !CollectManifestStateEnum.CHANGE.getValue().equals(e.getState())))
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(updateList)) {
List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
updateList.forEach(collectManifestEO -> {
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
updateCollectManifestEO.setId(collectManifestEO.getId());
updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
updateCollectManifestEOList.add(updateCollectManifestEO);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+1 -1
View File
@@ -596,7 +596,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
// 参数填写规则改变，删除参数项配置数据，状态变为：待发起收集，拍列表前边
updateCollectManifestEO.setId(oldCollectManifestEO.getId()); // 为收集参数项id
updateCollectManifestEO.setState(CollectManifestStateEnum.WAIT_COLLECT.getValue());
updateCollectManifestEO.setState(CollectManifestStateEnum.CHANGE.getValue());
updateCollectManifestEO.setChangeFlag(CollectManifestChangeFlagEnum.CHANGE_AFTER.getValue()); // 因新发布模板中该参数项控件变化，标记为变更后参数项
updateCollectManifestEO.setDelFlag(CollectManifestChangeFlagEnum.DELETE_BEFORE.getValue()); // 标记为变更时未删除参数项
updateCollectManifestEO.setAddFlag(CollectManifestChangeFlagEnum.ADD_BEFORE.getValue()); // 非添加参数项
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
+4
View File
@@ -114,6 +114,10 @@ public enum TemplateInfoEnum2 {
CERTIFICATION_MESSAGE24("发起人审查退回，责任人接收-任务","ctp_AArfOgl3mr4z",""), // 已同步飞书开放平台
CERTIFICATION_MESSAGE25("发起人审查通过，责任人接收通知-通知","ctp_AArffopvM8vQ",""),// 已同步飞书开放平台
CERTIFICATION_PUBLIC_MESSAGE_G("认证清单-公用消息-绿色","ctp_AAmcXtKz4z6r",""),// 已同步飞书开放平台
CERTIFICATION_PUBLIC_MESSAGE_Y("认证清单-公用消息-黄色","ctp_AAmcKcXLbh0H",""), // 已同步飞书开放平台
CERTIFICATION_PUBLIC_MESSAGE_R("认证清单-公用消息-红色","ctp_AAmcLxM85y9p",""),// 已同步飞书开放平台
// 法规清单发布相关消息模板
REGULATION_LIST_RELEASE1("Studio发起或stuido催办，法规工程师收到消息","ctp_AArfOhy7O9R4",""),// 已同步飞书开放平台
REGULATION_LIST_RELEASE2("法规清单发布-公用消息-绿色","ctp_AArYJam3JTyg",""), // 已同步飞书开放平台
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectMessageEnum.java
+8 -1
View File
@@ -7,13 +7,20 @@ import com.jero.common.constant.enums.CutEnum;
* 认证流程 节点枚举类
*/
public enum ProjectMessageEnum {
//法规消息
SJFHXLC("sjfhxlc","设计符合性流程","Design Compliance Process"),
YZFHXLC("yzfhxlc","验证符合性流程","Verify Compliance Process"),
RWBFQRCH("rwbfqrch","您好，您以下任务已被发起人撤回。","Hello! Your task has been withdrawn by the initiator."),
RWJZSJBXG("rwjzsjbxg","您好，以下符合性任务的截止时间已被发起人修改。","Hello! The due date of the compliance task has been modified by the initiator."),
RWJFWLXBXG("rwjfwlxbxg","您好，以下符合性任务的交付物类型已被发起人修改。","Hello! The type of deliverables of the compliance task has been modified by the initiator."),
RWJFWMBBXG("rwjfwmbbxg","您好，以下符合性任务的交付物模板已被发起人修改。","Hello! The deliverable template of the compliance task has been modified by the initiator."),
//认证消息
RZRWQR("rzrwqr","认证任务确认","Homologation Task Confirmation"),
PREHOMEQR("Pre-Homoqr","Pre-Homo确认","Pre-Homo Confirmation"),
RZQRRWYQ("rzqrrwyq","您好，请及时查看确认以下任务要求，谢谢！","Hello! Please check and confirm the following task requirement in a timely manner. Thank you!"),
RZRWJZSJBXG("rzrwjzsjbxg","您好，以下任务的截止时间已被发起人修改。","Hello! The due date of the task has been modified by the initiator."),
RZRWJFWLXBXG("rzrwjfwlxbxg","您好，以下任务的交付物类型已被发起人修改。","Hello! The type of deliverables of the task has been modified by the initiator."),
RZRWJFWMBBXG("rzrwjfwmbbxg","您好，以下任务的交付物模板已被发起人修改。","Hello! The deliverable template of the task has been modified by the initiator."),
;
String key;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+375 -47
View File
@@ -210,21 +210,32 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
*/
@Override
public void editById(ProjectCertificationInventoryEO projectCertificationInventoryEO) {
//获取当前用户
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<ProjectCertificationInventoryEO> certificationQueryWrap = new QueryWrapper<>();
certificationQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId());
List<ProjectCertificationInventoryEO> oldPciEoList = this.list(certificationQueryWrap);
if(projectCertificationInventoryEO.getEndTime() != null){
// 编辑截至日期处理逻辑
this.editEndTime(projectCertificationInventoryEO, oldPciEoList);
if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())) {
// 编辑工程接口人处理逻辑
this.editSdt(projectCertificationInventoryEO, oldPciEoList, currentUser);
}
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){
if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())) {
// 编辑责任人处理逻辑
this.editDutyPerson(projectCertificationInventoryEO,oldPciEoList);
this.editDutyPerson(projectCertificationInventoryEO, oldPciEoList, currentUser);
}
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType()) || StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())){
// 编辑交付物类型、交付物模板逻辑
// TODO 此处逻辑需要详细需求。如何操作。
if (projectCertificationInventoryEO.getEndTime() != null) {
// 编辑截至日期处理逻辑
this.editEndTime(projectCertificationInventoryEO, oldPciEoList, currentUser);
}
if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType())) {
// 编辑交付物类型逻辑
this.editDeliverableType(projectCertificationInventoryEO, oldPciEoList, currentUser);
}
if (StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())) {
// 编辑交付物模板逻辑
this.editDeliverableTemplate(projectCertificationInventoryEO, oldPciEoList, currentUser);
}
// 获取编辑前的数据
@@ -247,8 +258,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
//获取当前的projectId
String projectId = projectCertificationInventoryEO.getProjectLibraryId();
String cut = projectCertificationInventoryEO.getCut();
//获取当前用户
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
Map<String,Object> params = new HashMap<>();
params.put("projectLibraryId",projectId);
params.put("userId",currentUser.getId());
@@ -396,11 +405,213 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
}
private void editDeliverableTemplate(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList, LoginUser currentUser) {
String newDeliverableTemplate = newPciEo.getDeliverableTemplate();
List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(pldPciEo -> {
boolean flag = (
!newDeliverableTemplate.equals(pldPciEo.getDeliverableTemplate())
&& (
StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
)
);
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oldPciEos)){
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
String msgTitleCn = "";
String msgTitleEn = "";
String taskDefinitionKey = "";
if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName();
msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName();
taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey();
}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) {
msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName();
msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName();
taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey();
}
List<String> userIdList = new ArrayList<>();
userIdList.add(oldPciEo.getDutyPerson());
if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
}
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
oldPciEo.setEndTime(newPciEo.getEndTime());
List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
PciEoList.add(oldPciEo);
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
oldPciEo.getEndTime(),
taskDefinitionKey,
msgTitleCn,
msgTitleEn,
ProjectMessageEnum.RZRWJFWMBBXG.getCnName(),
ProjectMessageEnum.RZRWJFWMBBXG.getEnName()
);
}
}
}
}
private void editDeliverableType(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList, LoginUser currentUser) {
String newDeliverableType = newPciEo.getDeliverableType();
List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(pldPciEo -> {
boolean flag = (
!newDeliverableType.equals(pldPciEo.getDeliverableType())
&& (
StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(pldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
)
);
return flag;
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oldPciEos)){
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
String msgTitleCn = "";
String msgTitleEn = "";
String taskDefinitionKey = "";
if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName();
msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName();
taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey();
}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) {
msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName();
msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName();
taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey();
}
List<String> userIdList = new ArrayList<>();
userIdList.add(oldPciEo.getDutyPerson());
if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
}
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
oldPciEo.setEndTime(newPciEo.getEndTime());
List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
PciEoList.add(oldPciEo);
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
oldPciEo.getEndTime(),
taskDefinitionKey,
msgTitleCn,
msgTitleEn,
ProjectMessageEnum.RZRWJFWLXBXG.getCnName(),
ProjectMessageEnum.RZRWJFWLXBXG.getEnName()
);
}
}
}
}
/**
* 编辑工程接口人处理逻辑
*/
private void editSdt(ProjectCertificationInventoryEO pciEo, List<ProjectCertificationInventoryEO> oldPciEoList,LoginUser currentUser) {
// 过滤出来，旧数据的接口人与新修改的接口人不是同一个人
List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(oldPciEo -> {
boolean flag = (
!StringUtils.equals(oldPciEo.getDutyPerson(), pciEo.getDutyPerson())
&& (
StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
)
);
return flag;
}).collect(Collectors.toList());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
List<String> userIdList = new ArrayList<>();
userIdList.add(oldPciEo.getSdt());
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
PciEoList.add(oldPciEo);
if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
ProjectMessageEnum.RZRWQR.getCnName(),
ProjectMessageEnum.RZRWQR.getEnName(),
ProjectMessageEnum.RWBFQRCH.getCnName(),
ProjectMessageEnum.RWBFQRCH.getEnName()
);
}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
ProjectMessageEnum.PREHOMEQR.getCnName(),
ProjectMessageEnum.PREHOMEQR.getEnName(),
ProjectMessageEnum.RWBFQRCH.getCnName(),
ProjectMessageEnum.RWBFQRCH.getEnName()
);
}
}
if (CollectionUtils.isNotEmpty(oldPciEos)) {
List<String> userIdList = oldPciEos.stream().map(ProjectCertificationInventoryEO::getSdt).distinct().collect(Collectors.toList());
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
if (StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
this.sendMessageByTemplateId(
oldPciEos,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
ProjectMessageEnum.RZRWQR.getCnName(),
ProjectMessageEnum.RZRWQR.getEnName(),
ProjectMessageEnum.RZQRRWYQ.getCnName(),
ProjectMessageEnum.RZQRRWYQ.getEnName()
);
}else if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
this.sendMessageByTemplateId(
oldPciEos,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
ProjectMessageEnum.PREHOMEQR.getCnName(),
ProjectMessageEnum.PREHOMEQR.getEnName(),
ProjectMessageEnum.RZQRRWYQ.getCnName(),
ProjectMessageEnum.RZQRRWYQ.getEnName()
);
}
}
}
/**
* 编辑责任人处理逻辑
* @param pciEo
*/
private void editDutyPerson(ProjectCertificationInventoryEO pciEo,List<ProjectCertificationInventoryEO> oldPciEoList) {
private void editDutyPerson(ProjectCertificationInventoryEO pciEo,List<ProjectCertificationInventoryEO> oldPciEoList,LoginUser currentUser) {
// 过滤出来，旧数据的责任人与新修改的责任人不是同一个人，并且流程状态是 任务待确认、结果待提交、审查退回的数据，这三个状态的流程数据在责任人节点。
List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(oldPciEo -> {
boolean flag = (
@@ -413,18 +624,72 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
);
return flag;
}).collect(Collectors.toList());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
List<String> userIdList = new ArrayList<>();
userIdList.add(oldPciEo.getDutyPerson());
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
PciEoList.add(oldPciEo);
if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
ProjectMessageEnum.RZRWQR.getCnName(),
ProjectMessageEnum.RZRWQR.getEnName(),
ProjectMessageEnum.RWBFQRCH.getCnName(),
ProjectMessageEnum.RWBFQRCH.getEnName()
);
}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
ProjectMessageEnum.PREHOMEQR.getCnName(),
ProjectMessageEnum.PREHOMEQR.getEnName(),
ProjectMessageEnum.RWBFQRCH.getCnName(),
ProjectMessageEnum.RWBFQRCH.getEnName()
);
}
}
if (CollectionUtils.isNotEmpty(oldPciEos)) {
List<String> userIdList = oldPciEos.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
this.sendMessageByTemplateId(
oldPciEos,
TemplateInfoEnum2.CERTIFICATION_MESSAGE15.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
""
);
if (StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
this.sendMessageByTemplateId(
oldPciEos,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey(),
ProjectMessageEnum.RZRWQR.getCnName(),
ProjectMessageEnum.RZRWQR.getEnName(),
ProjectMessageEnum.RZQRRWYQ.getCnName(),
ProjectMessageEnum.RZQRRWYQ.getEnName()
);
}else if(StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())){
this.sendMessageByTemplateId(
oldPciEos,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
pciEo.getEndTime(),
CertificationFlowNodeEnum.TASK_HANDLING.getKey(),
ProjectMessageEnum.PREHOMEQR.getCnName(),
ProjectMessageEnum.PREHOMEQR.getEnName(),
ProjectMessageEnum.RZQRRWYQ.getCnName(),
ProjectMessageEnum.RZQRRWYQ.getEnName()
);
}
// 如果责任人有变更，将之前责任人的待办中心任务，移交给新的责任人。
QueryWrapper<ProcessInfoDetailEO> detailQueryWrap = new QueryWrapper<>();
@@ -452,7 +717,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
* @param newPciEo 最新编辑的认证清单信息
* @param oldPciEoList 旧的认证清单数组
*/
private void editEndTime(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList) {
private void editEndTime(ProjectCertificationInventoryEO newPciEo, List<ProjectCertificationInventoryEO> oldPciEoList,LoginUser currentUser) {
Date newEndTime = newPciEo.getEndTime();
// 过滤出来，旧的截止日期不等于更改后的新截止日期，并且数据状态为 任务待确认、结果待提交、审查退回的数据。
List<ProjectCertificationInventoryEO> oldPciEos = oldPciEoList.stream().filter(pldPciEo -> {
@@ -468,23 +733,49 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(oldPciEos)){
// 同步更新待办中心-流程明细截止日期
this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPciEos.get(0).getProjectLibraryId());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
oldPciEos.get(0).setEndTime(newPciEo.getEndTime());
this.sendMessageByTemplateId(
oldPciEos,
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
newEndTime,
""
);
// 同步更新待办中心-流程明细截止日期
this.syncProcessInfoDetailEndTime(newEndTime, oldPciEos);
int role = checkUserRole(oldPciEos.get(0).getProjectLibraryId(),currentUser.getId());
for (ProjectCertificationInventoryEO oldPciEo : oldPciEos) {
String msgTitleCn = "";
String msgTitleEn = "";
String taskDefinitionKey = "";
if (StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())) {
msgTitleCn = ProjectMessageEnum.RZRWQR.getCnName();
msgTitleEn = ProjectMessageEnum.RZRWQR.getEnName();
taskDefinitionKey = CertificationFlowNodeEnum.TASK_RESPONSIBILITY_CONFIRMATION.getKey();
}else if(StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(oldPciEo.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())) {
msgTitleCn = ProjectMessageEnum.PREHOMEQR.getCnName();
msgTitleEn = ProjectMessageEnum.PREHOMEQR.getEnName();
taskDefinitionKey = CertificationFlowNodeEnum.TASK_HANDLING.getKey();
}
List<String> userIdList = new ArrayList<>();
userIdList.add(oldPciEo.getDutyPerson());
if(role == ProjectRoleEnum.STUDIO_ENGINEER.getIntValue()){
userIdList.addAll(Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")));
}else if(role == ProjectRoleEnum.HOMOLOGATION_ENGINEER.getIntValue()){
userIdList.add(projectLibraryBase.getStudioEngineer());
}
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
oldPciEo.setEndTime(newPciEo.getEndTime());
List<ProjectCertificationInventoryEO> PciEoList = new ArrayList<>();
PciEoList.add(oldPciEo);
this.sendMessageByTemplateId(
PciEoList,
TemplateInfoEnum2.CERTIFICATION_PUBLIC_MESSAGE_G.getValue(),
userIdList,
userInfoList,
oldPciEo.getEndTime(),
taskDefinitionKey,
msgTitleCn,
msgTitleEn,
ProjectMessageEnum.RZRWJZSJBXG.getCnName(),
ProjectMessageEnum.RZRWJZSJBXG.getEnName()
);
}
}
}
}
@@ -605,6 +896,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
@Override
public Result<?> setBatch(ProjectCertificationInventoryEO projectCertificationInventoryEO) {
//获取当前用户
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String ids = projectCertificationInventoryEO.getIds();
if(StringUtils.isEmpty(ids)){
throw new JeroBootException("至少选择一条数据进行批量设置！");
@@ -647,18 +940,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
updateList.add(updateProjectCertificationInventoryEO);
}
if(projectCertificationInventoryEO.getEndTime() != null){
// 编辑截至日期处理逻辑
this.editEndTime(projectCertificationInventoryEO, pciEoList);
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getSdt())){
// 编辑工程接口人处理逻辑
this.editSdt(projectCertificationInventoryEO,pciEoList,currentUser);
}
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDutyPerson())){
// 编辑责任人处理逻辑
this.editDutyPerson(projectCertificationInventoryEO,pciEoList);
this.editDutyPerson(projectCertificationInventoryEO,pciEoList,currentUser);
}
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType()) || StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())){
// 编辑交付物类型、交付物模板逻辑
// TODO 此处逻辑需要详细需求。如何操作。
if(projectCertificationInventoryEO.getEndTime() != null){
// 编辑截至日期处理逻辑
this.editEndTime(projectCertificationInventoryEO, pciEoList,currentUser);
}
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableType()) ){
// 编辑交付物类型逻辑
this.editDeliverableType(projectCertificationInventoryEO, pciEoList, currentUser);
}
if(StringUtils.isNotEmpty(projectCertificationInventoryEO.getDeliverableTemplate())){
// 编辑交付物模板逻辑
this.editDeliverableTemplate(projectCertificationInventoryEO, pciEoList, currentUser);
}
// List<String> flowStatusList = new ArrayList<>();
@@ -728,8 +1028,6 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
/**
* 根据模板发送消息
* @param projectCertificationInventoryEOS
* @param templeteId
*/
@Override
public void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS,
@@ -738,6 +1036,22 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
List<SysUser> userInfoList,
Date endTime,
String taskDefinitionKey){
this.sendMessageByTemplateId(projectCertificationInventoryEOS,templeteId,userIdList,userInfoList,endTime,taskDefinitionKey,"","","","");
}
/**
* 根据模板发送消息(可发送公共消息)
*/
private void sendMessageByTemplateId(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS,
String templeteId,
List<String> userIdList,
List<SysUser> userInfoList,
Date endTime,
String taskDefinitionKey,
String msgTitleCn,
String msgTitleEn,
String contentCn,
String contentEn){
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
@@ -772,6 +1086,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
larkMesJson.put("userIds",thirdId);
Map<String,Object> templateVariableMap = new HashMap<>();
if(StringUtils.isNotEmpty(msgTitleCn)){
templateVariableMap.put("msgTitleCn",msgTitleCn);
}
if(StringUtils.isNotEmpty(msgTitleEn)){
templateVariableMap.put("msgTitleEn",msgTitleEn);
}
if(StringUtils.isNotEmpty(contentCn)){
templateVariableMap.put("contentCn",contentCn);
}
if(StringUtils.isNotEmpty(contentEn)){
templateVariableMap.put("contentEn",contentEn);
}
templateVariableMap.put("projectNameCn",PRN_CN);
templateVariableMap.put("projectNameEn",PRN_EN);
templateVariableMap.put("standName",standName);
@@ -6323,6 +6649,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
@Override
public void replacementUser(JSONObject json) {
//获取当前用户
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = json.getString("userId");
String projectLibraryId = json.getString("projectLibraryId");
List<Map<String, Object>> replacementUserList = (List<Map<String, Object>>) json.get("replacementUserList");
@@ -6348,7 +6676,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
// List<ProjectCertificationInventoryEO> oldPciEoList = this.list(certificationQueryWrap);
List<ProjectCertificationInventoryEO> oldPciEoList = pciEoList.stream().filter(p -> StringUtils.equals(p.getId(),pciEo.getId())).distinct().collect(Collectors.toList());
// 编辑责任人处理逻辑
this.editDutyPerson(newPciEo, oldPciEoList);
this.editDutyPerson(newPciEo, oldPciEoList,currentUser);
pciEo.setDutyPerson(newUserId);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+13 -11
View File
@@ -9293,17 +9293,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEO.setInventoryAffirmDueDate(endTime);
userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
processInfoDetailEO.setEndTime(endTime);
processInfoDetailEO.setCreateTime(new Date());
processInfoDetailEO.setCreateBy(currentUser.getId());
processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
processInfoDetailEOList.add(processInfoDetailEO);
//如果都是不涉及就不发待办
if (!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())
&& !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())) {
ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
processInfoDetailEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
processInfoDetailEO.setUserId(projectLawsInventoryEO.getRegulationOwnerId());
processInfoDetailEO.setTaskDefinitionKey(InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey());
processInfoDetailEO.setEndTime(endTime);
processInfoDetailEO.setCreateTime(new Date());
processInfoDetailEO.setCreateBy(currentUser.getId());
processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
processInfoDetailEOList.add(processInfoDetailEO);
}
}
}
jero-web/public/index.html
Vendored
+2 -1
View File
@@ -269,8 +269,9 @@
<!-- 全局配置 -->
<script>
localStorage.removeItem('isPhone')
localStorage.setItem('isPhone', 'yes')
localStorage.setItem('isPhone', 'no')
window.loginUrl = 'https://grp.nioint.com'
// window.loginUrl = 'https://grp-mobile.nio.com'
// // 判断当前设备
// function isMobile() {
// var userAgentInfo = navigator.userAgent
jero-web/src/common/lang/en-us.js
+1 -1
View File
@@ -786,7 +786,7 @@ module.exports = {
modifyprojectInterfacePerson: 'Modify Project Interface Person',
operatethisbutton: 'You do not have permission to operate this button',
ParameterLibrary: 'Parameter Library',
referenceparameter: 'Reference Parameter',
referenceparameter: 'Copy Parameter',
tempSave: 'Save',
Assignedby: 'Assign',
CompulsoryWithdrawal: 'Revoke',
jero-web/src/common/lang/zh-cn.js
+2 -2
View File
@@ -804,7 +804,7 @@ module.exports = {
modifyprojectInterfacePerson: '修改工程接口人',
operatethisbutton: '没有权限操作此按钮',
ParameterLibrary: '参数库',
referenceparameter: '引用参数',
referenceparameter: '复制参数',
tempSave: '暂存',
Assignedby: '分配填写人',
CompulsoryWithdrawal: '强制撤回',
@@ -2711,7 +2711,7 @@ module.exports = {
modifyprojectInterfacePerson: '修改工程接口人',
operatethisbutton: '没有权限操作此按钮',
ParameterLibrary: '参数库',
referenceparameter: '引用参数',
referenceparameter: '复制参数',
tempSave: '暂存',
Assignedby: '分配填写人',
CompulsoryWithdrawal: '强制撤回',
jero-web/src/components/search/index.vue
+3 -1
View File
@@ -263,13 +263,15 @@
getAction(this.url.seachList, params).then((res) => {
if (res.success) {
this.searchList = res.result
console.log(this.searchQueryList)
if (this.searchQueryList && this.searchQueryList.length > 0) {
console.log(this.searchList)
for (let i = 0; i < this.searchList.length; i++) {
if (this.searchList[i].db_field_name == 'issue_time') {
this.searchList.splice(i, 1)
i--
}
if (this.searchList[i].db_field_name == 'title') {
if (this.searchList[i].db_field_name == 'title' || this.searchList[i].db_field_name == 'title_en') {
let data = this.searchList[i + 1]
this.searchList[i + 1] = this.searchQueryList[0]
this.searchList.push(data)
jero-web/src/components/tableCollection/index.vue
+3
View File
@@ -1151,6 +1151,9 @@
// console.log(this.currentPersonRole)
if ((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol') {
itemLi.isLock = 0
}else if(this.currentPersonRole == 'homo' && (Obj.state == '变更' || Obj.state == 'Modify')){
itemLi.isLock = 0
Obj[item].referencesColFlag = '1'
} else {
itemLi.isLock = 1
}
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+35 -1
View File
@@ -104,6 +104,29 @@
@change="onChangedatet"></a-range-picker>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('statisticalNodes')">
<span>{{ $t('statisticalNodes') }}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
allowClear
class="box-input"
show-search
optionFilterProp="label"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.firstLevelDutyTerritory">
<a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
:key="key"
:label="item.key"
:value="item.key">
<span style="display: inline-block;width: 100%" :title=" item.key ">
{{ item.key }}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
@@ -1043,7 +1066,8 @@
text: this.$t('areaOfResponsibility'),
dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
}
]
],
firstLevelDutyTerritoryList:[],
}
},
created() {
@@ -1058,6 +1082,7 @@
this.isTrue = this.$route.query.title == '市场清单详情' ? false : true
this.getHeader()
this.getList()
this.getFirstLevelDutyTerritory()
},
computed: {
columns() {
@@ -1079,6 +1104,15 @@
},
methods: {
...mapGetters(['userInfo']),
getFirstLevelDutyTerritory() {
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
if (res.success) {
this.firstLevelDutyTerritoryList = res.result
} else {
this.firstLevelDutyTerritoryList = []
}
})
},
sVisible() {
this.getDataAdmin()
},
jero-web/src/views/phoneView/handlingPage.vue
+3 -1
View File
@@ -72,7 +72,9 @@
}
})
} else {
this.$router.go(-1)
this.$router.push({
path: '/phoneToDoCenter',
})
}
},
handlingClick(item) {
jero-web/src/views/phoneView/preHomoMangement.vue
+863 -855
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/phoneView/problemKnowledgeBase.vue
+2 -2
View File
@@ -458,7 +458,7 @@
display: flex;
position: sticky;
top: 0;
padding-top: 0.4rem;
padding-top: 10px;
background: #fff;
z-index: 1000;
}
@@ -469,7 +469,7 @@
}
.header-search-text {
font-size: 0.44rem;
font-size: 16px;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 600;
color: #040B29;
jero-web/src/views/phoneView/processManagement.vue
+6 -2
View File
@@ -355,7 +355,9 @@
}
})
} else {
this.$router.go(-1)
this.$router.push({
path: '/phoneToDoCenter',
})
}
},
onSubmit() {
@@ -570,7 +572,9 @@
}
})
} else {
this.$router.go(-1)
this.$router.push({
path: '/phoneToDoCenter',
})
}
} else {
this.show = false
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+3 -3
View File
@@ -267,12 +267,12 @@
{{$t('dataExport')}}
</div>
<!-- 引用参数-->
<div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" '>
<div @click="referenceparameter" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
<a-icon type="plus"/>
{{$t('referenceparameter')}}
</div>
<!-- 保存-->
<div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre"'>
<div @click="handlePreservation(1)" class="operator-text" v-if='currentPersonRole == "dre" || currentPersonRole == "homo"'>
<a-icon type="check-circle"/>
{{$t('tempSave')}}
</div>
@@ -2097,7 +2097,7 @@
let selectedRowKeysValue = []
data.forEach(res => {
if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' ||
res.state == 'Rejected by homo engineer') {
res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') {
selectedRowKeysValue.push(res)
}
})
jero-web/src/views/projectManagement/components/certificationList/index.vue
+1 -1
View File
@@ -461,7 +461,7 @@
<batSetting :url="url" ref="batSettingRef" :roleSwitchingCode="roleSwitchingCode" @batSettingForm="batSettingForm"/>
<addModel ref="addModelRef" @addModelForm="addModelForm"/>
<modifyHistory ref="modifyHistoryRef"/>
<uploadFile ref="uploadFile" :isMultiple="true" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
<uploadFile ref="uploadFile" :isMultiple="false" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
<TaskListModel @TaskListModelList="transferListForm" ref="TaskListModelRef"/>
<referenceDeliverablesList ref="referenceDeliverablesListRef" @referenceDeliverablesListForm="transferListForm"/>
<SelectedBy ref="SelectedByRef" :isSingleChoice="true"
jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+13
View File
@@ -113,6 +113,7 @@
:columns="columns"
rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@change="tableOnChange"
:pagination="false"
:scroll="{x:800,y: 500}"
:data-source="dataSource"
@@ -355,6 +356,7 @@
align: 'left',
dataIndex: 'dutyTerritory_dictText',
ellipsis: true,
sorter:true,
width: 100
},
{
@@ -602,6 +604,17 @@
this.$refs.SelectedByRef.submitLoading = false
this.getUserAllDutyTerritoryList()
},
tableOnChange(pagination, filters, sorter) {
this.orderBy = sorter.order == 'ascend' ? '1' : '2'
if (sorter.columnKey == 'flowTypeShow') {
this.orderByField = 'flowType'
} else if (sorter.columnKey == 'taskDefinitionKeyName') {
this.orderByField = 'taskDefinitionKey'
} else {
this.orderByField = sorter.columnKey
}
this.getList()
},
getUserAllDutyTerritoryList() {
let query = {
projectLibraryId: this.$route.query.id,
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+34
View File
@@ -79,6 +79,29 @@
:triggerChange="false" :dictCode="'duty_territory'"/>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('statisticalNodes')">
<span>{{ $t('statisticalNodes') }}</span>
</div>
<a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
allowClear
class="box-input"
show-search
optionFilterProp="label"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.firstLevelDutyTerritory">
<a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
:key="key"
:label="item.key"
:value="item.key">
<span style="display: inline-block;width: 100%" :title=" item.key ">
{{ item.key }}
</span>
</a-select-option>
</a-select>
</div>
</a-col>
</template>
<span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
@@ -320,6 +343,7 @@
},
queryParam: {},
orderByField: '',
firstLevelDutyTerritoryList:[],
columns: [
{
title: this.$t('category'),
@@ -429,10 +453,20 @@
this.isTrue = this.$route.query.title == '市场认证清单详情' ? false : true
this.isFalse = this.$route.query.title == '市场认证清单详情' ? true : false
this.getList()
this.getFirstLevelDutyTerritory()
},
computed: {},
methods: {
...mapGetters(['userInfo']),
getFirstLevelDutyTerritory() {
getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
if (res.success) {
this.firstLevelDutyTerritoryList = res.result
} else {
this.firstLevelDutyTerritoryList = []
}
})
},
onSelectChange(value) {
this.selectedRowKeys = value
},