From ccfbc541d5413d2499b01dc7966c39c1c7068021 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 26 Jul 2021 11:12:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=20=E8=BF=81=E7=A7=BB2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarBussStandPlanController.java | 4 +- .../SarBussionessStandController.java | 23 +++++++- .../dao/SarBussionessStandDao.java | 2 + .../service/ISarBussionessStandService.java | 2 + .../impl/SarBussionessStandServiceImpl.java | 53 +++++++++++++++++-- .../java/com/adc/da/sys/dao/DicTypeEODao.java | 2 + 6 files changed, 79 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java index 5b226c9a..b858ed30 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandPlan/controller/SarBussStandPlanController.java @@ -16,8 +16,8 @@ import com.adc.da.base.web.BaseController; * @since 2021-07-25 */ @RestController -@Api(description = "|SarBussStandPlan|") -@RequestMapping("/sarBussStandPlan/sar-buss-stand-plan") +@Api(tags = "福田标准法规--企业标准信息-|SarBussStandPlan|") +@RequestMapping("/${restPath}/lawss/sarBussStandPlan") public class SarBussStandPlanController extends BaseController { } 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 97c01e8c..04e92d80 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -40,12 +41,32 @@ public class SarBussionessStandController extends BaseController getStandInfoById(String id) throws Exception { + SarBussionessStand result = sarBussionessStandEOService.selectStandardsInfoByKey(id); + String collectId = personCollectEOService.queryCollectByUserAndId(id); + result.setCollectId(collectId); + return Result.success(result); + } + /** * 给指定标准配置目录 * @param standardsInfoEO @@ -54,7 +75,7 @@ public class SarBussionessStandController extends BaseController { + List selectStandardsInfoByKey(String id); + List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); int getBussionessStandInfoCount(SarBussionessStandEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 8bb85db8..55f22bd5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -16,6 +16,8 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { + SarBussionessStand selectStandardsInfoByKey(String id) throws Exception; + SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO); List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); 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 52a4180f..c16d1382 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 @@ -1,5 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.service.impl; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.IAttFileEOService; import com.adc.da.common.SelectionTypeEnum; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; @@ -14,6 +16,7 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; @@ -23,10 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.sql.Clob; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -42,6 +42,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarBussionessStandlist = this.baseMapper.selectStandardsInfoByKey(id); + SarBussionessStand sarBussionessStandEO = new SarBussionessStand(); + if(!sarBussionessStandlist.isEmpty()) { + List newStandList = new ArrayList<>(); + newStandList.add(sarBussionessStandlist.get(0)); + attrInfoShowDetails(newStandList); + sarBussionessStandEO = newStandList.get(0); + } + return sarBussionessStandEO; + } + + public void attrInfoShowDetails(List sarlist) throws Exception { + for (SarBussionessStand row : sarlist) { + attrInfoDetails(row); + Map getAttrMap = row.getAttrInfoMap(); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + if (entry.getValue() != null && InitStandAttrUtil.fileFieldList != null && InitStandAttrUtil.fileFieldList.size() > 0 && InitStandAttrUtil.fileFieldList.contains(name)) { + value = entry.getValue().toString(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(value)) { + List fileObj = attFileEOService.getMultiFileInfos(value); + entry.setValue(fileObj); + } + }else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + value = entry.getValue().toString(); + List valArr = Arrays.asList(value.split(",")); + value = dicTypeEODao.getDicNamesByCodes(valArr); + entry.setValue(value); + } + } + } + } + } + + @Override public SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO) { SarBussStandMenu sarStandMenuEO = new SarBussStandMenu(); String nowMenuId = standardsInfoEO.getMenuId(); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java index 5a730ac0..3aa04d45 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java @@ -5,9 +5,11 @@ import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.page.DicTypeEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; import java.util.List; +@Repository public interface DicTypeEODao extends BaseMapper { public DicTypeEO getDicTypeEOById(String id);