未成年人查询过滤

wxy
1 parent 1d604b47
Showing 9 changed files with 32 additions and 15 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/MinorController.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/MinorMapper.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/MinorMapper.xml
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IMinorService.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
juvenile-prosecution-vue/src/views/business/MinorList.vue
@@ -70,10 +70,10 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
     @Resource
     private ISysDictService dictService;
-//    private final List<Family> resultFamily = new ArrayList<>();//分析后家庭的数据
-    private final List<Minor> resultMinor = new ArrayList<>();//分析后未成年人的信息
-    private final List<MrSchool> resultSchools = new ArrayList<>();//分析后学籍的信息
-    private final Set<String> testIdCards = new HashSet<>();//存储户号
+//    private List<Family> resultFamily = new ArrayList<>();//分析后家庭的数据
+    private List<Minor> resultMinor = new ArrayList<>();//分析后未成年人的信息
+    private List<MrSchool> resultSchools = new ArrayList<>();//分析后学籍的信息
+    private Set<String> 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<Runnable>(1000));
     private Integer random_number=000000;
@@ -107,7 +107,11 @@ public class MinorController {
         if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){
             sysOrgCode=sysUser.getOrgCode();
         }
-        IPage<Minor> 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<Minor> 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<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode);
+        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason());
         //Step.2 获取导出数据
         List<Minor> queryList = pageList.getRecords();
         // 过滤选中数据
@@ -77,7 +77,6 @@ public class Family implements Serializable {
     @ApiModelProperty(value = "与户主的关系")
     private String relation;
     /**行政区划*/
-    @Excel(name = "行政区划", width = 25)
     @ApiModelProperty(value = "行政区划")
     private String division;
     /**现住址*/
@@ -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;
 }
@@ -26,7 +26,7 @@ public interface MinorMapper extends BaseMapper&lt;Minor&gt; {
      * @param page
      * @return
      */
-    IPage<Minor> queryPageList(Page page,@Param("name") String name,@Param("sysOrgCode") String sysOrgCode);
+    IPage<Minor> queryPageList(Page page,@Param("name") String name,@Param("sysOrgCode") String sysOrgCode,@Param("isReason")String isReason);
     /**
      * 根据身份证号查询总数
@@ -43,6 +43,9 @@
         <if test="sysOrgCode!=null and sysOrgCode!=''">
             and sys_org_code like concat(#{sysOrgCode},'%')
         </if>
+        <if test="isReason!=null and isReason!=''">
+            and reason !=''
+        </if>
         ORDER BY create_time desc
     </select>
@@ -46,7 +46,7 @@ public interface IMinorService extends IService&lt;Minor&gt; {
 	public Integer insertBatch(List<Minor> list);
-	IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode);
+	IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason);
 	/**
 	 * 添加多对多
@@ -167,8 +167,8 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 	}
 	@Override
-	public IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode) {
-		return minorMapper.queryPageList(page,name,sysOrgCode);
+	public IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason) {
+		return minorMapper.queryPageList(page,name,sysOrgCode,isReason);
 	}
@@ -209,12 +209,13 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; 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);
@@ -9,6 +9,14 @@
               <a-input placeholder="输入姓名查询" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="是否重点关注">
+              <a-select v-model="queryParam.isReason"  placeholder="请选择" >
+                <a-select-option value="1">是</a-select-option>
+                <a-select-option value="2">否</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>