Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
958a5507
Commit
958a5507
authored
4 years ago
by
ilal
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'lal' into develop
parents
cb075799
143ef91d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
2 deletions
+10
-2
src/main/java/cn/timer/api/bean/htzz/HtzzAdminZzda.java
+3
-0
src/main/java/cn/timer/api/controller/htzz/HtzzController.java
+1
-1
src/main/java/cn/timer/api/dto/htzz/HtzzQueryDto.java
+3
-0
src/main/resources/mapping/htzz/HtzzAdminZzdaMapper.xml
+3
-1
No files found.
src/main/java/cn/timer/api/bean/htzz/HtzzAdminZzda.java
View file @
958a5507
...
...
@@ -92,6 +92,9 @@ public class HtzzAdminZzda extends Model<HtzzAdminZzda> {
@ApiModelProperty
(
value
=
"0:未发;1:已发"
,
example
=
"0"
)
private
Integer
sendingStatus
;
@ApiModelProperty
(
value
=
"1:合同;2:证照"
,
example
=
"1"
)
private
Integer
documentType
;
@Transient
@TableField
(
exist
=
false
)
private
List
<
NotifyPersonDto
>
ids
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/htzz/HtzzController.java
View file @
958a5507
...
...
@@ -162,7 +162,7 @@ public class HtzzController {
QueryWrapper
<
HtzzAdminZzda
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"org_code"
,
userBean
.
getOrgCode
())
.
select
(
"id"
,
"zjmc"
,
"czry"
,
"czrdh"
,
"fzrq"
,
"yxdqr"
,
"txkg_type"
).
eq
(
"is_delete"
,
0
)
.
select
(
"id"
,
"zjmc"
,
"czry"
,
"czrdh"
,
"fzrq"
,
"yxdqr"
,
"txkg_type"
).
eq
(
"is_delete"
,
0
)
.
eq
(
"document_type"
,
htzzQueryDto
.
getDocumentType
())
.
gt
(!
StrUtil
.
hasBlank
(
e
),
"yxdqr"
,
!
StrUtil
.
hasBlank
(
e
)
?
e
:
"9999-01-01 00:00:00"
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"zjmc"
,
q
).
or
().
like
(
"czry"
,
q
)).
orderByDesc
(
"lrsj_time"
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/dto/htzz/HtzzQueryDto.java
View file @
958a5507
...
...
@@ -23,5 +23,8 @@ public class HtzzQueryDto extends Page implements Serializable{
@ApiModelProperty
(
value
=
"名称、型号、供应商"
,
example
=
"张三"
)
private
String
query
;
@ApiModelProperty
(
value
=
"1:合同;2:证照"
,
example
=
"1"
)
private
Integer
documentType
;
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/htzz/HtzzAdminZzdaMapper.xml
View file @
958a5507
...
...
@@ -21,6 +21,7 @@
<result
column=
"is_delete"
property=
"isDelete"
/>
<result
column=
"template_id"
property=
"templateId"
/>
<result
column=
"sending_status"
property=
"sendingStatus"
/>
<result
column=
"document_type"
property=
"documentType"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -40,7 +41,8 @@
zjmc,
is_delete,
template_id,
sending_status
sending_status,
document_type
</sql>
...
...
This diff is collapsed.
Click to expand it.
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