事项添加区域字段

base-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java

@@ -350,8 +350,10 @@ public class MatterEntity extends MatterVo {
         if (obj == null) return false;
         if (obj instanceof MatterEntity) {
             MatterEntity tmp = (MatterEntity) obj;
-            if (this.getId() == tmp.getId()) {
-                return true;
+            if ((this.getAreaCode() + this.matterNo).equals(tmp.getAreaCode() + tmp.matterNo)) {
+                if (this.getId() == tmp.getId()) {
+                    return true;
+                }
             }
         }
         return false;
@@ -360,78 +362,152 @@ public class MatterEntity extends MatterVo {
     public void initAttrValue(){
         this.siteId = null;
         this.tid = "";
+
         this.tcode = "";
+
         this.tname = "";
+
         this.matterName = "";
+
         this.englishName = "";
+
         this.matterNo = "";
+
         this.areaCode = "";
+
         this.deptCode = "";
+
+        this.deptName = "";
+
         this.powerCode = "";
+
         this.themeCode = "";
+
         this.usertypeCode = "";
+
         this.groupName = "";
+
         this.url = "";
-        this.haveGetMatterInfo = "";
+
+        this.haveGetMatterInfo = "false";
+
         this.belongDept = "";
+
         this.appoveObjectShow = "事业法人";
+
         this.operatScopeShow = "无";
+
         this.appoveTimeLimitShow = "网络办件";
+
         this.handleType = "窗口办理";
+
         this.legalTimeLimitShow = "";
+
         this.legalEndExplain = "";
+
         this.promiseTimeLimitShow = "";
+
         this.promiseEndExplain = "";
-        this.isChargesShow = "否";
+
+        this.isChargesShow = "无";
+
         this.certificationLevelsShow = "实名认证";
+
         this.planTakeTime = null;
+
         this.promiseTakeTime = null;
+
         this.specialProcedure = "";
-        this.windowToTheSceneNum = 0;
-        this.isOnlineSubscribeShow = "否";
-        this.isExpressTakeShow = "否";
-        this.isProvinceAcquisitionShow = "否";
-        this.isApplyProvinceShow = "否";
+
+        this.windowToTheSceneNum = null;
+
+        this.isOnlineSubscribeShow = "无";
+
+        this.isExpressTakeShow = "无";
+
+        this.isProvinceAcquisitionShow = "无";
+
+        this.isApplyProvinceShow = "无";
+
+
         this.mustSceneExplain = "";
+
         this.onlineType = "原件预审";
+
         this.onlineToTheSceneNum = 0;
+
         this.onlineOperatDeep = "互联网咨询";
+
         this.isExpressTakeOnlineShow = "";
-        this.isDoorTakeShow = "否";
+
+        this.isDoorTakeShow = "无";
+
         this.onlineMustSceneExplain = "";
+
         this.performDeptType = "";
+
         this.matterEdition = "";
+
         this.eventTypeShow = "行政许可";
+
         this.performHierarchyShow = "";
+
         this.powerSourceShow = "";
+
         this.performDeptTypeShow = "";
-        this.goveServiceCenterShow = "否";
-        this.isConvenientCenterShow = "否";
-        this.terminalHandle = "是";
-        this.isOnline = "是";
-        this.isOnlinePayShow = "是";
-        this.entrustmentDepartmen = "是";
+
+        this.goveServiceCenterShow = "无";
+
+        this.isConvenientCenterShow = "无";
+
+        this.terminalHandle = "无";
+
+        this.isOnline = "无";
+
+        this.isOnlinePayShow = "无";
+
+        this.entrustmentDepartmen = "无";
+
         this.jointInfoShow = "";
+
         this.matterStatus = "在用";
+
         this.numberLimit = null;
+
         this.type = "";
+
         this.baseCode = "";
+
         this.implementCode = "";
+
         this.implementBodyCode = "";
+
         this.operateItemCode = "";
+
         this.townshipName = "";
+
         this.townshipCode = "";
+
         this.villageName = "";
+
         this.villageCode = "";
+
         this.operateTime = "";
+
         this.operateSite = "";
+
         this.cousultingShow = "";
+
         this.cousultingTelephoneShow = "";
+
         this.superviseShow = "";
+
         this.sort = 0;
+
         this.source = 1;
-        this.deptName = "";
+
         this.evaluationUrl = "";
+
         this.netApplyUrl = "";
         this.areaName = "";
         this.areaLevel = 0;

base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http

@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
 Content-Type: application/json
 
 {
-  "areaCode": "511124000000"
+  "areaCode": "511700000000"
 }