Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
458db7d3
Commit
458db7d3
authored
Sep 01, 2020
by
zhutianwei@hyzcservice.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
委托审批状态规定: 0未审批,1已通过,2未通过
parent
9e9aae89
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
EntrustController.java
...wise/sc/cement/business/controller/EntrustController.java
+3
-3
EntrustMapper.xml
...a/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
+2
-5
SampleQuery.java
...a/cn/wise/sc/cement/business/model/query/SampleQuery.java
+1
-1
SysLogsServiceImpl.java
...e/sc/cement/business/service/impl/SysLogsServiceImpl.java
+1
-0
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java
View file @
458db7d3
...
@@ -39,7 +39,7 @@ public class EntrustController {
...
@@ -39,7 +39,7 @@ public class EntrustController {
@ApiImplicitParams
(
value
=
{
@ApiImplicitParams
(
value
=
{
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"开始日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"开始日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"结束日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"结束日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态(0未审批,1
未通过,2已
通过,3样品处理,4派发)"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态(0未审批,1
已通过,2未
通过,3样品处理,4派发)"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"clientId"
,
value
=
"委托单位id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"clientId"
,
value
=
"委托单位id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"projectName"
,
value
=
"项目名称"
,
paramType
=
"query"
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"projectName"
,
value
=
"项目名称"
,
paramType
=
"query"
,
dataType
=
"String"
)
})
})
...
@@ -103,7 +103,7 @@ public class EntrustController {
...
@@ -103,7 +103,7 @@ public class EntrustController {
@ApiImplicitParams
(
value
=
{
@ApiImplicitParams
(
value
=
{
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"开始日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"开始日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"结束日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"结束日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态(0未审批,1
未通过,2已
通过,3样品处理,4派发)"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态(0未审批,1
已通过,2未
通过,3样品处理,4派发)"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"clientId"
,
value
=
"委托单位id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"clientId"
,
value
=
"委托单位id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"projectName"
,
value
=
"项目名称"
,
paramType
=
"query"
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"projectName"
,
value
=
"项目名称"
,
paramType
=
"query"
,
dataType
=
"String"
)
})
})
...
@@ -154,7 +154,7 @@ public class EntrustController {
...
@@ -154,7 +154,7 @@ public class EntrustController {
@ApiImplicitParams
(
value
=
{
@ApiImplicitParams
(
value
=
{
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"开始日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"startDate"
,
value
=
"开始日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"结束日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"endDate"
,
value
=
"结束日期"
,
paramType
=
"query"
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态(0未审批,1
未通过,2已
通过,3样品处理,4派发)"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"status"
,
value
=
"状态(0未审批,1
已通过,2未
通过,3样品处理,4派发)"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"clientId"
,
value
=
"委托单位id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"clientId"
,
value
=
"委托单位id"
,
paramType
=
"query"
,
dataType
=
"Integer"
),
@ApiImplicitParam
(
name
=
"projectName"
,
value
=
"项目名称"
,
paramType
=
"query"
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"projectName"
,
value
=
"项目名称"
,
paramType
=
"query"
,
dataType
=
"String"
)
})
})
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
View file @
458db7d3
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
(
(
CASE e.status
CASE e.status
WHEN 0 THEN '未审批'
WHEN 0 THEN '未审批'
WHEN 1 THEN '
未
通过'
WHEN 1 THEN '
已
通过'
ELSE '
已
通过'
ELSE '
未
通过'
END
END
) as statusValue
) as statusValue
from entrust e
from entrust e
...
@@ -43,9 +43,6 @@
...
@@ -43,9 +43,6 @@
<select
id=
"getDetail"
resultType=
"cn.wise.sc.cement.business.model.vo.EntrustVo"
>
<select
id=
"getDetail"
resultType=
"cn.wise.sc.cement.business.model.vo.EntrustVo"
>
select e.*, p.name as projectName, c.name as clientName, su.name as userName,
select e.*, p.name as projectName, c.name as clientName, su.name as userName,
su.phone as userPhone, su.fax as userFax
su.phone as userPhone, su.fax as userFax
from entrust e
from entrust e
left join project p on p.id = e.project_id
left join project p on p.id = e.project_id
left join client c on c.id = e.client_id
left join client c on c.id = e.client_id
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleQuery.java
View file @
458db7d3
...
@@ -28,7 +28,7 @@ public class SampleQuery {
...
@@ -28,7 +28,7 @@ public class SampleQuery {
private
String
sampleForm
;
private
String
sampleForm
;
@ApiModelProperty
(
"检测项id 例子:1、2、3"
)
@ApiModelProperty
(
"检测项id 例子:1、2、3"
)
private
String
样品表
d
;
private
String
teamIds
;
@ApiModelProperty
(
"样品照片"
)
@ApiModelProperty
(
"样品照片"
)
private
String
samplePhoto
;
private
String
samplePhoto
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SysLogsServiceImpl.java
View file @
458db7d3
...
@@ -48,6 +48,7 @@ public class SysLogsServiceImpl extends ServiceImpl<SysLogsMapper, SysLogs> impl
...
@@ -48,6 +48,7 @@ public class SysLogsServiceImpl extends ServiceImpl<SysLogsMapper, SysLogs> impl
* @param objId
* @param objId
* @return
* @return
*/
*/
@Override
public
BaseResponse
<
IPage
<
LogVo
>>
getPage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
objType
,
Integer
objId
)
{
public
BaseResponse
<
IPage
<
LogVo
>>
getPage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
objType
,
Integer
objId
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"startDate"
,
startDate
);
params
.
put
(
"startDate"
,
startDate
);
...
...
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