添加根据身份证号、学校、家庭住址、重点关注原因、性别、年龄范围查询

wxy
1 parent d1a8496e
Showing 10 changed files with 183 additions and 72 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java
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
@@ -88,8 +88,8 @@ public class SparkEtlService implements Serializable {
         //家庭成员数据
         List<Family> families = new ArrayList<Family>();
         for (Minor minor : minors) {
-            if (null != minor.getFamilies() && !minor.getFamilies().isEmpty()) {
-                families.addAll(minor.getFamilies());
+            if (null != minor.getFamilyList() && !minor.getFamilyList().isEmpty()) {
+                families.addAll(minor.getFamilyList());
             }
         }
         this.saveMinor(minors);
@@ -742,9 +742,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
             Map<String, Family> guardians = new HashMap<>();
             Date createTime = new Date();
             if (oConvertUtils.isNotEmpty(gaHouseholds)) {
-                getRandomId idWorker = new getRandomId(0, 0);
                 for (Map.Entry<String, Family> m : gaHouseholds.entrySet()) {
-                    long id = idWorker.nextId();
                     String mapKey = m.getKey();
                     Family family = m.getValue();
                     if (oConvertUtils.isNotEmpty(family)) {
@@ -830,7 +828,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                                 testIdCards.add(houseNum);
                             }
                         }
-                        minor.setFamilies(f);
+                        minor.setFamilyList(f);
                         //获取监护人
                         if (oConvertUtils.isNotEmpty(houseNum) && oConvertUtils.isNotEmpty(guardians) && oConvertUtils.isNotEmpty(guardians.get(houseNum))) {
                             minor.setGuardian(guardians.get(houseNum).getName());
@@ -98,7 +98,8 @@ public class MinorController {
     public Result<?> queryPageList(Minor minor,
                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                   HttpServletRequest req) {
+                                   HttpServletRequest req,@RequestParam(name = "column", defaultValue = "age") String column,
+                                   @RequestParam(name = "order", defaultValue = "asc") String order) {
         QueryWrapper<Minor> queryWrapper = QueryGenerator.initQueryWrapper(minor, req.getParameterMap());
         Page<Minor> page = new Page<Minor>(pageNo, pageSize);
 //		IPage<Minor> pageList = minorService.page(page, queryWrapper);
@@ -111,32 +112,23 @@ public class MinorController {
 //        if(oConvertUtils.isNotEmpty(minor) && oConvertUtils.isNotEmpty(minor.getIsReason()) && minor.getIsReason().equals("1")){
 //            isReason=minor.getIsReason();
 //        }
-        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason());
+        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason(),minor.getIdentity(),minor.getSchoolName(),
+                minor.getGender(),minor.getReason(),minor.getAddress(),minor.getAge(),column,order);
         return Result.OK(pageList);
     }
     /**
      * 添加
      *
-     * @param minorPage
+     * @param minor
      * @return
      */
     @AutoLog(value = "未成年人-添加")
     @ApiOperation(value = "未成年人-添加", notes = "未成年人-添加")
     @PostMapping(value = "/add")
-    public Result<?> add(@RequestBody MinorPage minorPage) {
-//        Integer count=0;
-//        if(oConvertUtils.isNotEmpty(minorPage) && oConvertUtils.isNotEmpty(minorPage.getIdentity())){
-//            count=minorService.getMinorByIdCard(minorPage.getIdentity());
-//        }
-//        if(count==0){
-            Minor minor = new Minor();
-            BeanUtils.copyProperties(minorPage, minor);
-            minorService.saveMain(minor, minorPage.getFamilyList());
+    public Result<?> add(@RequestBody Minor minor) {
+            minorService.saveMain(minor, minor.getFamilyList());
             return Result.OK("添加成功！");
-//        }else {
-//            return Result.error("身份证号重复！");
-//        }
     }
     /**
@@ -151,7 +143,7 @@ public class MinorController {
     public Result<?> edit(@RequestBody MinorPage minorPage) {
         Minor minor = new Minor();
         BeanUtils.copyProperties(minorPage, minor);
-        Minor minorEntity = minorService.getById(minor.getId());
+        Minor minorEntity = minorService.getById(minorPage.getId());
         if (minorEntity == null) {
             return Result.error("未找到对应数据");
         }
@@ -215,7 +207,7 @@ public class MinorController {
     @ApiOperation(value = "家庭成员表主表householdNum查询", notes = "家庭成员表-通主表householdNum查询")
     @GetMapping(value = "/queryFamilyByMainId")
     public Result<?> queryFamilyListByMainId(@RequestParam(name = "householdNum", required = true) String householdNum) {
-        List<Family> familyList = familyService.selectByHouseholdNum(householdNum);
+        List<Family> familyList = familyService.getFamilysByHouseholdNum(householdNum);
         return Result.OK(familyList);
     }
@@ -241,7 +233,8 @@ public class MinorController {
 	 */
 	@RequestMapping(value = "/exportXls")
 	public ModelAndView exportXls(HttpServletRequest request, Minor minor,  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,@RequestParam(name = "column", defaultValue = "age") String column,
+                                  @RequestParam(name = "order", defaultValue = "asc") String order) {
         // Step.1 组装查询条件查询数据
         // 过滤选中数据
         String selections = request.getParameter("selections");
@@ -258,7 +251,8 @@ public class MinorController {
         if(oConvertUtils.isNotEmpty(sysUser) && oConvertUtils.isNotEmpty(sysUser.getOrgCode())){
             sysOrgCode=sysUser.getOrgCode();
         }
-        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason());
+        IPage<Minor> pageList = minorService.queryPageList(page,minor.getName(),sysOrgCode,minor.getIsReason(),minor.getIdentity(),minor.getSchoolName(),
+                minor.getGender(),minor.getReason(),minor.getAddress(),minor.getAge(),column,order);
         //Step.2 获取导出数据
         List<Minor> queryList = pageList.getRecords();
         List<Minor> minorList = new ArrayList<Minor>();
@@ -13,6 +13,9 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import shaded.parquet.com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import shaded.parquet.com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import java.io.UnsupportedEncodingException;
 /**
@@ -32,7 +35,7 @@ public class Family implements Serializable {
     @TableId(type = IdType.NONE)
     @ApiModelProperty(value = "主键")
-    private Long id;
+    private String id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -43,8 +43,9 @@ public class Minor implements Serializable {
 	/**主键*/
 	@TableId(type = IdType.NONE)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     @ApiModelProperty(value = "主键")
-    private Long id;
+    private String id;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
@@ -135,11 +136,17 @@ public class Minor implements Serializable {
     private String division;
     @TableField(exist = false)
-    private List<Family> families;
+    private List<Family> familyList;
     @TableField(exist = false)
     private String age;
     @TableField(exist = false)
     private String isReason;
+
+    @TableField(exist = false)
+    private String column;
+
+    @TableField(exist = false)
+    private String order;
 }
@@ -26,7 +26,9 @@ public interface MinorMapper extends BaseMapper&lt;Minor&gt; {
      * @param page
      * @return
      */
-    IPage<Minor> queryPageList(Page page,@Param("name") String name,@Param("sysOrgCode") String sysOrgCode,@Param("isReason")String isReason);
+    IPage<Minor> queryPageList(Page page,@Param("name") String name,@Param("sysOrgCode") String sysOrgCode,@Param("isReason")String isReason,
+                               @Param("identity") String identity,@Param("schoolName") String schoolName,@Param("gender")Integer gender,@Param("reason") String reason,
+                               @Param("address") String address,@Param("age")String age,@Param("column") String column,@Param("order")String order);
     /**
      * 根据身份证号查询总数
@@ -40,6 +40,21 @@
         <if test="name!=null and name!=''">
             and name like concat('%',#{name},'%')
         </if>
+        <if test="identity!=null and identity!=''">
+            and identity =#{identity}
+        </if>
+        <if test="schoolName!=null and schoolName!=''">
+            and school_name like concat('%',#{schoolName},'%')
+        </if>
+        <if test="gender!=null">
+            and gender =#{gender}
+        </if>
+        <if test="reason!=null and reason!=''">
+            and reason like concat('%',#{reason},'%')
+        </if>
+        <if test="address!=null and address!=''">
+            and address like concat('%',#{address},'%')
+        </if>
         <if test="sysOrgCode!=null and sysOrgCode!=''">
             and sys_org_code like concat(#{sysOrgCode},'%')
         </if>
@@ -54,7 +69,44 @@
             </otherwise>
         </choose>
-        ORDER BY create_time desc
+        <choose>
+            <when test='age=="6"'>
+                and ((timestampdiff(year, substring(identity, 7, 8), now())) <![CDATA[>=]]> 0 and (timestampdiff(year, substring(identity, 7, 8), now())) <![CDATA[<=]]> 6)
+            </when>
+            <when test='age=="12"'>
+                and ((timestampdiff(year, substring(identity, 7, 8), now())) <![CDATA[>=]]> 6 and (timestampdiff(year, substring(identity, 7, 8), now())) <![CDATA[<=]]> 12)
+            </when>
+            <when test='age=="18"'>
+                and ((timestampdiff(year, substring(identity, 7, 8), now())) <![CDATA[>=]]> 12 and (timestampdiff(year, substring(identity, 7, 8), now())) <![CDATA[<=]]> 18)
+            </when>
+        </choose>
+        <choose>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="age" and order=="asc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="age" and order=="desc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) desc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="schoolName" and order=="asc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc,school_name asc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="schoolName" and order=="desc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc,school_name desc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="address" and order=="asc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc,address asc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="address" and order=="desc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc,address desc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="reason" and order=="asc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc,reason asc
+            </when>
+            <when test='column!=null and column!="" and order!=null and order!="" and column =="reason" and order=="desc"'>
+                ORDER BY (timestampdiff(year, substring(identity, 7, 8), now())) asc,reason desc
+            </when>
+        </choose>
+
     </select>
     <select id="getMinorByIdCard"  parameterType="java.lang.String" >
@@ -50,7 +50,8 @@ public interface IMinorService extends IService&lt;Minor&gt; {
 	 * @param page
 	 * @return
 	 */
-	IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason);
+	IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason,String identity,String schoolName,Integer gender,String reason,
+							   String address,String age,String column,String order);
 	/**
 	 * 查询未成年人信息
@@ -58,6 +58,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 	@Transactional
 	public void saveMain(Minor minor, List<Family> familyList) {
 		getRandomId idWorker = new getRandomId(0, 0);
+		String reason="";
 		if(familyList!=null && familyList.size()>0) {
 			//判断家庭成员信息里的数据是否包含未成年人,默认包含
 			Boolean falg=true;
@@ -72,13 +73,18 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 				if(oConvertUtils.isNotEmpty(entity.getCrime()) && entity.getCrime().equals(Family.IS_CRIME)){
 					isCrime=true;
 				}
-				entity.setId(idWorker.nextId());
+				entity.setId(String.valueOf(idWorker.nextId()));
 			}
 			if(isCrime){
-				minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME));
+				if(oConvertUtils.isNotEmpty(minor.getReason()) && minor.getReason().contains("家庭成员有犯罪记录")){
+					reason=minor.getReason()+","+"家庭成员有犯罪记录";
+				}else {
+					reason="家庭成员有犯罪记录";
+				}
 			}
 		}
-		minor.setId(idWorker.nextId());
+		minor.setReason(reason);
+		minor.setId(String.valueOf(idWorker.nextId()));
 		familyMapper.insertBatch(familyList);
 		minorMapper.insert(minor);
 	}
@@ -106,25 +112,13 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 					isCrime=true;
 				}
 			}
-//			if(!falg){
-//				Family family=new Family();
-//				family.setCrime(Family.IS_NOT_CRIME);
-//				family.setName(minor.getName());
-//				family.setHouseholdNum(minor.getHouseholdNum());
-//				family.setIdentity(minor.getIdentity());
-//				family.setNumber(minor.getNumber());
-//				family.setGender(minor.getGender());
-//				family.setAddress(minor.getAddress());
-//				family.setRelation(minor.getRelation());
-//				families.add(family);
-//			}
 			if(isCrime){
 				if(oConvertUtils.isNotEmpty(minor.getReason())){
 					if(!minor.getReason().contains(String.valueOf(Minor.ATTENTION_REASON_CRIME))){
-						minor.setReason(minor.getReason()+","+Minor.ATTENTION_REASON_CRIME);
+						minor.setReason(minor.getReason()+","+"家庭成员有犯罪记录");
 					}
 				}else {
-					minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME));
+					minor.setReason("家庭成员有犯罪记录");
 				}
 			}
 			familyMapper.insertBatch(familyList);
@@ -161,7 +155,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 		if(oConvertUtils.isNotEmpty(list)){
 			for(int i=0;i<list.size();i++){
 				String id=System.currentTimeMillis()+String.valueOf((random_number+i));
-				list.get(i).setId(Long.valueOf(id));
+				list.get(i).setId(id);
 			}
 		}
 		updateStudentWithThreads(list);
@@ -174,8 +168,9 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 	 * @return
 	 */
 	@Override
-	public IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason) {
-		return minorMapper.queryPageList(page,name,sysOrgCode,isReason);
+	public IPage<Minor> queryPageList(Page<Minor> page,String name,String sysOrgCode,String isReason,String identity,String schoolName,Integer gender,String reason,
+									  String address,String age,String column,String order) {
+		return minorMapper.queryPageList(page,name,sysOrgCode,isReason,identity,schoolName,gender,reason,address,age,column,order);
 	}
 	/**
@@ -216,7 +211,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; 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());
+					family.setId(String.valueOf(idWorker.nextId()));
 				}
 			});
 		}
@@ -225,7 +220,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 			minors.stream().forEach(minor -> {
 				if(oConvertUtils.isNotEmpty(minor)){
 					minor.setCreateTime(createTime);
-					minor.setId(idWorker.nextId());
+					minor.setId(String.valueOf(idWorker.nextId()));
 					if(oConvertUtils.isNotEmpty(houseFamily) && oConvertUtils.isNotEmpty(minor.getHouseholdNum())){
 						String houseNum=minor.getHouseholdNum();
 						Family family=houseFamily.get(houseNum);
@@ -264,9 +259,9 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 			list.forEach(s -> {
 				if(oConvertUtils.isNotEmpty(s)){
 					minorMapper.insert(s);
-					if(oConvertUtils.isNotEmpty(s.getFamilies())){
-						if(s.getFamilies().size()>0){
-							familyMapper.insertBatch(s.getFamilies());
+					if(oConvertUtils.isNotEmpty(s.getFamilyList())){
+						if(s.getFamilyList().size()>0){
+							familyMapper.insertBatch(s.getFamilyList());
 						}
 					}
 				}
@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
+      <a-form layout="inline" @keyup.enter.native="searchQuery" :label-col="labelCol" labelAlign="right">
         <a-row :gutter="24">
           <a-col :md="6" :sm="12">
             <a-form-item label="姓名">
@@ -10,7 +10,17 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="12">
-            <a-form-item label="是否重点关注">
+            <a-form-item label="身份证号">
+              <a-input placeholder="输入身份证号查询" v-model="queryParam.identity"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="性别">
+              <j-dict-select-tag v-model="queryParam.gender" dictCode="sex" placeholder="请选择性别" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="重点关注" :label-col="labelCol2">
               <a-select v-model="queryParam.isReason"  placeholder="请选择" >
                 <a-select-option value="0">全部</a-select-option>
                 <a-select-option value="1">是</a-select-option>
@@ -18,21 +28,42 @@
               </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>
-            </span>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="学校">
+              <a-input placeholder="输入学校名称查询" v-model="queryParam.schoolName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="家庭住址">
+              <a-input placeholder="输入家庭住址查询" v-model="queryParam.address"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="年龄">
+              <a-select v-model="queryParam.age"  placeholder="请选择" >
+                <a-select-option value="0">全部</a-select-option>
+                <a-select-option value="6">6岁以下</a-select-option>
+                <a-select-option value="12">6岁-12岁</a-select-option>
+                <a-select-option value="18">12岁-18岁</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="重点关注原因" :label-col="labelCol2">
+              <a-input placeholder="输入重点关注原因查询" v-model="queryParam.reason"></a-input>
+            </a-form-item>
           </a-col>
         </a-row>
       </a-form>
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus"  >新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('未检人员模板')" style="margin-left:8px;">模板导出
       </a-button>
       <a-upload style="margin-left:8px;" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                 :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
+      <a-button type="primary" @click="searchQuery" icon="search" style="margin-left:8px;">查询</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0" style="margin-left:8px;">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel">
@@ -72,10 +103,10 @@
           <j-ellipsis :value="text" :length="15" />
         </span>
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
           <a @click="handleDetail(record)">查看</a>
           <a-divider type="vertical" />
+          <a @click="handleEdit(record)">编辑</a>
+          <a-divider type="vertical" />
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
              <a>删除</a>
            </a-popconfirm>
@@ -140,6 +171,8 @@ export default {
   },
   data() {
     return {
+      labelCol: { style: { width: '70px' } },
+      labelCol2: { style: { width: '100px' } },
       activeKey: '1',
       infoVisible: false,
       info: {},
@@ -170,7 +203,8 @@ export default {
           dataIndex: 'age',
           customRender: function(text, record) {
             return GetAge(record.identity)
-          }
+          },
+          sorter: true
         },
         {
           title: '性别',
@@ -181,7 +215,8 @@ export default {
           title: '学校名称',
           align: 'center',
           dataIndex: 'schoolName',
-          scopedSlots: { customRender: 'longText' }
+          scopedSlots: { customRender: 'longText' },
+          sorter: true
         },
         {
           title: '入学年份',
@@ -197,7 +232,8 @@ export default {
           title: '家庭住址',
           align: 'center',
           dataIndex: 'address',
-          scopedSlots: { customRender: 'longText' }
+          scopedSlots: { customRender: 'longText' },
+          sorter: true
         },
         {
           title: '身份证号',
@@ -218,7 +254,8 @@ export default {
           title: '重点关注原因',
           align: 'center',
           dataIndex: 'reason',
-          scopedSlots: { customRender: 'longText' }
+          scopedSlots: { customRender: 'longText' },
+          sorter: true
         },
         {
           title: '操作',
@@ -229,6 +266,15 @@ export default {
           scopedSlots: { customRender: 'action' }
         }
       ],
+      queryParam:{
+        name:'',
+        isReason:'0',
+        reason:'',
+        identity:'',
+        schoolName:'',
+        address:'',
+        age:'0',
+      },
       url: {
         list: '/sys/minor/list',
         delete: '/sys/minor/delete',
@@ -265,6 +311,7 @@ export default {
           align: 'center',
           width: 120,
           dataIndex: 'division',
+          ellipsis: true,
           scopedSlots: { customRender: 'longText' }
         },
         {
@@ -314,10 +361,11 @@ export default {
         total: 0
       },
       familyLoading: false,
-      queryParam:{
-        name:'',
-        isReason:'0'
-      }
+      /* 排序参数 */
+      isorter:{
+        column: 'age',
+        order: 'asc',
+      },
     }
   },
   created() {
@@ -329,6 +377,17 @@ export default {
     }
   },
   methods: {
+    // handleTableChange(pagination, filters, sorter) {
+    //   //分页、排序、筛选变化时触发
+    //   //TODO 筛选
+    //   console.log(pagination)
+    //   if (Object.keys(sorter).length > 0) {
+    //     this.isorter.column = sorter.field;
+    //     this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
+    //   }
+    //   this.ipagination = pagination;
+    //   this.loadData();
+    // },
     handleExportXls(fileName){
       if(!fileName || typeof fileName != "string"){
         fileName = "导出文件"