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

合并master数据

Browse Source
This commit is contained in:
zer0Black
2022-06-21 22:21:07 +08:00
parent b86fa3a064 c530d98f47
commit 4182b4df14
36 changed files with 559 additions and 249 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
+4 -5
View File
@@ -272,11 +272,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//文档动态-------------------
//http://localhost:3000/docManage/library/detail?id=7a10adf4d01248b7a82368c0aed3a03f&wen2_ben3_kuang4=&shu1_ru4_kuang4_lian4_jie1=&serial_number=ceshi20220607&ren2_yuan2_xuan3_ze2=&biao1_zhun3_xuan3_ze2=&title=ceshi20220607&e_e_e=&title_en=ceshi20220607&state=%E7%8E%B0%E8%A1%8C&region=&issue_time=2022-06-07&technology_territory=&shu4_zi4_shu1_ru4_kuang4=&collectFlag=0&subscribeFlag=0
String hrefTemp =category + " " + "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn + ",";
HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
sbTemp.append(hrefTemp);
serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn);
//---------------------------
@@ -296,7 +294,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String msgContent = "The " + StringUtils.join(serialNumberListTemp,",") + " has been deleted from the document library.";
String msgContentInfo = "The " + substring + " has been deleted from the document library.";
homeDocumentDynamicEO.setMsgContent(msgContent);
homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo);
homeDocumentDynamicEO.setMsgContentInfo(msgContent);
homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
}
@@ -4777,7 +4775,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
@SneakyThrows
@Override
public void importZip(MultipartFile file,String cut) {
List<String> list = getWorkbookTitle("cn");
List<String> list = getWorkbookTitle(cut);
int pos = file.getOriginalFilename().lastIndexOf(".");
String str = file.getOriginalFilename().substring(pos + 1).toLowerCase();
String filenameorg = file.getOriginalFilename().substring(0, pos);
@@ -4961,7 +4959,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
//表头
List<Map<String, Object>> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add");
List<Map<String, Object>> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), cut, "add");
exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName,saveDirectory,cut);
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
@@ -5621,6 +5619,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldListQuery.add("title");
fieldListQuery.add("title_en");
fieldListQuery.add("state");
fieldListQuery.add("region");
fieldListQuery.add("technology_territory");
fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
fieldListQuery.add("implement_time");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+16 -2
View File
@@ -429,10 +429,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
if(CollectionUtils.isNotEmpty(updateLogList)){
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>";
String content = contentLogList.get(i);
if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
content = content.substring(0,content.length()-5);
}
contentLog += "（"+ (i+1) +"）" + content + "</br>";
}
}
}
if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
contentLog = contentLog.substring(0,contentLog.length()-5);
}
//列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理
if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) {
@@ -481,7 +488,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
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>";
String content = contentLogList.get(i);
if(StringUtils.isNotBlank(content) && content.endsWith("</br>")){
content = content.substring(0,content.length()-5);
}
contentLog += "（"+ (i+1) +"）" + content + "</br>";
}
if(StringUtils.isNotBlank(contentLog) && contentLog.endsWith("</br>")){
contentLog = contentLog.substring(0,contentLog.length()-5);
}
iDummyContentChangeEOService.saveBatch(list);
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(),contentLog ,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+36 -23
View File
@@ -411,45 +411,52 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//实施类别 implementType
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())){
dummyInventoryInfoEOTemp.setImplementType(dummyInventoryInfoEO.getImplementType());
}else{
dummyInventoryInfoEOTemp.setImplementType("");
}
// else{
// dummyInventoryInfoEOTemp.setImplementType("");
// }
//认证类型 attestationType
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())){
dummyInventoryInfoEOTemp.setAttestationType(dummyInventoryInfoEO.getAttestationType());
}else{
dummyInventoryInfoEOTemp.setAttestationType("");
}
// else{
// dummyInventoryInfoEOTemp.setAttestationType("");
// }
//认证级别 attestationRank
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())){
dummyInventoryInfoEOTemp.setAttestationRank(dummyInventoryInfoEO.getAttestationRank());
}else{
dummyInventoryInfoEOTemp.setAttestationRank("");
}
// else{
// dummyInventoryInfoEOTemp.setAttestationRank("");
// }
//责任领域 dutyTerritory
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())){
dummyInventoryInfoEOTemp.setDutyTerritory(dummyInventoryInfoEO.getDutyTerritory());
}else{
dummyInventoryInfoEOTemp.setDutyTerritory("");
}
// else{
// dummyInventoryInfoEOTemp.setDutyTerritory("");
// }
//适用范围 shi4Yong4Fan4Wei2
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){
dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2());
}else{
dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
}
// else{
// dummyInventoryInfoEOTemp.setShi4Yong4Fan4Wei2("");
// }
//技术领域 technologyTerritory
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){
dummyInventoryInfoEOTemp.setTechnologyTerritory(dummyInventoryInfoEO.getTechnologyTerritory());
}else{
dummyInventoryInfoEOTemp.setTechnologyTerritory("");
}
// else{
// dummyInventoryInfoEOTemp.setTechnologyTerritory("");
// }
//适用地区 region
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){
dummyInventoryInfoEOTemp.setRegion(dummyInventoryInfoEO.getRegion());
}else{
dummyInventoryInfoEOTemp.setRegion("");
}
// else{
// dummyInventoryInfoEOTemp.setRegion("");
// }
//新车实施日期
if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
dummyInventoryInfoEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
@@ -461,14 +468,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEOList.add(dummyInventoryInfoEOTemp);
}
// this.updateBatchById(dummyInventoryInfoEOList);
for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
setDateNull(inventoryInfoEO, updateWrapper);
//保存
this.update(inventoryInfoEO,updateWrapper);
}
this.updateBatchById(dummyInventoryInfoEOList);
// for (DummyInventoryInfoEO inventoryInfoEO : dummyInventoryInfoEOList) {
// LambdaUpdateWrapper<DummyInventoryInfoEO> updateWrapper = new LambdaUpdateWrapper<>();
// updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId());
// setDateNull(inventoryInfoEO, updateWrapper);
// //保存
// this.update(inventoryInfoEO,updateWrapper);
// }
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -1836,8 +1843,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
fileTemp.mkdirs();
//文件
exportFile(dataList,fileInfos);
String excelName = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
excelName = "虚拟清单.xlsx";
}else{
excelName = "Virtual list.xlsx";
}
//excel
OutputStream excelOS = new FileOutputStream(path + File.separator + "虚拟清单.xlsx");
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+9
View File
@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectYearNameInfoEO;
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
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.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -42,6 +44,9 @@ public class InventoryAffirmJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Value(value = "${jero.backUrl}")
private String backUrl;
@@ -85,6 +90,10 @@ public class InventoryAffirmJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
List<String> threeDaysUserIdList = new ArrayList<>();
List<String> currentDaysUserIdList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java
+9 -4
View File
@@ -1,16 +1,14 @@
package com.jero.modules.project.job;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.DesignComplianceStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
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.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import lombok.extern.slf4j.Slf4j;
@@ -43,6 +41,9 @@ public class PrehomoJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -91,6 +92,10 @@ public class PrehomoJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO: projectLawsInventoryEOList) {
List<String> threeDaysUserIdList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java
+8 -4
View File
@@ -1,16 +1,14 @@
package com.jero.modules.project.job;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.modules.project.entity.ProjectLawsInventoryEO;
import com.jero.modules.project.entity.ProjectLibraryBase;
import com.jero.modules.project.entity.ProjectNameInfoEO;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.DesignComplianceStatusEnum;
import com.jero.modules.project.enums.JumpLinkEnum;
import com.jero.modules.project.enums.SendMsgFlagEnum;
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.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import lombok.extern.slf4j.Slf4j;
@@ -43,6 +41,9 @@ public class VerifyComplianceJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -90,6 +91,9 @@ public class VerifyComplianceJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO: projectLawsInventoryEOList) {
List<String> threeDaysUserIdList = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java
+8 -6
View File
@@ -8,6 +8,7 @@ import com.jero.modules.project.enums.SendMsgFlagEnum;
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.ProjectYearNameInfoEOMapper;
import com.jero.modules.project.service.IProjectLawsInventoryEOService;
import com.jero.modules.project.service.IProjectTaskInventoryEOService;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +41,9 @@ public class designComplianceJob implements Job {
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -87,6 +91,9 @@ public class designComplianceJob implements Job {
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
for (ProjectLawsInventoryEO projectLawsInventoryEO: projectLawsInventoryEOList) {
List<String> threeDaysUserIdList = new ArrayList<>();
@@ -133,15 +140,10 @@ public class designComplianceJob implements Job {
+ " 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()
+ "&projectName=" + projectNameInfoEO.getProjectName();
String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType();
//系统内部跳转链接
String href = "<a href='"
+ JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType()
+ "&projectName=" + projectNameInfoEO.getProjectName()
+ "'>" + "Jump link" + "</a>";
String contentInfo = msgContentEN + " " + href;
Map<String,Object> sendMessageMap = new HashMap<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCommentEOServiceImpl.java
+5 -1
View File
@@ -9,6 +9,7 @@ import com.jero.modules.project.mapper.ProjectCommentEOMapper;
import com.jero.modules.project.service.IProjectCommentEOService;
import com.jero.modules.project.service.IProjectReplyEOService;
import com.jero.modules.project.vo.ProjectCommentVO;
import com.jero.modules.system.util.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -107,7 +108,10 @@ public class ProjectCommentEOServiceImpl extends ServiceImpl<ProjectCommentEOMap
public List<ProjectCommentVO> getInfoList(ProjectCommentEO projectCommentEOTemp) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<ProjectCommentEO> wrapper = new LambdaQueryWrapper<>();
if(StringUtils.isNotBlank(projectCommentEOTemp.getCommentContent())){
String replace = projectCommentEOTemp.getCommentContent().replaceAll("\\*", "");
wrapper.like(ProjectCommentEO::getCommentContent,replace);
}
//验证当前用户在该项目中是什么角色
int isProjectRole = projectLawsInventoryEOService.checkUserRole(projectCommentEOTemp.getProjectLibraryId(), sysUser.getId(), "");
if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+12 -4
View File
@@ -40,10 +40,7 @@ import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.entity.*;
import com.jero.modules.project.enums.*;
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.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.mapper.*;
import com.jero.modules.project.service.*;
import com.jero.modules.project.util.WordUtil;
import com.jero.modules.split.common.FileUnZip;
@@ -153,6 +150,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private IProjectTaskInventoryEOService projectTaskInventoryEOService;
@@ -1097,6 +1097,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
//消息内容
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.";
@@ -5777,6 +5781,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
//消息内容
String msgContentEN = "Please address the regulation list confirmation process for "+ projectNameInfoEO.getProjectName() +" ASAP. ";
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+4 -4
View File
@@ -233,9 +233,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if (!(inventoryAffirmFlag && taskAffirmFlag)) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("数据不能删除");
throw new JeroBootException("当前项目下有未走完的流程，不能删除");
}else{
throw new JeroBootException("Data cannot be deleted.");
throw new JeroBootException("There are unfinished processes under the current project and cannot be deleted.");
}
}
@@ -256,9 +256,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
if (!(designStatusFlag && verifyStatusFlag && prehomoStatusFlag)) {
if (CutEnum.CN.getValue().equals(cut)) {
throw new JeroBootException("数据不能删除");
throw new JeroBootException("当前项目下有未走完的流程，不能删除");
}else{
throw new JeroBootException("Data cannot be deleted.");
throw new JeroBootException("There are unfinished processes under the current project and cannot be deleted.");
}
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+14 -2
View File
@@ -506,7 +506,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
nowFile.delete();
}
nowFile.mkdirs();
HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
String excelName = "";
if(CutEnum.CN.getValue().equals(cut)){
excelName = "相关人员名单";
}else{
excelName = "Personal List";
}
HSSFSheet sheet = workbook.createSheet(excelName);
sheet.setDefaultColumnWidth(16);//列宽
HSSFCellStyle cellStyle = workbook.createCellStyle();
cellStyle.setWrapText(true);//自动换行
@@ -614,7 +620,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
nowFile.delete();
}
nowFile.mkdirs();
HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
String sheetName = "";
if(CutEnum.CN.getValue().equals(projectRelatedPersonnel.getCut())){
sheetName = "相关人员名单";
}else{
sheetName = "Personal List";
}
HSSFSheet sheet = workbook.createSheet(sheetName);
sheet.setDefaultColumnWidth(16);//列宽
HSSFCellStyle cellStyle = workbook.createCellStyle();
cellStyle.setWrapText(true);//自动换行
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+7 -4
View File
@@ -9,10 +9,7 @@ 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.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.mapper.*;
import com.jero.modules.project.service.IProjectTaskInventoryDetailEOService;
import com.jero.modules.project.service.IProjectTaskInventoryFeedbackEOService;
import com.jero.modules.project.util.SendMessageUtils;
@@ -45,6 +42,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private ISysUserService sysUserService;
@@ -255,6 +255,9 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
String projectNameId = projectLibraryBase.getProjectNameId();
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(new QueryWrapper<ProjectNameInfoEO>().lambda().eq(ProjectNameInfoEO::getId, projectNameId));
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
String id = UUID.randomUUID().toString().replace("-", "");
//给工程师下发消息
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+7
View File
@@ -61,6 +61,9 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
@Autowired
private ProjectNameInfoEOMapper projectNameInfoEOMapper;
@Autowired
private ProjectYearNameInfoEOMapper projectYearNameInfoEOMapper;
@Autowired
private SysUserMapper sysUserMapper;
@@ -306,6 +309,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId());
ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper);
QueryWrapper<ProjectYearNameInfoEO> projectYearInfoEOQueryWrapper = new QueryWrapper<>();
projectYearInfoEOQueryWrapper.lambda().eq(ProjectYearNameInfoEO::getId,projectLibraryBase.getYearNameId());
ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOMapper.selectOne(projectYearInfoEOQueryWrapper);
String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id
userIdList.addAll(Arrays.asList(dreUserIds.split(",")));
if(StringUtils.equals(msgType,MsgTypeEnum.DESIGN_REMIND_MSG.getValue())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+20 -5
View File
@@ -344,14 +344,29 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
for (Map.Entry<String, Object> entry : otherMap.entrySet()) {
String key = entry.getKey();
String value = (String) entry.getValue();
if (ObjectUtils.isNotEmpty(value)) {
if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){
Map<String, Object> queryMapNew = new HashMap<>();
Map<String, Object> queryMapTempNew = new HashMap<>();
queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*");
queryMapNew.put("wildcard", queryMapTempNew);
must.add(queryMapNew);
}else{
Map<String, Object> map = new HashMap<>();
Map<String, Object> queryMap = new HashMap<>();
Map<String, Object> queryMapTemp = new HashMap<>();
queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
// queryMapTemp.put(key, "*"+value+"*");
queryMap.put("wildcard", queryMapTemp);
must.add(queryMap);
queryMapTemp.put("query", value);
queryMap.put(key, queryMapTemp);
map.put("match",queryMap);
must.add(map);
}
// if (ObjectUtils.isNotEmpty(value)) {
// Map<String, Object> queryMap = new HashMap<>();
// Map<String, Object> queryMapTemp = new HashMap<>();
// queryMapTemp.put(key, "*"+value.replaceAll(",","*")+"*");
//// queryMapTemp.put(key, "*"+value+"*");
// queryMap.put("wildcard", queryMapTemp);
// must.add(queryMap);
// }
}
}
//封装时间类型字段查询(时间范围)