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

wxy
1 parent 505660cf
Showing 14 changed files with 37 additions and 109 deletions
juvenile-prosecution-boot/jeecg-boot-base/jeecg-boot-base-core/pom.xml
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/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/service/impl/GaHouseholdServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/MinorServiceImpl.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorPage.java
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/MinorVo.java
juvenile-prosecution-boot/pom.xml
juvenile-prosecution-vue/src/views/business/MinorList.vue
juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue
juvenile-prosecution-vue/src/views/system/UserList.vue
juvenile-prosecution-vue/src/views/system/modules/SelectUserListModal.vue
juvenile-prosecution-vue/src/views/system/modules/UserModal.vue
@@ -14,7 +14,7 @@
 		<repository>
 			<id>aliyun</id>
 			<name>aliyun Repository</name>
-			<url>http://maven.aliyun.com/nexus/content/groups/public</url>
+			<url>https://maven.aliyun.com/repository/public</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -597,7 +597,7 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                     if (oConvertUtils.isNotEmpty(s.getIdentity()) && oConvertUtils.isNotEmpty(minors.get(s.getIdentity()))) {
                         minors.get(s.getIdentity()).setSpecialReason(s.getReason());
                         minors.get(s.getIdentity()).setRemark(s.getRemark());
-                        minors.get(s.getIdentity()).setReason(String.valueOf(Minor.ATTENTION_REASON_STUDENT));
+                        minors.get(s.getIdentity()).setReason("特殊学生");
                     }
                 }
             }
@@ -618,14 +618,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
         long startTime = System.currentTimeMillis();
         try {
             System.out.println("无人抚养");
-
+            String reason="无人抚养";
             if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzUnsupporteds)) {
                 for (String s : mzUnsupporteds) {
                     if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s)) ) {
-                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_UNSUPPORTED))){
-                            minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_UNSUPPORTED);
+                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
+                            minors.get(s).setReason(minors.get(s).getReason()+","+reason);
                         }else {
-                            minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_UNSUPPORTED));
+                            minors.get(s).setReason(reason);
                         }
                     }
                 }
@@ -646,13 +646,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
         long startTime = System.currentTimeMillis();
         try {
             System.out.println("收养");
+            String reason="收养";
             if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzAdoptions)) {
                 for (String s : mzAdoptions) {
                     if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s)) ) {
-                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_ADOPTION))){
-                            minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_ADOPTION);
+                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
+                            minors.get(s).setReason(minors.get(s).getReason()+","+reason);
                         }else {
-                            minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_ADOPTION));
+                            minors.get(s).setReason(reason);
                         }
                     }
                 }
@@ -673,13 +674,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
         long startTime = System.currentTimeMillis();
         try {
             System.out.println("留守儿童");
+            String reason="留守儿童";
             if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzLeftBehinds)) {
                 for (String s : mzLeftBehinds) {
                     if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s))) {
-                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_CHILDREN))){
-                            minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_CHILDREN);
+                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
+                            minors.get(s).setReason(minors.get(s).getReason()+","+reason);
                         }else {
-                            minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_CHILDREN));
+                            minors.get(s).setReason(reason);
                         }
                     }
                 }
@@ -700,13 +702,14 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
         long startTime = System.currentTimeMillis();
         try {
             System.out.println("孤儿");
+            String reason="孤儿";
             if (oConvertUtils.isNotEmpty(minors) && oConvertUtils.isNotEmpty(mzOrphans)) {
                 for (String s : mzOrphans) {
                     if (oConvertUtils.isNotEmpty(s) && oConvertUtils.isNotEmpty(minors.get(s)) ) {
-                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(String.valueOf(Minor.ATTENTION_REASON_ORPHAN))){
-                            minors.get(s).setReason(minors.get(s).getReason()+","+Minor.ATTENTION_REASON_ORPHAN);
+                        if(oConvertUtils.isNotEmpty(minors.get(s).getReason()) && !minors.get(s).getReason().contains(reason)){
+                            minors.get(s).setReason(minors.get(s).getReason()+","+reason);
                         }else {
-                            minors.get(s).setReason(String.valueOf(Minor.ATTENTION_REASON_ORPHAN));
+                            minors.get(s).setReason(reason);
                         }
                     }
                 }
@@ -831,12 +834,13 @@ public class AnalyzeController extends JeecgController&lt;GaDemographic, IGaDemogra
                         if (oConvertUtils.isNotEmpty(houseNum) && oConvertUtils.isNotEmpty(guardians) && oConvertUtils.isNotEmpty(guardians.get(houseNum))) {
                             minor.setGuardian(guardians.get(houseNum).getName());
                         }
+                        String reason="家庭成员有犯罪记录";
                         //判断家庭成员是否犯罪
                         if (oConvertUtils.isNotEmpty(idCard) && oConvertUtils.isNotEmpty(idCards) && oConvertUtils.isNotEmpty(idCards.get(houseNum))) {
-                            if(oConvertUtils.isNotEmpty(minor.getReason()) && !minor.getReason().contains(String.valueOf(Minor.ATTENTION_REASON_CRIME))){
-                                minor.setReason(minor.getReason()+","+Minor.ATTENTION_REASON_CRIME);
+                            if(oConvertUtils.isNotEmpty(minor.getReason()) && !minor.getReason().contains(reason)){
+                                minor.setReason(minor.getReason()+","+reason);
                             }else {
-                                minor.setReason(String.valueOf(Minor.ATTENTION_REASON_CRIME));
+                                minor.setReason(reason);
                             }
                         }
                     }
@@ -85,7 +85,7 @@ public class Family implements Serializable {
     @ApiModelProperty(value = "现住址")
     private String address;
 	/**是否犯罪*/
-	@Excel(name = "是否犯罪", width = 10,dicCode = "is_crime")
+	@Excel(name = "是否犯罪——是或否", width = 10,dicCode = "is_crime")
     @ApiModelProperty(value = "是否犯罪")
     @Dict(dicCode = "is_crime")
     private Integer crime;
@@ -119,9 +119,8 @@ public class Minor implements Serializable {
     private String relation;
     /**重点关注原因*/
-    @Excel(name = "重点关注原因", width = 15,dicCode = "attention_reason")
+    @Excel(name = "重点关注原因", width = 15)
     @ApiModelProperty(value = "重点关注原因")
-    @Dict(dicCode = "attention_reason")
     private String reason;
     /**特殊原因*/
     @Excel(name = "特殊原因", width = 15)
 package org.jeecg.modules.system.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sun.org.apache.xml.internal.resolver.readers.OASISXMLCatalogReader;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.entity.Family;
 import org.jeecg.modules.system.entity.GaHousehold;
@@ -185,7 +185,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 			sysOrgCode=sysUser.getOrgCode();
 		}
 		Date createTime=new Date();
-		//存放是否犯罪为是的户号和某一个家庭成员的信息
+		//存放户号和犯罪的某一个家庭成员信息
 		Map<String,Family> houseFamily=new HashMap<>();
 		if(oConvertUtils.isNotEmpty(familyList) ){
 			String finalSysOrgCode = sysOrgCode;
@@ -193,7 +193,7 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 				if(oConvertUtils.isNotEmpty(family)){
 					family.setCreateTime(createTime);
 					family.setSysOrgCode(finalSysOrgCode);
-					if(oConvertUtils.isNotEmpty(family.getCrime()) && oConvertUtils.isNotEmpty(family.getHouseholdNum())){
+					if(oConvertUtils.isNotEmpty(family.getCrime()) && family.getCrime().equals(Family.IS_CRIME) && oConvertUtils.isNotEmpty(family.getHouseholdNum())){
 						houseFamily.put(family.getHouseholdNum(),family);
 					}
 				}
@@ -227,7 +227,9 @@ public class MinorServiceImpl extends ServiceImpl&lt;MinorMapper, Minor&gt; implements
 				}
 			});
 		}
-		familyMapper.insertBatch(familyList);
+		if(oConvertUtils.isNotEmpty(familyList)){
+			familyMapper.insertBatch(familyList);
+		}
 		minorMapper.insertBatch(minors);
 	}
@@ -97,9 +97,8 @@ public class MinorPage {
 	@ApiModelProperty(value = "监护人关系")
 	private String relation;
 	/**重点关注原因*/
-	@Excel(name = "重点关注原因", width = 15,dicCode = "attention_reason")
+	@Excel(name = "重点关注原因", width = 15)
 	@ApiModelProperty(value = "重点关注原因")
-	@Dict(dicCode = "attention_reason")
 	private String reason;
 	/**特殊原因*/
 	@Excel(name = "特殊原因", width = 15)
@@ -86,9 +86,8 @@ public class MinorVo {
 	@ApiModelProperty(value = "监护人关系")
 	private String relation;
 	/**重点关注原因*/
-	@Excel(name = "重点关注原因", width = 15,dicCode = "attention_reason")
+	@Excel(name = "重点关注原因", width = 15)
 	@ApiModelProperty(value = "重点关注原因")
-	@Dict(dicCode = "attention_reason")
 	private Integer reason;
 	/**特殊原因*/
 	@Excel(name = "特殊原因", width = 15)
@@ -61,7 +61,7 @@
 		<repository>
             <id>aliyun</id>
             <name>aliyun Repository</name>
-            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+            <url>https://maven.aliyun.com/repository/public</url>
             <snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -50,7 +50,7 @@
         ref="table"
         size="middle"
         bordered
-        rowKey="identity"
+        rowKey="id"
         class="j-table-force-nowrap"
         :scroll="{x:true}"
         :columns="columns"
@@ -89,7 +89,7 @@
         <a-descriptions-item label="是否失学">{{ info.school_dictText }}</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="重点关注原因">{{ info.reason_dictText }}</a-descriptions-item>
+        <a-descriptions-item label="重点关注原因">{{ info.reason }}</a-descriptions-item>
         <a-descriptions-item label="特殊原因" :span="2">{{ info.specialReason }}</a-descriptions-item>
         <a-descriptions-item label="家庭住址" :span="2">{{ info.address }}</a-descriptions-item>
         <a-descriptions-item label="备注" :span="2">{{ info.remark }}</a-descriptions-item>
@@ -208,7 +208,7 @@ export default {
         {
           title: '重点关注原因',
           align: 'center',
-          dataIndex: 'reason_dictText',
+          dataIndex: 'reason',
           scopedSlots: { customRender: 'longText' }
         },
         {
@@ -78,11 +78,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-model-item label="重点关注原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reason">
-                <j-multi-select-tag
-                  v-model="model.reason"
-                  dictCode="attention_reason"
-                  placeholder="请选择重点关注原因">
-                </j-multi-select-tag>
+                <a-textarea v-model="model.reason" placeholder="请输入重点关注原因" :rows="1"></a-textarea>
               </a-form-model-item>
             </a-col>
             <a-col :span="12">
@@ -32,12 +32,6 @@
             </a-col>
             <a-col :md="6" :sm="8">
-              <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="8">
               <a-form-item label="用户状态">
                 <a-select v-model="queryParam.status" placeholder="请选择">
                   <a-select-option value="">请选择</a-select-option>
@@ -157,9 +151,6 @@
                 </a-popconfirm>
               </a-menu-item>
-              <a-menu-item>
-                <a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a>
-              </a-menu-item>
             </a-menu>
           </a-dropdown>
@@ -245,39 +236,13 @@
             dataIndex: 'avatar',
             scopedSlots: {customRender: "avatarslot"}
           },
-
-          {
-            title: '性别',
-            align: "center",
-            width: 80,
-            dataIndex: 'sex_dictText',
-            sorter: true
-          },
           {
-            title: '生日',
-            align: "center",
-            width: 100,
-            dataIndex: 'birthday'
-          },
-          {
-            title: '手机号码',
-            align: "center",
-            width: 100,
-            dataIndex: 'phone'
-          },
-          {
-            title: '部门',
+            title: '单位',
             align: "center",
             width: 180,
             dataIndex: 'orgCodeTxt'
           },
           {
-            title: '负责部门',
-            align: "center",
-            width: 180,
-            dataIndex: 'departIds_dictText'
-          },
-          {
             title: '状态',
             align: "center",
             width: 80,
@@ -29,17 +29,6 @@
           <template v-if="toggleSearchStatus">
-            <a-col :span="6">
-              <a-form-item label="邮箱">
-                <a-input placeholder="请输入邮箱" v-model="queryParam.email"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :span="6">
-              <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码" v-model="queryParam.phone"></a-input>
-              </a-form-item>
-            </a-col>
             <a-col :span="6">
               <a-form-item label="状态">
@@ -54,40 +54,16 @@
           <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"></j-select-depart>
         </a-form-model-item>
-
-
         <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
         </a-form-model-item>
-        <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-            style="width: 100%"
-            placeholder="请选择生日"
-            v-model="model.birthday"
-            :format="dateFormat"
-            :getCalendarContainer="node => node.parentNode"/>
-        </a-form-model-item>
-
         <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
             <a-select-option :value="1">男</a-select-option>
             <a-select-option :value="2">女</a-select-option>
           </a-select>
         </a-form-model-item>
-
-        <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
-          <a-input placeholder="请输入邮箱" v-model="model.email" />
-        </a-form-model-item>
-
-        <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-          <a-input placeholder="请输入手机号码" v-model="model.phone" />
-        </a-form-model-item>
-
-        <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
-          <a-input placeholder="请输入座机" v-model="model.telephone" />
-        </a-form-model-item>
-
       </a-form-model>
     </a-spin>