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 78861c7..adf2be2 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 @@ -70,10 +70,10 @@ public class AnalyzeController extends JeecgController resultFamily = new ArrayList<>();//分析后家庭的数据 - private final List resultMinor = new ArrayList<>();//分析后未成年人的信息 - private final List resultSchools = new ArrayList<>();//分析后学籍的信息 - private final Set testIdCards = new HashSet<>();//存储户号 +// private List resultFamily = new ArrayList<>();//分析后家庭的数据 + private List resultMinor = new ArrayList<>();//分析后未成年人的信息 + private List resultSchools = new ArrayList<>();//分析后学籍的信息 + private Set testIdCards = new HashSet<>();//存储户号 private static final int corePoolSize = Runtime.getRuntime().availableProcessors(); private static final ThreadPoolExecutor executor = new ThreadPoolExecutor(corePoolSize, corePoolSize + 1, 10L, TimeUnit.SECONDS, new LinkedBlockingQueue(1000)); private Integer random_number=000000; diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java index efcd032..9b5876f 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java @@ -107,7 +107,11 @@ public class MinorController { if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){ sysOrgCode=sysUser.getOrgCode(); } - IPage pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode); + 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,isReason); return Result.OK(pageList); } @@ -230,7 +234,7 @@ public class MinorController { if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){ sysOrgCode=sysUser.getOrgCode(); } - IPage pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode); + IPage pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason()); //Step.2 获取导出数据 List queryList = pageList.getRecords(); // 过滤选中数据 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 35cc883..cce405d 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 @@ -77,7 +77,6 @@ public class Family implements Serializable { @ApiModelProperty(value = "与户主的关系") private String relation; /**行政区划*/ - @Excel(name = "行政区划", width = 25) @ApiModelProperty(value = "行政区划") private String division; /**现住址*/ 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 cab752f..62b87eb 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 @@ -131,7 +131,6 @@ public class Minor implements Serializable { @ApiModelProperty(value = "备注") private String remark; - @Excel(name = "行政区划", width = 15) @ApiModelProperty(value = "行政区划") private String division; @@ -140,4 +139,7 @@ public class Minor implements Serializable { @TableField(exist = false) private String age; + + @TableField(exist = false) + private String isReason; } 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 b7708c2..cf96e60 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 @@ -26,7 +26,7 @@ public interface MinorMapper extends BaseMapper { * @param page * @return */ - IPage queryPageList(Page page,@Param("name") String name,@Param("sysOrgCode") String sysOrgCode); + IPage queryPageList(Page page,@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/MinorMapper.xml b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml index 5ee1157..73d4790 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,6 +43,9 @@ and sys_org_code like concat(#{sysOrgCode},'%') + + and reason !='' + ORDER BY create_time desc 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 39ea440..e9b9da2 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 @@ -46,7 +46,7 @@ public interface IMinorService extends IService { public Integer insertBatch(List list); - IPage queryPageList(Page page,String name,String sysOrgCode); + IPage queryPageList(Page page,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/MinorServiceImpl.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java index e94382e..facb63d 100644 --- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java +++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java @@ -167,8 +167,8 @@ public class MinorServiceImpl extends ServiceImpl implements } @Override - public IPage queryPageList(Page page,String name,String sysOrgCode) { - return minorMapper.queryPageList(page,name,sysOrgCode); + public IPage queryPageList(Page page,String name,String sysOrgCode,String isReason) { + return minorMapper.queryPageList(page,name,sysOrgCode,isReason); } @@ -209,12 +209,13 @@ public class MinorServiceImpl extends ServiceImpl implements Family family=houseFamily.get(houseNum); if(oConvertUtils.isNotEmpty(family) && oConvertUtils.isNotEmpty(family.getSysOrgCode())){ minor.setSysOrgCode(family.getSysOrgCode()); + String reason="家庭成员有犯罪记录"; if(oConvertUtils.isNotEmpty(minor.getReason())){ - if(!minor.getReason().contains(String.valueOf(Minor.ATTENTION_REASON_CRIME))){ - minor.setReason(minor.getReason()+","+Minor.ATTENTION_REASON_CRIME); + if(!minor.getReason().contains(reason)){ + minor.setReason(minor.getReason()+","+reason); } }else { - minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME)); + minor.setReason(reason); } }else { minor.setSysOrgCode(finalSysOrgCode); diff --git a/juvenile-prosecution-vue/src/views/business/MinorList.vue b/juvenile-prosecution-vue/src/views/business/MinorList.vue index 4bff0f5..5c8f2f9 100644 --- a/juvenile-prosecution-vue/src/views/business/MinorList.vue +++ b/juvenile-prosecution-vue/src/views/business/MinorList.vue @@ -9,6 +9,14 @@ + + + + + + + + 查询