From 43ef09221d27825c05bbfb0b80995417f5406f9d Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Mon, 7 Mar 2022 17:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=20=E5=A4=9A=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=A0=B9=E6=8D=AEkey=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/processModel/exportWkExcel.java | 5 ++-- .../service/impl/IExportServiceImpl.java | 7 +++-- .../java/com/adc/da/sys/dao/DicEODao.java | 2 ++ .../com/adc/da/sys/service/IDicEOService.java | 2 ++ .../adc/da/sys/service/IDicTypeEOService.java | 2 ++ .../da/sys/service/impl/DicEOServiceImpl.java | 6 ++++ .../service/impl/DicTypeEOServiceImpl.java | 28 +++++++++++++++++++ .../mybatis/mapper/sys/DictionaryEOMapper.xml | 13 +++++++++ 8 files changed, 61 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java index bb45f170..0fa0771a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java @@ -52,8 +52,9 @@ public class exportWkExcel { ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.HSSF); exportParams.setSheetName(exportName); - - Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); + List types=new ArrayList<>(); + types.add("BUSSSTANDCLASS"); + Map dicTypeEO = dicTypeEOService.getDicTypeListCodeByType(types); workbook = ExcelExportUtilByWk.getHSSFWorkbook(exportParams, exportExcel.class,workbook,"1",dicTypeEO); os = response.getOutputStream(); workbook.write(os); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java index 51a3c55a..bc529903 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/service/impl/IExportServiceImpl.java @@ -44,9 +44,12 @@ public class IExportServiceImpl implements IExportService { // //获取数据字典数据 // Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); //获取机构数据 - List tsInstitutions=tsInstitutionService.list(); + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.select("id","name"); + List tsInstitutions=tsInstitutionService.list(wrapper); //获取人员数据 QueryWrapper tsUserQueryWrapper=new QueryWrapper<>(); + tsUserQueryWrapper.select("ACCOUNT","UNAME"); tsUserQueryWrapper.eq("VALID_FLAG","0"); List tsUsers=tsUserService.list(tsUserQueryWrapper); @@ -58,7 +61,7 @@ public class IExportServiceImpl implements IExportService { //获取user工具集合 Map tsUserMap=new HashMap<>(); tsUsers.forEach(tsUser -> { - tsUserMap.put(tsUser.getUserId(),tsUser.getUname()); + tsUserMap.put(tsUser.getAccount(),tsUser.getUname()); }); List res= ExcelImportUtilByWk.readExcelpublic(importExcelDTO.class,file); DateFormat formater = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java index feeb2652..4697c837 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/DicEODao.java @@ -23,6 +23,8 @@ public interface DicEODao extends BaseMapper { //gaoyan public List getDictionaryEO(); + public List getDictionaryEOByType(@Param("types") List types); + public Integer countByCodeOrName(DictionaryEOPage page); public List queryAllDicByPage(DictionaryEOPage page); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicEOService.java index 9d9c693c..20dcfe30 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicEOService.java @@ -22,6 +22,8 @@ public interface IDicEOService extends IService { //gaoyan public List getDictionaryEO(); + public List getDictionaryEOByType(List types); + public Integer countByCodeOrName(DictionaryEOPage page); public List queryAllDicByPage(DictionaryEOPage page); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java index a2763196..78692dac 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java @@ -84,6 +84,8 @@ public interface IDicTypeEOService extends IService { public Map getDicTypeListCode(); + public Map getDicTypeListCodeByType(List types); + public List> getDicTypeByParentCodes(String dicTypeCode); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicEOServiceImpl.java index f2d1d588..31770197 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicEOServiceImpl.java @@ -8,6 +8,7 @@ import com.adc.da.sys.service.IDicEOService; import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; @@ -82,6 +83,11 @@ public class DicEOServiceImpl extends ServiceImpl impleme return dicEODao.getDictionaryEO(); } + @Override + public List getDictionaryEOByType(List types) { + return dicEODao.getDictionaryEOByType(types); + } + @Override public Integer countByCodeOrName(DictionaryEOPage page) { return dicEODao.countByCodeOrName(page); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java index a8b96227..ab577a4e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java @@ -190,6 +190,34 @@ public class DicTypeEOServiceImpl extends ServiceImpl im return resultMap; } + /** + * @Author gaoyan + * @Description + * Date 2018/9/11 19:12 + * @Param [dictionaryCode] + * @return java.util.List + **/ + @Override + public Map getDicTypeListCodeByType(List types){ + Map resultMap = new HashMap<>(); + List diclist = dicEODao.getDictionaryEOByType(types); + for (DictionaryEO dictionaryEO : diclist){ + if(dictionaryEO.getDictionType().equals("TREE")){ + List treeList = iSarMenuStandardService.getAll(dictionaryEO.getId()); + resultMap.put(dictionaryEO.getDictionaryCode(),treeList); + }else { + List> relist = getDicTypeByDicCode(dictionaryEO.getDictionaryCode()); + resultMap.put(dictionaryEO.getDictionaryCode(),relist); + } + } + // 查询细类 + List> relist = getDicTypeByDicCode("BUSSFINECLASSSHOW"); + resultMap.put("BUSSFINECLASSSHOW",relist); + List> arr = new ArrayList<>(); + resultMap.put("STANDCLASSIFYSHOW",arr); + return resultMap; + } + //liwenxuan:国家地区新增 public List queryByPageNoParentId(DicTypeEOPage page){ Integer rowCount = dicTypeEODao.queryByCountCounter(page); diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml index a293f7cc..c8788318 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DictionaryEOMapper.xml @@ -244,6 +244,19 @@ where dn.VALID_FLAG = 0 + +