FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!49
This commit is contained in:
高嵩
2023-04-11 17:39:23 +08:00
parent 85f3ebf281 dbe728db6f
commit ee31478d0e
6 changed files with 98 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
+77 -27
View File
@@ -272,40 +272,90 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
} }
@PostMapping("/selectQuestionReplyInfo") @PostMapping("/selectQuestionReplyInfo")
public ResponseMessage selectQuestionReplyInfo(String id){ public ResponseMessage selectQuestionReplyInfo(String id,String userId){
List<Object> objects = new ArrayList<>(); List<Object> objects = new ArrayList<>();
if(StringUtils.isNotBlank(id)){ if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(userId)){
Set<String> uIdSet = new HashSet<>();
AskQuestions askQuestions = askQuestionsService.getById(id); AskQuestions askQuestions = askQuestionsService.getById(id);
QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
replyQueryWrapper.eq("ASK_ID", id);
List<Reply> list = replyService.list(replyQueryWrapper);
List<String> uId = askQuestionsDao.getUId();
if(!list.isEmpty()){
for (Reply uid :list){
uIdSet.add(uid.getAnswerer());
}
}
if(!uId.isEmpty()){
for (String uid: uId){
uIdSet.add(uid);
}
}
if(askQuestions!=null) { if(askQuestions!=null) {
TsUser tsUser = tsUserDao.selectById(askQuestions.getQuestioner()); uIdSet.add(askQuestions.getQuestioner());
if(tsUser!=null){ //
askQuestions.setQuestioner(tsUser.getUname()); for (String uid: uIdSet){
} if(uid.equals(userId)){
if(askQuestions.getClassification().equals("BUSINESS_STAND")){ TsUser tsUser = tsUserDao.selectById(askQuestions.getQuestioner());
askQuestions.setClassification("企业标准"); if (tsUser != null) {
} askQuestions.setQuestioner(tsUser.getUname());
if(askQuestions.getClassification().equals("FOREIGN")){ }
askQuestions.setClassification("海外标准"); if (askQuestions.getClassification().equals("BUSINESS_STAND")) {
} askQuestions.setClassification("企业标准");
if(askQuestions.getClassification().equals("INLAND")){ }
askQuestions.setClassification("国内标准"); if (askQuestions.getClassification().equals("FOREIGN")) {
} askQuestions.setClassification("海外标准");
if(askQuestions.getClassification().equals("OTHER")){ }
askQuestions.setClassification("公共标准"); if (askQuestions.getClassification().equals("INLAND")) {
} askQuestions.setClassification("国内标准");
QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>(); }
replyQueryWrapper.eq("ASK_ID", id); if (askQuestions.getClassification().equals("OTHER")) {
List<Reply> list = replyService.list(replyQueryWrapper); askQuestions.setClassification("公共标准");
if(!list.isEmpty()){ }
for (Reply reply : list){ QueryWrapper<Reply> replyQueryWrapperInfo = new QueryWrapper<>();
TsUser ruser = tsUserDao.selectById(reply.getAnswerer()); replyQueryWrapperInfo.eq("ASK_ID", id);
if(ruser!=null){ List<Reply> listInfo = replyService.list(replyQueryWrapperInfo);
reply.setAnswerer(ruser.getUname()); if (!listInfo.isEmpty()) {
for (Reply reply : listInfo) {
TsUser ruser = tsUserDao.selectById(reply.getAnswerer());
if (ruser != null) {
reply.setAnswerer(ruser.getUname());
}
}
}
objects.add(askQuestions);
objects.add(listInfo);
return Result.success(objects);
} }
} }
//第三方人员 只能看到归档数据
// 问题存在则回填问题
TsUser tsUser = tsUserDao.selectById(askQuestions.getQuestioner());
if (tsUser != null) {
askQuestions.setQuestioner(tsUser.getUname());
} }
if (askQuestions.getClassification().equals("BUSINESS_STAND")) {
askQuestions.setClassification("企业标准");
}
if (askQuestions.getClassification().equals("FOREIGN")) {
askQuestions.setClassification("海外标准");
}
if (askQuestions.getClassification().equals("INLAND")) {
askQuestions.setClassification("国内标准");
}
if (askQuestions.getClassification().equals("OTHER")) {
askQuestions.setClassification("公共标准");
}
QueryWrapper<Reply> replyQueryWrapperInfo = new QueryWrapper<>();
replyQueryWrapperInfo.eq("ASK_ID", id);
replyQueryWrapperInfo.eq("state","yes");
List<Reply> listInfo = replyService.list(replyQueryWrapperInfo);
objects.add(askQuestions); objects.add(askQuestions);
objects.add(list); objects.add(listInfo);
return Result.success(objects);
}else {
//问题不存在
return Result.success("0");
} }
} }
return Result.success(objects); return Result.success(objects);
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java
+10
View File
@@ -121,9 +121,19 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
public List<Reply> getAskQuestionsByakId(String id,String state,String userId) { public List<Reply> getAskQuestionsByakId(String id,String state,String userId) {
String questioner = askQuestionsDao.selectBYAQId(id); String questioner = askQuestionsDao.selectBYAQId(id);
String answerer = askQuestionsDao.selectByRId(id,userId); String answerer = askQuestionsDao.selectByRId(id,userId);
List<String> uId = askQuestionsDao.getUId();
if (userId.equals(questioner)||userId.equals(answerer)){ if (userId.equals(questioner)||userId.equals(answerer)){
return askQuestionsDao.getAskQuestionsByakId(id,null); return askQuestionsDao.getAskQuestionsByakId(id,null);
} }
// 当前人是法规部门的人
if(!uId.isEmpty()){
for (String uid :uId){
if(uid.equals(userId)){
return askQuestionsDao.getAskQuestionsByakId(id,null);
}
}
}
// 如果都不是则回填归档内容
return askQuestionsDao.getAskQuestionsById(id); return askQuestionsDao.getAskQuestionsById(id);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+1 -1
View File
@@ -174,7 +174,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper); List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
Integer valIdFlag = 0; Integer valIdFlag = 0;
for (SarBussionessStand stand :list){ for (SarBussionessStand stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ if ((list.size() >=1 && !stand.getId().equals(sarBussionessStandEO.getId()))){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){ if (valIdFlag == 0){
return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在"); return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+4 -1
View File
@@ -1738,6 +1738,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
List<String> collectResIds = sarlist.stream().map(SarBussionessStand::getId).collect(Collectors.toList()); List<String> collectResIds = sarlist.stream().map(SarBussionessStand::getId).collect(Collectors.toList());
Map<String,String> collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds); Map<String,String> collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds);
for (SarBussionessStand row : sarlist) { for (SarBussionessStand row : sarlist) {
row.setStandSortShow(row.getStandSort());
if(collectMap != null && collectMap.get(row.getId()) != null){ if(collectMap != null && collectMap.get(row.getId()) != null){
row.setCollectId(collectMap.get(row.getId())); row.setCollectId(collectMap.get(row.getId()));
} }
@@ -4421,11 +4422,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
public ResponseMessage selectById(String id, String type) { public ResponseMessage selectById(String id, String type) {
if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type)){ if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type)){
if(type.equals("国内标准") || type.equals("海外标准")){ if(type.equals("国内标准") || type.equals("海外标准")){
SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectById(id); SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectById(id);
sarStandardsInfo.setStandSortShow(sarStandardsInfo.getStandSort());
return Result.success(sarStandardsInfo); return Result.success(sarStandardsInfo);
} }
if(type.equals("企业标准")){ if(type.equals("企业标准")){
SarBussionessStand sarBussionessStand = sarBussionessStandEODao.selectById(id); SarBussionessStand sarBussionessStand = sarBussionessStandEODao.selectById(id);
sarBussionessStand.setStandSortShow(sarBussionessStand.getStandSort());
return Result.success(sarBussionessStand); return Result.success(sarBussionessStand);
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+5 -5
View File
@@ -314,7 +314,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag.equals("0")){ if (valIdFlag.equals("0")){
return Result.error("企标编号("+ standnumber +")或企标名称("+ sarStandardsInfoEO.getStandName() +")已存在"); return Result.error("标准号("+ standnumber +")或标准中文名称("+ sarStandardsInfoEO.getStandName() +")已存在");
} }
} }
} }
@@ -337,10 +337,10 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO); List<SarStandardsInfo> list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO);
String valIdFlag = "0"; String valIdFlag = "0";
for (SarStandardsInfo stand :list){ for (SarStandardsInfo stand :list){
if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ if ((list.size() >=1 && !stand.getId().equals(sarStandardsInfoEO.getId()))){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag.equals("0")){ if (valIdFlag.equals("0")){
return Result.error("企标编号("+ standnumber +")或企标名称("+ sarStandardsInfoEO.getStandName() +")已存在"); return Result.error("标准号("+ standnumber +")或标准中文名称("+ sarStandardsInfoEO.getStandName() +")已存在");
} }
} }
} }
@@ -589,7 +589,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag.equals("0")){ if (valIdFlag.equals("0")){
return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); return Result.error("标准号("+ standnumber +")或标准中文名称("+ page.getStandName() +")已存在");
} }
} }
} }
@@ -603,7 +603,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag.equals("0")){ if (valIdFlag.equals("0")){
return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); return Result.error("标准号("+ standnumber +")或标准中文名称("+ page.getStandName() +")已存在");
} }
} }
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+1 -2
View File
@@ -174,8 +174,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
try { try {
AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId());
//String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
// String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName();
String readFilePath = "C:/Users/syxy/Desktop/GB 1589-2016 汽车、挂车及汽车列车外廓尺寸、轴荷及质量限值.docx";
InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。
XWPFDocument doc = new XWPFDocument(is); XWPFDocument doc = new XWPFDocument(is);