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-05-31 09:36:41 +08:00
parent ff93603d5a d298554b3b
commit 8da0bb6b94
46 changed files with 1157 additions and 283 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
+65 -52
View File
@@ -2086,7 +2086,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String hrefTemp = backUrl + "/docManage/library/detail?id=" + idTemp;
String content = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
//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 standard "+ serialNumber +" has been updated.";
String contentInfo = "In the "+ technologyTerritoryName + " technical field you subscribed to, the standard "+ serialNumber +" has been updated.";
// String contentInfo = sysUser.getUsername() + " add " + serialNumber + ",Please pay attention to check.";
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
@@ -2455,11 +2455,66 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
.filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
List<String> fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
StringBuilder sbTemp = new StringBuilder();
StringBuilder sbContent = new StringBuilder();
StringBuilder sbContentInfo = new StringBuilder();
StringBuilder sbField = new StringBuilder();
StringBuilder sbNew = new StringBuilder();
dataList.get(0).entrySet().forEach(entry -> {
String keyTemp = entry.getKey();
if(fileFieldList.contains(keyTemp)) {
String valueTemp = (String) entry.getValue();
List<OnlCgformField> fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(keyTemp)).collect(Collectors.toList());
List<OSSFile> fileInfosTemp = iOSSFileService.getFileInfos(valueTemp);
//之前的文件
List<String> fileNameList = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
String value = (String) map.get(keyTemp);
List<OSSFile> fileInfosTempNew = iOSSFileService.getFileInfos(value);
//现在的文件
List<String> fileNameListNew = fileInfosTempNew.stream().map(OSSFile::getFileName).collect(Collectors.toList());
boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListNew);
if (!checkDiffrent && fileNameListNew.size() != 0) {
//消息
sbField.append(fields.get(0).getDbFieldEnName() + ",");
for (String s : fileNameListNew) {
if (!fileNameList.contains(s)) {
//消息详情
sbNew.append(fields.get(0).getDbFieldEnName() + " " + s + ",");
}
}
if (StringUtils.isNotBlank(sbField)) {
String substring = sbField.substring(0, sbField.length() - 1);
String content = substring;
}
if (StringUtils.isNotBlank(sbNew)) {
String substring = sbNew.substring(0, sbNew.length() - 1);
//Standard GB 7258 Uploaded Supplement File AA.dox, Release File BB.dox
String dbFieldEnName = fields.get(0).getDbFieldEnName();
String contentInfo = dbFieldEnName + " " + fileNameList + ",";
}
}
}
});
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
String href = "<a href='/docManage/library/detail?id=" + id +
"&title=" + title +
"&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn;
String contentFile = "";
String contentInfoFile = "";
if(StringUtils.isNotBlank(sbField)){
String substring = sbField.substring(0, sbField.length() - 1);
contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + substring;
}
if(StringUtils.isNotBlank(sbNew)){
String substring = sbNew.substring(0, sbNew.length() - 1);
contentInfoFile = category + " " + href + " uploaded " + substring;
}
//编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件
// String href = "<a href='/docManage/library/detail?id=" + id +
// "&title=" + title +
// "&serial_number=" + serialNumber + "'" + " target='_blank'>" + serialNumber + "</a>" + " " + titleEn;
StringBuilder msgContentSb = new StringBuilder();
StringBuilder msgContentInfoSb = new StringBuilder();
@@ -2480,46 +2535,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fileIdLIstTemp.addAll(Arrays.asList(value.split(",")));
}
}
List<String> fileIdLIst = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
//文件
if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){
fileIdLIst.addAll(Arrays.asList(value.split(",")));
}
}
//之前的文件
List<OSSFile> fileListTemp = new ArrayList<>();
if(fileIdLIstTemp.size() != 0){
fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,","));
}
List<String> fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList());
//编辑的文件
List<OSSFile> fileList = new ArrayList<>();
if(fileIdLIst.size() != 0){
fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,","));
}
List<String> fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList());
//删除的文件
List<String> deleteFileList = new ArrayList<>();
for (String fileName : fileNameListTemp) {
if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){
deleteFileList.add(fileName);
}
}
//上传的文件
List<String> upFileList = new ArrayList<>();
for (String fileName : fileNameList) {
if(!fileNameListTemp.contains(fileName)){
upFileList.add(fileName);
}
}
int count = 0;
for (Map.Entry<String, Object> entry : map.entrySet()) {
String key = entry.getKey();
String value = String.valueOf(entry.getValue());
@@ -2549,7 +2565,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
//适用车型 car_type
if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){
if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2")) && !"null".equals(value)){
count++;
//数据字典转换 dictItemList
List<SysDictItem> stateDictItemList = dictItemList.stream()
@@ -2585,15 +2601,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
}
}
if(upFileList.size() != 0){
count++;
msgContentSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
msgContentInfoSb.append("上传了" + StringUtils.join(upFileList,",") + ",");
if(StringUtils.isNotBlank(contentFile)){
count ++;
msgContentSb.append(contentFile);
}
if(deleteFileList.size() != 0){
count++;
msgContentSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
msgContentInfoSb.append("删除了" + StringUtils.join(deleteFileList,",") + ",");
if(StringUtils.isNotBlank(contentInfoFile)){
msgContentInfoSb.append(contentInfoFile);
}
if(count > 0){
String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1);
@@ -2976,11 +2989,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if (StringUtils.isNotBlank(sbStr.toString())) {
//您订阅的XXX已被修改
String content = "In the standard "+serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
String content = "In the "+serialNumber+" you subscribed to, has been modified,Please pay attention to check.";
// String content = sysUser.getUsername() + " update " + serialNumber + ",Please pay attention to check.";
//您订阅的GB 7258-2021 中,由张三将技术领域"车身"改为"车门"
String contentInfo = "In the standard "+serialNumber+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href+ sbStr.toString();
String contentInfo = "In the "+serialNumber+" you subscribed to, "+sysUser.getUsername()+" changed the "+ href+ sbStr.toString();
// String contentInfo = sysUser.getUsername() + " update " + href + sbStr.toString();
//封装消息的实体类
SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+3 -3
View File
@@ -174,7 +174,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**设计符合性确认-交付物类型*/
@Excel(name = "设计-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
// @Dict(dicCode ="deliverable_template")
private java.lang.String designDeliverableType;
@TableField(exist = false)
@@ -204,7 +204,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**prehomo确认-交付物类型*/
@Excel(name = "Prehomo-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "prehomo确认-交付物类型")
@Dict(dicCode ="deliverable_template")
// @Dict(dicCode ="deliverable_template")
private java.lang.String prehomoDeliverableType;
@TableField(exist = false)
private java.lang.String prehomoDeliverableTypeName;
@@ -233,7 +233,7 @@ public class DummyInventoryInfoEO implements Serializable {
/**验证符合性确认-交付物类型*/
@Excel(name = "验证-交付物类型", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
// @Dict(dicCode ="deliverable_template")
private java.lang.String verifyDeliverableType;
@TableField(exist = false)
private java.lang.String verifyDeliverableTypeName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java
+10 -10
View File
@@ -70,7 +70,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String serialNumber;
/**标题*/
@Excel(name = "title", width = 15)
@Excel(name = "Title", width = 15)
@ApiModelProperty(value = "标题")
private String title;
@@ -92,7 +92,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String shi4Yong4Fan4Wei2;
/**状态*/
@Excel(name = "state", width = 15,dicCode ="state")
@Excel(name = "State", width = 15,dicCode ="state")
@ApiModelProperty(value = "状态")
@Dict(dicCode ="state")
private String state;
@@ -171,7 +171,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String remark;
/**设计符合性确认-交付物类型*/
@Excel(name = "design-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Design-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "设计符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String designDeliverableType;
@@ -182,17 +182,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String designDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "design-Deliverable Template", width = 15)
@Excel(name = "Design-Deliverable Template", width = 15)
private String designDeliverableTemplateName;
/**设计符合性确认-发起人*/
@Excel(name = "design-Initiator", width = 15)
@Excel(name = "Design-Initiator", width = 15)
@ApiModelProperty(value = "设计符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String designInitiator;
/**设计符合性确认-责任人*/
@Excel(name = "design-Assignee", width = 15)
@Excel(name = "Design-Assignee", width = 15)
@ApiModelProperty(value = "设计符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String designDuty;
@@ -225,7 +225,7 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String prehomoDuty;
/**验证符合性确认-交付物类型*/
@Excel(name = "verify-Deliverables", width = 15,dicCode ="deliverable_template")
@Excel(name = "Verify-Deliverables", width = 15,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@Dict(dicCode ="deliverable_template")
private String verifyDeliverableType;
@@ -236,17 +236,17 @@ public class DummyInventoryInfoEOEn implements Serializable {
private String verifyDeliverableTemplate;
@TableField(exist = false)
@Excel(name = "verify-Deliverable Template", width = 15)
@Excel(name = "Verify-Deliverable Template", width = 15)
private String verifyDeliverableTemplateName;
/**验证符合性确认-发起人*/
@Excel(name = "verify-Initiator", width = 15)
@Excel(name = "Verify-Initiator", width = 15)
@ApiModelProperty(value = "验证符合性确认-发起人")
@Dict(dicCode ="fa1_qi3_ren2")
private String verifyInitiator;
/**验证符合性确认-责任人*/
@Excel(name = "verify-Assignee", width = 15)
@Excel(name = "Verify-Assignee", width = 15)
@ApiModelProperty(value = "验证符合性确认-责任人")
@Dict(dicCode ="ze2_ren4_ren2")
private String verifyDuty;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/DummyInventoryBaseFieldEnum.java
+1 -1
View File
@@ -17,7 +17,7 @@ public enum DummyInventoryBaseFieldEnum {
APPLICABLE_SUPPLEMENT("适用增补件", "applicable_supplement","Applicable Supplement"),
REMARK("备注", "remark","Comments"),
DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"),
DELIVERABLE_TEMPLATE("交付物类型", "jiao1_fu4_wu4_lei4_xing2","Type of deliverables"),
FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"),
ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+219 -53
View File
@@ -28,6 +28,8 @@ import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
import com.jero.modules.dummy.service.IDummyReadEOService;
import com.jero.modules.dummy.util.ListDiff;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.system.entity.SysAnnouncement;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem;
@@ -85,7 +87,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
private SysDictItemMapper sysDictItemMapper;
@Autowired
private DummyContentChangeEOMapper dummyContentChangeEOMapper;
@Autowired
private IOSSFileService iOSSFileService;
/**
* 保存
*
@@ -426,8 +429,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
iDummyContentChangeEOService.saveBatch(list);
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
// private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
// String addSerialNumber,String deleteSerialNumber,String state,String cut) {
// private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
// String addSerialNumber,String deleteSerialNumber,String state,String cut) {
}else {
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败");
@@ -448,7 +451,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//翻译成中文名
public void disposeData(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
@@ -467,6 +470,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setApplicableSupplement("空");
}
//技术领域
Set<String> technologyTerritorySet = new HashSet<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
technologyTerritorySet.addAll(list);
@@ -587,29 +591,85 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
dummyInventoryInfoEO.setDesignDeliverableType("空");
designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getName() + ",");
}
}
String designName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designName = designBuilder.substring(0, designBuilder.length() - 1);
}
dummyInventoryInfoEO.setDesignDeliverableTypeName(designName);
} else {
dummyInventoryInfoEO.setDesignDeliverableTypeName("空");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
dummyInventoryInfoEO.setPrehomoDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getName() + ",");
}
}
String prehomoName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoName);
} else {
dummyInventoryInfoEO.setPrehomoDeliverableTypeName("空");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
dummyInventoryInfoEO.setVerifyDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getName() + ",");
}
}
String verifyName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyName);
} else {
dummyInventoryInfoEO.setVerifyDeliverableTypeName("空");
}
//发起人
List<SysDictItem> fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue());
//设计符合性确认-发起人
@@ -657,12 +717,63 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}else {
dummyInventoryInfoEO.setVerifyDuty("空");
}
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
dummyInventoryInfoEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
}
}
private String getFileName(List<OSSFile> fileInfos, String deliverableTemplate){
StringBuilder sb = new StringBuilder();
for (String s : deliverableTemplate.split(",")) {
List<OSSFile> collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList());
sb.append(collect.get(0).getFileName() + ",");
}
String sbStr = "";
if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){
sbStr = sb.substring(0, sb.length() - 1);
}
return sbStr;
}
//翻译成英文名
public void disposeDataToEn(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
@@ -681,6 +792,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setApplicableSupplement("null");
}
//技术领域
Set<String> technologyTerritorySet = new HashSet<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
technologyTerritorySet.addAll(list);
@@ -799,27 +911,81 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName);
}else {
dummyInventoryInfoEO.setDesignDeliverableType("null");
designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getEnName() + ",");
}
}
String designEnName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designEnName = designBuilder.substring(0, designBuilder.length() - 1);
}
dummyInventoryInfoEO.setDesignDeliverableTypeName(designEnName);
} else {
dummyInventoryInfoEO.setDesignDeliverableTypeName("null");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName);
}else {
dummyInventoryInfoEO.setPrehomoDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getEnName() + ",");
}
}
String prehomoEnName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoEnName);
} else {
dummyInventoryInfoEO.setPrehomoDeliverableTypeName("null");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(","));
dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName);
}else {
dummyInventoryInfoEO.setVerifyDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getEnName() + ",");
}
}
String verifyEnName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyEnName);
} else {
dummyInventoryInfoEO.setVerifyDeliverableTypeName("null");
}
//发起人
@@ -956,7 +1122,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
for (Map<String, String> infoDiff : infoDiffList) {
if (infoDiff.size() > 1) {
contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog);
contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog);
}
}
}
@@ -974,10 +1140,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
}else{
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
}
}
@@ -1148,10 +1314,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
//设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = "list.get(1)";
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
@@ -1160,8 +1326,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//设计符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1196,8 +1362,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1208,8 +1374,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//prehomo确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1244,8 +1410,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
@@ -1256,8 +1422,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
}
}
//验证符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+6 -6
View File
@@ -206,14 +206,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
infoDiffList.add(infoDiff);
List<Map<String,String>> infoDiffListEn = new ArrayList<>();
infoDiffListEn.add(infoDiffEn);
if(infoDiff.size()>1) {
contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog);
enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null);
contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog);
enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null);
dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue());
dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue());
}
}
/**
* 通过id删除
*
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java
+5 -2
View File
@@ -29,7 +29,8 @@ public class ListDiff <T> {
&& !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1")
&& !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName")
&& !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode")
&& !f.getName().equals("roleName")
&& !f.getName().equals("roleName") && !f.getName().equals("verifyDeliverableType")&& !f.getName().equals("designDeliverableType")
&& !f.getName().equals("prehomoDeliverableType")
){
StringBuilder v1String= new StringBuilder(String.valueOf(v1));
@@ -42,7 +43,9 @@ public class ListDiff <T> {
// }
if(f.getName().contains("erritory") || f.getName().contains("emplate")
|| f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region")
|| f.getName().equals("applyScope")){
|| f.getName().equals("applyScope") || f.getName().contains("DeliverableType")
){
result.put(f.getName(), v1String.append("|").append(v2String).toString());
}else {
//
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
//所有的图表(state=0)
LambdaQueryWrapper<HomeFunctionModuleEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(HomeFunctionModuleEO::getState,"0");
wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy);
List<HomeFunctionModuleEO> homeFunctionModuleEOList = this.list(wrapper);
//当前用户配置的图表
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
+38 -8
View File
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.base.controller.JeroController;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.ocr.entity.OcrRecordEO;
@@ -82,18 +83,42 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
@PostMapping(value = "/syncToDocument")
@RequiresPermissions("ocr:ocrRecord:syncToDocument")
public Result<?> syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) {
String cut = ocrRecordEO.getCut();
if(StringUtils.isBlank(ocrRecordEO.getConnectId())){
return Result.error("同步失败");
if (CutEnum.CN.getValue().equals(cut)) {
return Result.error("同步失败！");
} else {
return Result.error("sync failure!");
}
}
// 文档库删了识别的pdf文件时
LambdaQueryWrapper<OSSFile> pdfFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
pdfFileLambdaQueryWrapper.eq(OSSFile::getConnectId, ocrRecordEO.getConnectId());
List<OSSFile> pdfFiles = ossFileService.list(pdfFileLambdaQueryWrapper);
if (CollectionUtil.isEmpty(pdfFiles)) {
if (CutEnum.CN.getValue().equals(cut)) {
return Result.error("文档库已不存在转换前的pdf文件，同步失败！");
} else {
return Result.error("Document Library no longer existed before the conversion of PDF files, synchronization fails!");
}
}
//查询doc文件的id
LambdaQueryWrapper<OSSFile> ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
ossFileLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName());
List<OSSFile> ossFiles = ossFileService.list(ossFileLambdaQueryWrapper);
if (CollectionUtil.isEmpty(ossFiles)) {
return Result.error("没有可同步的文件");
LambdaQueryWrapper<OSSFile> docLambdaQueryWrapper = new LambdaQueryWrapper<>();
docLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName());
List<OSSFile> docFiles = ossFileService.list(docLambdaQueryWrapper);
if (CollectionUtil.isEmpty(docFiles)) {
if (CutEnum.CN.getValue().equals(cut)) {
return Result.error("转换后的word文件不存在，同步失败！");
} else {
return Result.error("Converted Word file does not exist, the synchronization fails!");
}
}
OSSFile ossFile = new OSSFile();
String docFileId = ossFiles.get(0).getId();
String docFileId = docFiles.get(0).getId();
ossFile.setId(docFileId);
ossFile.setConnectId(ocrRecordEO.getConnectId());
ossFileService.updateById(ossFile);
@@ -104,7 +129,12 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
updateOcrRecordEO.setSyncState(FileSyncStateEnum.SYNC_YES.getValue());
ocrRecordService.editById(updateOcrRecordEO);
return Result.OK("同步成功", ossFile);
if (CutEnum.CN.getValue().equals(cut)) {
return Result.OK("同步成功！", ossFile);
} else {
return Result.OK("sync success!", ossFile);
}
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/entity/OcrRecordEO.java
+4
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -123,6 +124,7 @@ public class OcrRecordEO implements Serializable {
/**同步状态*/
@Excel(name = "同步状态", width = 15)
// @Dict(dicCode = "sync_state")
@ApiModelProperty(value = "同步状态")
private String syncState;
@@ -140,4 +142,6 @@ public class OcrRecordEO implements Serializable {
private String jsonRealFile;
@TableField(exist = false)
private String fileSource; //文件来源：0-上传 1-导入
@TableField(exist = false)
private String cut;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java
+6
View File
@@ -54,9 +54,15 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
@Override
public List<NcrTrackVO> getPageInfo(NcrTrackVO ncrTrackVO) {
if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){
if(ncrTrackVO.getSerialNumber().contains("%")){
ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%"));
}
ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*",""));
}
if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){
if(ncrTrackVO.getTitle().contains("%")){
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("%","/%"));
}
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
}
List<SysUser> sysUserList = sysUserService.list();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+279 -57
View File
@@ -382,9 +382,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId()));
List<ProjectLawsInventoryEO> dataListCopy = DeepCopyListUtil.depCopy(dataList);
LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper = new LambdaUpdateWrapper<>();
setDateNull(projectLawsInventoryEO, updateWrapper);
//保存
saveOrUpdate(projectLawsInventoryEO);
this.update(projectLawsInventoryEO,updateWrapper);
// saveOrUpdate(projectLawsInventoryEO);
//翻译-中文
translateData(infoEOList);
@@ -412,6 +414,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
private void setDateNull(ProjectLawsInventoryEO projectLawsInventoryEO, LambdaUpdateWrapper<ProjectLawsInventoryEO> updateWrapper) {
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){
updateWrapper.set(ProjectLawsInventoryEO::getImplementTime,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null);
}
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){
updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null);
}
}
/**
* 更新流程信息
* @param projectLawsInventoryEO
@@ -1558,12 +1578,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
@Override
public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) {/////
if(org.apache.commons.lang3.StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = new ArrayList<>();
for (String id : projectLawsInventoryEO.getIds().split(",")) {
ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO();
@@ -1584,6 +1598,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){
projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory());
}
//在产车实施日期implementTime
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
}
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
projectLawsInventoryEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
}
//适用地区region
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
}
//设计符合性确认截止时间
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate());
@@ -1600,6 +1626,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.updateBatchById(projectLawsInventoryEOList);
//根据id查询数据库中完整信息,翻译
List<String> idList = Arrays.asList(projectLawsInventoryEO.getIds().split(","));
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> infoList = list(queryWrapper.in("id", idList));
String projectLibraryId = infoList.get(0).getProjectLibraryId();
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
@@ -1725,9 +1756,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
}
}
projectLawsInventoryEOList.add(projectLawsInventoryEOTemp);
}
this.updateBatchById(projectLawsInventoryEOList);
contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1);
enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1);
@@ -1830,27 +1859,83 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
//交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
projectLawsInventoryEO.setDesignDeliverableType("空");
designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getName() + ",");
}
}
String designName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designName = designBuilder.substring(0, designBuilder.length() - 1);
}
projectLawsInventoryEO.setDesignDeliverableTypeName(designName);
} else {
projectLawsInventoryEO.setDesignDeliverableTypeName("空");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
projectLawsInventoryEO.setPrehomoDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getName() + ",");
}
}
String prehomoName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoName);
} else {
projectLawsInventoryEO.setPrehomoDeliverableTypeName("空");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
projectLawsInventoryEO.setVerifyDeliverableType("空");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getName() + ",");
}
}
String verifyName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyName);
} else {
projectLawsInventoryEO.setVerifyDeliverableTypeName("空");
}
@@ -1989,6 +2074,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else {
projectLawsInventoryEO.setVerifyDueDateString("空");
}
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
}
}
@@ -2089,27 +2216,82 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
//交付物类型
Set<String> deliverableTypeSet = new HashSet<>();
List<String> designDeliverableTypeIdList= new ArrayList<>();
List<String> prehomoDeliverableTypeIdList = new ArrayList<>();
List<String> verifyDeliverableTypeIdList = new ArrayList<>();
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
projectLawsInventoryEO.setDesignDeliverableType("null");
designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(","));
deliverableTypeSet.addAll(designDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(","));
deliverableTypeSet.addAll(prehomoDeliverableTypeIdList);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(","));
deliverableTypeSet.addAll(verifyDeliverableTypeIdList);
}
//树形结构
List<SysCategory> deliverableTypeList = new ArrayList<>();
if (deliverableTypeSet.size() != 0) {
LambdaQueryWrapper<SysCategory> wrapper = new LambdaQueryWrapper<>();
wrapper.in(SysCategory::getId, deliverableTypeSet);
deliverableTypeList = sysCategoryService.list(wrapper);
}
//设计符合性确认-交付物类型
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
StringBuilder designBuilder = new StringBuilder();
for(String id : designDeliverableTypeIdList){
List<SysCategory> designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (designList.size() != 0) {
designBuilder.append(designList.get(0).getEnName() + ",");
}
}
String designEnName = null;
if (StringUtils.isNotBlank(designBuilder)) {
designEnName = designBuilder.substring(0, designBuilder.length() - 1);
}
projectLawsInventoryEO.setDesignDeliverableTypeName(designEnName);
} else {
projectLawsInventoryEO.setDesignDeliverableTypeName("null");
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
projectLawsInventoryEO.setPrehomoDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
StringBuilder prehomoBuilder = new StringBuilder();
for(String id : prehomoDeliverableTypeIdList){
List<SysCategory> prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (prehomoList.size() != 0) {
prehomoBuilder.append(prehomoList.get(0).getEnName() + ",");
}
}
String prehomoEnName = null;
if (StringUtils.isNotBlank(prehomoBuilder )) {
prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1);
}
projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoEnName);
} else {
projectLawsInventoryEO.setPrehomoDeliverableTypeName("null");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
projectLawsInventoryEO.setVerifyDeliverableType("null");
if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
StringBuilder verifyBuilder = new StringBuilder();
for(String id : verifyDeliverableTypeIdList){
List<SysCategory> verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList());
if (verifyList.size() != 0) {
verifyBuilder.append(verifyList.get(0).getEnName() + ",");
}
}
String verifyEnName = null;
if (StringUtils.isNotBlank(verifyBuilder)) {
verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1);
}
projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyEnName);
} else {
projectLawsInventoryEO.setVerifyDeliverableTypeName("null");
}
@@ -2248,6 +2430,47 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}else {
projectLawsInventoryEO.setVerifyDueDateString("null");
}
//文件
List<String> deliverableList = new ArrayList<>();
//设计符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(",")));
}
// Prehomo确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(",")));
}
// 验证符合性确认交付物模板
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(",")));
}
List<OSSFile> fileInfos = new ArrayList<>();
if(deliverableList.size() != 0){
fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ","));
}
//交付物类型模板
if(fileInfos.size() != 0){
if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName);
}
}
if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){
String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate());
if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){
projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName);
}
}
}
}
}
@@ -4272,13 +4495,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableType").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4332,13 +4555,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableType").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4393,13 +4616,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(","));
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableType").split(","));
List<String> listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|"));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
@@ -4452,15 +4675,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";
}
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}
}
contentLog = contentLog.substring(0, contentLog.length()-1);
enContentLog =enContentLog.substring(0, enContentLog.length()-1);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
}
//表格高度
private static int high = 25;
//表格宽度
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+3
View File
@@ -108,4 +108,7 @@ public class SarFileSplitInfoEO implements Serializable {
@TableField(exist = false)
private String cut;
@TableField(exist = false)
private String documentId;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+8
View File
@@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.document.enums.FieldTypeEnum;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -57,6 +58,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
private FileSpiltService fileSpiltService;
@Autowired
private ISarFileSplitMenuEOService sarFileSplitMenuEOService;
@Autowired
private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
/**
@@ -258,6 +261,11 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
// splitInfoEO.setFileType(enMap.get(splitInfoEO.getFileType()));
splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
}
// 处理文档库id字段 根据编号和标题查询
List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());
if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) {
splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString());
}
if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {
splitInfoEO.setFlag("1");
}else{