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
31c4865f
Commit
31c4865f
authored
Oct 29, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):【需求3053】:将所有的维保备案名称改为维保合同备案
parent
6ff49b83
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
BusinessTypeEnum.java
...ejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java
+1
-1
SafetyProblemTypeEnum.java
.../amos/boot/module/jg/api/enums/SafetyProblemTypeEnum.java
+1
-1
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+1
-1
ReportAnalysisServiceImpl.java
...module/jg/biz/service/impl/ReportAnalysisServiceImpl.java
+1
-1
superviseBusinessCategory0715.json
...rc/main/resources/json/superviseBusinessCategory0715.json
+1
-1
urlInfo.json
...s-boot-module-jg-biz/src/main/resources/json/urlInfo.json
+3
-3
BusinessTypeEnum.java
...oin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java
+1
-1
JGDPStatisticsServiceImpl.java
...statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java
+1
-1
ApplicationFormTypeEnum.java
...os/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
+1
-1
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/BusinessTypeEnum.java
View file @
31c4865f
...
@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
...
@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
JG_ADVICE_REMOVAL
(
"105"
,
"移装告知"
),
JG_ADVICE_REMOVAL
(
"105"
,
"移装告知"
),
JG_MAINTENANCE_RECORD
(
"106"
,
"维保备案"
),
JG_MAINTENANCE_RECORD
(
"106"
,
"维保
合同
备案"
),
JG_USAGE_REGISTRATION
(
"107"
,
"使用登记"
),
JG_USAGE_REGISTRATION
(
"107"
,
"使用登记"
),
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/SafetyProblemTypeEnum.java
View file @
31c4865f
...
@@ -16,7 +16,7 @@ public enum SafetyProblemTypeEnum {
...
@@ -16,7 +16,7 @@ public enum SafetyProblemTypeEnum {
JYCQ
(
"2"
,
"检验超期"
,
"设备检验超期"
,
"safetyProblemTracing/jy/cq"
,
"outOfInspectionRecords"
),
JYCQ
(
"2"
,
"检验超期"
,
"设备检验超期"
,
"safetyProblemTracing/jy/cq"
,
"outOfInspectionRecords"
),
JYBJ
(
"21"
,
"检验报检"
,
"设备报检"
,
"safetyProblemTracing/jy/bj"
,
null
),
JYBJ
(
"21"
,
"检验报检"
,
"设备报检"
,
"safetyProblemTracing/jy/bj"
,
null
),
WBCQ
(
"1"
,
"维保超期"
,
"设备维保超期"
,
"safetyProblemTracing/wb/cq"
,
"outOfMaintenanceRecords"
),
WBCQ
(
"1"
,
"维保超期"
,
"设备维保超期"
,
"safetyProblemTracing/wb/cq"
,
"outOfMaintenanceRecords"
),
WBBA
(
"11"
,
"维保
备案"
,
"设备维保
备案"
,
"safetyProblemTracing/wb/ba"
,
null
),
WBBA
(
"11"
,
"维保
合同备案"
,
"设备维保合同
备案"
,
"safetyProblemTracing/wb/ba"
,
null
),
ZZCQ
(
"3"
,
"资质超期"
,
"企业资质超期"
,
"safetyProblemTracing/zz/cq"
,
null
);
ZZCQ
(
"3"
,
"资质超期"
,
"企业资质超期"
,
"safetyProblemTracing/zz/cq"
,
null
);
private
final
String
code
;
private
final
String
code
;
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @
31c4865f
...
@@ -1144,7 +1144,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
...
@@ -1144,7 +1144,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
// 维保备案
// 维保备案
Map
<
String
,
Object
>
maintenanceDetail
=
jgUseRegistrationMapper
.
getMaintenanceDetail
(
record
);
Map
<
String
,
Object
>
maintenanceDetail
=
jgUseRegistrationMapper
.
getMaintenanceDetail
(
record
);
if
(!
ObjectUtils
.
isEmpty
(
maintenanceDetail
))
{
if
(!
ObjectUtils
.
isEmpty
(
maintenanceDetail
))
{
business
=
business
+
",维保备案"
;
business
=
business
+
",维保
合同
备案"
;
objMap
.
putAll
(
maintenanceDetail
);
objMap
.
putAll
(
maintenanceDetail
);
objMap
.
put
(
"maintenanceContract"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintenanceContract"
)).
orElse
(
""
).
toString
()));
objMap
.
put
(
"maintenanceContract"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintenanceContract"
)).
orElse
(
""
).
toString
()));
objMap
.
put
(
"maintOtherAccessories"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintOtherAccessories"
)).
orElse
(
""
).
toString
()));
objMap
.
put
(
"maintOtherAccessories"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintOtherAccessories"
)).
orElse
(
""
).
toString
()));
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ReportAnalysisServiceImpl.java
View file @
31c4865f
...
@@ -218,7 +218,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
...
@@ -218,7 +218,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
// 已去重行数据为集合,填充每种流程状态下单据的数量及将code->name
// 已去重行数据为集合,填充每种流程状态下单据的数量及将code->name
return
countVoSet
.
stream
().
map
(
c
->
{
return
countVoSet
.
stream
().
map
(
c
->
{
JgBizCountBaseVo
vo
=
new
JgBizCountBaseVo
();
JgBizCountBaseVo
vo
=
new
JgBizCountBaseVo
();
vo
.
setBizGroup
(
"维保备案"
);
vo
.
setBizGroup
(
"维保
合同
备案"
);
return
buildJgBizCountBaseVo
(
countDataBOList
,
c
,
vo
,
mainLaunchesStatusList
,
false
);
return
buildJgBizCountBaseVo
(
countDataBOList
,
c
,
vo
,
mainLaunchesStatusList
,
false
);
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
}
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory0715.json
View file @
31c4865f
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
],
],
"WBBA"
:
[
"WBBA"
:
[
{
{
"name"
:
"维保备案"
,
"name"
:
"维保
合同
备案"
,
"code"
:
"WB_BA"
,
"code"
:
"WB_BA"
,
"image"
:
"upload/tzs/common/image/维保备案.png"
"image"
:
"upload/tzs/common/image/维保备案.png"
}
}
...
...
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @
31c4865f
...
@@ -92,19 +92,19 @@
...
@@ -92,19 +92,19 @@
{
{
"type"
:
"106"
,
"type"
:
"106"
,
"pageType"
:
"draft"
,
"pageType"
:
"draft"
,
"name"
:
"维保备案"
,
"name"
:
"维保
合同
备案"
,
"url"
:
"/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
"url"
:
"/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
},
},
{
{
"type"
:
"106"
,
"type"
:
"106"
,
"pageType"
:
"edit"
,
"pageType"
:
"edit"
,
"name"
:
"维保备案"
,
"name"
:
"维保
合同
备案"
,
"url"
:
"/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
"url"
:
"/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=edit"
},
},
{
{
"type"
:
"106"
,
"type"
:
"106"
,
"pageType"
:
"look"
,
"pageType"
:
"look"
,
"name"
:
"维保备案"
,
"name"
:
"维保
合同
备案"
,
"url"
:
"/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
"url"
:
"/mixuap?appId=1742358052905971713&id=1735612073380966402&roleIds={roleIds}&userId={userId}&pageType=look"
},
},
{
{
...
...
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/BusinessTypeEnum.java
View file @
31c4865f
...
@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
...
@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
JG_ADVICE_REMOVAL
(
"105"
,
"移装告知"
),
JG_ADVICE_REMOVAL
(
"105"
,
"移装告知"
),
JG_MAINTENANCE_RECORD
(
"106"
,
"维保备案"
),
JG_MAINTENANCE_RECORD
(
"106"
,
"维保
合同
备案"
),
JG_USAGE_REGISTRATION
(
"107"
,
"使用登记"
),
JG_USAGE_REGISTRATION
(
"107"
,
"使用登记"
),
...
...
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 @
31c4865f
...
@@ -2748,7 +2748,7 @@ public class JGDPStatisticsServiceImpl {
...
@@ -2748,7 +2748,7 @@ public class JGDPStatisticsServiceImpl {
// 维保备案
// 维保备案
Map
<
String
,
Object
>
maintenanceDetail
=
useRegistrationMapper
.
getMaintenanceDetail
(
record
);
Map
<
String
,
Object
>
maintenanceDetail
=
useRegistrationMapper
.
getMaintenanceDetail
(
record
);
if
(!
ObjectUtils
.
isEmpty
(
maintenanceDetail
))
{
if
(!
ObjectUtils
.
isEmpty
(
maintenanceDetail
))
{
business
=
business
+
",维保备案"
;
business
=
business
+
",维保
合同
备案"
;
objMap
.
putAll
(
maintenanceDetail
);
objMap
.
putAll
(
maintenanceDetail
);
objMap
.
put
(
"maintenanceContract"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintenanceContract"
)).
orElse
(
""
).
toString
()));
objMap
.
put
(
"maintenanceContract"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintenanceContract"
)).
orElse
(
""
).
toString
()));
objMap
.
put
(
"maintOtherAccessories"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintOtherAccessories"
)).
orElse
(
""
).
toString
()));
objMap
.
put
(
"maintOtherAccessories"
,
JSON
.
parse
(
Optional
.
ofNullable
(
maintenanceDetail
.
get
(
"maintOtherAccessories"
)).
orElse
(
""
).
toString
()));
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java
View file @
31c4865f
...
@@ -19,7 +19,7 @@ public enum ApplicationFormTypeEnum {
...
@@ -19,7 +19,7 @@ public enum ApplicationFormTypeEnum {
* 申请单枚举
* 申请单枚举
*/
*/
AZGZ
(
"AZGZ"
,
"GZ_AZ"
),
//安装告知
AZGZ
(
"AZGZ"
,
"GZ_AZ"
),
//安装告知
WBBA
(
"WBBA"
,
"WB_BA"
),
//维保备案
WBBA
(
"WBBA"
,
"WB_BA"
),
//维保
合同
备案
SYDJ
(
"SYDJ"
,
"DJ_SY"
),
//使用登记
SYDJ
(
"SYDJ"
,
"DJ_SY"
),
//使用登记
SBYJ
(
"SBYJ"
,
"SB_YJ"
),
//设备移交
SBYJ
(
"SBYJ"
,
"SB_YJ"
),
//设备移交
GZGZ
(
"GZGZ"
,
"GZ_GZ"
),
//改造告知
GZGZ
(
"GZGZ"
,
"GZ_GZ"
),
//改造告知
...
...
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