wx-group / juvenile-prosecution

Commit 799ae8b3d6aeda22234b551a1c3d5f877390b069

Authored by wxy
1 parent 505660cf

把未成年人重点关注原因改为不从字典表获取

Inline Side-by-side
Showing 14 changed files with 37 additions and 109 deletions
juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
  View file @799ae8b
... ... @@ -14,7 +14,7 @@
14 14 <repository>
15 15 <id>aliyun</id>
16 16 <name>aliyun Repository</name>
17   - <url>http://maven.aliyun.com/nexus/content/groups/public</url>
  17 + <url>https://maven.aliyun.com/repository/public</url>
18 18 <snapshots>
19 19 <enabled>false</enabled>
20 20 </snapshots>
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/AnalyzeController.java
  View file @799ae8b
... ... @@ -597,7 +597,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
597 597 if (oConvertUtils.isNotEmpty(s.getIdentity()) && oConvertUtils.isNotEmpty(minors.get(s.getIdentity()))) {
598 598 minors.get(s.getIdentity()).setSpecialReason(s.getReason());
599 599 minors.get(s.getIdentity()).setRemark(s.getRemark());
600   - minors.get(s.getIdentity()).setReason(String.valueOf(Minor.ATTENTION_REASON_STUDENT));
  600 + minors.get(s.getIdentity()).setReason("特殊学生");
601 601 }
602 602 }
603 603 }
... ... @@ -618,14 +618,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
618 618 long startTime = System.currentTimeMillis();
619 619 try {
620 620 System.out.println("无人抚养");
621   -
  621 + String reason="无人抚养";
622 622 if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzUnsupporteds)) {
623 623 for (String s : mzUnsupporteds) {
624 624 if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s)) ) {
625   - if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_UNSUPPORTED))){
626   - minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_UNSUPPORTED);
  625 + if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
  626 + minors.get(s).setReason(minors.get(s).getReason()+","+reason);
627 627 }else {
628   - minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_UNSUPPORTED));
  628 + minors.get(s).setReason(reason);
629 629 }
630 630 }
631 631 }
... ... @@ -646,13 +646,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
646 646 long startTime = System.currentTimeMillis();
647 647 try {
648 648 System.out.println("收养");
  649 + String reason="收养";
649 650 if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzAdoptions)) {
650 651 for (String s : mzAdoptions) {
651 652 if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s)) ) {
652   - if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_ADOPTION))){
653   - minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_ADOPTION);
  653 + if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
  654 + minors.get(s).setReason(minors.get(s).getReason()+","+reason);
654 655 }else {
655   - minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_ADOPTION));
  656 + minors.get(s).setReason(reason);
656 657 }
657 658 }
658 659 }
... ... @@ -673,13 +674,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
673 674 long startTime = System.currentTimeMillis();
674 675 try {
675 676 System.out.println("留守儿童");
  677 + String reason="留守儿童";
676 678 if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzLeftBehinds)) {
677 679 for (String s : mzLeftBehinds) {
678 680 if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s))) {
679   - if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_CHILDREN))){
680   - minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_CHILDREN);
  681 + if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
  682 + minors.get(s).setReason(minors.get(s).getReason()+","+reason);
681 683 }else {
682   - minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_CHILDREN));
  684 + minors.get(s).setReason(reason);
683 685 }
684 686 }
685 687 }
... ... @@ -700,13 +702,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
700 702 long startTime = System.currentTimeMillis();
701 703 try {
702 704 System.out.println("孤儿");
  705 + String reason="孤儿";
703 706 if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzOrphans)) {
704 707 for (String s : mzOrphans) {
705 708 if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s)) ) {
706   - if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_ORPHAN))){
707   - minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_ORPHAN);
  709 + if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
  710 + minors.get(s).setReason(minors.get(s).getReason()+","+reason);
708 711 }else {
709   - minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_ORPHAN));
  712 + minors.get(s).setReason(reason);
710 713 }
711 714 }
712 715 }
... ... @@ -831,12 +834,13 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
831 834 if (oConvertUtils.isNotEmpty(houseNum) && oConvertUtils.isNotEmpty(guardians) && oConvertUtils.isNotEmpty(guardians.get(houseNum))) {
832 835 minor.setGuardian(guardians.get(houseNum).getName());
833 836 }
  837 + String reason="家庭成员有犯罪记录";
834 838 //判断家庭成员是否犯罪
835 839 if (oConvertUtils.isNotEmpty(idCard) && oConvertUtils.isNotEmpty(idCards) && oConvertUtils.isNotEmpty(idCards.get(houseNum))) {
836   - if(oConvertUtils.isNotEmpty(minor.getReason()) && !minor.getReason().contains(String.valueOf(Minor.ATTENTION_REASON_CRIME))){
837   - minor.setReason(minor.getReason()+","+Minor.ATTENTION_REASON_CRIME);
  840 + if(oConvertUtils.isNotEmpty(minor.getReason()) && !minor.getReason().contains(reason)){
  841 + minor.setReason(minor.getReason()+","+reason);
838 842 }else {
839   - minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME));
  843 + minor.setReason(reason);
840 844 }
841 845 }
842 846 }
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Family.java
  View file @799ae8b
... ... @@ -85,7 +85,7 @@ public class Family implements Serializable {
85 85 @ApiModelProperty(value = "现住址")
86 86 private String address;
87 87 /**是否犯罪*/
88   - @Excel(name = "是否犯罪", width = 10,dicCode = "is_crime")
  88 + @Excel(name = "是否犯罪——是或否", width = 10,dicCode = "is_crime")
89 89 @ApiModelProperty(value = "是否犯罪")
90 90 @Dict(dicCode = "is_crime")
91 91 private Integer crime;
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/Minor.java
  View file @799ae8b
... ... @@ -119,9 +119,8 @@ public class Minor implements Serializable {
119 119 private String relation;
120 120  
121 121 /**重点关注原因*/
122   - @Excel(name = "重点关注原因", width = 15,dicCode = "attention_reason")
  122 + @Excel(name = "重点关注原因", width = 15)
123 123 @ApiModelProperty(value = "重点关注原因")
124   - @Dict(dicCode = "attention_reason")
125 124 private String reason;
126 125 /**特殊原因*/
127 126 @Excel(name = "特殊原因", width = 15)
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/GaHouseholdServiceImpl.java
  View file @799ae8b
1 1 package org.jeecg.modules.system.service.impl;
2 2  
3 3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4   -import com.sun.org.apache.xml.internal.resolver.readers.OASISXMLCatalogReader;
5 4 import org.jeecg.common.util.oConvertUtils;
6 5 import org.jeecg.modules.system.entity.Family;
7 6 import org.jeecg.modules.system.entity.GaHousehold;
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
  View file @799ae8b
... ... @@ -185,7 +185,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
185 185 sysOrgCode=sysUser.getOrgCode();
186 186 }
187 187 Date createTime=new Date();
188   - //存放是否犯罪为是的户号和某一个家庭成员的信息
  188 + //存放户号和犯罪的某一个家庭成员信息
189 189 Map<String,Family> houseFamily=new HashMap<>();
190 190 if(oConvertUtils.isNotEmpty(familyList) ){
191 191 String finalSysOrgCode = sysOrgCode;
... ... @@ -193,7 +193,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
193 193 if(oConvertUtils.isNotEmpty(family)){
194 194 family.setCreateTime(createTime);
195 195 family.setSysOrgCode(finalSysOrgCode);
196   - if(oConvertUtils.isNotEmpty(family.getCrime()) && oConvertUtils.isNotEmpty(family.getHouseholdNum())){
  196 + if(oConvertUtils.isNotEmpty(family.getCrime()) && family.getCrime().equals(Family.IS_CRIME) && oConvertUtils.isNotEmpty(family.getHouseholdNum())){
197 197 houseFamily.put(family.getHouseholdNum(),family);
198 198 }
199 199 }
... ... @@ -227,7 +227,9 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
227 227 }
228 228 });
229 229 }
230   - familyMapper.insertBatch(familyList);
  230 + if(oConvertUtils.isNotEmpty(familyList)){
  231 + familyMapper.insertBatch(familyList);
  232 + }
231 233 minorMapper.insertBatch(minors);
232 234 }
233 235  
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorPage.java
  View file @799ae8b
... ... @@ -97,9 +97,8 @@ public class MinorPage {
97 97 @ApiModelProperty(value = "监护人关系")
98 98 private String relation;
99 99 /**重点关注原因*/
100   - @Excel(name = "重点关注原因", width = 15,dicCode = "attention_reason")
  100 + @Excel(name = "重点关注原因", width = 15)
101 101 @ApiModelProperty(value = "重点关注原因")
102   - @Dict(dicCode = "attention_reason")
103 102 private String reason;
104 103 /**特殊原因*/
105 104 @Excel(name = "特殊原因", width = 15)
... ...
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorVo.java
  View file @799ae8b
... ... @@ -86,9 +86,8 @@ public class MinorVo {
86 86 @ApiModelProperty(value = "监护人关系")
87 87 private String relation;
88 88 /**重点关注原因*/
89   - @Excel(name = "重点关注原因", width = 15,dicCode = "attention_reason")
  89 + @Excel(name = "重点关注原因", width = 15)
90 90 @ApiModelProperty(value = "重点关注原因")
91   - @Dict(dicCode = "attention_reason")
92 91 private Integer reason;
93 92 /**特殊原因*/
94 93 @Excel(name = "特殊原因", width = 15)
... ...
juvenile-prosecution-boot/pom.xml
  View file @799ae8b
... ... @@ -61,7 +61,7 @@
61 61 <repository>
62 62 <id>aliyun</id>
63 63 <name>aliyun Repository</name>
64   - <url>http://maven.aliyun.com/nexus/content/groups/public</url>
  64 + <url>https://maven.aliyun.com/repository/public</url>
65 65 <snapshots>
66 66 <enabled>false</enabled>
67 67 </snapshots>
... ...
juvenile-prosecution-vue/src/views/business/MinorList.vue
  View file @799ae8b
... ... @@ -50,7 +50,7 @@
50 50 ref="table"
51 51 size="middle"
52 52 bordered
53   - rowKey="identity"
  53 + rowKey="id"
54 54 class="j-table-force-nowrap"
55 55 :scroll="{x:true}"
56 56 :columns="columns"
... ... @@ -89,7 +89,7 @@
89 89 <a-descriptions-item label="是否失学">{{ info.school_dictText }}</a-descriptions-item>
90 90 <a-descriptions-item label="监护人">{{ info.guardian }}</a-descriptions-item>
91 91 <a-descriptions-item label="监护人关系">{{ info.relation }}</a-descriptions-item>
92   - <a-descriptions-item label="重点关注原因">{{ info.reason_dictText }}</a-descriptions-item>
  92 + <a-descriptions-item label="重点关注原因">{{ info.reason }}</a-descriptions-item>
93 93 <a-descriptions-item label="特殊原因" :span="2">{{ info.specialReason }}</a-descriptions-item>
94 94 <a-descriptions-item label="家庭住址" :span="2">{{ info.address }}</a-descriptions-item>
95 95 <a-descriptions-item label="备注" :span="2">{{ info.remark }}</a-descriptions-item>
... ... @@ -208,7 +208,7 @@ export default {
208 208 {
209 209 title: '重点关注原因',
210 210 align: 'center',
211   - dataIndex: 'reason_dictText',
  211 + dataIndex: 'reason',
212 212 scopedSlots: { customRender: 'longText' }
213 213 },
214 214 {
... ...
juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue
  View file @799ae8b
... ... @@ -78,11 +78,7 @@
78 78 </a-col>
79 79 <a-col :span="12">
80 80 <a-form-model-item label="重点关注原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reason">
81   - <j-multi-select-tag
82   - v-model="model.reason"
83   - dictCode="attention_reason"
84   - placeholder="请选择重点关注原因">
85   - </j-multi-select-tag>
  81 + <a-textarea v-model="model.reason" placeholder="请输入重点关注原因" :rows="1"></a-textarea>
86 82 </a-form-model-item>
87 83 </a-col>
88 84 <a-col :span="12">
... ...
juvenile-prosecution-vue/src/views/system/UserList.vue
  View file @799ae8b
... ... @@ -32,12 +32,6 @@
32 32 </a-col>
33 33  
34 34 <a-col :md="6" :sm="8">
35   - <a-form-item label="手机号码">
36   - <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
37   - </a-form-item>
38   - </a-col>
39   -
40   - <a-col :md="6" :sm="8">
41 35 <a-form-item label="用户状态">
42 36 <a-select v-model="queryParam.status" placeholder="请选择">
43 37 <a-select-option value="">请选择</a-select-option>
... ... @@ -157,9 +151,6 @@
157 151 </a-popconfirm>
158 152 </a-menu-item>
159 153  
160   - <a-menu-item>
161   - <a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>
162   - </a-menu-item>
163 154  
164 155 </a-menu>
165 156 </a-dropdown>
... ... @@ -245,39 +236,13 @@
245 236 dataIndex: 'avatar',
246 237 scopedSlots: {customRender: "avatarslot"}
247 238 },
248   -
249   - {
250   - title: '性别',
251   - align: "center",
252   - width: 80,
253   - dataIndex: 'sex_dictText',
254   - sorter: true
255   - },
256 239 {
257   - title: '生日',
258   - align: "center",
259   - width: 100,
260   - dataIndex: 'birthday'
261   - },
262   - {
263   - title: '手机号码',
264   - align: "center",
265   - width: 100,
266   - dataIndex: 'phone'
267   - },
268   - {
269   - title: '部门',
  240 + title: '单位',
270 241 align: "center",
271 242 width: 180,
272 243 dataIndex: 'orgCodeTxt'
273 244 },
274 245 {
275   - title: '负责部门',
276   - align: "center",
277   - width: 180,
278   - dataIndex: 'departIds_dictText'
279   - },
280   - {
281 246 title: '状态',
282 247 align: "center",
283 248 width: 80,
... ...
juvenile-prosecution-vue/src/views/system/modules/SelectUserListModal.vue
  View file @799ae8b
... ... @@ -29,17 +29,6 @@
29 29  
30 30  
31 31 <template v-if="toggleSearchStatus">
32   - <a-col :span="6">
33   - <a-form-item label="邮箱">
34   - <a-input placeholder="请输入邮箱" v-model="queryParam.email"></a-input>
35   - </a-form-item>
36   - </a-col>
37   -
38   - <a-col :span="6">
39   - <a-form-item label="手机号码">
40   - <a-input placeholder="请输入手机号码" v-model="queryParam.phone"></a-input>
41   - </a-form-item>
42   - </a-col>
43 32  
44 33 <a-col :span="6">
45 34 <a-form-item label="状态">
... ...
juvenile-prosecution-vue/src/views/system/modules/UserModal.vue
  View file @799ae8b
... ... @@ -54,40 +54,16 @@
54 54 <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"></j-select-depart>
55 55 </a-form-model-item>
56 56  
57   -
58   -
59 57 <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
60 58 <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
61 59 </a-form-model-item>
62 60  
63   - <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
64   - <a-date-picker
65   - style="width: 100%"
66   - placeholder="请选择生日"
67   - v-model="model.birthday"
68   - :format="dateFormat"
69   - :getCalendarContainer="node => node.parentNode"/>
70   - </a-form-model-item>
71   -
72 61 <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
73 62 <a-select v-model="model.sex" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
74 63 <a-select-option :value="1">男</a-select-option>
75 64 <a-select-option :value="2">女</a-select-option>
76 65 </a-select>
77 66 </a-form-model-item>
78   -
79   - <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
80   - <a-input placeholder="请输入邮箱" v-model="model.email" />
81   - </a-form-model-item>
82   -
83   - <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
84   - <a-input placeholder="请输入手机号码" v-model="model.phone" />
85   - </a-form-model-item>
86   -
87   - <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
88   - <a-input placeholder="请输入座机" v-model="model.telephone" />
89   - </a-form-model-item>
90   -
91 67 </a-form-model>
92 68 </a-spin>
93 69  
... ...