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:
liyawei
2022-05-17 11:27:29 +08:00
parent cfedebd12d cc350fa830
commit 2e877d4322
8 changed files with 430 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyLogEOController.java
+14 -12
View File
@@ -1,25 +1,26 @@
package com.jero.modules.dummy.controller; package com.jero.modules.dummy.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.dummy.entity.DummyLogEO;
import com.jero.modules.dummy.service.IDummyLogEOService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.dummy.entity.DummyLogEO;
import com.jero.modules.dummy.service.IDummyLogEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletRequest;
import com.jero.common.aspect.annotation.AutoLog; import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/** /**
@@ -53,6 +54,7 @@ public class DummyLogEOController extends JeroController<DummyLogEO, IDummyLogEO
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<DummyLogEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyLogEO, req.getParameterMap()); QueryWrapper<DummyLogEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyLogEO, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<DummyLogEO> page = new Page<DummyLogEO>(pageNo, pageSize); Page<DummyLogEO> page = new Page<DummyLogEO>(pageNo, pageSize);
IPage<DummyLogEO> pageList = dummyLogEOService.page(page, queryWrapper); IPage<DummyLogEO> pageList = dummyLogEOService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+270 -180
View File
@@ -281,133 +281,133 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo); List<DummyContentChangeEO> dummyContentChangeEOInfoList = iDummyContentChangeEOService.list(wrapperInfo);
if(CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)){ if(CollectionUtils.isNotEmpty(dummyContentChangeEOInfoList)){
//3.对比基础表数据 //3.对比基础表数据
//3.1截止到现在发布,期间修改的数据(基础) //3.1截止到现在发布,期间修改的数据(基础)
//最新的数据为-->dummyInventoryBaseEOList //最新的数据为-->dummyInventoryBaseEOList
//3.2基础表数据对比 //3.2基础表数据对比
String baseCJ=dummyContentChangeEOBaseList.get(0).getContentJson(); String baseCJ=dummyContentChangeEOBaseList.get(0).getContentJson();
List<DummyInventoryBaseEO> baseCJList = JSONArray.parseArray(baseCJ, DummyInventoryBaseEO.class);//json转list List<DummyInventoryBaseEO> baseCJList = JSONArray.parseArray(baseCJ, DummyInventoryBaseEO.class);//json转list
//对比,获取值不同的字段 //对比,获取值不同的字段
Map<String, String> baseDiff = null; Map<String, String> baseDiff = null;
for(int i=0;i< baseCJList.size();i++) { for(int i=0;i< baseCJList.size();i++) {
baseCJList.get(i); baseCJList.get(i);
dummyInventoryBaseEOList.get(i); dummyInventoryBaseEOList.get(i);
baseDiff = ListDiff.compareObject(baseCJList.get(i), dummyInventoryBaseEOList.get(i)); baseDiff = ListDiff.compareObject(baseCJList.get(i), dummyInventoryBaseEOList.get(i));
} }
//4.对比详情表数据 //4.对比详情表数据
//4.1截止到现在发布,期间修改的数据(详情) //4.1截止到现在发布,期间修改的数据(详情)
//现在的数据为-->dummyInventoryInfoEOList //现在的数据为-->dummyInventoryInfoEOList
//4.2详情表数据(一条基础数据可能对应多个详情数据---一对多) //4.2详情表数据(一条基础数据可能对应多个详情数据---一对多)
//数据库里原来的详情数据 //数据库里原来的详情数据
String addSerialNumber=null; String addSerialNumber=null;
String deleteSerialNumber=null; String deleteSerialNumber=null;
List<String> addSerialNumberList =null; List<String> addSerialNumberList =null;
List<String> deleteSerialNumberList =null; List<String> deleteSerialNumberList =null;
//获取数据库里保存的json //获取数据库里保存的json
String infoCJ = dummyContentChangeEOInfoList.get(0).getContentJson(); String infoCJ = dummyContentChangeEOInfoList.get(0).getContentJson();
List<DummyInventoryInfoEO> infoCJList = JSONArray.parseArray(infoCJ, DummyInventoryInfoEO.class);//json转list List<DummyInventoryInfoEO> infoCJList = JSONArray.parseArray(infoCJ, DummyInventoryInfoEO.class);//json转list
//翻译字典code值 //翻译字典code值
disposeData(dummyInventoryInfoEOList); disposeData(dummyInventoryInfoEOList);
//获取数据库和传入同时存在的编号 //获取数据库和传入同时存在的编号
//获取两个的编号 //获取两个的编号
List<String> infoCJBaseSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); List<String> infoCJBaseSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList());
List<String> dummyInventoryInfoEOSerialNumberList = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); List<String> dummyInventoryInfoEOSerialNumberList = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList());
List<DummyInventoryInfoEO> sameDummyInventoryInfoEOList = new ArrayList<>(); List<DummyInventoryInfoEO> sameDummyInventoryInfoEOList = new ArrayList<>();
List<DummyInventoryInfoEO> sameinfoCJList = new ArrayList<>(); List<DummyInventoryInfoEO> sameinfoCJList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(dummyInventoryInfoEOSerialNumberList)) { if (CollectionUtils.isNotEmpty(dummyInventoryInfoEOSerialNumberList)) {
//查询共有编号 //查询共有编号
List<String> sameSerialNumberList = infoCJBaseSerialNumberList.stream().filter(t -> dummyInventoryInfoEOSerialNumberList.contains(t)).collect(Collectors.toList()); List<String> sameSerialNumberList = infoCJBaseSerialNumberList.stream().filter(t -> dummyInventoryInfoEOSerialNumberList.contains(t)).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(sameSerialNumberList)) { if(CollectionUtils.isNotEmpty(sameSerialNumberList)) {
for (String sameSerialNumber : sameSerialNumberList) { for (String sameSerialNumber : sameSerialNumberList) {
//查询传入里包含共有编号的数据 //查询传入里包含共有编号的数据
DummyInventoryInfoEO sameInfoEO = dummyInventoryInfoEOList.stream().filter(e->e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0); DummyInventoryInfoEO sameInfoEO = dummyInventoryInfoEOList.stream().filter(e->e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
sameDummyInventoryInfoEOList.add(sameInfoEO); sameDummyInventoryInfoEOList.add(sameInfoEO);
//查询数据库里包含共有编号的数据 //查询数据库里包含共有编号的数据
DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0); DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0);
sameinfoCJList.add(sameInfoCJ); sameinfoCJList.add(sameInfoCJ);
}
} }
} }
}
//4.2.1处理现原共有有详情数据不同值字段 //4.2.1处理现原共有有详情数据不同值字段
Map<String, String> infoDiff = null; Map<String, String> infoDiff = null;
List<Map<String, String>> infoDiffList=new ArrayList<>(); List<Map<String, String>> infoDiffList=new ArrayList<>();
for (int i = 0; i < sameinfoCJList.size(); i++) { for (int i = 0; i < sameinfoCJList.size(); i++) {
infoDiff = ListDiff.compareObject(sameinfoCJList.get(i), sameDummyInventoryInfoEOList.get(i)); infoDiff = ListDiff.compareObject(sameinfoCJList.get(i), sameDummyInventoryInfoEOList.get(i));
if (MapUtils.isNotEmpty(infoDiff)) { if (MapUtils.isNotEmpty(infoDiff)) {
if(infoDiff.size() > 1) { if(infoDiff.size() > 1) {
infoDiffList.add(infoDiff); infoDiffList.add(infoDiff);
}
} }
} }
}
//4.2.2处理新增数据 //4.2.2处理新增数据
List<String> infoCJSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); List<String> infoCJSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList());
for (DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) { for (DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) {
addSerialNumberList = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId())) addSerialNumberList = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId()))
.map(f -> f.getSerialNumber()).collect(Collectors.toList()); .map(f -> f.getSerialNumber()).collect(Collectors.toList());
}
//去掉发布时传入的和数据库同时有的数据
for(String midSerialNumber:infoCJSerialNumberList){
addSerialNumberList.remove(midSerialNumber);
}
addSerialNumber =StringUtils.join(addSerialNumberList,",");
//4.2.3处理删除的数据
for (DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) {
deleteSerialNumberList = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId()))
.map(f -> f.getSerialNumber()).collect(Collectors.toList());
}
for(String midSerialNumber:deleteSerialNumberList){
infoCJSerialNumberList.remove(midSerialNumber);
}
deleteSerialNumber=StringUtils.join(infoCJSerialNumberList,",");
//列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理
if(MapUtils.isNotEmpty(baseDiff) || CollectionUtils.isNotEmpty(infoDiffList)
|| StringUtils.isNotEmpty(addSerialNumber) || StringUtils.isNotEmpty(deleteSerialNumber)) {
//向订阅该领域管理的人发消息和飞书
sendMsg(baseDiff, dummyContentChangeEOBaseList.get(0).getConnectId(), infoDiffList, addSerialNumber, deleteSerialNumber,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
Date now=new Date();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//5.数据对比完成后.更新之前保存的dummy_inventory_info中的content_json数据,重新保存最新的数据
if(MapUtils.isNotEmpty(baseDiff)){//列表有不同字段
String base = JSONArray.toJSONString(dummyInventoryBaseEOList);
UpdateWrapper<DummyContentChangeEO> baseUpdateWrapper=new UpdateWrapper<>();
baseUpdateWrapper.set("content_json",base)
.set("update_by",sysUser.getUsername())
.set("update_time",now)
.eq("connect_id",dummyInventoryBaseEOList.get(0).getId());
dummyContentChangeEOMapper.update(null,baseUpdateWrapper);
} }
if(CollectionUtils.isNotEmpty(infoDiffList) || StringUtils.isNotEmpty(addSerialNumber) //去掉发布时传入的和数据库同时有的数据
|| StringUtils.isNotEmpty(deleteSerialNumber)){//维护清单有不同字段,addSerialNumber,deleteSerialNumber也有数据 for(String midSerialNumber:infoCJSerialNumberList){
String info = JSONArray.toJSONString(dummyInventoryInfoEOList); addSerialNumberList.remove(midSerialNumber);
UpdateWrapper<DummyContentChangeEO> infoUpdateWrapper=new UpdateWrapper<>();
infoUpdateWrapper.set("content_json",info)
.set("update_by",sysUser.getUsername())
.set("update_time",now)
.eq("parent_id",dummyInventoryBaseEOList.get(0).getId());
dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
} }
} addSerialNumber =StringUtils.join(addSerialNumberList,",");
}else{
//4.2.3处理删除的数据
for (DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) {
deleteSerialNumberList = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId()))
.map(f -> f.getSerialNumber()).collect(Collectors.toList());
}
for(String midSerialNumber:deleteSerialNumberList){
infoCJSerialNumberList.remove(midSerialNumber);
}
deleteSerialNumber=StringUtils.join(infoCJSerialNumberList,",");
//列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理
if(MapUtils.isNotEmpty(baseDiff) || CollectionUtils.isNotEmpty(infoDiffList)
|| StringUtils.isNotEmpty(addSerialNumber) || StringUtils.isNotEmpty(deleteSerialNumber)) {
//向订阅该领域管理的人发消息和飞书
sendMsg(baseDiff, dummyContentChangeEOBaseList.get(0).getConnectId(), infoDiffList, addSerialNumber, deleteSerialNumber,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
Date now=new Date();
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//5.数据对比完成后.更新之前保存的dummy_inventory_info中的content_json数据,重新保存最新的数据
if(MapUtils.isNotEmpty(baseDiff)){//列表有不同字段
String base = JSONArray.toJSONString(dummyInventoryBaseEOList);
UpdateWrapper<DummyContentChangeEO> baseUpdateWrapper=new UpdateWrapper<>();
baseUpdateWrapper.set("content_json",base)
.set("update_by",sysUser.getUsername())
.set("update_time",now)
.eq("connect_id",dummyInventoryBaseEOList.get(0).getId());
dummyContentChangeEOMapper.update(null,baseUpdateWrapper);
}
if(CollectionUtils.isNotEmpty(infoDiffList) || StringUtils.isNotEmpty(addSerialNumber)
|| StringUtils.isNotEmpty(deleteSerialNumber)){//维护清单有不同字段,addSerialNumber,deleteSerialNumber也有数据
String info = JSONArray.toJSONString(dummyInventoryInfoEOList);
UpdateWrapper<DummyContentChangeEO> infoUpdateWrapper=new UpdateWrapper<>();
infoUpdateWrapper.set("content_json",info)
.set("update_by",sysUser.getUsername())
.set("update_time",now)
.eq("parent_id",dummyInventoryBaseEOList.get(0).getId());
dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
}
}
}else{
if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
throw new JeroBootException("维护清单为空,发布失败"); throw new JeroBootException("维护清单为空,发布失败");
}else{ }else{
@@ -456,7 +456,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
dummyInventoryInfoEO.setTechnologyTerritoryName(technologyTerritoryName); dummyInventoryInfoEO.setTechnologyTerritoryName(technologyTerritoryName);
}else{ }else{
dummyInventoryInfoEO.setTechnologyTerritoryName("空"); dummyInventoryInfoEO.setTechnologyTerritoryName("空");
} }
//适用范围 //适用范围
@@ -639,7 +639,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
content = "The " + baseName + " virtual list you subscribed to has been updated."; content = "The " + baseName + " virtual list you subscribed to has been updated.";
contentInfo = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n"; contentInfo = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n";
//拼接维护清单的消息 //拼接维护清单的消息
contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,idTemp); contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
}else{//撤回的消息 }else{//撤回的消息
content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note."; content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
@@ -660,9 +660,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
} }
//拼接维护清单的消息 //拼接维护清单的消息
public String setContentInfo(String contentInfo, Map<String, String> baseDiff, List<Map<String, String>> infoDiffList public String setContentInfo(String contentInfo, Map<String, String> baseDiff, List<Map<String, String>> infoDiffList
, String addSerialNumber, String deleteSerialNumber,String idTemp) { , String addSerialNumber, String deleteSerialNumber,String contentLog) {
int row = 1; int row = 1;
String contentLog = null;
//设置虚拟清单列表的修改消息 //设置虚拟清单列表的修改消息
if(MapUtils.isNotEmpty(baseDiff)) { if(MapUtils.isNotEmpty(baseDiff)) {
//虚拟清单名称 //虚拟清单名称
@@ -703,188 +703,278 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
contentInfo += row + ". The serial Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; contentInfo += row + ". The serial Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
//技术领域 //技术领域
if (StringUtils.isNotBlank(infoDiff.get("technologyTerritoryName"))) { if (StringUtils.isNotBlank(infoDiff.get("technologyTerritoryName"))) {
List<String> list = Arrays.asList(infoDiff.get("technologyTerritoryName").split("\\|")); List<String> list = Arrays.asList(infoDiff.get("technologyTerritoryName").split("\\|"));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Technology territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Technology territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//新车型实施日期 //新车型实施日期
if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) { if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). The implementation date of new model has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). The implementation date of new model has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//在产车实施日期 //在产车实施日期
if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) { if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) {
List<String> list = Arrays.asList(infoDiff.get("implementTimeString").split(",")); List<String> list = Arrays.asList(infoDiff.get("implementTimeString").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Implement time has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Implement time has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//WVTA ID //WVTA ID
if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(",")); List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). WVTA ID has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). WVTA ID has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.WVTA_ID.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//子标题 //子标题
if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) {
List<String> list = Arrays.asList(infoDiff.get("subtitle").split(",")); List<String> list = Arrays.asList(infoDiff.get("subtitle").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//实施类别 //实施类别
if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
List<String> list = Arrays.asList(infoDiff.get("implementType").split(",")); List<String> list = Arrays.asList(infoDiff.get("implementType").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Implement type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Implement type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//认证类型 //认证类型
if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationType").split(",")); List<String> list = Arrays.asList(infoDiff.get("attestationType").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Attestation type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Attestation type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//认证级别 //认证级别
if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) { if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(",")); List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Attestation rank has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Attestation rank has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//责任领域 //责任领域
if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) { if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split(",")); List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
// List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Duty territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Duty territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//备注 //备注
if (StringUtils.isNotBlank(infoDiff.get("remark"))) { if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
List<String> list = Arrays.asList(infoDiff.get("remark").split(",")); List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Remark has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Remark has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.REMARK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//设计符合性确认-交付物类型 //设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) { if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Design deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Design deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//设计符合性确认-交付物模板 //设计符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) { if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Design deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Design deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//设计符合性确认-发起人 //设计符合性确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) { if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) {
List<String> list = Arrays.asList(infoDiff.get("designInitiator").split(",")); List<String> list = Arrays.asList(infoDiff.get("designInitiator").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Design initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Design initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//设计符合性确认-责任人 //设计符合性确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) { if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) {
List<String> list = Arrays.asList(infoDiff.get("designDuty").split(",")); List<String> list = Arrays.asList(infoDiff.get("designDuty").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Design duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Design duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.DESIGN_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//prehomo确认-交付物类型 //prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Prehomo deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Prehomo deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//prehomo确认-交付物模板 //prehomo确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Prehomo deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Prehomo deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//prehomo确认-发起人 //prehomo确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoInitiator").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoInitiator").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Prehomo initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Prehomo initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//prehomo确认-责任人 //prehomo确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) { if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDuty").split(",")); List<String> list = Arrays.asList(infoDiff.get("prehomoDuty").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Prehomo duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Prehomo duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//验证符合性确认-交付物类型 //验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Verify deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Verify deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//验证符合性确认-交付物模板 //验证符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Verify deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Verify deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//验证符合性确认-发起人 //验证符合性确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyInitiator").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyInitiator").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Verify initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Verify initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
//验证符合性确认-责任人 //验证符合性确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) { if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDuty").split(",")); List<String> list = Arrays.asList(infoDiff.get("verifyDuty").split(","));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);//需要翻译 String infoDiffNew = list.get(1);
contentInfo += "(" + infoDiffRow + "). Verify duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; if (StringUtils.isBlank(contentLog)) {
infoDiffRow++; contentInfo += "(" + infoDiffRow + "). Verify duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
} else{
contentLog += DummyInventoryBaseFieldEnum.VERIFY_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
} }
row++; row++;
} }
} }
} }
if(StringUtils.isNotBlank(contentLog)) {
contentInfo = contentLog;
}
contentInfo.substring(0, contentInfo.length() - 1);
return contentInfo; return contentInfo;
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+26 -1
View File
@@ -20,6 +20,7 @@ import com.jero.modules.dummy.entity.DummyLogEO;
import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum;
import com.jero.modules.dummy.mapper.DummyInventoryInfoEOMapper; import com.jero.modules.dummy.mapper.DummyInventoryInfoEOMapper;
import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
import com.jero.modules.dummy.util.ListDiff;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.split.common.FileUnZip; import com.jero.modules.split.common.FileUnZip;
@@ -177,7 +178,31 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
public void editById(DummyInventoryInfoEO dummyInventoryInfoEO) { public void editById(DummyInventoryInfoEO dummyInventoryInfoEO) {
Date now = new Date(); Date now = new Date();
dummyInventoryInfoEO.setUpdateTime(now); dummyInventoryInfoEO.setUpdateTime(now);
saveOrUpdate(dummyInventoryInfoEO);
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"编辑了清单中的\""+dummyInventoryInfoEO.getSerialNumber()+"\",";
List<DummyInventoryInfoEO> infoEOList = new ArrayList<>();
infoEOList.add(dummyInventoryInfoEO);
//查询数据库里原来的数据
QueryWrapper<DummyInventoryInfoEO> queryWrapper = new QueryWrapper<>();
List<DummyInventoryInfoEO> dataList = list(queryWrapper.eq("id", dummyInventoryInfoEO.getId()));
saveOrUpdate(dummyInventoryInfoEO);
//翻译
dummyInventoryBaseEOService.disposeData(infoEOList);
dummyInventoryBaseEOService.disposeData(dataList);
//比对不同字段
Map<String, String> infoDiff = ListDiff.compareObject(dataList.get(0),dummyInventoryInfoEO);
//设置更新log
List<Map<String,String>> infoDiffList = new ArrayList<>();
infoDiffList.add(infoDiff);
contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog);
updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId());
} }
/** /**
jero-web/src/common/lang/en-us.js
+37 -36
View File
@@ -797,40 +797,41 @@ module.exports = {
red: 'red', red: 'red',
blue: 'blue', blue: 'blue',
yellow: 'yellow', yellow: 'yellow',
resultReported:'Result Reported', resultReported: 'Result Reported',
TheDoesNotContainData:'The maintenance list of the virtual list does not contain data', TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data',
number:'No', number: 'No',
Deadline:'Deadline', Deadline: 'Deadline',
toBeConfirmed:'To be confirmed', toBeConfirmed: 'To be confirmed',
designComplianceReview:'Confirm design conformance', designComplianceReview: 'Confirm design conformance',
preHomeConfirmation:'PreHomo confirmation', preHomeConfirmation: 'PreHomo confirmation',
verificationComplianceReview:'Verify conformance validation', verificationComplianceReview: 'Verify conformance validation',
Deployment:'Deployment', Deployment: 'Deployment',
pleaseDesignConformityConfirmation:'Please complete the data of design conformity confirmation', pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
pleaseConfirmedByPrehomo:'Please complete the data confirmed by prehomo', pleaseConfirmedByPrehomo: 'Please complete the data confirmed by prehomo',
pleaseConformityVerification:'Please complete the data of Conformity verification', pleaseConformityVerification: 'Please complete the data of Conformity verification',
virtualListDetails:'Virtual list details', virtualListDetails: 'Virtual list details',
maintainVirtualList:'Maintain virtual list', maintainVirtualList: 'Maintain virtual list',
reasonsForRejection:'Reasons for rejection', reasonsForRejection: 'Reasons for rejection',
inconformity:'Non-Compliance', inconformity: 'Non-Compliance',
toTrack:'To be tracked', toTrack: 'To be tracked',
Launch:'Launch', Launch: 'Launch',
maintainProgress:'Maintain', maintainProgress: 'Maintain',
redSchedule:'Red: not in conformity, and there is no acceptable scheme and schedule', redSchedule: 'Red: not in conformity, and there is no acceptable scheme and schedule',
yellowSchedule:'Yellow: non conformance / to be tracked, with acceptable scheme and schedule', yellowSchedule: 'Yellow: non conformance / to be tracked, with acceptable scheme and schedule',
greenRequirements:'Green: confirm that it meets or meets the current requirements', greenRequirements: 'Green: confirm that it meets or meets the current requirements',
blueUndeterminedState:'Blue: undetermined state', blueUndeterminedState: 'Blue: undetermined state',
authenticationMessage:'Authentication Message', authenticationMessage: 'Authentication Message',
accept:'Accept', accept: 'Accept',
notLaunch:'Not Launch', notLaunch: 'Not Launch',
refuse:'Refuse', refuse: 'Refuse',
taskTermination:'Task termination', taskTermination: 'Task termination',
projectStatusAndProgress:'Project status and progress', projectStatusAndProgress: 'Project status and progress',
listConfirmationProgress:'List confirmation progress', listConfirmationProgress: 'List confirmation progress',
taskConfirmationProgress:'Task confirmation progress', taskConfirmationProgress: 'Task confirmation progress',
designComplianceConfirmationProgress:'Design Compliance Confirmation Progress', designComplianceConfirmationProgress: 'Design Compliance Confirmation Progress',
preHomeConfirmProgress:'Pre-Home confirm progress', preHomeConfirmProgress: 'Pre-Home confirm progress',
verificationComplianceConfirmationProgress:'Verification compliance confirmation progress', verificationComplianceConfirmationProgress: 'Verification compliance confirmation progress',
totalTable:'Total', totalTable: 'Total',
newlyAdded:'Newly Added', newlyAdded: 'Newly Added',
applicableSupplement: 'Applicable Supplement'
} }
jero-web/src/common/lang/zh-cn.js
+25 -24
View File
@@ -56,7 +56,7 @@ module.exports = {
no: '没有任何', no: '没有任何',
click: '点击', click: '点击',
add: '添加', add: '添加',
newlyAdded:'新增', newlyAdded: '新增',
FilterMatching: '过滤条件匹配', FilterMatching: '过滤条件匹配',
AllMatching: '（所有条件都要求匹配）', AllMatching: '（所有条件都要求匹配）',
AnyOneMatches: '（条件中的任意一个匹配）', AnyOneMatches: '（条件中的任意一个匹配）',
@@ -815,27 +815,28 @@ module.exports = {
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据', pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据',
virtualListDetails:'虚拟清单详情', virtualListDetails: '虚拟清单详情',
maintainVirtualList:'维护虚拟清单', maintainVirtualList: '维护虚拟清单',
reasonsForRejection:'驳回原因', reasonsForRejection: '驳回原因',
inconformity:'不符合', inconformity: '不符合',
toTrack:'待追踪', toTrack: '待追踪',
Launch:'发起', Launch: '发起',
notLaunch:'未发起', notLaunch: '未发起',
maintainProgress:'维护进度', maintainProgress: '维护进度',
redSchedule:'红：不符合，且无可接受的方案和时间表', redSchedule: '红：不符合，且无可接受的方案和时间表',
yellowSchedule:'黄：不符合/待追踪，有可接受的方案和时间表', yellowSchedule: '黄：不符合/待追踪，有可接受的方案和时间表',
greenRequirements:'绿：确认符合或满足当前要求', greenRequirements: '绿：确认符合或满足当前要求',
blueUndeterminedState:'蓝：未判断状态', blueUndeterminedState: '蓝：未判断状态',
authenticationMessage:'认证消息', authenticationMessage: '认证消息',
accept:'接受', accept: '接受',
refuse:'拒绝', refuse: '拒绝',
taskTermination:'任务终止', taskTermination: '任务终止',
projectStatusAndProgress:'项目状态进度', projectStatusAndProgress: '项目状态进度',
listConfirmationProgress:'清单确认进度', listConfirmationProgress: '清单确认进度',
taskConfirmationProgress:'任务确认进度', taskConfirmationProgress: '任务确认进度',
designComplianceConfirmationProgress:'设计符合性确认进度', designComplianceConfirmationProgress: '设计符合性确认进度',
preHomeConfirmProgress:'Pre-Home确认进度', preHomeConfirmProgress: 'Pre-Home确认进度',
verificationComplianceConfirmationProgress:'验证符合性确认进度', verificationComplianceConfirmationProgress: '验证符合性确认进度',
totalTable:'总数', totalTable: '总数',
applicableSupplement: '适用增补件'
} }
jero-web/src/components/tableCollection/index.vue
+28 -4
View File
@@ -14,8 +14,21 @@
@onHeaderRow='onHeaderRow' @onHeaderRow='onHeaderRow'
> >
<span slot="operationbtn" slot-scope="record"> <span slot="operationbtn" slot-scope="record">
<span v-if='homo'>按钮 </span> <!-- 待发起收集 1-->
<span>{{ record }}</span> <!-- 待工程接口人处理 2-->
<!-- 工程接口人退回 3-->
<!-- 待填写 4-->
<!-- 填写人退回 5-->
<!-- 已提交 6-->
<!-- 认证工程师退回 7-->
<!-- 已同步至上报库 8-->
<!-- 变更 9-->
<span v-if='homo === 1'>
<!-- 认证工程师 -->
<!-- <span v-if='record.controlType == 1'>-->
<span @click='ondataValue'>{{ record.dataValue == null? '--': record.dataValue}}</span>
<!-- </span>-->
</span>
</span> </span>
<span slot="operation" slot-scope="record"> <span slot="operation" slot-scope="record">
<a v-for="(ol,index) in OperationList" <a v-for="(ol,index) in OperationList"
@@ -36,6 +49,10 @@
</span> </span>
</a-table> </a-table>
</div> </div>
<!-- 添加--->
<a-modal v-model="areaVisible" :title="$t('ParameterLibrary')" width='750px' :footer="null">
<!-- <parameter-library v-if='areaVisible' :paramsManifest='paramsManifest'/>-->
</a-modal>
</div> </div>
</template> </template>
@@ -86,13 +103,19 @@ export default {
homo: 0, // 认证工程师 homo: 0, // 认证工程师
sdt: 0, // 工程接口人 sdt: 0, // 工程接口人
dre: 0, // 填写人 dre: 0, // 填写人
areaVisible: false,
} }
}, },
mounted() {}, mounted() {
},
methods: { methods: {
onHeaderRow(column, index) { onHeaderRow(column, index) {
console.log(column, index) console.log(column, index)
}, },
ondataValue() {
this.areaVisible = true
console.log('ppp')
},
getLoginUserType() { getLoginUserType() {
let params = { let params = {
paramsManifestId: this.paramsManifest.id, paramsManifestId: this.paramsManifest.id,
@@ -101,6 +124,7 @@ export default {
getAction(this.url.getLoginUserType, params).then((res) => { getAction(this.url.getLoginUserType, params).then((res) => {
if (res.success) { if (res.success) {
this.LoginUserType = res.result this.LoginUserType = res.result
this.getTableList()
this.$emit('LoginUserType', this.LoginUserType) this.$emit('LoginUserType', this.LoginUserType)
res.result.split(',').forEach((item,index) => { res.result.split(',').forEach((item,index) => {
if(item === 'homo') { if(item === 'homo') {
@@ -175,6 +199,7 @@ export default {
}, },
getTableList() { getTableList() {
let params = { let params = {
userTypes: this.LoginUserType,
paramsManifestId: this.paramsManifest.id, paramsManifestId: this.paramsManifest.id,
...this.formInline ...this.formInline
} }
@@ -210,7 +235,6 @@ export default {
paramsManifest(newVal, oldVal) { paramsManifest(newVal, oldVal) {
this.getData() this.getData()
this.getLoginUserType() this.getLoginUserType()
this.getTableList()
} }
} }
} }
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+21
View File
@@ -260,6 +260,20 @@
</a-form-model-item> </a-form-model-item>
</div> </div>
</a-col> </a-col>
<a-col :span="12">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
</div>
<a-form-model-item class="itemModel" prop="applicableSupplement">
<a-input class="box-input"
:disabled="false"
v-model="formInline.applicableSupplement"
:placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
</a-form-model-item>
</div>
</a-col>
</a-row> </a-row>
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="24"> <a-col :span="24">
@@ -539,6 +553,13 @@
trigger: 'blur' trigger: 'blur'
} }
], ],
applicableSupplement:[
{
max: 100,
message: this.$t('applicableSupplement') + this.$t('cannotExceed') + 100 + this.$t('Characters'),
trigger: 'blur'
}
],
remark: [ remark: [
{ {
max: 300, max: 300,
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+9 -2
View File
@@ -271,7 +271,7 @@
exportData: '/dummy/dummyInventoryInfoEO/exportData', exportData: '/dummy/dummyInventoryInfoEO/exportData',
exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate', exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate',
getSysCategoryTree: '/sys/category/getSysCategoryTree', getSysCategoryTree: '/sys/category/getSysCategoryTree',
logList:'/dummy/dummyLogEO/page', logList: '/dummy/dummyLogEO/page'
}, },
loading: false, loading: false,
dataSource: [], dataSource: [],
@@ -370,6 +370,13 @@
dataIndex: 'attestationRank_dictText', dataIndex: 'attestationRank_dictText',
scopedSlots: { customRender: 'titleName' } scopedSlots: { customRender: 'titleName' }
}, },
{
title: this.$t('applicableSupplement'),
align: 'center',
width: 180,
dataIndex: 'applicableSupplement',
scopedSlots: { customRender: 'titleName' }
},
{ {
title: this.$t('technicalField'), title: this.$t('technicalField'),
align: 'center', align: 'center',
@@ -590,7 +597,7 @@
this.getList() this.getList()
}, },
UpdateLogClick() { UpdateLogClick() {
this.$refs.UpdateLogRef.getList({dummyInventoryBaseId:this.$route.query.id}) this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id })
}, },
searchQuery() { searchQuery() {
this.getList() this.getList()