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

合并分支 'dev_2nd_LCYH' 到 'master'

Browse Source 
Dev 2nd lcyh

查看合并请求 laws-nio/laws-weilai!309
This commit is contained in:
高嵩
2023-04-18 18:20:12 +08:00
parent f0b4e4fc3f 97e9b6567e
commit da6d1abf98
31 changed files with 1643 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+3 -1
View File
@@ -619,4 +619,6 @@ INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `descrip
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033251040337922', '1646032917672861697', '地标', 'dfbc363b6e2d4d9c97664aeb6731767e', NULL, 3, 1, 'admin', '2023-04-12 14:11:24', NULL, NULL, 1, NULL, NULL, '0', 'Landmark');
INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646033351942709250', '1646032917672861697', '其他', '17a3731e5a374d8ba3909cca2464a8eb', NULL, 4, 1, 'admin', '2023-04-12 14:11:48', NULL, NULL, 1, NULL, NULL, '0', 'Other');
-- 市场认证清单 增加字段 2023-04-17 未同步生产环境
ALTER TABLE `auth_dummy_inventory_info`
ADD COLUMN `attestation_type` varchar(2000) NULL COMMENT '认证类型' AFTER `deliverable_template`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+9
View File
@@ -77,6 +77,11 @@ public class AuthDummyInventoryInfoEO implements Serializable {
@ApiModelProperty(value = "配置项")
private java.lang.String configItem;
/**认证类型名称**/
@Excel(name = "认证类型", width = 20)
@TableField(exist = false)
private String attestationTypeName;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 15)
@ApiModelProperty(value = "WVTA ID")
@@ -149,4 +154,8 @@ public class AuthDummyInventoryInfoEO implements Serializable {
// 1顺序 2倒序
@TableField(exist = false)
private String orderBy;
/**认证类型*/
@ApiModelProperty(value = "认证类型")
private String attestationType;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEOEn.java
+6
View File
@@ -74,6 +74,12 @@ public class AuthDummyInventoryInfoEOEn implements Serializable {
@ApiModelProperty(value = "配置项")
private String configItem;
/**认证类型*/
@Excel(name = "Certification Type", width = 20)
@ApiModelProperty(value = "认证类型")
@TableField(exist = false)
private String attestationTypeName;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 15)
@ApiModelProperty(value = "WVTA ID")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+21 -5
View File
@@ -957,9 +957,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
if(CollectionUtils.isNotEmpty(baseList)){
String title = "";
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID,*编号,*责任领域,交付物模板,*交付物类型";
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID,*编号,*责任领域,*交付物类型,交付物模板";
}else{
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID,*Number,*Responsible Field,Deliverable Template,*Deliverable Type";
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID,*Number,*Responsible Field,*Deliverable Type,Deliverable Template";
}
int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1077,7 +1077,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
if (i == 0) {
cell.setCellType(HSSFCell.CELL_TYPE_STRING);
headerSb.append(cell.getStringCellValue() + ",");
if(j == 7){
if(j == 8){
break;
}
} else if(i > 1){
@@ -1293,6 +1293,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
//编号必填
flag = must(authDummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number");
// 认证类型
String attestationTypeName = authDummyInventoryInfoEO.getAttestationTypeName();
//类别
if(StringUtils.isNotBlank(category)){
@@ -1361,6 +1365,12 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
authDummyInventoryInfoEO.setDeliverableType(treeId);
}
}
if (StringUtils.isNotEmpty(attestationTypeName)) {
value = pullMore(dictItemList, authDummyInventoryInfoEO, errorMsg, attestationTypeName,msgList,"认证类型","Certification Type","ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
if(StringUtils.isNotBlank(value)){
authDummyInventoryInfoEO.setAttestationType(value);
}
}
}
return msgList;
}
@@ -1683,6 +1693,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
case "*类别": return "category";
case "*检验项目": return "inspectionItem";
case "*配置项": return "configItem";
case "*认证类型": return "attestationTypeName";
case "*WVTA ID": return "wvtaId";
case "*编号" : return "serialNumber";
case "*责任领域": return "dutyTerritoryName";
@@ -1692,6 +1703,7 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
case "*Category" : return "Category";
case "*Inspection Items" : return"inspectionItem";
case "*Configuration Item" : return"configItem";
case "*Certification Type": return "attestationTypeName";
// case "WVTA ID" : return "wvtaId";
case "*Number" : return "serialNumber";
case "*Responsible Field" : return "dutyTerritoryName";
@@ -1778,10 +1790,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
try {
String title = "";
if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID," +
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
"*编号,*责任领域,*交付物类型,交付物模板,";
}else{
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
}
List<String> list = Arrays.asList(title.split(","));
@@ -1896,6 +1908,10 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
}).map(OSSFile::getFileName).collect(Collectors.joining(","));
data.setDeliverableTemplateName(deliverableTemplateName);
}
if(StringUtils.isNotEmpty(data.getAttestationType())){
String attestationTypeName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getAttestationType(),cut, "ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
data.setAttestationTypeName(attestationTypeName);
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+20 -18
View File
@@ -2820,28 +2820,30 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if(StringUtils.isNotBlank(paramsCollectManifestVO.getProjectId())){
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(paramsCollectManifestVO.getProjectId());
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = projectLawsInventoryEOService
.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = projectLawsInventoryEOService
.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, com.jero.modules.system.enums.ProjectRoleEnum.REGULATI_ENGINEER.getValue());
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn);
params.put("contentInfoFeiEn",contentInfoFeiEn);
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
//飞书消息（模板-20230410）
Map<String,Object> params = new HashMap<>();
params.put("contentInfoFeiCn",contentInfoFeiCn);
params.put("contentInfoFeiEn",contentInfoFeiEn);
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
// params.put("back_url_cn",(String)hrefFeishuMap.get("hrefFeishu_cn"));
// params.put("back_url_en",(String)hrefFeishuMap.get("hrefFeishu_en"));
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_GREEN.getValue(),params,null);
}
}
} catch (Exception e) {
log.error("飞书消息推送失败");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+14
View File
@@ -260,4 +260,18 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
List<Map<String,Object>> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params);
return Result.OK(regulatoryEngineerMapList);
}
//engineeringInterfacePerson
/**
* 通过projectId查询法规工程师
*
* @return
*/
@AutoLog(value = "项目库-相关人员维护表-根据projectId查询工程接口人")
@ApiOperation(value="项目库-相关人员维护表-根据projectId查询工程接口人", notes="项目库-相关人员维护表-根据projectId查询工程接口人")
@GetMapping(value = "/queryEngineeringInterfacePersonByProjectId")
public Result<?> queryEngineeringInterfacePersonByProjectId(@RequestParam Map<String,Object> params){
List<Map<String,Object>> engineeringInterfacePersonMapList = projectRelatedPersonnelService.queryEngineeringInterfacePersonByProjectId(params);
return Result.OK(engineeringInterfacePersonMapList);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEO.java
+9 -6
View File
@@ -80,6 +80,11 @@ public class ProjectCertificationInventoryEO implements Serializable {
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
private String configItem;
/**认证类型名称**/
@Excel(name = "认证类型", width = 20)
@TableField(exist = false)
private String attestationTypeName;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 20)
@ApiModelProperty(value = "WVTA ID")
@@ -183,10 +188,13 @@ public class ProjectCertificationInventoryEO implements Serializable {
private String productionEnterpriseName;
/**认证进度*/
@ApiModelProperty(value = "认证进度")
private String certificationProgress;
// 认证进度排序字段
@TableField(exist = false)
private String certificationProgressNumber;
/**认证进度展示名称**/
@Excel(name = "认证进度", width = 20)
@TableField(exist = false)
@@ -246,9 +254,4 @@ public class ProjectCertificationInventoryEO implements Serializable {
/**认证类型*/
@ApiModelProperty(value = "认证类型")
private String attestationType;
/**认证类型名称**/
@Excel(name = "认证类型", width = 20)
@TableField(exist = false)
private String attestationTypeName;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryEOEn.java
+6 -5
View File
@@ -78,6 +78,12 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
@Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4")
private java.lang.String configItem;
/**认证类型*/
@Excel(name = "Certification Type", width = 20)
@ApiModelProperty(value = "认证类型")
@TableField(exist = false)
private String attestationTypeName;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 20)
@ApiModelProperty(value = "WVTA ID")
@@ -219,9 +225,4 @@ public class ProjectCertificationInventoryEOEn implements Serializable {
@TableField(exist = false)
private String endTimeStr;
/**认证类型*/
@Excel(name = "Certification Type", width = 20)
@ApiModelProperty(value = "认证类型")
@TableField(exist = false)
private String attestationTypeName;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java
+29 -9
View File
@@ -7,22 +7,24 @@ import com.jero.common.constant.enums.CutEnum;
* 认证进度枚举类
*/
public enum CertificationProgressEnum {
TEST_PASSED("实验通过","Test passed"),
TEST_FAILED("实验失败","Test failed"),
NOT_START("未开始","Not start"),
IN_PROGRESS("进行中","In progress"),
NOT_START("未开始","Not start","1"),
IN_PROGRESS("进行中","In progress","2"),
TEST_PASSED("实验通过","Test passed","3"),
TEST_FAILED("实验失败","Test failed","4"),
// NA("不涉及","NA"),// 04-12弃用，
COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted"),
COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted"),
COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored"),
COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted","5"),
COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted","6"),
COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored","7"),
;
String name;
String value;
String number;
private CertificationProgressEnum(String name, String value) {
private CertificationProgressEnum(String name, String value,String number) {
this.name = name;
this.value = value;
this.number = number;
}
public String getName() {
@@ -41,7 +43,15 @@ public enum CertificationProgressEnum {
this.value = value;
}
public static String getTextByValue(String value,String cut) {
public String getNumber() {
return number;
}
public void setNumber(String number) {
this.number = number;
}
public static String getTextByValue(String value, String cut) {
CertificationProgressEnum[] values = values();
for (CertificationProgressEnum certificationProgressEnum : values) {
if (certificationProgressEnum.value.equals(value)) {
@@ -54,4 +64,14 @@ public enum CertificationProgressEnum {
}
return null;
}
public static String getNumberByValue(String value) {
CertificationProgressEnum[] values = values();
for (CertificationProgressEnum certificationProgressEnum : values) {
if (certificationProgressEnum.value.equals(value)) {
return certificationProgressEnum.number;
}
}
return null;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/CertificationInventoryJob.java
+179 -11
View File
@@ -70,13 +70,14 @@ public class CertificationInventoryJob implements Job {
if(CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)){
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){
// 消息提醒 认证工程师 认证清单数据
this.remindCertificationEngineer(projectCertificationInventoryEOS,projectLibraryBase);
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
if(StringUtils.isNotEmpty(projectLibraryBase.getCertificationEngineer())){
// 消息提醒 认证工程师 认证清单数据
this.remindCertificationEngineer(projectCertificationInventoryEOS,projectLibraryBase);
}
// 消息提醒 责任人 认证清单数据
this.remindDutyPerson(projectCertificationInventoryEOS,projectLibraryBase);
}
// 消息提醒 责任人 认证清单数据
this.remindDutyPerson(projectCertificationInventoryEOS,projectLibraryBase);
}
}
}
@@ -210,20 +211,20 @@ public class CertificationInventoryJob implements Job {
* @param projectLibraryBase
*/
private void remindDutyPerson(List<ProjectCertificationInventoryEO> projectCertificationInventoryEOS,ProjectLibraryBase projectLibraryBase) {
Map<String, List<ProjectCertificationInventoryEO>> certifycationInventoryListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> {
// 结果待提交 、审查退回
Map<String, List<ProjectCertificationInventoryEO>> toBeSubmittedCiEoListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue())
|| StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue())
);
return flag;
}).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
if(ObjectUtils.isNotEmpty(certifycationInventoryListByDutyPersonMap)){
if(ObjectUtils.isNotEmpty(toBeSubmittedCiEoListByDutyPersonMap)){
List<String> dutyPersonIdList = projectCertificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : certifycationInventoryListByDutyPersonMap.entrySet()) {
for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : toBeSubmittedCiEoListByDutyPersonMap.entrySet()) {
String dutyPersonUserId = dataByDutyPersonMap.getKey();
List<ProjectCertificationInventoryEO> dutyPersonDataList = dataByDutyPersonMap.getValue();
if(CollectionUtils.isEmpty(dutyPersonDataList)){
@@ -295,6 +296,78 @@ public class CertificationInventoryJob implements Job {
}
}
}
// 任务待确认
Map<String, List<ProjectCertificationInventoryEO>> toBeConfirmedCiEoListByDutyPersonMap = projectCertificationInventoryEOS.stream().filter(data -> {
boolean flag = (StringUtils.equals(data.getFlowStatus(), CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()));
return flag;
}).collect(Collectors.groupingBy(ProjectCertificationInventoryEO::getDutyPerson));
if(ObjectUtils.isNotEmpty(toBeConfirmedCiEoListByDutyPersonMap)){
List<String> dutyPersonIdList = projectCertificationInventoryEOS.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList());
List<SysUser> dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList);
for (Map.Entry<String, List<ProjectCertificationInventoryEO>> dataByDutyPersonMap : toBeConfirmedCiEoListByDutyPersonMap.entrySet()) {
String dutyPersonUserId = dataByDutyPersonMap.getKey();
List<ProjectCertificationInventoryEO> dutyPersonDataList = dataByDutyPersonMap.getValue();
if(CollectionUtils.isEmpty(dutyPersonDataList)){
continue;
}
Map<String, Object> sendMsgDataListMap = this.disposeSendMsgDataListByTaskConfirmEndTime(dutyPersonDataList);
// 十四天后结束的
List<ProjectCertificationInventoryEO> fourteenDaysList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("fourteenDaysList");
if(CollectionUtils.isNotEmpty(fourteenDaysList)){
this.sendLarkCardMsgByTemplate(
projectLibraryBase,
dutyPersonList,
dutyPersonUserId,
fourteenDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE19.getValue(),
fourteenDaysList.get(0).getTaskConfirmEndTime()
);
}
// 七天后结束的
List<ProjectCertificationInventoryEO> sevenDaysList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("sevenDaysList");
if(CollectionUtils.isNotEmpty(sevenDaysList)){
this.sendLarkCardMsgByTemplate(
projectLibraryBase,
dutyPersonList,
dutyPersonUserId,
sevenDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE20.getValue(),
sevenDaysList.get(0).getTaskConfirmEndTime()
);
}
// 当天结束的
List<ProjectCertificationInventoryEO> currentDaysList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("currentDaysList");
if(CollectionUtils.isNotEmpty(currentDaysList)){
this.sendLarkCardMsgByTemplate(
projectLibraryBase,
dutyPersonList,
dutyPersonUserId,
currentDaysList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE21.getValue(),
currentDaysList.get(0).getTaskConfirmEndTime()
);
}
// 逾期的
List<ProjectCertificationInventoryEO> overdueList = (List<ProjectCertificationInventoryEO>) sendMsgDataListMap.get("overdueList");
if(CollectionUtils.isNotEmpty(overdueList)){
this.sendLarkCardMsgByTemplate(
projectLibraryBase,
dutyPersonList,
dutyPersonUserId,
overdueList,
TemplateInfoEnum2.CERTIFICATION_MESSAGE22.getValue(),
overdueList.get(0).getTaskConfirmEndTime()
);
}
}
}
}
/**
@@ -508,6 +581,101 @@ public class CertificationInventoryJob implements Job {
return result;
}
/**
* 处理需要发送消息的数据
* @param pciEoList
* @return
*/
private Map<String,Object> disposeSendMsgDataListByTaskConfirmEndTime(List<ProjectCertificationInventoryEO> pciEoList) {
Map<String,Object> result = new HashMap<>();
Date currentDate = new Date();
//获取后三天前的时间
Calendar calendar=new GregorianCalendar();
calendar.setTime(new Date());
calendar.add(Calendar.DATE,3);
Date threeDays = calendar.getTime();
//获取后七天后的时间
Calendar sevenCalendar=new GregorianCalendar();
sevenCalendar.setTime(new Date());
sevenCalendar.add(Calendar.DATE,7);
Date sevenDays = sevenCalendar.getTime();
//获取后十四天后的时间
Calendar fourteenCalendar=new GregorianCalendar();
fourteenCalendar.setTime(new Date());
fourteenCalendar.add(Calendar.DATE,14);
Date fourteenDays = fourteenCalendar.getTime();
String threeDaysStr = sdf.format(threeDays);
String sevenDaysStr = sdf.format(sevenDays);
String fourteenDaysStr = sdf.format(fourteenDays);
String currentDateStr = sdf.format(currentDate);
// 当天结束的
List<ProjectCertificationInventoryEO> currentDaysList = pciEoList.stream().filter(data -> {
boolean flag = false;
//结束日期是当前日期
if(data.getTaskConfirmEndTime() != null){
if (StringUtils.equals(currentDateStr, sdf.format(data.getTaskConfirmEndTime()))) {
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
// 三天后结束的
List<ProjectCertificationInventoryEO> threeDaysList = pciEoList.stream().filter(data -> {
boolean flag = false;
if(data.getTaskConfirmEndTime() != null){
if (StringUtils.equals(threeDaysStr, sdf.format(data.getTaskConfirmEndTime()))) {
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
// 七天后结束的
List<ProjectCertificationInventoryEO> sevenDaysList = pciEoList.stream().filter(data -> {
boolean flag = false;
if(data.getTaskConfirmEndTime()!=null){
if (StringUtils.equals(sevenDaysStr, sdf.format(data.getTaskConfirmEndTime()))) {
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
// 十四天后结束的
List<ProjectCertificationInventoryEO> fourteenDaysList = pciEoList.stream().filter(data -> {
boolean flag = false;
if(data.getTaskConfirmEndTime() != null){
if (StringUtils.equals(fourteenDaysStr, sdf.format(data.getTaskConfirmEndTime()))) {
flag = true;
}
}
return flag;
}).collect(Collectors.toList());
// 逾期的
List<ProjectCertificationInventoryEO> overdueList = pciEoList.stream().filter(data -> {
// 只要早于当前日期都算逾期
boolean flag = false;
if(data.getTaskConfirmEndTime() != null){
flag = (data.getTaskConfirmEndTime().before(currentDate) && !StringUtils.equals(currentDateStr, sdf.format(data.getTaskConfirmEndTime())));
}
return flag;
}).collect(Collectors.toList());
result.put("currentDaysList",currentDaysList);
result.put("threeDaysList",threeDaysList);
result.put("overdueList",overdueList);
result.put("sevenDaysList",sevenDaysList);
result.put("fourteenDaysList",fourteenDaysList);
return result;
}
/**
* 根据模板 发送飞书消息
* @param projectLibraryBase
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+30 -24
View File
@@ -130,15 +130,17 @@ public class InventoryAffirmJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("Initiator",projectLibraryBase.getStudioEngineerName());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN, ProjectRoleEnum.REGULATI_ENGINEER.getValue());
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("Initiator",projectLibraryBase.getStudioEngineerName());
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
}
}
// 当天结束的
List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -159,15 +161,17 @@ public class InventoryAffirmJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("Initiator",projectLibraryBase.getStudioEngineerName());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("Initiator",projectLibraryBase.getStudioEngineerName());
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
}
}
// 逾期的
List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
@@ -188,15 +192,17 @@ public class InventoryAffirmJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("Initiator",projectLibraryBase.getStudioEngineerName());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取法规清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.projectLawsInventoryEOService.getProjectLawsInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN,PRN_EN,ProjectRoleEnum.REGULATI_ENGINEER.getValue());
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
params.put("Initiator",projectLibraryBase.getStudioEngineerName());
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_LIST_RELEASE4.getValue(),params);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java
+96 -84
View File
@@ -137,22 +137,24 @@ public class TaskAffirmJob implements Job {
params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
}
}
// 当天结束的
List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -175,22 +177,24 @@ public class TaskAffirmJob implements Job {
params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = designDutyDataList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
}
}
// 逾期的
List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
@@ -213,22 +217,24 @@ public class TaskAffirmJob implements Job {
params.put("flowTypeEn","Design Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
}
}
}
// 验证符合性
@@ -266,22 +272,24 @@ public class TaskAffirmJob implements Job {
params.put("flowTypeEn","Validation Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = threeDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
}
}
// 当天结束的
List<ProjectLawsInventoryEO> currentDaysList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("currentDaysList");
@@ -304,22 +312,24 @@ public class TaskAffirmJob implements Job {
params.put("flowTypeEn","Validation Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION4.getValue(),params);
}
}
// 逾期的
List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
@@ -342,22 +352,24 @@ public class TaskAffirmJob implements Job {
params.put("flowTypeEn","Validation Compliance Process");
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION5.getValue(),params);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+64 -56
View File
@@ -126,22 +126,24 @@ public class VerifyComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
}
}
// 七天后结束的
@@ -163,22 +165,24 @@ public class VerifyComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
}
}
// 当天结束的
@@ -200,22 +204,24 @@ public class VerifyComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION1.getValue(),params);
}
}
// 逾期的
List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
@@ -236,22 +242,24 @@ public class VerifyComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.VALIDATION_COMPLIANCE_CONFIRMATION3.getValue(),params);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+64 -56
View File
@@ -126,22 +126,24 @@ public class designComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = fourteenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
}
}
// 七天后结束的
@@ -163,22 +165,24 @@ public class designComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = sevenDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
}
}
// 当天结束的
@@ -200,22 +204,24 @@ public class designComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = currentDaysList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION1.getValue(),params);
}
}
// 逾期的
List<ProjectLawsInventoryEO> overdueList = (List<ProjectLawsInventoryEO>) sendMsgDataListMap.get("overdueList");
@@ -236,22 +242,24 @@ public class designComplianceJob implements Job {
params.put("serialNumbers",serialNumbers);
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
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 = this.projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams);
params.put("hrefFeishu_CN",(String)hrefFeishuMap.get("hrefFeishu_CN"));
params.put("hrefFeishu_EN",(String)hrefFeishuMap.get("hrefFeishu_EN"));
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
String regulationOwnerId = overdueList.get(0).getRegulationOwnerId();
List<SysUser> regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(",")));
String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId);
params.put("Initiator",regulationOwnerUserName);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params);
this.projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.DESIGN_COMPLIANCE_CONFIRMATION3.getValue(),params);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+2
View File
@@ -101,4 +101,6 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
* @return
*/
List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> params);
List<Map<String, Object>> queryEngineeringInterfacePersonByProjectId(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+351 -247
View File
@@ -213,18 +213,20 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(CollectionUtils.isNotEmpty(editEndTimeCertificationInventoryEOS)){
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(editEndTimeCertificationInventoryEOS.get(0).getProjectLibraryId());
List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
editEndTimeCertificationInventoryEOS.get(0).setEndTime(projectCertificationInventoryEO.getEndTime());
editEndTimeCertificationInventoryEOS.get(0).setEndTime(projectCertificationInventoryEO.getEndTime());
this.sendMessageByTemplateId(
editEndTimeCertificationInventoryEOS,
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
);
this.sendMessageByTemplateId(
editEndTimeCertificationInventoryEOS,
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
);
}
}
}
@@ -622,16 +624,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if (CollectionUtils.isNotEmpty(projectCertificationInventoryEOS)) {
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
List<String> userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
this.sendMessageByTemplateId(
projectCertificationInventoryEOS,
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
);
this.sendMessageByTemplateId(
projectCertificationInventoryEOS,
TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(),
userIdList,
userInfoList,
projectCertificationInventoryEO.getEndTime()
);
}
}
}
if(CollectionUtils.isNotEmpty(updateList)){
@@ -674,49 +678,50 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectCertificationInventoryEOS.get(0).getProjectLibraryId());
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
// 获取认证清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
// 获取认证清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryBase.getId(), PRN_CN, PRN_EN);
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
Map<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS);
String standName = (String) standNameAndItemName.get("standName");
String itemName = (String) standNameAndItemName.get("itemName");
Map<String, Object> standNameAndItemName = this.projectCertificationInventoryEOService.getStandNameAndItemName(projectCertificationInventoryEOS);
String standName = (String) standNameAndItemName.get("standName");
String itemName = (String) standNameAndItemName.get("itemName");
try {
for (String userId : userIdList) {
String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
try {
for (String userId : userIdList) {
String thirdId = this.sysUserService.getUserThirdIdByUserId(userInfoList,userId);
if(StringUtils.isNotEmpty(thirdId)){
// 根据结束时间进行排序，获取最近的时间，发消息时使用。
if(StringUtils.isNotEmpty(thirdId)){
// 根据结束时间进行排序，获取最近的时间，发消息时使用。
// this.certificationInventoryEOListSortByEndTimeAsc(projectCertificationInventoryEOS);
// Date endTime = projectCertificationInventoryEOS.get(0).getEndTime();
JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", templeteId);
larkMesJson.put("userIds",thirdId);
JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", templeteId);
larkMesJson.put("userIds",thirdId);
Map<String,Object> templateVariableMap = new HashMap<>();
templateVariableMap.put("projectNameCn",PRN_CN);
templateVariableMap.put("projectNameEn",PRN_EN);
templateVariableMap.put("standName",standName);
templateVariableMap.put("itemName",itemName);
templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("operateUserName",currentUser.getUsername());
Map<String,Object> templateVariableMap = new HashMap<>();
templateVariableMap.put("projectNameCn",PRN_CN);
templateVariableMap.put("projectNameEn",PRN_EN);
templateVariableMap.put("standName",standName);
templateVariableMap.put("itemName",itemName);
templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
templateVariableMap.put("endTime",DateUtils.formatDate(endTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
templateVariableMap.put("operateUserName",currentUser.getUsername());
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
}
}
} catch (Exception e) {
log.error("飞书消息推送失败");
}
} catch (Exception e) {
log.error("飞书消息推送失败");
}
}
@@ -1000,6 +1005,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
String attestationTypeName = this.sysDictItemService.disposeShowDictItemValue(sysDictItems,data.getAttestationType(),cut, "ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2");
data.setAttestationTypeName(attestationTypeName);
}
if(StringUtils.isNotEmpty(data.getCertificationProgress())){
String cpNumber = CertificationProgressEnum.getNumberByValue(data.getCertificationProgress());
data.setCertificationProgressNumber(cpNumber);
}
}
}
}
@@ -1079,77 +1089,79 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
String projectLibraryId = json.getString("projectLibraryId");
// 获取项目信息，获取认证工程师，给认证工程师分配待办任务
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
if(ObjectUtils.isEmpty(projectLibraryBase)){
throw new JeroBootException("无法获取项目信息，请稍后重试！");
}
String certificationEngineer = projectLibraryBase.getCertificationEngineer();
if(StringUtils.isEmpty(certificationEngineer)){
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
throw new JeroBootException("There is no certified engineer in this project. Please maintain the certified engineer first!");
}else {
throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文
if(ObjectUtils.isEmpty(projectLibraryBase)){
throw new JeroBootException("无法获取项目信息，请稍后重试！");
}
}
List<String> certificationEngineerIdList = Arrays.asList(certificationEngineer.split(","));
// 给认证工程师分配任务
for (String userId : certificationEngineerIdList) {
ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
processInfoDetailEO.setUserId(userId);
processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
processInfoDetailEO.setCreateTime(new Date());
processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
processInfoDetailEO.setProcessInfoId(projectLibraryId);
processInfoDetailEO.setActiProcInstId(projectLibraryId);
processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
processInfoDetailEO.setEndTime(inventoryVerifyEndTime);
processInfoDetailEOList.add(processInfoDetailEO);
}
ProcessInfoEO processInfoEO = new ProcessInfoEO();
this.addProcessInfoEO(processInfoEO,projectLibraryId);
// 删除该项目数据的待办任务，key为 认证工程师接受任务的数据
QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId());
deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey());
deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
this.processInfoDetailEOService.remove(deleteDetailWrap);
this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
this.updateBatchById(projectCertificationInventoryEOList);
// 获取认证清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN);
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
List<SysUser> certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
certificationEngineerIdList.forEach(userId -> {
try {
String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerUserInfoList,userId);
if(StringUtils.isNotEmpty(thirdId)){
JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE2.getValue());
larkMesJson.put("userIds",thirdId);
Map<String,Object> templateVariableMap = new HashMap<>();
templateVariableMap.put("projectNameCn",PRN_CN);
templateVariableMap.put("projectNameEn",PRN_EN);
templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
String certificationEngineer = projectLibraryBase.getCertificationEngineer();
if(StringUtils.isEmpty(certificationEngineer)){
if(StringUtils.equals(cut,CutEnum.EN.getValue())){
throw new JeroBootException("There is no certified engineer in this project. Please maintain the certified engineer first!");
}else {
throw new JeroBootException("该项目中认证工程师为空，请先维护认证工程师！");
}
} catch (Exception e) {
log.error("飞书消息推送失败");
}
});
List<String> certificationEngineerIdList = Arrays.asList(certificationEngineer.split(","));
// 给认证工程师分配任务
for (String userId : certificationEngineerIdList) {
ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO();
processInfoDetailEO.setUserId(userId);
processInfoDetailEO.setTaskDefinitionKey(CertificationFlowNodeEnum.RZGCSJSRW.getKey());
processInfoDetailEO.setCreateTime(new Date());
processInfoDetailEO.setStatus(TaskStatusEnum.NOT_DONE.getValue());
processInfoDetailEO.setProcessInfoId(projectLibraryId);
processInfoDetailEO.setActiProcInstId(projectLibraryId);
processInfoDetailEO.setFlowType(FlowTypeEnum.CERTIFICATION_LC.getValue());
processInfoDetailEO.setEndTime(inventoryVerifyEndTime);
processInfoDetailEOList.add(processInfoDetailEO);
}
ProcessInfoEO processInfoEO = new ProcessInfoEO();
this.addProcessInfoEO(processInfoEO,projectLibraryId);
// 删除该项目数据的待办任务，key为 认证工程师接受任务的数据
QueryWrapper<ProcessInfoDetailEO> deleteDetailWrap = new QueryWrapper<>();
deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getProcessInfoId,processInfoEO.getId());
deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.RZGCSJSRW.getKey());
deleteDetailWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
this.processInfoDetailEOService.remove(deleteDetailWrap);
this.processInfoDetailEOService.saveBatch(processInfoDetailEOList);
this.updateBatchById(projectCertificationInventoryEOList);
// 获取认证清单 - 飞书跳转链接
Map<String, Object> hrefFeishuMap = this.getCertificationInventoryLinkHrefFeishu(projectLibraryId, PRN_CN, PRN_EN);
String hrefFeishu_CN = (String) hrefFeishuMap.get("hrefFeishu_CN");
String hrefFeishu_EN = (String) hrefFeishuMap.get("hrefFeishu_EN");
List<SysUser> certificationEngineerUserInfoList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
certificationEngineerIdList.forEach(userId -> {
try {
String thirdId = this.sysUserService.getUserThirdIdByUserId(certificationEngineerUserInfoList,userId);
if(StringUtils.isNotEmpty(thirdId)){
JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE2.getValue());
larkMesJson.put("userIds",thirdId);
Map<String,Object> templateVariableMap = new HashMap<>();
templateVariableMap.put("projectNameCn",PRN_CN);
templateVariableMap.put("projectNameEn",PRN_EN);
templateVariableMap.put("Initiator",projectLibraryBase.getStudioEngineerName());
templateVariableMap.put("endTime",DateUtils.formatDate(inventoryVerifyEndTime));
templateVariableMap.put("viewBtnUrlCn",hrefFeishu_CN);
templateVariableMap.put("viewBtnUrlEn",hrefFeishu_EN);
larkMesJson.put("templateVariableMap",templateVariableMap);
this.feishuService.batchSendLarkCardMsgByTemplate2(larkMesJson);
}
} catch (Exception e) {
log.error("飞书消息推送失败");
}
});
}
return Result.OK("发布成功！");
}
@@ -1439,6 +1451,24 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
});
}
}
// WVTA ID wvtaId
if(StringUtils.equals("wvtaId",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(datas,(e1, e2)->{
String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
return comparator.compare(e1WvtaId,e2WvtaId);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(datas,(e1,e2)->{
String e1WvtaId = (StringUtils.isNotEmpty(e1.getWvtaId()) ? e1.getWvtaId() : "");
String e2WvtaId = (StringUtils.isNotEmpty(e2.getWvtaId()) ? e2.getWvtaId() : "");
return comparator.compare(e2WvtaId,e1WvtaId);
});
}
}
// 标准编号 serialNumber
if(StringUtils.equals("serialNumber",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
@@ -1456,6 +1486,57 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
}
// 责任领域 dutyTerritoryName
if(StringUtils.equals("dutyTerritoryName",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(datas,(e1, e2)->{
String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
return comparator.compare(e1DutyTerritoryName,e2DutyTerritoryName);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(datas,(e1,e2)->{
String e1DutyTerritoryName = (StringUtils.isNotEmpty(e1.getDutyTerritoryName()) ? e1.getDutyTerritoryName() : "");
String e2DutyTerritoryName = (StringUtils.isNotEmpty(e2.getDutyTerritoryName()) ? e2.getDutyTerritoryName() : "");
return comparator.compare(e2DutyTerritoryName,e1DutyTerritoryName);
});
}
}
// 工程接口人 sdtName
if(StringUtils.equals("sdtName",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(datas,(e1, e2)->{
String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
return comparator.compare(e1SdtName,e2SdtName);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(datas,(e1,e2)->{
String e1SdtName = (StringUtils.isNotEmpty(e1.getSdtName()) ? e1.getSdtName() : "");
String e2SdtName = (StringUtils.isNotEmpty(e2.getSdtName()) ? e2.getSdtName() : "");
return comparator.compare(e2SdtName,e1SdtName);
});
}
}
// 责任人 dutyPersonName
if(StringUtils.equals("dutyPersonName",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(datas,(e1, e2)->{
String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
return comparator.compare(e1DutyPersonName,e2DutyPersonName);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(datas,(e1,e2)->{
String e1DutyPersonName = (StringUtils.isNotEmpty(e1.getDutyPersonName()) ? e1.getDutyPersonName() : "");
String e2DutyPersonName = (StringUtils.isNotEmpty(e2.getDutyPersonName()) ? e2.getDutyPersonName() : "");
return comparator.compare(e2DutyPersonName,e1DutyPersonName);
});
}
}
// 交付物类型 deliverableTypeName
if(StringUtils.equals("deliverableTypeName",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
@@ -1506,6 +1587,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
});
}
}
// 认证进度 certificationProgress
if(StringUtils.equals("certificationProgress",orderByField)){
if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
Collections.sort(datas,(e1, e2)->{
String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : "");
String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : "");
return comparator.compare(e1CertificationProgressNumber,e2CertificationProgressNumber);
});
}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
Collections.sort(datas,(e1,e2)->{
String e1CertificationProgressNumber = (StringUtils.isNotEmpty(e1.getCertificationProgressNumber()) ? e1.getCertificationProgressNumber() : "");
String e2CertificationProgressNumber = (StringUtils.isNotEmpty(e2.getCertificationProgressNumber()) ? e2.getCertificationProgressNumber() : "");
return comparator.compare(e2CertificationProgressNumber,e1CertificationProgressNumber);
});
}
}
}
return datas;
}
@@ -2212,7 +2310,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(StringUtils.isNotEmpty(thirdId)){
// 根据结束时间进行排序，获取最近的时间，发消息时使用。
Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
/*Collections.sort(projectCertificationInventoryEOList, new Comparator<ProjectCertificationInventoryEO>() {
@Override
public int compare(ProjectCertificationInventoryEO p1, ProjectCertificationInventoryEO p2) {
if(p1.getEndTime() != null && p2.getEndTime() != null){
@@ -2221,7 +2319,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
return 1;
}
});
Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();
Date endTime = projectCertificationInventoryEOList.get(0).getEndTime();*/
this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
Date endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
JSONObject larkMesJson = new JSONObject();
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE3.getValue());
@@ -2561,6 +2661,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
JSONObject larkMesJson = new JSONObject();
if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
this.certificationInventoryEOListSortByInventoryVerifyEndTimeAsc(projectCertificationInventoryEOList);
endTime = projectCertificationInventoryEOList.get(0).getInventoryVerifyEndTime();
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE4.getValue());
}else if(StringUtils.equals(operatorType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
larkMesJson.put("template_id", TemplateInfoEnum2.CERTIFICATION_MESSAGE5.getValue());
@@ -3262,12 +3364,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
public void importData(MultipartFile file, ProjectCertificationInventoryEO projectCertificationInventoryEO) {
String title = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID," +
"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
"*标准编号,*责任领域,*工程接口人,*责任人," +
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
}else {
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
}
@@ -4501,12 +4603,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
try {
String title = "";
if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
title = "*类别,*检验项目,*配置项,*WVTA ID," +
"*标准编号,*责任领域,*认证类型,*工程接口人,*责任人," +
title = "*类别,*检验项目,*配置项,*认证类型,*WVTA ID," +
"*标准编号,*责任领域,*工程接口人,*责任人," +
"交付物模板,*交付物类型,*截止日期,报告编号,产品型号,生产企业名称";
}else {
title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
"*Standard No,*Responsible Field,*Certification Type,*Eng. Interface,*Assignee," +
title = "*Category,*Inspection Items,*Configuration Item,*Certification Type,*WVTA ID," +
"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
"Deliverable Template,*Deliverable Type,*Due Date,Report No,Product Model,Name Of Manufacturer";
}
@@ -4652,7 +4754,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
if(StringUtils.isNotBlank(deliveryResult)){
projectCertificationInventoryEO.setDeliveryResult(deliveryResult);
}else {
noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem());
noCiteInspectionItem.add(projectCertificationInventoryEO.getInspectionItem() + "-" +projectCertificationInventoryEO.getConfigItem());
}
}
@@ -4707,127 +4809,129 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String projectLibraryId = pciList.get(0).getProjectLibraryId();
ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(projectLibraryId);
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
if(ObjectUtils.isNotEmpty(projectLibraryBase)){
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(Arrays.asList(projectLibraryBase.getStudioEngineer().split(",")));
String certificationEngineerUserNames = "";
if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
}
List<ProjectCertificationInventoryLogEO> pciLogEOList = new ArrayList<>();
for (ProjectCertificationInventoryEO pci : pciList) {
StringBuilder contentCnSb = new StringBuilder();
StringBuilder contentEnSb = new StringBuilder();
if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回");
contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned");
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){
if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) {
String fileName = "N/A";
if (StringUtils.isNotEmpty(pci.getDeliveryResult())) {
fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
}
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName);
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName);
}else {
String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A");
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult);
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult);
}
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息");
contentCnSb.append("，拒绝原因:\"").append(pci.getReasonForReturn()).append("\"");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
contentEnSb.append(",Reject for Reason:\"").append(pci.getReasonForReturn()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至")
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ")
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
String certificationEngineerUserNames = "";
if(StringUtils.isNotBlank(projectLibraryBase.getCertificationEngineer())){
List<String> certificationEngineerIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(","));
List<SysUser> certificationEngineerList = this.sysUserService.querySysUserListByIdList(certificationEngineerIdList);
certificationEngineerUserNames = certificationEngineerList.stream().map(SysUser::getUsername).distinct().collect(Collectors.joining(","));
}
ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO();
pciLogEO.setProjectCertificationInventoryId(pci.getId());
pciLogEO.setContentCn(contentCnSb.toString());
pciLogEO.setContentEn(contentEnSb.toString());
pciLogEO.setOperatorType(operateType);
pciLogEOList.add(pciLogEO);
}
List<ProjectCertificationInventoryLogEO> pciLogEOList = new ArrayList<>();
for (ProjectCertificationInventoryEO pci : pciList) {
StringBuilder contentCnSb = new StringBuilder();
StringBuilder contentEnSb = new StringBuilder();
if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
if(CollectionUtils.isNotEmpty(pciLogEOList)){
this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList);
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_ISSUE.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发布了认证清单");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has published a certification list");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_RETURNED.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核退回");
contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" review and returned");
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_REVIEW_THROUGH.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("审核通过");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" pass the audit");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_SUBMIT_TASK.getValue())){
if (StringUtils.equals(pci.getValueType(), SysCategoryValueTypeEnum.FILE.getValue())) {
String fileName = "N/A";
if (StringUtils.isNotEmpty(pci.getDeliveryResult())) {
fileName = this.ossFileService.getFileInfos(pci.getDeliveryResult()).stream().map(OSSFile::getFileName).distinct().collect(Collectors.joining(","));
}
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了附件 ").append(fileName);
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted attachment ").append(fileName);
}else {
String deliveryResult = (StringUtils.isNotEmpty(pci.getDeliveryResult()) ? pci.getDeliveryResult() : "N/A");
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("提交了交付结果为").append(deliveryResult);
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" submitted a delivery result of ").append(deliveryResult);
}
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_ACCEPT_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("接受了任务信息");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" accepts the task information");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_DUTY_PERSON_REJECT_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("退回了任务信息");
contentCnSb.append("，拒绝原因:\"").append(pci.getReasonForReturn()).append("\"");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" returned the task information");
contentEnSb.append(",Reject for Reason:\"").append(pci.getReasonForReturn()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_RETURNED_STUDIO_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("拒绝，流程退回至")
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
contentCnSb.append("，退回原因:\"").append(pci.getReasonForReturn()).append("\"");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" refuses, and the process returns to ")
.append("\"").append(studioEngineerUserInfo.get(0).getUsername()).append("\"");
contentEnSb.append(",Reason for return:\"").append(pci.getReasonForReturn()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_INITIATING_TASK.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("发起了Pre-Homo流程");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" initiates the Pre-Homo process");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_RESET.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("操作了流程重置功能");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" has operated the process reset function");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_STUDIO_WITHDRAW.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append("从").append("\"").append(certificationEngineerUserNames).append("\"撤回了流程");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" withdrew the process from \"").append(certificationEngineerUserNames).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_CALL_ADD.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_IMPORT_ADD.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
} else if(StringUtils.equals(operateType,OperatorTypeEnum.CERTIFICATION_INVENTORY_ADD_CONFIG.getValue())){
contentCnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" 添加了 ");
contentCnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentCnSb.append("\"").append(pci.getSerialNumber()).append("\"").append(" ");
contentEnSb.append("\"").append(currentUser.getUsername()).append("\"").append(" added ");
contentEnSb.append("\"").append(pci.getCategory()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getInspectionItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getConfigItem()).append("\"").append(" ");
contentEnSb.append("\"").append(pci.getSerialNumber()).append("\"");
}
ProjectCertificationInventoryLogEO pciLogEO = new ProjectCertificationInventoryLogEO();
pciLogEO.setProjectCertificationInventoryId(pci.getId());
pciLogEO.setContentCn(contentCnSb.toString());
pciLogEO.setContentEn(contentEnSb.toString());
pciLogEO.setOperatorType(operateType);
pciLogEOList.add(pciLogEO);
}
if(CollectionUtils.isNotEmpty(pciLogEOList)){
this.projectCertificationInventoryLogEOService.insertBatch(pciLogEOList);
}
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+452 -369
View File
File diff suppressed because it is too large Load Diff
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+50 -45
View File
@@ -2014,61 +2014,66 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
@Override
public ProjectLibraryBase selectById(String projectLibraryId) {
ProjectLibraryBase result = null;
List<ProjectLibraryBase> records = this.projectLibraryBaseMapper.queryById(projectLibraryId);
List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
disposeData(records,"",false);
if(CollectionUtils.isNotEmpty(records)){
List<String> studioEngineerUserIdList = records.stream().map(ProjectLibraryBase::getStudioEngineer).distinct().collect(Collectors.toList());
List<SysUser> studioEngineerUserInfo = this.sysUserService.querySysUserListByIdList(studioEngineerUserIdList);
disposeData(records,"",false);
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
for(ProjectLibraryBase projectLibraryBase: records){
//历史数据的主版本没有版本号,所以默认给00
if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){
projectLibraryBase.setProjectVersion("00");
}
//目标市场 英文
Map<String,Object> paramEn = new HashMap<>();
paramEn.put("cut",CutEnum.EN.getValue());
String targetMarketEn = getMarket(paramEn, targetMarketList, projectLibraryBase);
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
for(ProjectLibraryBase projectLibraryBase: records){
//历史数据的主版本没有版本号,所以默认给00
if(StringUtils.isBlank(projectLibraryBase.getParentId()) && StringUtils.isBlank(projectLibraryBase.getProjectVersion())){
projectLibraryBase.setProjectVersion("00");
}
//目标市场 英文
Map<String,Object> paramEn = new HashMap<>();
paramEn.put("cut",CutEnum.EN.getValue());
String targetMarketEn = getMarket(paramEn, targetMarketList, projectLibraryBase);
//目标市场 中文
Map<String,Object> paramCn = new HashMap<>();
paramCn.put("cut",CutEnum.CN.getValue());
String targetMarketCn = getMarket(paramCn, targetMarketList, projectLibraryBase);
//目标市场 中文
Map<String,Object> paramCn = new HashMap<>();
paramCn.put("cut",CutEnum.CN.getValue());
String targetMarketCn = getMarket(paramCn, targetMarketList, projectLibraryBase);
//主项目的版本号
String projectVersion = "";
if(StringUtils.isBlank(projectLibraryBase.getParentId())){
projectVersion = "00";
}else{
projectVersion = projectLibraryBase.getProjectVersion();
}
if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
projectLibraryBase.setProjectNameEn(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName()
+ "-" + targetMarketEn
+ "-" + projectVersion);
//主项目的版本号
String projectVersion = "";
if(StringUtils.isBlank(projectLibraryBase.getParentId())){
projectVersion = "00";
}else{
projectVersion = projectLibraryBase.getProjectVersion();
}
if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
projectLibraryBase.setProjectNameEn(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName()
+ "-" + targetMarketEn
+ "-" + projectVersion);
projectLibraryBase.setProjectNameCn(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName()
+ "-" + targetMarketCn
+ "-" + projectVersion);
}
projectLibraryBase.setProjectNameCn(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName()
+ "-" + targetMarketCn
+ "-" + projectVersion);
}
if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){
if(CollectionUtils.isNotEmpty(studioEngineerUserInfo)){
String studioEngineerUserName = studioEngineerUserInfo.stream().filter(studioEngineerUser -> {
boolean flag = false;
if (StringUtils.equals(projectLibraryBase.getStudioEngineer(), studioEngineerUser.getId())) {
flag = true;
}
return flag;
}).map(SysUser::getUsername).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(projectLibraryBase.getStudioEngineer())){
if(CollectionUtils.isNotEmpty(studioEngineerUserInfo)){
String studioEngineerUserName = studioEngineerUserInfo.stream().filter(studioEngineerUser -> {
boolean flag = false;
if (StringUtils.equals(projectLibraryBase.getStudioEngineer(), studioEngineerUser.getId())) {
flag = true;
}
return flag;
}).map(SysUser::getUsername).collect(Collectors.joining(","));
projectLibraryBase.setStudioEngineerName(studioEngineerUserName);
projectLibraryBase.setStudioEngineerName(studioEngineerUserName);
}
}
}
result = records.get(0);
}
return records.get(0);
return result;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+41
View File
@@ -1823,4 +1823,45 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
return resultList;
}
@Override
public List<Map<String, Object>> queryEngineeringInterfacePersonByProjectId(Map<String, Object> params) {
List<Map<String, Object>> resultList = new ArrayList<>();
String projectLibraryId = (String) params.get("projectLibraryId");
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
List<ProjectRelatedPersonnel> prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId));
if(CollectionUtils.isNotEmpty(prpEoList)){
List<String> userIdList = new ArrayList<>();
String engineeringInterfacePersonIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson)
.filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineeringInterfacePersonIds)){
userIdList.addAll(Arrays.asList(engineeringInterfacePersonIds.split(",")));
}
String engineerAttSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerAttSet)
.filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineerAttSetIds)){
userIdList.addAll(Arrays.asList(engineerAttSetIds.split(",")));
}
String engineerLawSetIds = prpEoList.stream().map(ProjectRelatedPersonnel::getEngineerLawSet)
.filter(e->StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
if(StringUtils.isNotEmpty(engineerLawSetIds)){
userIdList.addAll(Arrays.asList(engineerLawSetIds.split(",")));
}
if(CollectionUtils.isNotEmpty(userIdList)){
userIdList = userIdList.stream().filter(userId -> StringUtils.isNotEmpty(userId)).collect(Collectors.toList());
List<SysUser> engineeringInterfacePersonList = this.sysUserService.querySysUserListByIdList(userIdList);
if(CollectionUtils.isNotEmpty(engineeringInterfacePersonList)){
for (SysUser engineeringInterfacePerson : engineeringInterfacePersonList) {
Map<String,Object> engineeringInterfacePersonMap = new HashMap<>();
engineeringInterfacePersonMap.put("id",engineeringInterfacePerson.getId());
engineeringInterfacePersonMap.put("userName",engineeringInterfacePerson.getUsername());
resultList.add(engineeringInterfacePersonMap);
}
}
}
}
return resultList;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+2 -1
View File
@@ -767,7 +767,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
data.setTaskDefinitionKeyName(taskDefinitionKeyName);
}
// 如果是Pre-Homo流程
if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.CERTIFICATION_LC.getValue())){
if(StringUtils.equals(data.getFlowType(),FlowTypeEnum.CERTIFICATION_LC.getValue()) && data.getEndTime() != null){
String taskDefinitionKey = "";
String processInfoId = data.getId();
@@ -817,6 +817,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
taskDefinitionKey = CertificationFlowNodeEnum.TASK_REVIEW.getKey();
}
data.setTaskDefinitionKey(taskDefinitionKey);
data.setTaskDefinitionKeyName(CertificationFlowNodeEnum.getTextByValue(taskDefinitionKey,cut));
}
});
jero-web/src/common/lang/en-us.js
+5 -1
View File
@@ -1724,7 +1724,7 @@ module.exports = {
cantTransferToYourself:"Can't transfer to yourself",
theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
reasonForReturnOfDesignCompliance:'Reason for compliance return',
reasonForReturnOfDesignCompliance:'Reason for the return by the regulation engineer',
noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
notethree:'Provide supporting materials',
@@ -1796,4 +1796,8 @@ module.exports = {
verify:'Verify',
inventoryVerifyEndTime:'Inventory Verify End Time',
taskConfirmEndTime:'Task Confirm End Time',
responsiblepersonfordesigncompliance:'Responsible person for design compliance',
responsiblepersonforverifyingcompliance:'Responsible person for verifying compliance',
verifytheconformancedeliverabletype:'Verify the conformance deliverable type',
designaconformancedeliverabletype:'Design a conformance deliverable type',
}
jero-web/src/common/lang/zh-cn.js
+5 -1
View File
@@ -1827,7 +1827,7 @@ module.exports = {
notecsv: '注:支持CSV格式，大小20M以内',
theDataYouInitiate: '您所选的数据，均不符合流程发起条件，请重新检查后发起',
dataWithProcessReleasedCannotBeReset: '流程状态为清单待发布的数据不能被重置',
reasonForReturnOfDesignCompliance: '符合性退回原因',
reasonForReturnOfDesignCompliance: '法规工程师退回原因',
notetwo: '\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
notethree: '\n提供证明材料\n',
verifyComplianceConfirmReturnReason: '验证符合性确认退回原因',
@@ -1898,4 +1898,8 @@ module.exports = {
verify:'验证',
inventoryVerifyEndTime:'清单校核截止时间',
taskConfirmEndTime:'责任确认截止时间',
responsiblepersonfordesigncompliance:'设计符合性责任人',
responsiblepersonforverifyingcompliance:'验证符合性责任人',
verifytheconformancedeliverabletype:'验证符合性交付物类型',
designaconformancedeliverabletype:'设计符合性交付物类型',
}
jero-web/src/components/globalAdvancedQuery/index.vue
+30 -2
View File
@@ -141,7 +141,20 @@
:tree-data="item.tree"
:placeholder="$t('PleaseSelect')"
/>
<!-- 交付物类型-->
<template v-else-if="item.type === 'deliverables'">
<a-tree-select
tree-node-filter-prop="title"
v-model="item.val"
:maxTagCount="1"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
class="box-input"
style="width: 100%"
:tree-data="DeliverableTreeList"
tree-checkable
:placeholder="$t('PleaseSelect')"
/>
</template>
<PersonnelSelection
v-else-if="item.type == 'Personnel'"
:query="{db_field_name:'valueId',db_field_txt:'',subscript:index}"
@@ -283,6 +296,7 @@
import moment from 'moment'
import * as utils from '@/utils/util'
import { mixinDevice } from '@/utils/mixin'
import { getAction, postAction } from '@/api/manage'
import JDate from '@/components/jero/JDate.vue'
import JSelectDepart from '@/components/jerobiz/JSelectDepart'
import JSelectMultiUser from '@/components/jerobiz/JSelectMultiUser'
@@ -338,6 +352,7 @@
return {
moment,
fieldTreeData: [],
DeliverableTreeList:[],
prompt: {
visible: false,
@@ -386,6 +401,7 @@
deep: true,
immediate: true,
handler(val) {
console.log(val,'11')
let mainData = [], subData = []
val.forEach(item => {
let data = { ...item }
@@ -412,8 +428,16 @@
}
}
},
methods: {
getDeliverableTree() {
getAction('/sys/category/getDeliverableTree', {}).then((res) => {
if (res.success) {
this.DeliverableTreeList = res.result
} else {
this.DeliverableTreeList = []
}
})
},
show() {
if (!this.queryParamsModel || this.queryParamsModel.length === 0) {
this.resetLine()
@@ -484,6 +508,7 @@
},
handleSelected(node, item) {
console.log(node)
console.log(item)
let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef
item['type'] = type
item['options'] = options
@@ -498,6 +523,9 @@
this.$set(item, 'val', undefined)
this.$set(item, 'valueName', undefined)
this.$set(item, 'valueId', undefined)
if(item.type == 'deliverables'){
this.getDeliverableTree()
}
},
handleOpen() {
this.show()
jero-web/src/views/parameter/managementdetails/index.vue
+2 -1
View File
@@ -101,8 +101,9 @@
{{$t('CustomExport')}}
</div>
<!-- 列表设置-->
<!-- v-if="!this.$route.query.it"-->
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmClassName"
placement="bottomRight" v-if="!this.$route.query.it">
placement="bottomRight" >
<template slot="title" id="popconfirmmize">
<div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
<a-checkbox
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+9 -4
View File
@@ -105,6 +105,7 @@
</div>
<div class="Virtual-detail-left-text"
:title="$t('projectStatus')"
v-has="'projectLawsInventory:ProjectStatus'"
@click="textClick(5,$t('projectStatus'))">
<a-icon type="cluster"/>
{{$t('projectStatus')}}
@@ -144,6 +145,7 @@
</div>
<div class="Virtual-detail-left-text"
:title="$t('projectStatus')"
v-has="'projectLawsInventory:ProjectStatus'"
@click="textClick(5,$t('projectStatus'))">
<a-icon type="cluster"/>
</div>
@@ -270,11 +272,14 @@
this.textColor(this.$t('listOfRegulations'))
this.textTitle = this.$t('listOfRegulations')
} else if (this.$route.query.type == '103') {
this.textColor(this.$t('taskList'))
this.textTitle = this.$t('taskList')
// this.textColor(this.$t('taskList'))
// this.textTitle = this.$t('taskList')
this.$router.push({
path:'/projectRegulationTasks',
})
} else if (this.$route.query.type == '104') {
this.textColor(this.$t('nonConformance'))
this.textTitle = this.$t('nonConformance')
// this.textColor(this.$t('nonConformance'))
// this.textTitle = this.$t('nonConformance')
} else if (this.$route.query.type == '105') {
this.textColor(this.$t('TaskParameterCollection'))
this.textTitle = this.$t('TaskParameterCollection')
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+2 -1
View File
@@ -269,8 +269,9 @@
{{$t('CompulsoryWithdrawal')}}
</div>
<!-- 列表设置-->
<!-- v-if="!this.$route.query.it"-->
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmIndex"
placement="bottomRight" v-if="!this.$route.query.it">
placement="bottomRight" >
<template slot="title" id="popconfirmmize">
<div style="max-height:360px;overflow:scroll;overflow-x: auto;width: 211px">
<a-checkbox
jero-web/src/views/projectManagement/components/certificationList/index.vue
+26 -15
View File
@@ -572,6 +572,12 @@
value: 'wvtaId',
text: 'WVTA ID'
},
{
type: 'list_multi',
value: 'attestationType',
text: this.$t('certificationType'),
dictCode: 'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
{
type: 'string',
value: 'serialNumber',
@@ -593,7 +599,7 @@
type: 'date',
value: 'endTime',
text: this.$t('closingDate')
}
},
],
disabled: false,
queryParamQuery: {},
@@ -647,7 +653,7 @@
title: this.$t('category'),
align: 'left',
dataIndex: 'category',
width: 180,
width: 120,
ellipsis: true,
fixed: 'left',
sorter: true
@@ -665,6 +671,13 @@
title: this.$t('configurationItem'),
align: 'left',
dataIndex: 'configItem',
width: 75,
ellipsis: true
},
{
title: this.$t('certificationType'),
align: 'left',
dataIndex: 'attestationTypeName',
width: 100,
ellipsis: true
},
@@ -672,14 +685,15 @@
title: 'WVTA ID',
align: 'left',
dataIndex: 'wvtaId',
width: 180,
width: 75,
sorter: true,
ellipsis: true
},
{
title: this.$t('standardNo'),
align: 'left',
dataIndex: 'serialNumber',
width: 180,
width: 150,
ellipsis: true,
sorter: true,
scopedSlots: { customRender: 'serialNumber' }
@@ -688,28 +702,24 @@
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritoryName',
width: 180,
ellipsis: true
},
{
title: this.$t('certificationType'),
align: 'left',
dataIndex: 'attestationTypeName',
width: 180,
width: 100,
sorter: true,
ellipsis: true
},
{
title: this.$t('engineeringInterfacePerson'),
align: 'left',
dataIndex: 'sdtName',
width: 180,
width: 90,
sorter: true,
ellipsis: true
},
{
title: this.$t('personLiable'),
align: 'left',
dataIndex: 'dutyPersonName',
width: 180,
width: 120,
sorter: true,
ellipsis: true
},
{
@@ -740,7 +750,7 @@
title: this.$t('closingDate'),
align: 'left',
dataIndex: 'endTime',
width: 180,
width: 100,
sorter: true,
ellipsis: true
},
@@ -780,6 +790,7 @@
title: this.$t('CertificationProgress'),
align: 'left',
dataIndex: 'certificationProgress',
sorter: true,
width: localStorage.getItem('language') == 'zh-cn' ? 180 : 200,
ellipsis: true,
scopedSlots: { customRender: 'CertificationProgress' }
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+61 -7
View File
@@ -143,9 +143,10 @@
{{ $t('copy') }}
</div>
<!-- 列表设置-->
<!-- v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
placement="bottomRight"
v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'">
>
<template slot="title" id="popconfirmmize">
<div style="max-height:360px;overflow:scroll;overflow-x: auto;">
<a-checkbox
@@ -1248,18 +1249,40 @@
text: this.$t('certificationLevel'),
dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
{
type: 'deliverables',
value: 'designDeliverableType',
text: this.$t('designaconformancedeliverabletype'),
},
{
type: 'deliverables',
value: 'verifyDeliverableType',
text: this.$t('verifytheconformancedeliverabletype'),
},
{
type: 'Personnel',
value: 'designDutyId',
valueName: 'designDutyIdName',
text: this.$t('responsiblepersonfordesigncompliance')
},
{
type: 'Personnel',
value: 'verifyDutyId',
valueName: 'verifyDutyIdName',
text: this.$t('responsiblepersonforverifyingcompliance')
},
// {
// type: '',
// value: 'dutyTerritory',
// text: this.$t('areaOfResponsibility'),
// dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
// },
{
type: 'Personnel',
value: 'engineeringInterfacePerson',
valueName: 'engineeringInterfacePersonName',
text: this.$t('engineeringInterfacePerson')
}
// {
// type: 'Personnel',
// value: 'engineeringInterfacePerson',
// valueName: 'engineeringInterfacePersonName',
// text: this.$t('engineeringInterfacePerson')
// }
],
listOptions: [
{
@@ -1411,6 +1434,7 @@
this.JLoading = true
this.getHeader()
this.queryLawEngineerByProjectId()
this.queryengineeringInterfacePersonId()
this.getRoleByUserId(() => {
this.getAndUserId()
})
@@ -1527,6 +1551,32 @@
}
})
},
queryengineeringInterfacePersonId() {
let query = {
projectLibraryId: this.$route.query.id
}
getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
if (res.success) {
let engineeringInterfacePerson = {
value: 'engineeringInterfacePerson',
text: this.$t('engineeringInterfacePerson'),
options: []
}
if (res.result && res.result.length > 0) {
res.result.forEach(val => {
engineeringInterfacePerson.options.push({
value: val.id,
key: val.id,
label: val.userName
})
})
}
this.fieldList.push(engineeringInterfacePerson)
} else {
}
})
},
//流程状态点击事件
designFlowStatusClick(row, name) {
let query = {}
@@ -2254,6 +2304,10 @@
this.orderByField = 'designDutyId'
} else if (sorter.columnKey == 'verifyDutyIdName') {
this.orderByField = 'verifyDutyId'
} else if (sorter.columnKey == 'verifyFlowStatusName') {
this.orderByField = 'verifyFlowStatus'
} else if (sorter.columnKey == 'designFlowStatusName') {
this.orderByField = 'designFlowStatus'
} else {
this.orderByField = sorter.columnKey
}
jero-web/src/views/virtualAuthenticationList/components/addModel.vue
+20
View File
@@ -146,6 +146,23 @@
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('certificationType')">{{$t('certificationType')}}</span>
</div>
<a-form-model-item class="itemModel attestationType"
:prop="'dataList.'+index+'.attestationType'"
:rules="[{ required: true, message: $t('certificationType') + $t('cannotEmpty'), trigger: 'change'}]">
<j-multi-select-tag class="box-input" v-model="item.attestationType"
:placeholder="$t('PleaseSelect')+$t('certificationType')"
:type="'select'"
:triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
@@ -435,4 +452,7 @@ export default {
border: 1px #00B3BE solid;
color: #00B3BE;
}
::v-deep .attestationType .ant-form-explain{
margin-top: -16px;
}
</style>
jero-web/src/views/virtualAuthenticationList/components/editModel.vue
+26
View File
@@ -61,6 +61,22 @@
</a-form-model-item>
</div>
</a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="Required" v-if="!disabled">*</span>
<span class="title-text-text"
:title="$t('certificationType')">{{$t('certificationType')}}</span>
</div>
<a-form-model-item class="itemModel attestationType" prop="attestationType">
<j-multi-select-tag class="box-input" v-model="formInline.attestationType"
:disabled="disabled"
:placeholder="$t('PleaseSelect')+$t('certificationType')"
:type="'select'"
:triggerChange="false" :dictCode="'ren4_zheng4_qing1_dan1_-_ren4_zheng4_lei4_xing2'"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
@@ -211,6 +227,13 @@ export default {
trigger: 'change'
}
],
attestationType: [
{
required: true,
message: this.$t('certificationType') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
category: [
{
required: true,
@@ -425,4 +448,7 @@ export default {
::v-deep .ant-select-disabled .ant-select-selection-selected-value{
color: #040B29!important;
}
::v-deep .attestationType .ant-form-explain{
margin-top: -16px;
}
</style>
jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue
+9 -2
View File
@@ -331,12 +331,19 @@
width: 200,
ellipsis: true
},
{
title: this.$t('certificationType'),
align: 'left',
dataIndex: 'attestationTypeName',
width: 100,
ellipsis: true
},
{
title: 'WVTA ID',
align: 'left',
sorter: true,
dataIndex: 'wvtaId',
width: 200,
width: 75,
ellipsis: true
},
{
@@ -352,7 +359,7 @@
title: this.$t('areaOfResponsibility'),
align: 'left',
dataIndex: 'dutyTerritoryName',
width: 200,
width: 150,
sorter: true,
ellipsis: true
},