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

bug61968

Browse Source
This commit is contained in:
CD
2022-10-28 15:22:28 +08:00
parent 43b3d9f7c5
commit d57c149b57
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+20 -12
View File
@@ -1300,14 +1300,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String urlParamsStr = parseUrlParams(paramsManifestEO);
String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
//认证工程师
String[] engThirdIds = new String[1];
//String[] engThirdIds = new String[1];
List<String> engThirdIds = new ArrayList<>();
List<ProjectLibraryBase> projectLibraryBases = projectLibraryBaseMapper.queryById(paramsManifestEO.getProjectId());
if (ObjectUtils.isNotEmpty(projectLibraryBases)) {
SysUser engineer = sysUserService.getById(projectLibraryBases.get(0).getCertificationEngineer());
if (ObjectUtils.isNotEmpty(engineer)) {
engThirdIds[0] = engineer.getThirdId();
String[] ids = projectLibraryBases.get(0).getCertificationEngineer().split(",");
if (ObjectUtils.isNotEmpty(ids)) {
for (String id : ids) {
SysUser engineer = sysUserService.getById(id);
if (ObjectUtils.isNotEmpty(engineer)) {
engThirdIds.add(engineer.getThirdId());
}
}
}
}
if (CollectManifestStateEnum.SDT_BACK.getValue().equals(paramsCollectManifestEO.getState())) {
//通知认证工程师
@@ -1324,7 +1329,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
"\nDue Date: " + deadline);
feishuMsgVo.setUrl(hrefFeishu);
feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
feishuService.sendCard(engThirdIds, feishuMsgVo);
feishuService.sendCard(engThirdIds.toArray(new String[engThirdIds.size()]), feishuMsgVo);
} catch (IOException e) {
log.error("飞书消息推送失败");
}
@@ -1344,16 +1349,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
"\nDue Date: " + deadline);
feishuMsgVo.setUrl(hrefFeishu);
feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
feishuService.sendCard(engThirdIds, feishuMsgVo);
feishuService.sendCard(engThirdIds.toArray(new String[engThirdIds.size()]), feishuMsgVo);
} catch (IOException e) {
log.error("飞书消息推送失败");
}*/
//通知工程接口人
SysUser sdtUser = sysUserService.getUserByName(paramsCollectManifestEO.getSdt());
String[] SdtThirdIds = new String[1];
if (ObjectUtils.isNotEmpty(sdtUser)) {
SdtThirdIds[0] = sdtUser.getThirdId();
List<String> SdtThirdIds = new ArrayList<>();
for (String sdt : paramsCollectManifestEO.getSdt().split(",")) {
SysUser sdtUser = sysUserService.getUserByName(sdt);
if (ObjectUtils.isNotEmpty(sdtUser)) {
SdtThirdIds.add(sdtUser.getThirdId());
}
}
try {
FeishuMsg2Vo feishuMsgVo = new FeishuMsg2Vo();
feishuMsgVo.setTitle(MessageType2Enum.HOMO_PARAMETER_COLLECTION.getCn() + "/" + MessageType2Enum.HOMO_PARAMETER_COLLECTION.getEn());
@@ -1367,7 +1375,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
"\nDue Date: " + deadline);
feishuMsgVo.setUrl(hrefFeishu);
feishuMsgVo.setColor(MsgColorEnum.RED.getValue()); // 颜色
feishuService.sendCard(engThirdIds, feishuMsgVo);
feishuService.sendCard(SdtThirdIds.toArray(new String[SdtThirdIds.size()]), feishuMsgVo);
} catch (IOException e) {
log.error("飞书消息推送失败");
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+1 -1
View File
@@ -335,7 +335,7 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
//msgContentEN = currentUser.getUsername() + " has submitted the collection process of Collection of Legislative Comments of "+serialNumber+", please check it in time.";
//msgTitle = "You have a Collection of Legislative Comments task completed";
initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
initiator = currentUser.getUsername();
cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交反馈意见，请查看";
cnContentLower = "编号: " + prcNum +
"\n标题: " + prcName +
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+7 -5
View File
@@ -668,7 +668,7 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
//msgContentEN = currentUser.getUsername() + " has submitted the collection process of Regulatory and technical assessment of "+serialNumber+", Please check and address it in time.";
//msgTitle = "You have a Regulatory and technical assessment task to complete";
initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
initiator = currentUser.getUsername();
cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交评估结果，请审核";
cnContentLower = "编号：" + number +
"\n标题: " + name +
@@ -684,8 +684,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
//您提交的GB 7258 的法规技术评估流程已通过。
//msgContentEN = "The regulatory and technical assessment process for "+serialNumber+" you submitted has passed.";
//msgTitle = "You have a Regulatory and technical assessment task completed";
initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
initiator = currentUser.getUsername();
cnContentUpper = "您好，您提交的评估结果已通过";
cnContentLower = "编号：" + number +
"\n标题: " + name +
@@ -701,8 +702,9 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
//您提交的GB 7258 的法规技术评估流程已被退回，请及时查看处理。
//msgContentEN = "The regulatory and technical assessment process of "+serialNumber+" you submitted has been returned, Please check and address it in time.";
//msgTitle = "You have a Regulatory and technical assessment task to complete";
initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
String currentUserId = jsonObject.getString("currentUserId"); //当前操作用户id
SysUser currentUser = this.sysUserService.getBaseMapper().selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
initiator = currentUser.getUsername();
cnContentUpper = "您好，您提交的评估结果被退回，请及时查看处理";
cnContentLower = "编号：" + number +
"\n标题: " + name +