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
2cb80504
Commit
2cb80504
authored
Oct 18, 2020
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
标样管理 标样材料需要看到历史的上传附件
parent
fc0eef77
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
2 deletions
+34
-2
StandardController.java
...ise/sc/cement/business/controller/StandardController.java
+11
-0
IStandardService.java
.../cn/wise/sc/cement/business/service/IStandardService.java
+3
-0
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+2
-2
StandardServiceImpl.java
.../sc/cement/business/service/impl/StandardServiceImpl.java
+18
-0
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/StandardController.java
View file @
2cb80504
...
@@ -89,6 +89,17 @@ public class StandardController {
...
@@ -89,6 +89,17 @@ public class StandardController {
return
BaseResponse
.
errorMsg
(
"失败!"
);
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
}
@ApiOperation
(
value
=
"查看历史标样材料信息"
)
@GetMapping
(
"/getHistoryStandard/{id}"
)
public
BaseResponse
getHistoryStandard
(
@PathVariable
Integer
id
){
try
{
return
standardService
.
getHistoryStandard
(
id
);
}
catch
(
Exception
e
){
log
.
debug
(
"查看历史标样材料信息{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
@ApiOperation
(
value
=
"标样详情"
)
@ApiOperation
(
value
=
"标样详情"
)
@GetMapping
(
"/{id}"
)
@GetMapping
(
"/{id}"
)
public
BaseResponse
getById
(
@PathVariable
Integer
id
){
public
BaseResponse
getById
(
@PathVariable
Integer
id
){
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/IStandardService.java
View file @
2cb80504
package
cn
.
wise
.
sc
.
cement
.
business
.
service
;
package
cn
.
wise
.
sc
.
cement
.
business
.
service
;
import
cn.wise.sc.cement.business.entity.EntityEnclosure
;
import
cn.wise.sc.cement.business.entity.Standard
;
import
cn.wise.sc.cement.business.entity.Standard
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.PageQuery
;
import
cn.wise.sc.cement.business.model.PageQuery
;
...
@@ -32,6 +33,8 @@ public interface IStandardService extends IService<Standard> {
...
@@ -32,6 +33,8 @@ public interface IStandardService extends IService<Standard> {
BaseResponse
<
Standard
>
update
(
StandardQuery
query
);
BaseResponse
<
Standard
>
update
(
StandardQuery
query
);
BaseResponse
<
List
<
EntityEnclosure
>
>
getHistoryStandard
(
Integer
id
);
BaseResponse
<
StandardVo
>
getDetail
(
Integer
id
);
BaseResponse
<
StandardVo
>
getDetail
(
Integer
id
);
BaseResponse
<
String
>
enter
(
ChangeStockQuery
query
);
BaseResponse
<
String
>
enter
(
ChangeStockQuery
query
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
2cb80504
...
@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
...
@@ -269,8 +269,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}
}
}
if
(
teamNameList
.
contains
(
"Al2O3"
)){
if
(
teamNameList
.
contains
(
"Al2O3"
)){
if
(!
teamNameList
.
contains
(
"Fe2
o
3"
)){
if
(!
teamNameList
.
contains
(
"Fe2
O
3"
)){
return
BaseResponse
.
errorMsg
(
"选择Al2O3必须要选择Fe2
o
3"
);
return
BaseResponse
.
errorMsg
(
"选择Al2O3必须要选择Fe2
O
3"
);
}
}
}
}
}
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java
View file @
2cb80504
package
cn
.
wise
.
sc
.
cement
.
business
.
service
.
impl
;
package
cn
.
wise
.
sc
.
cement
.
business
.
service
.
impl
;
import
cn.wise.sc.cement.business.entity.*
;
import
cn.wise.sc.cement.business.entity.*
;
import
cn.wise.sc.cement.business.mapper.EntityEnclosureMapper
;
import
cn.wise.sc.cement.business.mapper.StandardEnterMapper
;
import
cn.wise.sc.cement.business.mapper.StandardEnterMapper
;
import
cn.wise.sc.cement.business.mapper.StandardMapper
;
import
cn.wise.sc.cement.business.mapper.StandardMapper
;
import
cn.wise.sc.cement.business.mapper.StandardOutMapper
;
import
cn.wise.sc.cement.business.mapper.StandardOutMapper
;
...
@@ -247,6 +248,23 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
...
@@ -247,6 +248,23 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
return
BaseResponse
.
okData
(
standard
);
return
BaseResponse
.
okData
(
standard
);
}
}
@Resource
private
EntityEnclosureMapper
entityEnclosureMapper
;
/**
* 查看历史标样材料信息
* @param id
* @return
*/
@Override
public
BaseResponse
<
List
<
EntityEnclosure
>
>
getHistoryStandard
(
Integer
id
)
{
QueryWrapper
<
EntityEnclosure
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"entity_type"
,
EntityEnclosure
.
EntityType
.
STANDARD_SAMPLE
);
wrapper
.
eq
(
"entity_id"
,
id
);
List
<
EntityEnclosure
>
entityEnclosureList
=
entityEnclosureMapper
.
selectList
(
wrapper
);
return
BaseResponse
.
okData
(
entityEnclosureList
);
}
/**
/**
* 标样详情
* 标样详情
*
*
...
...
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