diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 5e021e69..98af36ae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -272,40 +272,90 @@ public class AskQuestionsController extends BaseController { } @PostMapping("/selectQuestionReplyInfo") - public ResponseMessage selectQuestionReplyInfo(String id){ + public ResponseMessage selectQuestionReplyInfo(String id,String userId){ List objects = new ArrayList<>(); - if(StringUtils.isNotBlank(id)){ + if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(userId)){ + Set uIdSet = new HashSet<>(); AskQuestions askQuestions = askQuestionsService.getById(id); + QueryWrapper replyQueryWrapper = new QueryWrapper<>(); + replyQueryWrapper.eq("ASK_ID", id); + List list = replyService.list(replyQueryWrapper); + List 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) { - 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 replyQueryWrapper = new QueryWrapper<>(); - replyQueryWrapper.eq("ASK_ID", id); - List list = replyService.list(replyQueryWrapper); - if(!list.isEmpty()){ - for (Reply reply : list){ - TsUser ruser = tsUserDao.selectById(reply.getAnswerer()); - if(ruser!=null){ - reply.setAnswerer(ruser.getUname()); + uIdSet.add(askQuestions.getQuestioner()); + // + for (String uid: uIdSet){ + if(uid.equals(userId)){ + 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 replyQueryWrapperInfo = new QueryWrapper<>(); + replyQueryWrapperInfo.eq("ASK_ID", id); + List listInfo = replyService.list(replyQueryWrapperInfo); + 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 replyQueryWrapperInfo = new QueryWrapper<>(); + replyQueryWrapperInfo.eq("ASK_ID", id); + replyQueryWrapperInfo.eq("state","yes"); + List listInfo = replyService.list(replyQueryWrapperInfo); objects.add(askQuestions); - objects.add(list); + objects.add(listInfo); + return Result.success(objects); + }else { + //问题不存在 + return Result.success("0"); } } return Result.success(objects); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java index 3b6ae0c0..7958c3b1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java @@ -121,9 +121,19 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestionsByakId(String id,String state,String userId) { String questioner = askQuestionsDao.selectBYAQId(id); String answerer = askQuestionsDao.selectByRId(id,userId); + List uId = askQuestionsDao.getUId(); if (userId.equals(questioner)||userId.equals(answerer)){ 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); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 1f4463f4..cd8ce7c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -174,7 +174,7 @@ public class SarBussionessStandController extends BaseController list = sarBussionessStandEOService.list(queryWrapper); Integer valIdFlag = 0; 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(); if (valIdFlag == 0){ return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在"); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index ba5386a1..4d30971d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1738,6 +1738,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl collectResIds = sarlist.stream().map(SarBussionessStand::getId).collect(Collectors.toList()); Map collectMap = personCollectEOService.queryCollectByUserAndIds(collectResIds); for (SarBussionessStand row : sarlist) { + row.setStandSortShow(row.getStandSort()); if(collectMap != null && collectMap.get(row.getId()) != null){ row.setCollectId(collectMap.get(row.getId())); } @@ -4421,11 +4422,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ valIdFlag = stand.getValidFlag(); 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 List list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO); String valIdFlag = "0"; 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(); 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 if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ valIdFlag = stand.getValidFlag(); 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 if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ valIdFlag = stand.getValidFlag(); if (valIdFlag.equals("0")){ - return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); + return Result.error("标准号("+ standnumber +")或标准中文名称("+ page.getStandName() +")已存在"); } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d81c75d9..fd3c534c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -174,8 +174,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService try { AttFileEO attFileEO = attFileEOService.getFileInfo(sarFileSplitInfoEO.getAttId()); //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName(); - // String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); - String readFilePath = "C:/Users/syxy/Desktop/GB 1589-2016 汽车、挂车及汽车列车外廓尺寸、轴荷及质量限值.docx"; + String readFilePath = filePath + attFileEO.getFilePath() + attFileEO.getFileName(); InputStream is = new FileInputStream(readFilePath); //需要将文件路更改为word文档所在路径。 XWPFDocument doc = new XWPFDocument(is);