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
03c08334
Commit
03c08334
authored
Sep 03, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.历史的使用登记、车用气瓶登记增加原登记机关、原登记日期
parent
be9dd5d6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
3 deletions
+34
-3
JgVehicleInformationVo.java
...in/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java
+9
-3
JgUseRegistrationServiceImpl.java
...ule/jg/biz/service/impl/JgUseRegistrationServiceImpl.java
+4
-0
JgVehicleInformationServiceImpl.java
.../jg/biz/service/impl/JgVehicleInformationServiceImpl.java
+7
-0
IdxBizJgUseInfo.java
...join/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java
+14
-0
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/vo/JgVehicleInformationVo.java
View file @
03c08334
...
@@ -12,13 +12,11 @@ import java.util.List;
...
@@ -12,13 +12,11 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
*
*
* @author system_generator
* @author system_generator
* @date 2024-03-18
* @date 2024-03-18
*/
*/
@Data
@Data
@ApiModel
(
value
=
"JgVehicleInformationVo"
,
description
=
""
)
@ApiModel
(
value
=
"JgVehicleInformationVo"
,
description
=
""
)
public
class
JgVehicleInformationVo
implements
Serializable
{
public
class
JgVehicleInformationVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -253,5 +251,13 @@ public class JgVehicleInformationVo implements Serializable {
...
@@ -253,5 +251,13 @@ public class JgVehicleInformationVo implements Serializable {
@ApiModelProperty
(
value
=
"历史设备-原使用登记证附件"
)
@ApiModelProperty
(
value
=
"历史设备-原使用登记证附件"
)
private
List
<?>
oldUseRegistrationCertificate
;
private
List
<?>
oldUseRegistrationCertificate
;
@ApiModelProperty
(
value
=
"历史设备-原登记机关"
)
private
String
oRegUnit
;
@ApiModelProperty
(
value
=
"历史设备-原登记日期"
)
private
String
oRegDate
;
private
CompanyBo
companyInfo
;
private
CompanyBo
companyInfo
;
}
}
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/JgUseRegistrationServiceImpl.java
View file @
03c08334
...
@@ -2851,6 +2851,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -2851,6 +2851,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
useInfo
.
setUsePlace
((
String
)
map
.
get
(
"usePlace"
));
useInfo
.
setUsePlace
((
String
)
map
.
get
(
"usePlace"
));
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setORegDate
(
String
.
valueOf
(
map
.
get
(
"oRegDate"
)));
useInfo
.
setORegUnit
(
String
.
valueOf
(
map
.
get
(
"oRegUnit"
)));
// 历史平台登记,将设备状态改为在用
// 历史平台登记,将设备状态改为在用
useInfo
.
setEquState
(
EquimentEnum
.
ZAIYONG
.
getCode
().
toString
());
useInfo
.
setEquState
(
EquimentEnum
.
ZAIYONG
.
getCode
().
toString
());
String
usePlace
=
useInfo
.
getProvinceName
()
+
"/"
+
useInfo
.
getCityName
()
+
"/"
+
useInfo
.
getCountyName
()
+
"/"
+
useInfo
.
getStreetName
();
String
usePlace
=
useInfo
.
getProvinceName
()
+
"/"
+
useInfo
.
getCityName
()
+
"/"
+
useInfo
.
getCountyName
()
+
"/"
+
useInfo
.
getStreetName
();
...
@@ -3182,6 +3184,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
...
@@ -3182,6 +3184,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
IdxBizJgUseInfo
useInfo
=
new
IdxBizJgUseInfo
();
IdxBizJgUseInfo
useInfo
=
new
IdxBizJgUseInfo
();
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setORegDate
(
String
.
valueOf
(
map
.
get
(
"oRegDate"
)));
useInfo
.
setORegUnit
(
String
.
valueOf
(
map
.
get
(
"oRegUnit"
)));
useInfoMapper
.
update
(
useInfo
,
lambda
);
useInfoMapper
.
update
(
useInfo
,
lambda
);
// 更新检验检测信息【一对多,暂时只取最新一条数据】
// 更新检验检测信息【一对多,暂时只取最新一条数据】
...
...
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/JgVehicleInformationServiceImpl.java
View file @
03c08334
...
@@ -649,7 +649,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
...
@@ -649,7 +649,10 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
if
(
firstEqu
.
isPresent
())
{
if
(
firstEqu
.
isPresent
())
{
LambdaQueryWrapper
<
IdxBizJgUseInfo
>
lambda
=
new
QueryWrapper
<
IdxBizJgUseInfo
>().
lambda
();
LambdaQueryWrapper
<
IdxBizJgUseInfo
>
lambda
=
new
QueryWrapper
<
IdxBizJgUseInfo
>().
lambda
();
lambda
.
eq
(
IdxBizJgUseInfo:
:
getRecord
,
firstEqu
.
get
().
get
(
"record"
));
lambda
.
eq
(
IdxBizJgUseInfo:
:
getRecord
,
firstEqu
.
get
().
get
(
"record"
));
lambda
.
select
(
IdxBizJgUseInfo:
:
getOldUseRegistrationCertificate
,
IdxBizJgUseInfo:
:
getOldUseRegistrationTable
,
IdxBizJgUseInfo:
:
getORegDate
,
IdxBizJgUseInfo:
:
getORegUnit
);
IdxBizJgUseInfo
useInfo
=
useInfoMapper
.
selectOne
(
lambda
);
IdxBizJgUseInfo
useInfo
=
useInfoMapper
.
selectOne
(
lambda
);
vo
.
setORegDate
(
useInfo
.
getORegDate
());
vo
.
setORegUnit
(
useInfo
.
getORegUnit
());
vo
.
setOldUseRegistrationTable
(
JSONArray
.
parseArray
(
useInfo
.
getOldUseRegistrationTable
()));
vo
.
setOldUseRegistrationTable
(
JSONArray
.
parseArray
(
useInfo
.
getOldUseRegistrationTable
()));
vo
.
setOldUseRegistrationCertificate
(
JSONArray
.
parseArray
(
useInfo
.
getOldUseRegistrationCertificate
()));
vo
.
setOldUseRegistrationCertificate
(
JSONArray
.
parseArray
(
useInfo
.
getOldUseRegistrationCertificate
()));
}
}
...
@@ -1902,6 +1905,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
...
@@ -1902,6 +1905,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
IdxBizJgUseInfo
useInfo
=
useInfoMapper
.
selectOne
(
useInfoLambdaQueryWrapper
);
IdxBizJgUseInfo
useInfo
=
useInfoMapper
.
selectOne
(
useInfoLambdaQueryWrapper
);
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setORegDate
(
String
.
valueOf
(
map
.
get
(
"oRegDate"
)));
useInfo
.
setORegUnit
(
String
.
valueOf
(
map
.
get
(
"oRegUnit"
)));
useInfoMapper
.
updateById
(
useInfo
);
useInfoMapper
.
updateById
(
useInfo
);
// 更新注册登记信息表
// 更新注册登记信息表
...
@@ -2095,6 +2100,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
...
@@ -2095,6 +2100,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
IdxBizJgUseInfo
useInfo
=
useInfoMapper
.
selectOne
(
useInfoLambdaQueryWrapper
);
IdxBizJgUseInfo
useInfo
=
useInfoMapper
.
selectOne
(
useInfoLambdaQueryWrapper
);
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationTable
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationTable"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setOldUseRegistrationCertificate
(
JSON
.
toJSONString
(
map
.
get
(
"oldUseRegistrationCertificate"
)));
useInfo
.
setORegDate
(
String
.
valueOf
(
map
.
get
(
"oRegDate"
)));
useInfo
.
setORegUnit
(
String
.
valueOf
(
map
.
get
(
"oRegUnit"
)));
useInfoMapper
.
updateById
(
useInfo
);
useInfoMapper
.
updateById
(
useInfo
);
// 更新注册登记信息表
// 更新注册登记信息表
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java
View file @
03c08334
...
@@ -259,4 +259,18 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
...
@@ -259,4 +259,18 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
@TableField
(
"\"OLD_USE_REGISTRATION_TABLE\""
)
@TableField
(
"\"OLD_USE_REGISTRATION_TABLE\""
)
private
String
oldUseRegistrationTable
;
private
String
oldUseRegistrationTable
;
/**
* 历史设备-原登记机关
*/
@TableField
(
"\"O_REG_UNIT\""
)
private
String
oRegUnit
;
/**
* 历史设备-原登记日期
*/
@TableField
(
"\"O_REG_DATE\""
)
private
String
oRegDate
;
}
}
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