From fdbd2a3336f5f3d5a38ca33bdca7b768ec8cb328 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 28 Mar 2023 18:18:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 69 +++++++++---------- .../controller/AskQuestionsController.java | 7 ++ .../impl/SarBussionessStandServiceImpl.java | 39 ++++------- 3 files changed, 51 insertions(+), 64 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 05ae71e6..1f250cad 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -193,13 +193,6 @@ public class ActSarItemsEOService { String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarStandardsInfoEO.setSarStandAttrEOStr(resData); - QueryWrapper wrapper=new QueryWrapper<>(); - wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()) - .eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()); - Integer s=sarStandardsInfoEOService.count(wrapper); - if (s>0){ - throw new AdcDaBaseException("当前标准编号和中文名称已存在"); - } // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId String standnumber = ""; @@ -254,37 +247,37 @@ public class ActSarItemsEOService { sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",relatePro); String content = "新增一条相关流程:" +prcName+" "+prcNum; sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),standType+"_STAND",content); - }else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况 - String standId = standlist.get(0).getId(); - SarStandardsInfo query = new SarStandardsInfo(); - query.setId(standId); - sarStandardsInfoEOService.attrInfoDetails(query); - Map attrInfoMap = query.getAttrInfoMap(); - if(attInfoMap!=null && !attInfoMap.isEmpty()){ - updateStandFileFieldData(attInfoMap,attrInfoMap); - resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); - sarStandardsInfoEO.setSarStandAttrEOStr(resData); - } - // 查询原相关流程 - String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId); - if (StringUtils.isNotBlank(relatePro)) { - String[] processSplit = relatePro.split(","); - Set processSet = new HashSet<>(); - for(String sData:processSplit){ - processSet.add(sData); - } - processSet.add(prcNum); - relatePro = StringUtils.join(processSet.toArray(), ","); - } else { - relatePro = prcNum; - } - // 编辑标准 - sarStandardsInfoEO.setId(standId); - sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); - // 编辑相关流程 - sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro); - String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); +// }else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况 +// String standId = standlist.get(0).getId(); +// SarStandardsInfo query = new SarStandardsInfo(); +// query.setId(standId); +// sarStandardsInfoEOService.attrInfoDetails(query); +// Map attrInfoMap = query.getAttrInfoMap(); +// if(attInfoMap!=null && !attInfoMap.isEmpty()){ +// updateStandFileFieldData(attInfoMap,attrInfoMap); +// resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); +// sarStandardsInfoEO.setSarStandAttrEOStr(resData); +// } +// // 查询原相关流程 +// String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId); +// if (StringUtils.isNotBlank(relatePro)) { +// String[] processSplit = relatePro.split(","); +// Set processSet = new HashSet<>(); +// for(String sData:processSplit){ +// processSet.add(sData); +// } +// processSet.add(prcNum); +// relatePro = StringUtils.join(processSet.toArray(), ","); +// } else { +// relatePro = prcNum; +// } +// // 编辑标准 +// sarStandardsInfoEO.setId(standId); +// sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); +// // 编辑相关流程 +// sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro); +// String content = "新增一条相关流程:" +prcName+" "+prcNum; +// sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); } else {//标准号、ID都不存在的情况 // 新增方法 sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO); 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 9dd5b33f..de6da2a6 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 @@ -6,6 +6,7 @@ import com.adc.da.slrs.StandardQA.entity.*; import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl; +import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.util.http.ResponseMessage; @@ -16,6 +17,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -41,6 +44,9 @@ public class AskQuestionsController extends BaseController { @Autowired private SubscriptionServiceImpl subscriptionService; + private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoServiceImpl.class); + + @GetMapping("/getAskQuestionsPage") public ResponseMessage> getAskQuestionsPage(AskQuestionsPage askQuestions){ IPage iPage = new Page<>(); @@ -175,6 +181,7 @@ public class AskQuestionsController extends BaseController { List askUserListUser = new ArrayList<>(); for (AskUser user: askUserList){ askUserListUser.add(user.getUsid()); + logger.info("问答中心分配人员"+user.getUsid()+"===="+user.getAsdId()+"总人数："+askUserList.size()); } JSONArray jsonArray = JSONArray.fromObject(askUserListUser); objectObjectHashMap.put("questioner",jsonArray); 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 34201c5e..3bb0dfd3 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 @@ -69,7 +69,9 @@ import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.dao.UserEODao; import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.sys.util.LoginUserUtil; @@ -246,6 +248,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attrInfoMap = query.getAttrInfoMap(); - if(attInfoMap!=null && !attInfoMap.isEmpty()){ -// updateStandFileFieldData(attInfoMap,attrInfoMap); - resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); - sarBussionessStand.setSarStandAttrEOStr(resData); - } - - // 编辑标准 - sarBussionessStand.setId(standId); - iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); - } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setStandCode(standCode); @@ -3868,12 +3853,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl