From d1a8496e53152f653f1aca35a4e0d0db4e38a7ac Mon Sep 17 00:00:00 2001 From: wxy <1229384355@qq.com> Date: Tue, 2 Aug 2022 11:48:36 +0800 Subject: [PATCH] 批量导出 --- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java | 29 ++++++++++------------------- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java | 45 +++++++++++++++++++++++++++++++++------------ juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java | 5 +++-- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java | 2 ++ juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java | 4 ++-- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java | 4 ++-- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java | 1 + juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java | 2 ++ juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java | 8 ++++++++ juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml | 13 ++++++++++--- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml | 14 +++++++++++--- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java | 1 + juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java | 15 ++++++++++++++- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java | 8 ++++++-- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java | 2 -- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java | 30 ++++++++++++++++++++++++++---- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java | 2 +- juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/getRandomId.java | 111 +++++++++++++++------------------------------------------------------------------------------------------------ juvenile-prosecution-vue/public/logo.png | Bin 16958 -> 0 bytes juvenile-prosecution-vue/src/components/page/GlobalFooter.vue | 2 +- juvenile-prosecution-vue/src/views/business/MinorList.vue | 70 ++++++++++++++++++++++++++++++++++++---------------------------------- juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue | 4 +++- juvenile-prosecution-vue/src/views/system/DepartList.vue | 4 ++-- juvenile-prosecution-vue/src/views/system/UserList.vue | 1 - juvenile-prosecution-vue/src/views/system/modules/DepartAuthModal.vue | 2 +- 25 files changed, 190 insertions(+), 189 deletions(-) diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java index a2401cd..d0c26dd 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java @@ -116,6 +116,9 @@ public class AnalyzeController extends JeecgController> f7 = CompletableFuture.supplyAsync(() -> highSchoolService.getList(), executor); CompletableFuture> f8 = CompletableFuture.supplyAsync(() -> primarySchoolService.getList(), executor); //行政处罚数据 -// Map gaPunishVos = gaPunishService.queryAll(); Map gaPunishVos = new HashMap<>(); gaPunishVos.putAll(f1.get()); -// List specialStudentVos = specialStudentService.queryList(); List specialStudentVos = new ArrayList<>(); specialStudentVos.addAll(f2.get()); //孤儿数据 -// List mzOrphans = mzOrphanService.getIdentityS(); List mzOrphans = new ArrayList<>(); mzOrphans.addAll(f3.get()); //无人抚养 -// List mzUnsupporteds = mzUnsupportedService.getIdentityS(); List mzUnsupporteds = new ArrayList<>(); mzUnsupporteds.addAll(f4.get()); //留守儿童 -// List mzLeftBehinds =mzLeftBehindChildrenService.getIdentityS(); List mzLeftBehinds = new ArrayList<>(); mzLeftBehinds.addAll(f5.get()); //领养 -// List mzAdoptions =mzAdoptionService.getIdentityS(); List mzAdoptions = new ArrayList<>(); mzAdoptions.addAll(f6.get()); //获取初高中学生信息 -// List highSchools = highSchoolService.getList(); List highSchools = new ArrayList<>(); highSchools.addAll(f7.get()); //获取幼小学生信息 -// List primarySchools = primarySchoolService.getList(); List primarySchools = new ArrayList<>(); primarySchools.addAll(f8.get()); //人口基本信息小于18岁 -// Map gaDemographics =gaDemographicService.getIdentityS(); -// Map gaDemographics =new HashMap<>(); -// gaDemographics.putAll(f9.get()); //关闭线程池 pool.shutdown(); Map gaDemographics = gaDemographicService.getIdentityS(); @@ -177,7 +169,6 @@ public class AnalyzeController extends JeecgController familyMap = gaHouseholdService.getGaHouseholds(gaDemographics); -// Map familyMap = queryByThread(); log.info("户籍信息数据查询时间" + (System.currentTimeMillis() - startTime1) / 1000 + "秒"); log.info("判断初高中学生信息和人口基本信息的交集和差集开始时间" + (System.currentTimeMillis() - startTime) / 1000 + "秒"); judgeHighSchoolsAndDemographics(highSchools, gaDemographics, departs, specialStudentVos, mzUnsupporteds, mzLeftBehinds, mzAdoptions, familyMap, gaPunishVos, mzOrphans); @@ -406,7 +397,7 @@ public class AnalyzeController extends JeecgController pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,isReason); +// String isReason=""; +// if(oConvertUtils.isNotEmpty(minor) && oConvertUtils.isNotEmpty(minor.getIsReason()) && minor.getIsReason().equals("1")){ +// isReason=minor.getIsReason(); +// } + IPage pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason()); return Result.OK(pageList); } @@ -219,6 +219,20 @@ public class MinorController { return Result.OK(familyList); } + /** + * 通过householdNum查询 + * + * @param householdNum + * @return + */ + @AutoLog(value = "家庭成员表通过主表householdNum查询") + @ApiOperation(value = "家庭成员表主表householdNum查询", notes = "家庭成员表-通主表householdNum查询") + @GetMapping(value = "/getFamilysByHouseholdNum") + public Result getFamilysByHouseholdNum(@RequestParam(name = "householdNum", required = true) String householdNum) { + List familyList = familyService.getFamilysByHouseholdNum(householdNum); + return Result.OK(familyList); + } + /** * 导出excel * @@ -226,9 +240,19 @@ public class MinorController { * @param minor */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, Minor minor) { + public ModelAndView exportXls(HttpServletRequest request, Minor minor, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { // Step.1 组装查询条件查询数据 - Page page = new Page(1, 1); + // 过滤选中数据 + String selections = request.getParameter("selections"); + List ids=new ArrayList<>(); + if(oConvertUtils.isEmpty(selections)){ + pageSize=1; + }else { + List selectionList = Arrays.asList(selections.split(",")); + selectionList.stream().forEach(s -> ids.add(Long.valueOf(s))); + } + Page page = new Page(pageNo, pageSize); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String sysOrgCode=""; if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){ @@ -237,18 +261,15 @@ public class MinorController { IPage pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason()); //Step.2 获取导出数据 List queryList = pageList.getRecords(); - // 过滤选中数据 - String selections = request.getParameter("selections"); List minorList = new ArrayList(); if (oConvertUtils.isEmpty(selections)) { minorList = queryList; } else { - List selectionList = Arrays.asList(selections.split(",")); - minorList = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + minorList = queryList.stream().filter(item -> ids.contains(item.getId())).collect(Collectors.toList()); } List familyList = new ArrayList<>(); for (Minor main : minorList) { - familyList = familyService.selectByHouseholdNum(main.getHouseholdNum()); + familyList .addAll(familyService.selectByHouseholdNum(main.getHouseholdNum())); } // Step.3 多sheet处理 List> listMap = new ArrayList>(); diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java index cce405d..c70139e 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java @@ -30,9 +30,9 @@ public class Family implements Serializable { public static final Integer IS_CRIME=1;//是 public static final Integer IS_NOT_CRIME=0;//否 - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.NONE) @ApiModelProperty(value = "主键") - private String id; + private Long id; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; @@ -77,6 +77,7 @@ public class Family implements Serializable { @ApiModelProperty(value = "与户主的关系") private String relation; /**行政区划*/ + @Excel(name = "行政区划", width = 15) @ApiModelProperty(value = "行政区划") private String division; /**现住址*/ diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java index d0a7aaf..c4ade17 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/GaDemographic.java @@ -31,6 +31,7 @@ import lombok.experimental.Accessors; public class GaDemographic implements Serializable { private static final long serialVersionUID = 1L; + /**人员编号*/ @Excel(name = "人员编号", width = 15) @ApiModelProperty(value = "人员编号") @@ -40,6 +41,7 @@ public class GaDemographic implements Serializable { @ApiModelProperty(value = "姓名") private String xm; /**身份证号*/ + @TableId(type = IdType.NONE) @Excel(name = "身份证号", width = 15) @ApiModelProperty(value = "身份证号") private String gmsfhm; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java index 62b87eb..5b8919c 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java @@ -42,9 +42,9 @@ public class Minor implements Serializable { public static final Integer ATTENTION_REASON_STUDENT=6;//特殊学生 /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.NONE) @ApiModelProperty(value = "主键") - private String id; + private Long id; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java index 7dab017..9d4e8fa 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MrSchool.java @@ -32,9 +32,9 @@ public class MrSchool implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.NONE) @ApiModelProperty(value = "主键") - private String id; + private Long id; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java index eb4843f..d46716a 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/MzUnsupported.java @@ -56,6 +56,7 @@ public class MzUnsupported implements Serializable { @ApiModelProperty(value = "出生日期") private String birthday; /**身份证号*/ + @TableId(type = IdType.NONE) @Excel(name = "身份证号", width = 15) @ApiModelProperty(value = "身份证号") private String identity; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java index 3257072..34d1e5f 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/FamilyMapper.java @@ -27,4 +27,6 @@ public interface FamilyMapper extends BaseMapper { * @return */ public Integer insertBatch(List list); + + public List getFamilysByHouseholdNum(@Param("householdNum") String householdNum); } diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java index cf96e60..ef73942 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java @@ -35,4 +35,12 @@ public interface MinorMapper extends BaseMapper { */ Integer getMinorByIdCard(@Param("identity") String identity); + /** + * 查询未成年人信息 + * @param name + * @param sysOrgCode + * @param isReason + * @return + */ + List queryPageList(@Param("name") String name,@Param("sysOrgCode") String sysOrgCode,@Param("isReason")String isReason); } diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml index a7266b7..c462c33 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/FamilyMapper.xml @@ -9,17 +9,24 @@ household_num = #{householdNum} - INSERT INTO mr_family (id,create_time,sys_org_code,household_num,number,name,identity,gender,relation,address,crime,reason,other)VALUES + INSERT INTO mr_family (id,create_time,sys_org_code,household_num,number,name,identity,gender,relation,address,crime,reason,other,division)VALUES - (#{b.id},#{b.createTime},#{b.sysOrgCode},#{b.householdNum},#{b.number},#{b.name},#{b.identity},#{b.gender},#{b.relation},#{b.address},#{b.crime},#{b.reason},#{b.other}) + (#{b.id},#{b.createTime},#{b.sysOrgCode},#{b.householdNum},#{b.number},#{b.name},#{b.identity},#{b.gender},#{b.relation},#{b.address},#{b.crime},#{b.reason},#{b.other},#{b.division}) + + diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml index 73d4790..2af2d75 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml @@ -43,9 +43,17 @@ and sys_org_code like concat(#{sysOrgCode},'%') - - and reason !='' - + + + and reason !='' + + + and ISNULL(reason) + + + + + ORDER BY create_time desc diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java index 4be68e9..adfc965 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IFamilyService.java @@ -18,6 +18,7 @@ public interface IFamilyService extends IService { public List selectByHouseholdNum(String householdNum); + public List getFamilysByHouseholdNum(String householdNum); public Integer insertBatch(List list); } diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java index e9b9da2..d294e5e 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java @@ -45,10 +45,23 @@ public interface IMinorService extends IService { public Integer insertBatch(List list); - + /** + * 分页查询未成年人信息 + * @param page + * @return + */ IPage queryPageList(Page page,String name,String sysOrgCode,String isReason); /** + * 查询未成年人信息 + * @param name + * @param sysOrgCode + * @param isReason + * @return + */ + List queryList(String name, String sysOrgCode, String isReason); + + /** * 添加多对多 * */ diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java index 21a27a7..9d024cf 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/FamilyServiceImpl.java @@ -29,7 +29,8 @@ import javax.annotation.Resource; */ @Service public class FamilyServiceImpl extends ServiceImpl implements IFamilyService { - + private Integer random_number=00000000; + @Resource private FamilyMapper familyMapper; @@ -44,7 +45,10 @@ public class FamilyServiceImpl extends ServiceImpl impleme return familyMapper.selectByHouseholdNum(householdNum); } - private Integer random_number=00000000; + @Override + public List getFamilysByHouseholdNum(String householdNum) { + return familyMapper.getFamilysByHouseholdNum(householdNum); + } /** * 批量新增 diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java index 66d340a..f7c73d4 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java @@ -32,7 +32,6 @@ public class GaHouseholdServiceImpl extends ServiceImpl families = gaHouseholdMapper.getGaHouseholds(); - System.out.println("数据查询时间" + (System.currentTimeMillis() - startTime) / 1000 + "秒"); long startTime2 = System.currentTimeMillis(); if (oConvertUtils.isNotEmpty(families)) { families.stream().forEach(g -> { @@ -41,7 +40,6 @@ public class GaHouseholdServiceImpl extends ServiceImpl implements @Override @Transactional public void saveMain(Minor minor, List familyList) { - + getRandomId idWorker = new getRandomId(0, 0); if(familyList!=null && familyList.size()>0) { //判断家庭成员信息里的数据是否包含未成年人,默认包含 Boolean falg=true; @@ -71,12 +72,13 @@ public class MinorServiceImpl extends ServiceImpl implements if(oConvertUtils.isNotEmpty(entity.getCrime()) && entity.getCrime().equals(Family.IS_CRIME)){ isCrime=true; } + entity.setId(idWorker.nextId()); } if(isCrime){ minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME)); } } - + minor.setId(idWorker.nextId()); familyMapper.insertBatch(familyList); minorMapper.insert(minor); } @@ -159,20 +161,37 @@ public class MinorServiceImpl extends ServiceImpl implements if(oConvertUtils.isNotEmpty(list)){ for(int i=0;i queryPageList(Page page,String name,String sysOrgCode,String isReason) { return minorMapper.queryPageList(page,name,sysOrgCode,isReason); } - /** + * 查询未成年人信息 + * @param name + * @param sysOrgCode + * @param isReason + * @return + */ + @Override + public List queryList(String name, String sysOrgCode, String isReason) { + return minorMapper.queryPageList(name,sysOrgCode,isReason); + } + + + /** * 添加多对多 * */ @@ -185,6 +204,7 @@ public class MinorServiceImpl extends ServiceImpl implements sysOrgCode=sysUser.getOrgCode(); } Date createTime=new Date(); + getRandomId idWorker = new getRandomId(0, 0); //存放户号和犯罪的某一个家庭成员信息 Map houseFamily=new HashMap<>(); if(oConvertUtils.isNotEmpty(familyList) ){ @@ -196,6 +216,7 @@ public class MinorServiceImpl extends ServiceImpl implements if(oConvertUtils.isNotEmpty(family.getCrime()) && family.getCrime().equals(Family.IS_CRIME) && oConvertUtils.isNotEmpty(family.getHouseholdNum())){ houseFamily.put(family.getHouseholdNum(),family); } + family.setId(idWorker.nextId()); } }); } @@ -204,6 +225,7 @@ public class MinorServiceImpl extends ServiceImpl implements minors.stream().forEach(minor -> { if(oConvertUtils.isNotEmpty(minor)){ minor.setCreateTime(createTime); + minor.setId(idWorker.nextId()); if(oConvertUtils.isNotEmpty(houseFamily) && oConvertUtils.isNotEmpty(minor.getHouseholdNum())){ String houseNum=minor.getHouseholdNum(); Family family=houseFamily.get(houseNum); diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java index 37c6f2d..a092401 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MrSchoolServiceImpl.java @@ -50,7 +50,7 @@ public class MrSchoolServiceImpl extends ServiceImpl i if(oConvertUtils.isNotEmpty(list)){ for(int i=0;i familys = new HashSet<>(); -// //存放已经被放入minor里面的户号，避免数据重复 -// Set houseSet=new HashSet<>(); -// Map minors=getMinors(); -// Map> familyMaps=getFamilyMaps(); -// if (oConvertUtils.isNotEmpty(minors)) { -// for (Map.Entry m : minors.entrySet()) { -// String idCard = m.getKey(); -// Minor minor = m.getValue(); -// Set f=new HashSet<>(); -// //判断是否是一个家庭的人员 -// if (oConvertUtils.isNotEmpty(minor.getHouseholdNum())) { -// String houseNum = minor.getHouseholdNum(); -// if(oConvertUtils.isNotEmpty(familyMaps) && oConvertUtils.isNotEmpty(familyMaps.get(houseNum)) ){ -// if(!houseSet.contains(houseNum) ){ -// familys.addAll(familyMaps.get(houseNum)); -// houseSet.add(houseNum); -// } -// } -// minor.setFamilies(f); -// } -// } -// } -// long endTime = System.currentTimeMillis(); -// -// System.out.println("endTime-startTime:" + (endTime - startTime)); -// } -// public static Map> getFamilyMaps(){ -// Map> familyMaps=new HashMap<>(); -// List familys=getFamilys(); -// for(int i=0;i list = new ArrayList<>(); -// list.add(family); -// familyMaps.put(family.getHouseholdNum(),list); -// } -// -// } -// } -// return familyMaps; -// -// } -// -// public static List getFamilys(){ -// List familys=new ArrayList<>(); -// for(int i=0;i<25;i++){ -// Family f=new Family(); -// if(i<5){ -// f.setIdentity("#####################"+i); -// f.setHouseholdNum("**************house"+0); -// }else if(i<10){ -// f.setIdentity("#####################"+i); -// f.setHouseholdNum("**************house"+1); -// }else if(i<15){ -// f.setIdentity("#####################"+i); -// f.setHouseholdNum("**************house"+2); -// }else if(i<20){ -// f.setIdentity("#####################"+i); -// f.setHouseholdNum("**************house"+3); -// }else if(i<25){ -// f.setIdentity("#####################"+i); -// f.setHouseholdNum("**************house"+4); -// } -// familys.add(f); -// } -// return familys; -// -// } -// -// public static Map getMinors(){ -// Map minors=new HashMap<>(); -// for(int i=0;i<10;i++){ -// if(i<5){ -// Minor m=new Minor(); -// m.setIdentity("**************id"+i); -// m.setHouseholdNum("**************house"+i); -// minors.put("**************id"+i,m); -// }else if(i<10){ -// Minor m=new Minor(); -// m.setIdentity("**************id"+i); -// m.setHouseholdNum("**************house"+(i-5)); -// minors.put("**************id"+i,m); -// } -// } -// return minors; -// -// } + public static void main(String[] args) { + long startTime = System.currentTimeMillis(); + Set ids=new HashSet<>(); + getRandomId idWorker = new getRandomId(0, 0); + for(int i=0;i<100;i++){ + ids.add(idWorker.nextId()); + } + System.out.println(ids.size()); + long endTime = System.currentTimeMillis(); + + System.out.println("endTime-startTime:" + (endTime - startTime)); + } } diff --git a/juvenile-prosecution-vue/public/logo.png b/juvenile-prosecution-vue/public/logo.png index 5602771..f7c7a02 100644 Binary files a/juvenile-prosecution-vue/public/logo.png and b/juvenile-prosecution-vue/public/logo.png differ diff --git a/juvenile-prosecution-vue/src/components/page/GlobalFooter.vue b/juvenile-prosecution-vue/src/components/page/GlobalFooter.vue index 23464e0..0d95ae1 100644 --- a/juvenile-prosecution-vue/src/components/page/GlobalFooter.vue +++ b/juvenile-prosecution-vue/src/components/page/GlobalFooter.vue @@ -3,7 +3,7 @@
Copyright - 2021 + 2022
diff --git a/juvenile-prosecution-vue/src/views/business/MinorList.vue b/juvenile-prosecution-vue/src/views/business/MinorList.vue index 5c8f2f9..2ccdb68 100644 --- a/juvenile-prosecution-vue/src/views/business/MinorList.vue +++ b/juvenile-prosecution-vue/src/views/business/MinorList.vue @@ -12,6 +12,7 @@ + 全部 是 否 @@ -234,7 +235,7 @@ export default { deleteBatch: '/sys/minor/deleteBatch', exportXlsUrl: '/sys/minor/exportXls', importExcelUrl: 'sys/minor/importExcel', - familys: '/sys/minor/queryFamilyByMainId' + familys: '/sys/minor/getFamilysByHouseholdNum' }, dictOptions: {}, superFieldList: [], @@ -312,7 +313,11 @@ export default { showQuickJumper: true, total: 0 }, - familyLoading: false + familyLoading: false, + queryParam:{ + name:'', + isReason:'0' + } } }, created() { @@ -324,6 +329,35 @@ export default { } }, methods: { + handleExportXls(fileName){ + if(!fileName || typeof fileName != "string"){ + fileName = "导出文件" + } + let param = this.getQueryParams(); + if(this.selectedRowKeys && this.selectedRowKeys.length>0){ + param['selections'] = this.selectedRowKeys.join(",") + } + console.log("导出参数",param) + downFile(this.url.exportXlsUrl,param).then((data)=>{ + if (!data) { + this.$message.warning("文件下载失败") + return + } + if (typeof window.navigator.msSaveBlob !== 'undefined') { + window.navigator.msSaveBlob(new Blob([data],{type: 'application/vnd.ms-excel'}), fileName+'.xls') + }else{ + let url = window.URL.createObjectURL(new Blob([data],{type: 'application/vnd.ms-excel'})) + let link = document.createElement('a') + link.style.display = 'none' + link.href = url + link.setAttribute('download', fileName+'.xls') + document.body.appendChild(link) + link.click() + document.body.removeChild(link); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + } + }) + }, getAgeByIdentity(identity) { return GetAge(identity) }, @@ -345,38 +379,6 @@ export default { }) } }, - handleImportModel: function(name, type) { - if (!name || typeof name != 'string') { - name = '导出文件' - } - let param = { 'fileName': name, 'type': type } - console.log('导出参数', param) - downFile(this.url.exportXlsUrl, param).then((data) => { - console.log(data) - if (!data) { - this.$message.warning('文件下载失败') - return - } - console.log(window.navigator.msSaveBlob) - if (typeof window.navigator.msSaveBlob !== 'undefined') { - window.navigator.msSaveBlob(new Blob([data]), name + '.xlsx') - } else { - let url = window.URL.createObjectURL(new Blob([data])) - console.log(url) - let link = document.createElement('a') - console.log(link) - link.style.display = 'none' - link.href = url - link.setAttribute('download', name + '.xlsx') - console.log(link) - document.body.appendChild(link) - link.click() - console.log(link) - document.body.removeChild(link) //下载完成移除元素 - window.URL.revokeObjectURL(url) //释放掉blob对象 - } - }) - }, initDictConfig() { }, getSuperFieldList() { diff --git a/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue b/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue index 651c47f..bb41225 100644 --- a/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue +++ b/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue @@ -301,6 +301,7 @@ export default { }, edit(record) { this.model = Object.assign({}, record) + this.dataSource=[] this.visible = true // 加载子表数据 if (this.model.householdNum) { @@ -310,9 +311,10 @@ export default { }, /** 查询某个tab的数据 */ requestTableData(url, params) { + console.log("单一查询") this.familyLoading = true getAction(url, params).then(res => { - console.log(this.dataSource) + console.log(res) this.dataSource = res.result || [] console.log(this.dataSource) }).finally(() => { diff --git a/juvenile-prosecution-vue/src/views/system/DepartList.vue b/juvenile-prosecution-vue/src/views/system/DepartList.vue index e983c46..e0e99d2 100644 --- a/juvenile-prosecution-vue/src/views/system/DepartList.vue +++ b/juvenile-prosecution-vue/src/views/system/DepartList.vue @@ -117,11 +117,11 @@ - 请先选择一个机构! + 请先选择一个单位! - + diff --git a/juvenile-prosecution-vue/src/views/system/UserList.vue b/juvenile-prosecution-vue/src/views/system/UserList.vue index a85a738..1b5a255 100644 --- a/juvenile-prosecution-vue/src/views/system/UserList.vue +++ b/juvenile-prosecution-vue/src/views/system/UserList.vue @@ -86,7 +86,6 @@ - 数据分析 diff --git a/juvenile-prosecution-vue/src/views/system/modules/DepartAuthModal.vue b/juvenile-prosecution-vue/src/views/system/modules/DepartAuthModal.vue index 92aedf0..9258470 100644 --- a/juvenile-prosecution-vue/src/views/system/modules/DepartAuthModal.vue +++ b/juvenile-prosecution-vue/src/views/system/modules/DepartAuthModal.vue @@ -44,7 +44,7 @@ - 请先选择一个部门! + 请先选择一个单位! -- libgit2 0.21.4