wx-group / juvenile-prosecution

Commit ebeb57f112059beffa85383e0c6a0d4cea2f274d

Authored by wxy
1 parent f2095a1e

详情添加学校名称、入学日期等字段，修复数据分析监护人、部分户号、人员编号数据为空的情况

Inline Side-by-side
Showing 3 changed files with 25 additions and 26 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
  View file @ebeb57f
... ... @@ -74,13 +74,12 @@ public class AnalyzeController extends JeecgController<GaDemographic, IGaDemogra
74 74 private final List<MrSchool> resultSchools = new ArrayList<>();//分析后学籍的信息
75 75 private static final int corePoolSize = Runtime.getRuntime().availableProcessors();
76 76 private static final ThreadPoolExecutor executor = new ThreadPoolExecutor(corePoolSize, corePoolSize + 1, 10L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(1000));
77   - private String random_number="00000000";
78 77  
79 78  
80 79 @AutoLog(value = "来源数据管理-分页列表查询")
81 80 @ApiOperation(value = "来源数据管理-分页列表查询", notes = "来源数据管理-分页列表查询")
82 81 @PutMapping(value = "/doAnalyzeData")
83   - public Result<?> doAnalyzeData() {
  82 + public void doAnalyzeData() {
84 83 try {
85 84 System.out.println("开始数据分析");
86 85 long startTime = System.currentTimeMillis();
... ... @@ -103,11 +102,11 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
103 102 getSourceData();
104 103 System.out.println("来源数据入库时间" + (System.currentTimeMillis() - startTime4) / 1000 + "秒");
105 104 System.out.println("*********************************总用时" + (System.currentTimeMillis() - startTime) / 1000 + "秒");
106   - return Result.OK("操作成功");
  105 +// return Result.OK("操作成功");
107 106 } catch (Exception e) {
108 107 e.printStackTrace();
109 108 log.info(String.valueOf(e));
110   - return Result.OK("操作失败");
  109 +// return Result.OK("操作失败");
111 110 }
112 111 }
113 112  
... ... @@ -444,7 +443,11 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
444 443 if (oConvertUtils.isNotEmpty(i) && oConvertUtils.isNotEmpty(i.getSchool()) && oConvertUtils.isNotEmpty(d) && oConvertUtils.isNotEmpty(d.getCommonCode())) {
445 444 if (d.getCommonCode().contains(i.getSchool())) {
446 445 i.setSysOrgCode(d.getOrgCode());
  446 + }else {
  447 + i.setSysOrgCode("");
447 448 }
  449 + }else {
  450 + i.setSysOrgCode("");
448 451 }
449 452 });
450 453 }
... ... @@ -511,7 +514,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
511 514 Minor minor = new Minor();
512 515 if (oConvertUtils.isNotEmpty(m) && oConvertUtils.isNotEmpty(m.getIdentity()) && IDNumberUtil.checkID(m.getIdentity())) {
513 516 if (oConvertUtils.isNotEmpty(d) && oConvertUtils.isNotEmpty(d.getCommonCode()) && oConvertUtils.isNotEmpty(m.getSchool())) {
514   - if (d.getCommonCode().contains(m.getSchool()) && oConvertUtils.isNotEmpty(minorMap.get(m.getIdentity()))) {
  517 + if (d.getCommonCode().contains(m.getSchool())) {
515 518 minor.setSysOrgCode(d.getOrgCode());
516 519 m.setSysOrgCode(d.getOrgCode());
517 520 }
... ... @@ -530,6 +533,10 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
530 533 if (oConvertUtils.isNotEmpty(m.getAdmissionDate())) {
531 534 minor.setStartYear(m.getAdmissionDate());
532 535 }
  536 + if (oConvertUtils.isNotEmpty(gaHouseholds) && oConvertUtils.isNotEmpty(gaHouseholds.get(m.getIdentity()))) {
  537 + minor.setNumber(gaHouseholds.get(m.getIdentity()).getNumber());
  538 + minor.setHouseholdNum(gaHouseholds.get(m.getIdentity()).getHouseholdNum());
  539 + }
533 540 minor.setIdentity(m.getIdentity());
534 541 minor.setCreateTime(creatTime);
535 542 m.setCreateTime(creatTime);
... ... @@ -568,6 +575,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
568 575 // if (minors.get(s.getIdentity()).getIdentity().equals(s.getIdentity())) {
569 576 minors.get(s.getIdentity()).setSpecialReason(s.getReason());
570 577 minors.get(s.getIdentity()).setRemark(s.getRemark());
  578 + minors.get(s.getIdentity()).setReason(Minor.ATTENTION_REASON_STUDENT);
571 579 // }
572 580 }
573 581 }
... ... @@ -725,7 +733,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
725 733 if (oConvertUtils.isNotEmpty(family.getCrime()) && family.getCrime().equals(Family.IS_CRIME)) {
726 734 idCards.put(family.getIdentity(), houseNum);
727 735 }
728   - if (oConvertUtils.isNotEmpty(family.getRelation()) && family.getRelation().contains("户主")) {
  736 + if (oConvertUtils.isNotEmpty(family.getName()) && family.getName().contains("户主")) {
729 737 guardians.put(houseNum, family);
730 738 }
731 739 familyMaps.put(houseNum, list);
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java
  View file @ebeb57f
... ... @@ -36,6 +36,7 @@ public class Minor implements Serializable {
36 36 public static final Integer ATTENTION_REASON_UNSUPPORTED=3;//无人抚养
37 37 public static final Integer ATTENTION_REASON_CRIME=4;//家庭成员有犯罪记录
38 38 public static final Integer ATTENTION_REASON_ADOPTION=5;//收养
  39 + public static final Integer ATTENTION_REASON_STUDENT=6;//特殊学生
39 40  
40 41 /**主键*/
41 42 @TableId(type = IdType.ASSIGN_ID)
... ...
juvenile-prosecution-vue/src/views/business/MinorList.vue
  View file @ebeb57f
... ... @@ -73,18 +73,20 @@
73 73 <!-- 详情 -->
74 74 <a-modal v-model:visible="infoVisible" title="未成年信息" :footer=null :width="1000">
75 75 <a-descriptions bordered layout="vertical" :column="4">
76   - <a-descriptions-item label="户号">{{ info.householdNum }}</a-descriptions-item>
77   - <a-descriptions-item label="人员编号">{{ info.number }}</a-descriptions-item>
78 76 <a-descriptions-item label="姓名">{{ info.name }}</a-descriptions-item>
79 77 <a-descriptions-item label="性别">{{ info.gender_dictText }}</a-descriptions-item>
80 78 <a-descriptions-item label="年龄">{{ getAgeByIdentity(info.identity) }}</a-descriptions-item>
81 79 <a-descriptions-item label="身份证号">{{ info.identity }}</a-descriptions-item>
82   - <a-descriptions-item label="家庭住址" :span="2">{{ info.address }}</a-descriptions-item>
  80 + <a-descriptions-item label="学校名称">{{ info.schoolName }}</a-descriptions-item>
  81 + <a-descriptions-item label="入学年份">{{ info.startYear }}</a-descriptions-item>
  82 + <a-descriptions-item label="是否失学">{{ info.school_dictText }}</a-descriptions-item>
  83 + <a-descriptions-item label="家庭住址" >{{ info.address }}</a-descriptions-item>
83 84 <a-descriptions-item label="是否失学">{{ info.school_dictText }}</a-descriptions-item>
84 85 <a-descriptions-item label="学校名称">{{ info.schoolName }}</a-descriptions-item>
85 86 <a-descriptions-item label="监护人">{{ info.guardian }}</a-descriptions-item>
86 87 <a-descriptions-item label="监护人关系">{{ info.relation }}</a-descriptions-item>
87   - <a-descriptions-item label="重点关注原因" :span="4">{{ info.reason_dictText }}</a-descriptions-item>
  88 + <a-descriptions-item label="重点关注原因">{{ info.reason_dictText }}</a-descriptions-item>
  89 + <a-descriptions-item label="特殊原因">{{ info.specialReason }}</a-descriptions-item>
88 90 <a-descriptions-item label="备注" :span="4">{{ info.remark }}</a-descriptions-item>
89 91 </a-descriptions>
90 92 <a-tabs v-model:activeKey="activeKey">
... ... @@ -180,31 +182,19 @@ export default {
180 182 dataIndex: 'identity'
181 183 },
182 184 {
183   - title: '监护人关系',
184   - align: 'center',
185   - dataIndex: 'relation'
186   - },
187   - {
188 185 title: '监护人',
189 186 align: 'center',
190 187 dataIndex: 'guardian'
191 188 },
192 189 {
193   - title: '重点关注原因',
194   - align: 'center',
195   - dataIndex: 'reason_dictText'
196   - },
197   - {
198   - title: '特殊原因',
  190 + title: '监护人关系',
199 191 align: 'center',
200   - dataIndex: 'specialReason',
201   - scopedSlots: { customRender: 'longText' }
  192 + dataIndex: 'relation'
202 193 },
203 194 {
204   - title: '备注',
  195 + title: '重点关注原因',
205 196 align: 'center',
206   - dataIndex: 'remark',
207   - scopedSlots: { customRender: 'longText' }
  197 + dataIndex: 'reason_dictText'
208 198 },
209 199 {
210 200 title: '操作',
... ...