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
1ad0a221
Commit
1ad0a221
authored
Dec 13, 2023
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.调整表结构 ,检验检测资质和单位许可使用一张表
parent
19c3747c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
9 deletions
+25
-9
TzBaseUnitLicenceDto.java
...in/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java
+12
-4
TzBaseUnitLicence.java
...in/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java
+13
-5
No files found.
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseUnitLicenceDto.java
View file @
1ad0a221
...
@@ -19,7 +19,6 @@ import java.util.Date;
...
@@ -19,7 +19,6 @@ import java.util.Date;
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tz_base_unit_licence"
)
@ApiModel
(
value
=
"TzBaseUnitLicence对象"
,
description
=
"单位许可信息表"
)
@ApiModel
(
value
=
"TzBaseUnitLicence对象"
,
description
=
"单位许可信息表"
)
public
class
TzBaseUnitLicenceDto
extends
BaseDto
{
public
class
TzBaseUnitLicenceDto
extends
BaseDto
{
...
@@ -40,7 +39,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
...
@@ -40,7 +39,7 @@ public class TzBaseUnitLicenceDto extends BaseDto {
@ApiModelProperty
(
value
=
"证书类型code"
)
@ApiModelProperty
(
value
=
"证书类型code"
)
private
String
certTypeCode
;
private
String
certTypeCode
;
@ApiModelProperty
(
value
=
"证书编号"
)
@ApiModelProperty
(
value
=
"证书编号
(核准证编号)
"
)
private
String
certNo
;
private
String
certNo
;
@ApiModelProperty
(
value
=
"有效期至"
)
@ApiModelProperty
(
value
=
"有效期至"
)
...
@@ -73,10 +72,10 @@ public class TzBaseUnitLicenceDto extends BaseDto {
...
@@ -73,10 +72,10 @@ public class TzBaseUnitLicenceDto extends BaseDto {
@ApiModelProperty
(
value
=
"备注"
)
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
private
String
remark
;
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种编码"
)
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种编码
(核准项目代码)
"
)
private
String
itemCode
;
private
String
itemCode
;
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种"
)
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种
(核准项目名称)
"
)
private
String
itemCodeName
;
private
String
itemCodeName
;
@ApiModelProperty
(
value
=
"许可子项目/检验项目/充装介质类别code"
)
@ApiModelProperty
(
value
=
"许可子项目/检验项目/充装介质类别code"
)
...
@@ -94,5 +93,14 @@ public class TzBaseUnitLicenceDto extends BaseDto {
...
@@ -94,5 +93,14 @@ public class TzBaseUnitLicenceDto extends BaseDto {
@ApiModelProperty
(
value
=
"固定检验地址"
)
@ApiModelProperty
(
value
=
"固定检验地址"
)
private
String
itemAddress
;
private
String
itemAddress
;
@ApiModelProperty
(
value
=
"机构类别枚举"
)
private
String
agencyType
;
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
private
String
agencyTypeCode
;
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
private
String
licenceType
;
}
}
amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzBaseUnitLicence.java
View file @
1ad0a221
...
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
...
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
org.elasticsearch.common.recycler.Recycler
;
import
org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
;
import
org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
;
/**
/**
...
@@ -38,7 +39,7 @@ public class TzBaseUnitLicence extends BaseEntity {
...
@@ -38,7 +39,7 @@ public class TzBaseUnitLicence extends BaseEntity {
@ApiModelProperty
(
value
=
"证书类型code"
)
@ApiModelProperty
(
value
=
"证书类型code"
)
private
String
certTypeCode
;
private
String
certTypeCode
;
@ApiModelProperty
(
value
=
"证书编号"
)
@ApiModelProperty
(
value
=
"证书编号
(核准证编号)
"
)
private
String
certNo
;
private
String
certNo
;
@ApiModelProperty
(
value
=
"有效期至"
)
@ApiModelProperty
(
value
=
"有效期至"
)
...
@@ -71,10 +72,10 @@ public class TzBaseUnitLicence extends BaseEntity {
...
@@ -71,10 +72,10 @@ public class TzBaseUnitLicence extends BaseEntity {
@ApiModelProperty
(
value
=
"备注"
)
@ApiModelProperty
(
value
=
"备注"
)
private
String
remark
;
private
String
remark
;
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种编码"
)
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种编码
(核准项目代码)
"
)
private
String
itemCode
;
private
String
itemCode
;
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种"
)
@ApiModelProperty
(
value
=
"许可项目/检验类型/设备品种
(核准项目名称)
"
)
private
String
itemCodeName
;
private
String
itemCodeName
;
@ApiModelProperty
(
value
=
"许可子项目/检验项目/充装介质类别code"
)
@ApiModelProperty
(
value
=
"许可子项目/检验项目/充装介质类别code"
)
...
@@ -92,13 +93,20 @@ public class TzBaseUnitLicence extends BaseEntity {
...
@@ -92,13 +93,20 @@ public class TzBaseUnitLicence extends BaseEntity {
@ApiModelProperty
(
value
=
"固定检验地址"
)
@ApiModelProperty
(
value
=
"固定检验地址"
)
private
String
itemAddress
;
private
String
itemAddress
;
@ApiModelProperty
(
value
=
"更新人名称"
)
@ApiModelProperty
(
value
=
"更新人名称"
)
private
String
recUserName
;
private
String
recUserName
;
@ApiModelProperty
(
value
=
"是否删除(0:未删除,1:已删除)"
)
@ApiModelProperty
(
value
=
"是否删除(0:未删除,1:已删除)"
)
private
Boolean
isDelete
;
private
Boolean
isDelete
;
@ApiModelProperty
(
value
=
"机构类别枚举"
)
private
String
agencyType
;
@ApiModelProperty
(
value
=
"机构类别枚举名称,冗余"
)
private
String
agencyTypeCode
;
@ApiModelProperty
(
value
=
"资质类型编码(检验检测、其他)"
)
private
String
licenceType
;
}
}
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