From ebeb57f112059beffa85383e0c6a0d4cea2f274d Mon Sep 17 00:00:00 2001
From: wxy <1229384355@qq.com>
Date: Mon, 25 Jul 2022 11:58:30 +0800
Subject: [PATCH] 详情添加学校名称、入学日期等字段，修复数据分析监护人、部分户号、人员编号数据为空的情况

---
 juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java | 20 ++++++++++++++------
 juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java                 |  1 +
 juvenile-prosecution-vue/src/views/business/MinorList.vue                                                                   | 30 ++++++++++--------------------
 3 files changed, 25 insertions(+), 26 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 5f3e9f9..633f66e 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
@@ -74,13 +74,12 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
     private final List<MrSchool> resultSchools = new ArrayList<>();//分析后学籍的信息
     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 String random_number="00000000";
 
 
     @AutoLog(value = "来源数据管理-分页列表查询")
     @ApiOperation(value = "来源数据管理-分页列表查询", notes = "来源数据管理-分页列表查询")
     @PutMapping(value = "/doAnalyzeData")
-    public Result<?> doAnalyzeData() {
+    public void doAnalyzeData() {
         try {
             System.out.println("开始数据分析");
             long startTime = System.currentTimeMillis();
@@ -103,11 +102,11 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
             getSourceData();
             System.out.println("来源数据入库时间" + (System.currentTimeMillis() - startTime4) / 1000 + "秒");
             System.out.println("*********************************总用时" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
-            return Result.OK("操作成功");
+//            return Result.OK("操作成功");
         } catch (Exception e) {
             e.printStackTrace();
             log.info(String.valueOf(e));
-            return Result.OK("操作失败");
+//            return Result.OK("操作失败");
         }
     }
 
@@ -444,7 +443,11 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
                         if (oConvertUtils.isNotEmpty(i) && oConvertUtils.isNotEmpty(i.getSchool()) && oConvertUtils.isNotEmpty(d) && oConvertUtils.isNotEmpty(d.getCommonCode())) {
                             if (d.getCommonCode().contains(i.getSchool())) {
                                 i.setSysOrgCode(d.getOrgCode());
+                            }else {
+                                i.setSysOrgCode("");
                             }
+                        }else {
+                            i.setSysOrgCode("");
                         }
                     });
                 }
@@ -511,7 +514,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
                         Minor minor = new Minor();
                         if (oConvertUtils.isNotEmpty(m) && oConvertUtils.isNotEmpty(m.getIdentity())  && IDNumberUtil.checkID(m.getIdentity())) {
                             if (oConvertUtils.isNotEmpty(d) && oConvertUtils.isNotEmpty(d.getCommonCode()) && oConvertUtils.isNotEmpty(m.getSchool())) {
-                                if (d.getCommonCode().contains(m.getSchool()) && oConvertUtils.isNotEmpty(minorMap.get(m.getIdentity()))) {
+                                if (d.getCommonCode().contains(m.getSchool())) {
                                     minor.setSysOrgCode(d.getOrgCode());
                                     m.setSysOrgCode(d.getOrgCode());
                                 }
@@ -530,6 +533,10 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
                             if (oConvertUtils.isNotEmpty(m.getAdmissionDate())) {
                                 minor.setStartYear(m.getAdmissionDate());
                             }
+                            if (oConvertUtils.isNotEmpty(gaHouseholds) && oConvertUtils.isNotEmpty(gaHouseholds.get(m.getIdentity()))) {
+                                minor.setNumber(gaHouseholds.get(m.getIdentity()).getNumber());
+                                minor.setHouseholdNum(gaHouseholds.get(m.getIdentity()).getHouseholdNum());
+                            }
                             minor.setIdentity(m.getIdentity());
                             minor.setCreateTime(creatTime);
                             m.setCreateTime(creatTime);
@@ -568,6 +575,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
 //                        if (minors.get(s.getIdentity()).getIdentity().equals(s.getIdentity())) {
                             minors.get(s.getIdentity()).setSpecialReason(s.getReason());
                             minors.get(s.getIdentity()).setRemark(s.getRemark());
+                            minors.get(s.getIdentity()).setReason(Minor.ATTENTION_REASON_STUDENT);
 //                        }
                     }
                 }
@@ -725,7 +733,7 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
                         if (oConvertUtils.isNotEmpty(family.getCrime()) && family.getCrime().equals(Family.IS_CRIME)) {
                             idCards.put(family.getIdentity(), houseNum);
                         }
-                        if (oConvertUtils.isNotEmpty(family.getRelation()) && family.getRelation().contains("户主")) {
+                        if (oConvertUtils.isNotEmpty(family.getName()) && family.getName().contains("户主")) {
                             guardians.put(houseNum, family);
                         }
                         familyMaps.put(houseNum, list);
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 57dc70b..45ebf7e 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
@@ -36,6 +36,7 @@ public class Minor implements Serializable {
     public static  final Integer ATTENTION_REASON_UNSUPPORTED=3;//无人抚养
     public static  final Integer ATTENTION_REASON_CRIME=4;//家庭成员有犯罪记录
     public static  final Integer ATTENTION_REASON_ADOPTION=5;//收养
+    public static  final Integer ATTENTION_REASON_STUDENT=6;//特殊学生
 
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
diff --git a/juvenile-prosecution-vue/src/views/business/MinorList.vue b/juvenile-prosecution-vue/src/views/business/MinorList.vue
index cf0ea16..3ce1fe8 100644
--- a/juvenile-prosecution-vue/src/views/business/MinorList.vue
+++ b/juvenile-prosecution-vue/src/views/business/MinorList.vue
@@ -73,18 +73,20 @@
     <!--  详情  -->
     <a-modal v-model:visible="infoVisible" title="未成年信息" :footer=null :width="1000">
       <a-descriptions bordered layout="vertical" :column="4">
-        <a-descriptions-item label="户号">{{ info.householdNum }}</a-descriptions-item>
-        <a-descriptions-item label="人员编号">{{ info.number }}</a-descriptions-item>
         <a-descriptions-item label="姓名">{{ info.name }}</a-descriptions-item>
         <a-descriptions-item label="性别">{{ info.gender_dictText }}</a-descriptions-item>
         <a-descriptions-item label="年龄">{{ getAgeByIdentity(info.identity) }}</a-descriptions-item>
         <a-descriptions-item label="身份证号">{{ info.identity }}</a-descriptions-item>
-        <a-descriptions-item label="家庭住址" :span="2">{{ info.address }}</a-descriptions-item>
+        <a-descriptions-item label="学校名称">{{ info.schoolName }}</a-descriptions-item>
+        <a-descriptions-item label="入学年份">{{ info.startYear }}</a-descriptions-item>
+        <a-descriptions-item label="是否失学">{{ info.school_dictText }}</a-descriptions-item>
+        <a-descriptions-item label="家庭住址" >{{ info.address }}</a-descriptions-item>
         <a-descriptions-item label="是否失学">{{ info.school_dictText }}</a-descriptions-item>
         <a-descriptions-item label="学校名称">{{ info.schoolName }}</a-descriptions-item>
         <a-descriptions-item label="监护人">{{ info.guardian }}</a-descriptions-item>
         <a-descriptions-item label="监护人关系">{{ info.relation }}</a-descriptions-item>
-        <a-descriptions-item label="重点关注原因" :span="4">{{ info.reason_dictText }}</a-descriptions-item>
+        <a-descriptions-item label="重点关注原因">{{ info.reason_dictText }}</a-descriptions-item>
+        <a-descriptions-item label="特殊原因">{{ info.specialReason }}</a-descriptions-item>
         <a-descriptions-item label="备注" :span="4">{{ info.remark }}</a-descriptions-item>
       </a-descriptions>
       <a-tabs v-model:activeKey="activeKey">
@@ -180,31 +182,19 @@ export default {
           dataIndex: 'identity'
         },
         {
-          title: '监护人关系',
-          align: 'center',
-          dataIndex: 'relation'
-        },
-        {
           title: '监护人',
           align: 'center',
           dataIndex: 'guardian'
         },
         {
-          title: '重点关注原因',
-          align: 'center',
-          dataIndex: 'reason_dictText'
-        },
-        {
-          title: '特殊原因',
+          title: '监护人关系',
           align: 'center',
-          dataIndex: 'specialReason',
-          scopedSlots: { customRender: 'longText' }
+          dataIndex: 'relation'
         },
         {
-          title: '备注',
+          title: '重点关注原因',
           align: 'center',
-          dataIndex: 'remark',
-          scopedSlots: { customRender: 'longText' }
+          dataIndex: 'reason_dictText'
         },
         {
           title: '操作',
--
libgit2 0.21.4