Skip to content

A
amos-boot-biz
Commit dcb4fead authored by tianbo's avatar tianbo
Browse files
Options

feat(statistics): 更新设备详情中的登记机关字段名称（ORG_BRANCH_NAME 字段更改为 REGISTRATION_ORG_NAME）

parent bc1fe8b1
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 11 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
View file @ dcb4fead
...@@ -3100,6 +3100,7 @@ public class JGDPStatisticsServiceImpl { ...@@ -3100,6 +3100,7 @@ public class JGDPStatisticsServiceImpl {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String formattedDate = dateFormat.format(auditPassDate); String formattedDate = dateFormat.format(auditPassDate);
objMap.put("REGISTRATION_DATE", formattedDate); objMap.put("REGISTRATION_DATE", formattedDate);
objMap.put("REGISTRATION_ORG_NAME", jgUseRegistrationManage.getReceiveOrgName());
}); });
} }
return objMap; return objMap;
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json
View file @ dcb4fead
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json
View file @ dcb4fead
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
], ],
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" }, { "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" },
{ "key": "CAR_NUMBER", "label": "车牌号" }, { "key": "CAR_NUMBER", "label": "车牌号" },
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json
View file @ dcb4fead
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }, { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "ME_UNIT_NAME", "label": "维保单位名称" }, { "key": "ME_UNIT_NAME", "label": "维保单位名称" },
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json
View file @ dcb4fead
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
], ],
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json
View file @ dcb4fead
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
], ],
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json
View file @ dcb4fead
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json
View file @ dcb4fead
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
], ],
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json
View file @ dcb4fead
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
{ "key": "FULLAREA", "label": "所属区域" }, { "key": "FULLAREA", "label": "所属区域" },
{ "key": "FULLADDRESS", "label": "设备详细地址" }, { "key": "FULLADDRESS", "label": "设备详细地址" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" }, { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" }, { "key": "REGISTRATION_ORG_NAME", "label": "登记机关" },
{ "key": "REGISTRATION_DATE", "label": "登记日期" }, { "key": "REGISTRATION_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" } { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment