Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
fb42d245
Commit
fb42d245
authored
Aug 21, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(统计):设备基本信息中的登记日期
parent
973a3054
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
11 deletions
+24
-11
JGDPStatisticsServiceImpl.java
...statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
+13
-0
equip_1000.json
...le-statistics-biz/src/main/resources/json/equip_1000.json
+1
-1
equip_2000.json
...le-statistics-biz/src/main/resources/json/equip_2000.json
+3
-3
equip_3000.json
...le-statistics-biz/src/main/resources/json/equip_3000.json
+1
-1
equip_4000.json
...le-statistics-biz/src/main/resources/json/equip_4000.json
+1
-1
equip_5000.json
...le-statistics-biz/src/main/resources/json/equip_5000.json
+1
-1
equip_6000.json
...le-statistics-biz/src/main/resources/json/equip_6000.json
+1
-1
equip_8000.json
...le-statistics-biz/src/main/resources/json/equip_8000.json
+2
-2
equip_9000.json
...le-statistics-biz/src/main/resources/json/equip_9000.json
+1
-1
No files found.
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 @
fb42d245
...
...
@@ -2651,6 +2651,19 @@ public class JGDPStatisticsServiceImpl {
// 账号类型(用于车用气瓶流程页面-》监管审核-》打开设备详情 时隐藏保存按钮)
ReginParams
reginParams
=
JSON
.
parseObject
(
redisUtils
.
get
(
RedisKey
.
buildReginKey
(
RequestContext
.
getExeUserId
(),
RequestContext
.
getToken
())).
toString
(),
ReginParams
.
class
);
objMap
.
put
(
"accountType"
,
reginParams
.
getCompany
().
getCompanyType
());
// 登记日期
if
(!
ValidationUtil
.
isEmpty
(
registerInfo
.
getUseOrgCode
())){
Optional
<
JgUseRegistrationManage
>
firstRecord
=
jgUseRegistrationManageMapper
.
selectList
(
new
QueryWrapper
<
JgUseRegistrationManage
>().
lambda
()
.
eq
(
JgUseRegistrationManage:
:
getUseRegistrationCode
,
registerInfo
.
getUseOrgCode
())
.
orderByDesc
(
JgUseRegistrationManage:
:
getRecDate
)).
stream
().
findFirst
();
firstRecord
.
ifPresent
(
jgUseRegistrationManage
->
{
Date
auditPassDate
=
jgUseRegistrationManage
.
getAuditPassDate
();
SimpleDateFormat
dateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
String
formattedDate
=
dateFormat
.
format
(
auditPassDate
);
objMap
.
put
(
"REGISTRATION_DATE"
,
formattedDate
);
});
}
return
objMap
;
}
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_1000.json
View file @
fb42d245
...
...
@@ -152,7 +152,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_2000.json
View file @
fb42d245
...
...
@@ -156,7 +156,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
@@ -167,7 +167,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
}
],
"keyParams_2300_false"
:
[
...
...
@@ -177,7 +177,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECTION_DATE"
,
"label"
:
"下次检验日期"
},
{
"key"
:
"CAR_NUMBER"
,
"label"
:
"车牌号"
},
{
"key"
:
"IDENTIFICATION_CODE"
,
"label"
:
"车辆VIN码"
},
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_3000.json
View file @
fb42d245
...
...
@@ -152,7 +152,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"ME_UNIT_NAME"
,
"label"
:
"维保单位名称"
},
{
"key"
:
"INFORM_END"
,
"label"
:
"维保备案有效期"
},
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_4000.json
View file @
fb42d245
...
...
@@ -148,7 +148,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_5000.json
View file @
fb42d245
...
...
@@ -144,7 +144,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_6000.json
View file @
fb42d245
...
...
@@ -138,7 +138,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_8000.json
View file @
fb42d245
...
...
@@ -144,7 +144,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
@@ -155,7 +155,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
}
],
"infoRecords"
:
{
...
...
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/equip_9000.json
View file @
fb42d245
...
...
@@ -144,7 +144,7 @@
{
"key"
:
"ADDRESS"
,
"label"
:
"设备使用地点"
},
{
"key"
:
"USE_ORG_CODE"
,
"label"
:
"使用登记证编号"
},
{
"key"
:
"ORG_BRANCH_NAME"
,
"label"
:
"登记机关"
},
{
"key"
:
"RE
C
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"RE
GISTRATION
_DATE"
,
"label"
:
"登记日期"
},
{
"key"
:
"NEXT_INSPECT_DATE"
,
"label"
:
"下一次检验日期"
},
{
"key"
:
"USE_INNER_CODE"
,
"label"
:
"单位内编号"
}
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment