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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-06-15 18:27:29 +08:00
parent 130609a818 2f12194ef0
commit 08eec96bcd
24 changed files with 289 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+18 -18
View File
@@ -2578,8 +2578,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
StringBuilder msgContentSb = new StringBuilder();
StringBuilder msgContentInfoSb = new StringBuilder();
//适用车型
StringBuilder msgContentSbCarType = new StringBuilder("Applicable Models of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbCarType = new StringBuilder("Applicable Models of the " + category + " " + href);
StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + href);
//状态
StringBuilder msgContentSbStatus = new StringBuilder("The Status of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the " + category + " " + href);
@@ -2616,8 +2616,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//
if(StringUtils.isBlank(value)){
msgContentSbStatus.append(" has been modified to be empty ,");
msgContentInfoSbStatus.append(" has been modified to be empty ,");
msgContentSbStatus.append(" has been modified to be null ,");
msgContentInfoSbStatus.append(" has been modified to be null ,");
msgContentSb.append(msgContentSbStatus);
msgContentInfoSb.append(msgContentInfoSbStatus);
}else{
@@ -2652,8 +2652,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
value = substring;
}
if(StringUtils.isBlank(value)){
msgContentSbCarType.append(" has been modified to be empty ,");
msgContentInfoSbCarType.append(" has been modified to be empty ,");
msgContentSbCarType.append(" has been modified to be null ,");
msgContentInfoSbCarType.append(" has been modified to be null ,");
msgContentSb.append(msgContentSbCarType);
msgContentInfoSb.append(msgContentInfoSbCarType);
}else{
@@ -2887,13 +2887,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (ObjectUtils.isNotEmpty(value)) {
if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
if("1".equals(flag)){
sb.append(dbFieldTxt +" "+ value + " to " + valueTemp + ",");
sb.append(dbFieldTxt +" from "+ value + " to " + valueTemp + ",");
}else{
sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
}
} else if (ObjectUtils.isEmpty(valueTemp)) {
if("1".equals(flag)){
sb.append(dbFieldTxt + " "+value + " to empty " + ",");
sb.append(dbFieldTxt + " from "+value + " to null " + ",");
}else{
sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
}
@@ -2901,7 +2901,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} else {
if (ObjectUtils.isNotEmpty(valueTemp)) {
if("1".equals(flag)){
sb.append(dbFieldTxt + " empty to " + valueTemp + ",");
sb.append(dbFieldTxt + " from null to " + valueTemp + ",");
}else{
sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
}
@@ -2930,13 +2930,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (fileNameListTemp.size() != 0 && !checkDiffrent) {
if("1".equals(flag)){
//sysUser
sb.append(dbFieldTxt +" "+ StringUtils.join(fileNameList, ",") + " to " + StringUtils.join(fileNameListTemp, ",") + ",");
sb.append(dbFieldTxt +" from "+ StringUtils.join(fileNameList, ",") + " to " + StringUtils.join(fileNameListTemp, ",") + ",");
}else{
sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为" + StringUtils.join(fileNameListTemp, ",") + ",");
}
} else if (fileNameListTemp.size() == 0) {
if("1".equals(flag)){
sb.append(dbFieldTxt + " "+StringUtils.join(fileNameList, ",") + " to empty " + ",");
sb.append(dbFieldTxt + " from "+StringUtils.join(fileNameList, ",") + " to null " + ",");
}else{
sb.append(dbFieldTxt + "由" + StringUtils.join(fileNameList, ",") + "改为空" + ",");
}
@@ -2945,7 +2945,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} else {
if (fileNameListTemp.size() != 0) {
if("1".equals(flag)){
sb.append(dbFieldTxt + " empty to " + StringUtils.join(fileNameListTemp, ",") + ",");
sb.append(dbFieldTxt + " from null to " + StringUtils.join(fileNameListTemp, ",") + ",");
}else{
sb.append(dbFieldTxt + "由空改为" + StringUtils.join(fileNameListTemp, ",") + ",");
}
@@ -2966,13 +2966,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (ObjectUtils.isNotEmpty(value)) {
if (ObjectUtils.isNotEmpty(valueTemp) && !value.equals(valueTemp)) {
if("1".equals(flag)){
sb.append(dbFieldTxt +" "+ value + " to " + valueTemp + ",");
sb.append(dbFieldTxt +" from "+ value + " to " + valueTemp + ",");
}else{
sb.append(dbFieldTxt + "由" + value + "改为" + valueTemp + ",");
}
} else if (ObjectUtils.isEmpty(valueTemp)) {
if("1".equals(flag)){
sb.append(dbFieldTxt + " "+value + " to empty " + ",");
sb.append(dbFieldTxt + " from "+value + " to null " + ",");
}else{
sb.append(dbFieldTxt + "由" + value + "改为空" + ",");
}
@@ -2980,7 +2980,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
} else {
if (ObjectUtils.isNotEmpty(valueTemp)) {
if("1".equals(flag)){
sb.append(dbFieldTxt + " empty to " + valueTemp + ",");
sb.append(dbFieldTxt + " from null to " + valueTemp + ",");
}else{
sb.append(dbFieldTxt + "由空改为" + valueTemp + ",");
}
@@ -4712,8 +4712,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you, Please pay attention to check.";
String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you, Please pay attention to check.";
String content = sysUser.getUsername() + " pushed " + StringUtils.join(serialNumberList, ",") + " to you. Please be reminded to check it out.";
String contentInfo = sysUser.getUsername() + " pushed " + StringUtils.join(hrefList, ",") + " to you. Please be reminded to check it out.";
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -4729,7 +4729,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
list.add(serialNumber);
}
});
String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you, Please pay attention to check.";
String contentTemp = sysUser.getUsername() + " pushed " + StringUtils.join(list, ",") + " to you. Please be reminded to check it out.";
iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
}
} catch (IOException e) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+10 -8
View File
@@ -350,7 +350,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
LambdaQueryWrapper<DummyInventoryInfoEO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryBaseEO.getId());
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = iDummyInventoryInfoEOService.list(lambdaQueryWrapper);
String contentLog = null;
String contentLog = "";
if(dummyContentChangeEOList.size() == 0){
//没有添加过需要进行第一次添加
@@ -418,11 +418,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
.eq("is_en_log",CutEnum.EN.getValue());
List<DummyLogEO> updateLogList = dummyLogEOService.list(logEOQueryWrapper);
if(CollectionUtils.isNotEmpty(updateLogList)){
contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("</br></br>"));
List<String> contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList());
for(int i=0 ; i < contentLogList.size() ;i++){
contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "</br>";
}
}
}
//列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理
if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) {
//向订阅该领域管理的人发消息和飞书
@@ -1115,10 +1117,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx
content = "The " + baseName + " virtual list you subscribed to has been updated.";
contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "</br>";
contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "</br>";
contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " ;
//拼接维护清单的消息
contentInfo = setContentInfo(contentInfo, baseDiff,contentLog);
contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog);
contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog).replace("</br>"," ");
//封装消息的实体类
SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -1130,8 +1132,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
log.error("飞书消息推送失败");
}
}else{//撤回的消息
content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
content = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
contentInfo = "Please note that the "+baseName+" virtual list you subscribed to has been withdrawn.";
//封装消息的实体类
SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
@@ -1172,7 +1174,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
if (StringUtils.isNotBlank(contentLog)){
contentInfo += contentLog;
contentInfo += row +". Maintenance list has been modified as follows :</br>"+ contentLog;
}
return contentInfo;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+3 -3
View File
@@ -127,7 +127,7 @@ public class InventoryAffirmJob implements Job {
// XXX .
String msgContentEN = "The remaining processing time for the regulation list confirmation of"
+ projectNameInfoEO.getProjectName()
+ " is 3 days. Please check and handle it in time.";
+ " are 3 days. Please check and handle it in time.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType();
@@ -148,9 +148,9 @@ public class InventoryAffirmJob implements Job {
currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList());
/*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/
String msgContentEN = "The the regulation list confirmation of "
String msgContentEN = "The the regulation list confirmation for "
+ projectNameInfoEO.getProjectName()
+ " is coming to an end today. Please check and deal with it in time";
+ " will expire today. Please check and address it in a timely manner.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+2 -2
View File
@@ -133,7 +133,7 @@ public class PrehomoJob implements Job {
//The remaining processing time for the Pre-Homo confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time.
String msgContentEN = "The remaining processing time for the Pre-Homo confirmation of "
+ projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
+ " is 3 days. Please check and handle it in time.";
+ " are 3 days. Please check and handle it in time.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType();
@@ -157,7 +157,7 @@ public class PrehomoJob implements Job {
//The the Pre-Homo confirmation of GB 7258 in XXX (project name) is coming to an end today. Please check and deal with it in time
String msgContentEN = "The the Pre-Homo confirmation of "
+ projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
+ " is coming to an end today. Please check and deal with it in time.";
+ " will expire today. Please check and address it in time.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+4 -4
View File
@@ -130,9 +130,9 @@ public class VerifyComplianceJob implements Job {
//您XXX（项目名称）中GB 7258的验证符合性确认剩余处理时间还有3天，请及时查看处理
//The remaining processing time for the Verify compliance confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time.
String msgContentEN = "The remaining processing time for the Verify compliance confirmation of "
String msgContentEN = "The remaining processing time for the validation compliance confirmation of "
+ projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
+ " is 3 days. Please check and handle it in time.";
+ " are 3 days. Please check and handle it in time.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType();
@@ -154,9 +154,9 @@ public class VerifyComplianceJob implements Job {
//您XXX（项目名称）中GB 7258的验证符合性确认任务今天即将结束，请及时查看处理
//The the Verify compliance confirmation of GB 7258 in XXX (project name) is coming to an end today. Please check and deal with it in time
String msgContentEN = "The the Verify compliance confirmation of "
String msgContentEN = "The the validation compliance confirmation of "
+ projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
+ " is coming to an end today. Please check and deal with it in time.";
+ " will expire today. Please check and address it in time.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+4 -4
View File
@@ -128,9 +128,9 @@ public class designComplianceJob implements Job {
threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList());
//您XXX（项目名称）中GB 7258的设计符合性确认剩余处理时间还有3天，请及时查看处理
String msgContentEN = "The remaining processing time for the design compliance confirmation of "
String msgContentEN = "The remaining processing time for the design compliance confirmation for "
+ projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
+ " is 3 days. Please check and handle it in time.";
+ " are 3 days. Please check and address it in a timely manner.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType();
@@ -151,9 +151,9 @@ public class designComplianceJob implements Job {
currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList());
//您XXX（项目名称）中GB 7258的设计符合性确认任务今天即将结束，请及时查看处理
String msgContentEN = "The the design compliance confirmation of "
String msgContentEN = "The the design compliance confirmation for "
+ projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName()
+ " is coming to an end today. Please check and deal with it in time.";
+ " will expire today. Please check and address it in time.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5 -5
View File
@@ -1089,8 +1089,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
//消息内容
String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation of " + projectNameInfoEO.getProjectName()
+ ". The due date is：" +inventoryAffirmDueDate+ ". Please check and deal with it in time.";
String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for " + projectNameInfoEO.getProjectName()
+ ". The due date is：" +inventoryAffirmDueDate+ " .Please check and address it in a timely manner.";
//飞书跳转链接
String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryId + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType();
@@ -1595,12 +1595,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
userIdList.add(engineeringInterfacePerson);
msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName()
+ ".The due date is：" +taskAffirmDueDate+ " Please check and deal with it in time.";
msgContentEN = sysUser.getUsername() + " assigned the regulation task confirmation of " + projectNameInfoEO.getProjectName()
+ ".The due date is：" +taskAffirmDueDate+ " Please check and address it in a timely manner.";
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
userIdList.add(dreUserId);
msgContentEN = sysUser.getUsername() + " has distributed the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
+ ".to you. the due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
userIdList.add(engineeringInterfacePerson);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+7 -5
View File
@@ -3,12 +3,16 @@ package com.jero.modules.project.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.MsgTypeEnum;
import com.jero.modules.project.mapper.*;
import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
import com.jero.modules.project.mapper.ProjectNameInfoEOMapper;
import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
import com.jero.modules.project.util.SendMessageUtils;
@@ -23,8 +27,6 @@ import org.springframework.stereotype.Service;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 项目库-任务清单明细表
* @Author: jero-boot
@@ -263,12 +265,12 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
+ " to you. Please check and handle it in time.";
}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.PREHOMO_ISSUE_DRE_MSG.getValue())){
//XXX has distributed the Pre-Homo confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
msgContentEN = currentUser.getUsername() + " has distributed the Pre-Homo confirmation process of "
msgContentEN = currentUser.getUsername() + " has assigned the Pre-Homo confirmation process of "
+ projectLawsInventoryEO.getSerialNumber() + " in "+ projectNameInfoEO.getProjectName()
+ " to you. Please check and handle it in time.";
}else if(org.apache.commons.lang3.StringUtils.equals(projectTaskInventoryDetailEO.getMsgType(), MsgTypeEnum.VERIFY_ISSUE_DRE_MSG.getValue())){
//XXX has distributed the Verify compliance confirmation process of GB 7258 in XXX (project name) to you. Please check and handle it in time.
msgContentEN = currentUser.getUsername() + " has distributed the Verify compliance confirmation process of "
msgContentEN = currentUser.getUsername() + " has assigned the validation compliance confirmation process of "
+ projectLawsInventoryEO.getSerialNumber() + " in "+ projectNameInfoEO.getProjectName()
+ " to you. Please check and handle it in time.";
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+6 -8
View File
@@ -3,6 +3,7 @@ package com.jero.modules.project.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.exception.JeroBootException;
@@ -31,17 +32,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* @Description: 项目库-任务清单表
* @Author: jero-boot
@@ -317,12 +315,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
+ " in time.";
}else if(StringUtils.equals(msgType,MsgTypeEnum.PREHOMO_REMIND_MSG.getValue())){
//Please check and deal with the Pre-Homo confirmation process of GB 7258 in XXX (project name) in time.
msgContentEN = "Please check and deal with the Pre-Homo confirmation process of "
msgContentEN = "Please check and address the Pre-Homo confirmation process of "
+ serialNumber + " in "+ projectNameInfoEO.getProjectName()
+ " in time.";
}else if(StringUtils.equals(msgType,MsgTypeEnum.VERIFY_REMIND_MSG.getValue())){
//Please check and deal with the Verify compliance confirmation process of GB 7258 in XXX (project name) in time.
msgContentEN = "Please check and deal with the Verify compliance confirmation process of "
msgContentEN = "Please check and address the Verify compliance confirmation process of "
+ serialNumber + " in "+ projectNameInfoEO.getProjectName()
+ " in time.";
}
@@ -606,7 +604,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
userIdList.addAll(Arrays.asList(dreUserIds.split(",")));
if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
msgContentEN = sysUser.getUsername() + "has distributed the design compliance confirmation process of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
+ " to you. Please check and handle it in time.";
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+22 -7
View File
@@ -306,7 +306,9 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStart(nowStart.get(i));
menuCanAdd = true;
@@ -544,7 +546,9 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStart(nowStart.get(i));
menuCanAdd = true;
@@ -728,7 +732,9 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStartUS(nowStart.get(i));
menuCanAdd = true;
@@ -1102,7 +1108,9 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStartJapanTwo(lastStrTemp, secondStrTemp, nowStart.get(i));
menuCanAdd = true;
@@ -1276,7 +1284,10 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
// addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStartEU(nowStart.get(i));
menuCanAdd = true;
@@ -1453,7 +1464,9 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStartKmvssArticle(lastStr, nowStart.get(i));
menuCanAdd = true;
@@ -1676,7 +1689,9 @@ public class FileSpiltService {
SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue);
treeList.add(sarFileSplitMenuEO);
message.setMenuId(sarFileSplitMenuEO.getId());
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
if(!StringUtils.isEmpty(itemName)){
addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length()));
}
messageList.add(message);
nowStart = getNewNowStartKmvssTable(catalogerArr, nowStart.get(i), menuLevel);
menuCanAdd = true;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
-1
View File
@@ -3300,7 +3300,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
for(OSSFile fileExportDto : allRelevFileList){
String oldPath = fileExportDto.getUrl();
String newPath = fileNowPath + File.separator + fileExportDto.getFileName();
File oldFile = new File(oldPath);
if (CosBootUtil.doesObjectExist(oldPath)){
InputStream in = CosBootUtil.download(oldPath);
copyFile1(in, newPath);