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

Merge branch 'master' into dev_2nd_LCYH

Browse Source 
# Conflicts:
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
#	jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
#	jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
#	jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
This commit is contained in:
高嵩
2023-03-24 16:56:38 +08:00
parent 1daf1dcad0 eddac9197c
commit e115fc742e
30 changed files with 2081 additions and 1600 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/controller/ParamsCollectManifestEOController.java
+13
View File
@@ -673,4 +673,17 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
public Result<?> certifiedEngineerUpdateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
return this.paramsCollectManifestEOService.certifiedEngineerUpdateDreBatch(paramsCollectManifestVO);
}
/**
* 认证工程师-批量编辑截止时间
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-认证工程师-批量编辑截止时间")
@ApiOperation(value="参数项收集清单-认证工程师-批量编辑截止时间", notes="参数项收集清单-认证工程师-批量编辑截止时间")
@PostMapping(value = "/batchEditDeadline")
public Result<?> batchEditDeadline(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
return this.paramsCollectManifestEOService.batchEditDeadline(paramsCollectManifestVO);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+3
View File
@@ -197,4 +197,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 创建高级查询条件
void createAdvanceedSearchCondition(List<QueryConditionVO> queryConditionVOList, StringBuilder sqlJoin);
// 认证工程师-批量编辑截止时间
Result<?> batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+26 -7
View File
@@ -174,6 +174,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Autowired
private IProjectUserDutyTerritoryService projectUserDutyTerritoryService;
@Autowired
private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService;
/**
* 保存
@@ -6753,11 +6755,28 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
sqlJoinSb.append(" or ").append(field).append(" in (").append(nioNumberSb.toString()).append(")");
}
sqlJoinSb.append(")");
}
}
}
sqlJoinSb.append(" ) ");
}
}
sqlJoinSb.append(")");
}
}
}
sqlJoinSb.append(" ) ");
}
}
@Override
public Result<?> batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO) {
if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) {
throw new JeroBootException("参数不能为空！");
}
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
List<String> paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")).stream().distinct().collect(Collectors.toList());
LambdaUpdateWrapper<ParamsCollectManifestEO> manifestUpdateWrap = new LambdaUpdateWrapper<>();
manifestUpdateWrap.set(ParamsCollectManifestEO::getDeadline,paramsCollectManifestVO.getDeadline());
manifestUpdateWrap.in(ParamsCollectManifestEO::getId,paramsCollectManifestIdList);
this.update(manifestUpdateWrap);
return Result.OK("批量编辑截止时间成功！");
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java
+14
View File
@@ -83,6 +83,20 @@ public class BussDocumentLibraryEO implements Serializable {
@ApiModelProperty(value = "对应标准")
private java.lang.String correspondingStandard;
/**代替标准*/
@ApiModelProperty(value = "代替标准")
@Dict(dicCode ="replace_standard")
private java.lang.String replaceStandard;
/**被代替标准*/
@ApiModelProperty(value = "被代替标准")
@Dict(dicCode ="replaced_standard")
private java.lang.String replacedStandard;
@TableField(exist = false)
private java.lang.String cut;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+93 -113
View File
@@ -269,31 +269,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String serialNumber = (String) map.get("serial_number");
String titleEn = (String) map.get("title_en");
String title = (String) map.get("title");
String category = (String)map.get("lei4_bie2");
if(StringUtils.isNotBlank(category)){
String finalCategory = category;
List<SysDictItem> stateDictItemList = dictItemList.stream()
.filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue()))
.collect(Collectors.toList());
if(stateDictItemList.size() != 0){
if(CutEnum.CN.getValue().equals(cut)){
category = stateDictItemList.get(0).getItemText();
}else{
category = stateDictItemList.get(0).getEnName();
}
}
}else {
category = "";
}
//文档动态-------------------
String hrefTemp =category + " " + "<a href='/docManage/library/detail?id=" + id +
//文档动态-------------------
String hrefTemp ="<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn + ",";
sbTemp.append(hrefTemp);
serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn);
serialNumberListTempCn.add(category + " " + serialNumber + " " + title);
serialNumberListTemp.add(serialNumber + " " + titleEn);
serialNumberListTempCn.add(serialNumber + " " + title);
//---------------------------
if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) {
serialNumberList.add(serialNumber);
@@ -539,8 +521,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldList = fieldList.stream()
.filter(e -> !"serial_number".equals(e.getDbFieldName())
&& !"title".equals(e.getDbFieldName())
&& !"title_en".equals(e.getDbFieldName())
&& !"state".equals(e.getDbFieldName()))
&& !"title_en".equals(e.getDbFieldName()))
.collect(Collectors.toList());
if (fieldList.size() != 0) {
@@ -1756,6 +1737,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
continue;
}
Object value = entry.getValue();
if(key.equals("replace_standard_id")){
continue;
}
//es全文新增数据(数据转换)
// esFullText(cut, fieldList, categoryList, dictItemList, mapList, sbCn,sbEn, entry);
@@ -1980,6 +1964,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String insertField = mustFields + fieldsBuilder.toString();
String insertValue = mustValues + valuesBuilder.toString();
bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
//处理代替标准和被代替标准逻辑
Object repObj = map.get("replace_standard_id");
if(null != repObj) {
String[] replace_standard_list = repObj.toString().split(",");
for (String rs : replace_standard_list) {
BussDocumentLibraryEO bl = bussDocumentLibraryEOMapper.selectById(rs);
if (null != bl) {
String repStr = bl.getReplacedStandard();
if (StringUtils.isNotBlank(repStr)) {
if (!repStr.contains(idTemp)) {
repStr = repStr + "," + idTemp;
}
} else {
repStr = idTemp;
}
bl.setReplacedStandard(repStr);
bussDocumentLibraryEOMapper.updateById(bl);
}
}
}
String replaceStandard = StringUtils.valueOf(map.get("replace_standard"));
if (StringUtils.isNotBlank(replaceStandard)) {
@@ -2203,22 +2207,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<String> userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp);
String title = StringUtils.valueOf(map.get("title"));
String serialNumber = StringUtils.valueOf(map.get("serial_number"));
String category = StringUtils.valueOf(map.get("lei4_bie2"));
String categoryCn = "";
String titleEn = StringUtils.valueOf(map.get("title_en"));
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
if(StringUtils.isNotBlank(category)){
String finalCategory = category;
List<SysDictItem> stateDictItemList = dictItemList.stream()
.filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue()))
.collect(Collectors.toList());
if(stateDictItemList.size() != 0){
category = stateDictItemList.get(0).getEnName();
categoryCn = stateDictItemList.get(0).getItemText();
}
}else{
category = "";
}
Set<String> technologyTerritorySet = new HashSet<>();
String technologyTerritoryId = "";
@@ -2256,19 +2246,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String href = category + " " + "<a href='/docManage/library/detail?id=" + idTemp +
String href = "<a href='/docManage/library/detail?id=" + idTemp +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " "+ titleEn + " ";
String hrefCn = categoryCn + " " + "<a href='/docManage/library/detail?id=" + idTemp +
String hrefCn = "<a href='/docManage/library/detail?id=" + idTemp +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " "+ title;
//文档动态, 文档库中新增了标准XXXX homeDocumentDynamicEOService
//The standard GB 7258-2017 Technical specifications has been added to the document library.
String msgContentCn = "文档库中新增了"+categoryCn+" "+serialNumber+" "+title;
String msgContentCn = "文档库中新增了" + serialNumber + " "+title;
String msgContentInfoCn = "文档库中新增了"+hrefCn;
HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library.");
homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library.");
homeDocumentDynamicEO.setMsgContent(serialNumber + " " + titleEn + " has been added to the document library.");
homeDocumentDynamicEO.setMsgContentInfo(href + " has been added to the document library.");
homeDocumentDynamicEO.setMsgContentCn(msgContentCn);
homeDocumentDynamicEO.setMsgContentInfoCn(msgContentInfoCn);
homeDocumentDynamicEOService.save(homeDocumentDynamicEO);
@@ -2286,7 +2276,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String hrefTemp = backUrl + "/docManage/library/detail?id=" + idTemp;
String content = "In the "+ technologyTerritoryName
+ " technical field you subscribed to, the "+category+" "+serialNumber+" has been updated.";
+ " technical field you subscribed to, the "+serialNumber+" has been updated.";
//In the XXXX technical field you subscribed to, the standard "GBXXX" has been updated.
String contentInfo = "In the "+ technologyTerritoryName
+ " technical field you subscribed to, the "
@@ -2294,26 +2284,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String msgTitle = "The " + technologyTerritoryName + " technical field you subscribed to has been updated";
String hrefYes = category + " " + "<a href='/docManage/library/detail?id=" + idTemp +
String hrefYes = "<a href='/docManage/library/detail?id=" + idTemp +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>";
//消息英文--不带标签
String contentNo = "In the "+ technologyTerritoryName
+ " technical field you subscribed to, the "+
category + " " + serialNumber +" has been updated.";;
serialNumber +" has been updated.";;
//消息英文--带标签
String contentYes = "In the "+ technologyTerritoryName
+ " technical field you subscribed to, the "+
category + " " + hrefYes +" has been updated.";;
hrefYes +" has been updated.";;
//消息中文--不带标签
String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;;
String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + serialNumber;;
//消息中文--带标签
String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + hrefYes;;
String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + hrefYes;;
//封装消息的实体类
@@ -2330,9 +2320,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//飞书
try {
String contentInfoFeiShu = "In the "+ technologyTerritoryName
+ " technical field you subscribed to, the "+
category + " " + serialNumber +" has been updated.";
String contentInfoFeiShuCn = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;
+ " technical field you subscribed to, "+
serialNumber +" has been updated.";
String contentInfoFeiShuCn = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + serialNumber;
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName());
@@ -2359,7 +2349,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<BussDocumentLibraryEO> list = this.list();
List<String> serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
String serialNumber = StringUtils.valueOf(map.get("serial_number"));
String category = StringUtils.valueOf(map.get("lei4_bie2"));
String id = StringUtils.valueOf(map.get("id"));
String title = StringUtils.valueOf(map.get("title"));
String titleEn = StringUtils.valueOf(map.get("title_en"));
@@ -2378,7 +2367,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//普通数据字典
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,category,titleEn);
homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,titleEn);
try {
@@ -2694,8 +2683,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//删除文档库数据
bussDocumentLibraryEOMapper.deleteById((String) map.get("id"));
bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
//处理代替标准和被代替标准逻辑
String docId = (String) map.get("id");
Object repObj = map.get("replace_standard_id");
if(null != repObj){
String[] replace_standard_list = repObj.toString().split(",");
for (String rs : replace_standard_list) {
BussDocumentLibraryEO bl = bussDocumentLibraryEOMapper.selectById(rs);
if (null != bl) {
String repStr = bl.getReplacedStandard();
if (StringUtils.isNotBlank(repStr)) {
if (!repStr.contains(docId)) {
repStr = repStr + "," + docId;
}
} else {
repStr = docId;
}
bl.setReplacedStandard(repStr);
bussDocumentLibraryEOMapper.updateById(bl);
}
}
}
//开始更新ES
map.put("module_type", "文档库");
map.put("module_type_flag", ModuleTypeFlagEnum.DOCUMENT_LIBRARY.getValue());
map.put("create_time", new Date());
@@ -2757,21 +2766,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
List<Map<String, Object>> dataList,
List<OnlCgformField> fieldList,
List<SysDictItem> dictItemList,
String category,
String titleEn) {
String categoryCn = "";
if(StringUtils.isNotBlank(category)){
String finalCategory = category;
List<SysDictItem> stateDictItemList = dictItemList.stream()
.filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue()))
.collect(Collectors.toList());
if(stateDictItemList.size() != 0){
category = stateDictItemList.get(0).getEnName();
categoryCn = stateDictItemList.get(0).getItemText();
}
}else{
category = "";
}
//文件类型字段
List<OnlCgformField> onlCgformFieldList = fieldList.stream()
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
@@ -2825,13 +2820,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String contentInfoFileCn = "";
if(StringUtils.isNotBlank(sbField)){
// String substring = sbField.substring(0, sbField.length() - 1);
contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + sbField;
contentFileCn = categoryCn + " " + serialNumber + " " + title + " 中上传了 " + sbFieldCn;
contentFile = serialNumber + " " + titleEn + " uploaded " + sbField;
contentFileCn = serialNumber + " " + title + " 中上传了 " + sbFieldCn;
}
if(StringUtils.isNotBlank(sbNew)){
// String substring = sbNew.substring(0, sbNew.length() - 1);
contentInfoFile = category + " " + href + " uploaded " + sbNew;
contentInfoFileCn = categoryCn + " " + hrefCn + " 中上传了" + sbNewCn;
contentInfoFile = href + " uploaded " + sbNew;
contentInfoFileCn = hrefCn + " 中上传了" + sbNewCn;
}
// if(StringUtils.isNotBlank(sbField)){
//// contentInfoFile = category + " " + href + " uploaded " + sbNew;
@@ -2850,15 +2845,15 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
StringBuilder msgContentSbCn = new StringBuilder();
StringBuilder msgContentInfoSbCn = new StringBuilder();
//适用车型
StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + href);
StringBuilder msgContentSbCarTypeCn = new StringBuilder(categoryCn + " " + serialNumber + " " + title+" 的适用车型改为");
StringBuilder msgContentInfoSbCarTypeCn = new StringBuilder(categoryCn + " " + hrefCn+" 的适用车型改为");
StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the " + href);
StringBuilder msgContentSbCarTypeCn = new StringBuilder(serialNumber + " " + title+" 的适用车型改为");
StringBuilder msgContentInfoSbCarTypeCn = new StringBuilder(hrefCn+" 的适用车型改为");
//状态
StringBuilder msgContentSbStatus = new StringBuilder("The Status of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the " + category + " " + href);
StringBuilder msgContentSbStatusCn = new StringBuilder(categoryCn + " " + serialNumber + " " + title+" 的状态改为");
StringBuilder msgContentInfoSbStatusCn = new StringBuilder(categoryCn + " " + hrefCn+" 的状态改为");
StringBuilder msgContentSbStatus = new StringBuilder("The Status of the " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the " + href);
StringBuilder msgContentSbStatusCn = new StringBuilder(serialNumber + " " + title+" 的状态改为");
StringBuilder msgContentInfoSbStatusCn = new StringBuilder(hrefCn+" 的状态改为");
List<String> fileIdLIstTemp = new ArrayList<>();
@@ -3533,22 +3528,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String serialNumber = (String) dataList.get(0).get("serial_number");
String category = (String)map.get("lei4_bie2");
String categoryCn = (String)map.get("lei4_bie2");
String technologyTerritory = (String) map.get("technology_territory");
if(StringUtils.isNotBlank(category)){
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
String finalCategory = category;
List<SysDictItem> stateDictItemList = dictItemList.stream()
.filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue()))
.collect(Collectors.toList());
if(stateDictItemList.size() != 0){
category = stateDictItemList.get(0).getEnName();
categoryCn = stateDictItemList.get(0).getItemText();
}
}else{
category = "";
}
//只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”)
//向订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息
// 只有技术领域变更为订阅的技术领域这一种情况发消息, 假如订阅了技术领域A,编辑的文档的技术领域也是A,这时编辑的是其他的字段,这种情况不发消息
@@ -3614,9 +3594,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//订阅管理
if(thirdIdList.size() != 0){
String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
category + " " + serialNumber+" has been updated.";
String contentInfoFeiCn = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + categoryCn + " " + serialNumber;
String contentInfoFei = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, " +
serialNumber+" has been updated.";
String contentInfoFeiCn = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + serialNumber;
try {
//跳转文档详情
String url = backUrl + "/docManage/library/detail?id=" + id;
@@ -3645,18 +3625,18 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String contentInfo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to," +sysUser.getUsername()+" changed the "+ href + " " + sbStr.toString();
String msgTitle = "The " + technologyTerritoryNameEn + " technical field you subscribed to has been updated";
//消息英文--不带标签
String contentNo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
category + " " + serialNumber+" has been updated.";;
String contentNo = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, " +
serialNumber+" has been updated.";;
//消息英文--带标签
String contentYes = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, the " +
category + " " + href+" has been updated.";;
String contentYes = "In the " + technologyTerritoryNameEn + " technical field you subscribed to, " +
href+" has been updated.";;
//消息中文--不带标签
String contentInfoNo = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + categoryCn + " " + serialNumber;;
String contentInfoNo = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + serialNumber;;
//消息中文--带标签
String contentInfoYes = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + categoryCn + " " + href;;
String contentInfoYes = "您所订阅的" + technologyTerritoryNameEn + "技术领域中更新了" + href;;
// 封装消息的实体类
@@ -3685,21 +3665,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//去掉a标签
sbStr = sbStr.replaceAll("<text class='highlight-class'>", "").replaceAll("</text>", "");
//您订阅的XXX已被修改
content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
content = "In the "+ serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
//内容详情--英文(不带标签)
String contentInfoNo = "In the "+category + " " + serialNumber+" you subscribed to, "+ sbStr.toString();
String contentInfoNo = "In the "+ serialNumber+" you subscribed to, "+ sbStr.toString();
//内容详情--英文(带标签)
String contentInfoYes = "In the "+category + " " + href+" you subscribed to, "+ sbStr.toString();
String contentInfoYes = "In the "+ href+" you subscribed to, "+ sbStr.toString();
String msgTitle = serialNumber + " you subscribed to has been updated";
//内容详情-中文(不带标签)
String sbStrCnTemp = sbStrCn.replaceAll("<text class='highlight-class'>", "").replaceAll("</text>", "");
String contentCnNo = "您所订阅的"+categoryCn+serialNumber+","+sbStrCnTemp;
String contentCnNo = "您所订阅的"+serialNumber+","+sbStrCnTemp;
//内容详情--中文(带标签)
String contentInfoCnReplace = sbStrCn.replaceAll("<text class='highlight-class'>","").replaceAll("</text>","");
String contentInfoCnYes ="您所订阅的"+categoryCn+href+","+contentInfoCnReplace;;
String contentInfoCnYes ="您所订阅的"+href+","+contentInfoCnReplace;;
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate,
msgTitle,
@@ -3715,9 +3695,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//订阅文档的飞书消息
try {
//英文消息
String contentInfoFei = "In the "+category + " " + serialNumber +" you subscribed to, "+ sbStr.toString();;
String contentInfoFei = "In the " + " " + serialNumber +" you subscribed to, "+ sbStr.toString();;
//中文消息
String contentInfoFeiCn ="您所订阅的"+categoryCn+ serialNumber +","+ sbStrCn.toString();;
String contentInfoFeiCn ="您所订阅的"+serialNumber +","+ sbStrCn.toString();;
//跳转文档详情
String url = backUrl + "/docManage/library/detail?id=" + id;
FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+2 -1
View File
@@ -2431,7 +2431,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
excelName = baseList.get(0).getName() + " Virtual list.xlsx";
}
//excel
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
String excelNameRep = excelName.replace('/', '、');
OutputStream excelOS = new FileOutputStream(path + File.separator + excelNameRep);
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/entity/ProjectLibraryBase.java
+19 -4
View File
@@ -156,12 +156,27 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
@Override
public int compareTo(ProjectLibraryBase o) {
return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序
// return o.id-this.id;//降序
if (!this.getProjectName().equals(o.getProjectName())) {
return this.getProjectName().compareTo(o.getProjectName());//升序
}
if (!this.getYearName().equals(o.getYearName())) {
if (this.getYearName().length() != o.getYearName().length()) {
return this.getYearName().length() - o.getYearName().length();
} else {
return this.getYearName().compareTo(o.getYearName());//升序
}
}
if (!this.getTargetMarket().equals(o.getTargetMarket())) {
return this.getTargetMarket().compareTo(o.getTargetMarket());//升序
}
if (!this.getProjectVersion().equals(o.getProjectVersion())) {
return Integer.valueOf(this.projectVersion) - Integer.valueOf(o.projectVersion);//升序
}
return 0;
}
public String getShowName(){
return projectName+yearName+targetMarket+projectVersion;
public String getShowName() {
return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion;
}
@Override
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5 -5
View File
@@ -10340,7 +10340,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String dueDate = null;
QueryWrapper<ProjectTaskInventoryEO> queryProjectTaskInventoryWrapper = new QueryWrapper<>();
queryProjectTaskInventoryWrapper.isNotNull("design_p_id");
queryProjectTaskInventoryWrapper.isNotNull("design_p_id").or().isNotNull("verify_p_id");
queryProjectTaskInventoryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryId);
List<ProjectTaskInventoryEO> list = projectTaskInventoryEOService.list(queryProjectTaskInventoryWrapper);
@@ -10359,8 +10359,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
} else if (FlowTypeEnum.PREHOMOQRLC.getValue().equals(projectTaskUrgVo.getType())) {
dueDate = sdf.format(lawsInventoryEO.getPrehomoDueDate());
if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getDesignStatus())
||DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getDesignStatus())) {
if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getPrehomoStatus())
||DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getPrehomoStatus())) {
if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
throw new JeroBootException(LAW_CN + "已经被确认，无法催办");
} else {
@@ -10372,8 +10372,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
} else if (FlowTypeEnum.YZFHXSCLC.getValue().equals(projectTaskUrgVo.getType())) {
dueDate = sdf.format(lawsInventoryEO.getVerifyDueDate());
if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getDesignStatus())
||DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getDesignStatus())) {
if (DesignComplianceStatusEnum.TO_REVIEW.getValue().equals(list.get(0).getVerifyStatus())
||DesignComplianceStatusEnum.REVIEW_COMPLETED.getValue().equals(list.get(0).getVerifyStatus())) {
if (CutEnum.CN.getValue().equals(projectTaskUrgVo.getCut())) {
throw new JeroBootException(LAW_CN + "已经被确认，无法催办");
} else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+33 -1
View File
@@ -216,6 +216,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
}
/**
* 项目扩展(添加子项目--子项目基本信息、相关人员名单、法规/认证任务计划与被扩展项目保持一致)
* @param projectLibraryBase
@@ -234,8 +236,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
projectLibraryBaseTemp.setExplanation(projectLibraryBase.getExplanation());
this.save(projectLibraryBaseTemp);
Date now = new Date();
//处理版本号排序问题，如果版本号插入到中间，后面版本数字顺眼
checkVersionOrder(id,projectLibraryBase.getProjectVersion(),projectId);
Date now = new Date();
//相关人员名单中添加数据
List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnelMapper.queryPageList(id,
DictCodeEnum.DUTY_TERRITORY.getValue(),
@@ -334,6 +338,33 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
}
}
/**
* 如果创建的子项目版本号重复，处理排序
* @param id
* @param version
* @param projectId
*/
private void checkVersionOrder(String id,String version,String projectId) {
LambdaQueryWrapper<ProjectLibraryBase> wrapperVer = new LambdaQueryWrapper<>();
//查找其他统计子版本项目
wrapperVer.eq(ProjectLibraryBase::getParentId, id);
wrapperVer.orderByAsc(ProjectLibraryBase::getProjectVersion);
List<ProjectLibraryBase> clist = this.list(wrapperVer);
int tmpInt = Integer.parseInt(version);
for (ProjectLibraryBase plb : clist) {
int ver = Integer.parseInt(plb.getProjectVersion());
if(!plb.getId().equals(projectId) && ver == tmpInt){
tmpInt++;
String verStr = String.valueOf(tmpInt);
if(verStr.length() <= 1){
verStr= "0" + verStr;
}
plb.setProjectVersion(verStr);
this.updateById(plb);
}
}
}
/**检查车型名称id,年款号,目标市场,版本同时存在,报错*/
public void checkExitData(ProjectLibraryBase projectLibraryBase){
@@ -412,6 +443,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
}
checkExitData(projectLibraryBase);
saveOrUpdate(projectLibraryBase);
checkVersionOrder(projectLibraryBase.getParentId(),projectLibraryBase.getProjectVersion(),projectLibraryBase.getId());
// 删除当前项目的studio与项目库 角色关系
QueryWrapper<ProjectLibraryRoleRelEO> deleteLibraryRoleRelWrapper = new QueryWrapper<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+6 -8
View File
@@ -117,7 +117,6 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
}
}
List<ProjectLibraryBase> projectLibraryBaseLinkedList = new LinkedList<>();
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
if(StringUtils.isBlank(libraryBase.getParentId())){
@@ -131,13 +130,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
}
}
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
Collections.sort(projectLibraryBaseList);
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
targetMarket(projectLibraryBase, dictItemList, libraryBase);
Map<String,Object> mapList = new HashMap<>();
List<List<TimeNodeVO>> collect = new ArrayList<>();
List<List<TimeNodeVO>> collect;
if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList());
}else{
@@ -147,8 +146,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
if(collect.size() != 0){
index ++;
mapList.put("index",index);
mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion());
mapList.put("projectName",libraryBase.getShowName());
mapList.put("data",collect);
mapList.put("projectInfo",libraryBase);
result.add(mapList);
}
}
@@ -215,9 +215,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll);
projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper);
}
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
Collections.sort(projectLibraryBaseList);
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
//处理目标市场
targetMarket(projectLibraryBase, dictItemList, libraryBase);
@@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectVersion = "00";
}
Map<String,Object> map = new HashMap<>();
map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称
map.put("projectName",libraryBase.getShowName());//项目名称
map.put("targetMarket",libraryBase.getTargetMarket());//目标市场
//1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java
+4 -5
View File
@@ -56,11 +56,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
*/
@Override
public void editById(ProjectTaskPlanning projectTaskPlanning) {
Date now = new Date();
projectTaskPlanning.setUpdateTime(now);
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
projectTaskPlanning.setUpdateBy(sysUser.getUsername());
saveOrUpdate(projectTaskPlanning);
if (null != projectTaskPlanning && StringUtils.isNotEmpty(projectTaskPlanning.getId())) {
deleteById(projectTaskPlanning.getId());
add(projectTaskPlanning);
}
}
/**