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
77b114eb
Commit
77b114eb
authored
Sep 29, 2020
by
qinhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
质量控制--列表and查看详情--联调
parent
bfe18a88
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1971 additions
and
1934 deletions
+1971
-1934
QualityController.java
...wise/sc/cement/business/controller/QualityController.java
+0
-1
StandardController.java
...ise/sc/cement/business/controller/StandardController.java
+6
-5
EntrustReport.java
...java/cn/wise/sc/cement/business/entity/EntrustReport.java
+2
-0
StandardMapper.java
...ava/cn/wise/sc/cement/business/mapper/StandardMapper.java
+4
-0
StandardMapper.xml
.../cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml
+7
-0
IStandardService.java
.../cn/wise/sc/cement/business/service/IStandardService.java
+4
-2
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+1667
-1663
StandardServiceImpl.java
.../sc/cement/business/service/impl/StandardServiceImpl.java
+281
-263
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityController.java
View file @
77b114eb
...
@@ -61,5 +61,4 @@ public class QualityController {
...
@@ -61,5 +61,4 @@ public class QualityController {
}
}
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/controller/StandardController.java
View file @
77b114eb
...
@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
...
@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.PageQuery;
import
cn.wise.sc.cement.business.model.query.ChangeStockQuery
;
import
cn.wise.sc.cement.business.model.query.ChangeStockQuery
;
import
cn.wise.sc.cement.business.model.query.ChangeValidDateQuery
;
import
cn.wise.sc.cement.business.model.query.ChangeValidDateQuery
;
import
cn.wise.sc.cement.business.model.query.StandardQuery
;
import
cn.wise.sc.cement.business.model.query.StandardQuery
;
import
cn.wise.sc.cement.business.model.vo.StandardValueVo
;
import
cn.wise.sc.cement.business.service.IStandardService
;
import
cn.wise.sc.cement.business.service.IStandardService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
@@ -156,10 +157,10 @@ public class StandardController {
...
@@ -156,10 +157,10 @@ public class StandardController {
return
BaseResponse
.
errorMsg
(
"失败!"
);
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
}
@ApiOperation
(
"获取样本标准值列表"
)
@GetMapping
(
"/detailList"
)
public
BaseResponse
<
List
<
StandardValueVo
>>
getStandardDetailList
(){
return
standardService
.
getStandardDetailList
();
}
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntrustReport.java
View file @
77b114eb
...
@@ -51,6 +51,7 @@ public class EntrustReport {
...
@@ -51,6 +51,7 @@ public class EntrustReport {
* 检测依据 ids
* 检测依据 ids
*/
*/
private
String
methodNumbers
;
private
String
methodNumbers
;
/**
/**
* 检测依据名字
* 检测依据名字
*/
*/
...
@@ -80,6 +81,7 @@ public class EntrustReport {
...
@@ -80,6 +81,7 @@ public class EntrustReport {
* 项目编号
* 项目编号
*/
*/
private
String
entrustCode
;
private
String
entrustCode
;
/**
/**
* 项目类型
* 项目类型
*/
*/
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/StandardMapper.java
View file @
77b114eb
package
cn
.
wise
.
sc
.
cement
.
business
.
mapper
;
package
cn
.
wise
.
sc
.
cement
.
business
.
mapper
;
import
cn.wise.sc.cement.business.entity.Standard
;
import
cn.wise.sc.cement.business.entity.Standard
;
import
cn.wise.sc.cement.business.model.vo.StandardValueVo
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* Mapper 接口
* Mapper 接口
...
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
*/
public
interface
StandardMapper
extends
BaseMapper
<
Standard
>
{
public
interface
StandardMapper
extends
BaseMapper
<
Standard
>
{
List
<
StandardValueVo
>
getStandardDetaulList
();
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml
View file @
77b114eb
...
@@ -2,4 +2,11 @@
...
@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.wise.sc.cement.business.mapper.StandardMapper"
>
<mapper
namespace=
"cn.wise.sc.cement.business.mapper.StandardMapper"
>
<select
id=
"getStandardDetaulList"
resultType=
"cn.wise.sc.cement.business.model.vo.StandardValueVo"
>
SELECT standard_id as id,element_value,element_name FROM `standard_value` sv
LEFT JOIN
(SELECT id FROM standard) s
ON sv.standard_id = s.id
</select>
</mapper>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/service/IStandardService.java
View file @
77b114eb
...
@@ -6,10 +6,13 @@ import cn.wise.sc.cement.business.model.PageQuery;
...
@@ -6,10 +6,13 @@ import cn.wise.sc.cement.business.model.PageQuery;
import
cn.wise.sc.cement.business.model.query.ChangeStockQuery
;
import
cn.wise.sc.cement.business.model.query.ChangeStockQuery
;
import
cn.wise.sc.cement.business.model.query.ChangeValidDateQuery
;
import
cn.wise.sc.cement.business.model.query.ChangeValidDateQuery
;
import
cn.wise.sc.cement.business.model.query.StandardQuery
;
import
cn.wise.sc.cement.business.model.query.StandardQuery
;
import
cn.wise.sc.cement.business.model.vo.StandardValueVo
;
import
cn.wise.sc.cement.business.model.vo.StandardVo
;
import
cn.wise.sc.cement.business.model.vo.StandardVo
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
/**
/**
* <p>
* <p>
* 服务类
* 服务类
...
@@ -36,6 +39,5 @@ public interface IStandardService extends IService<Standard> {
...
@@ -36,6 +39,5 @@ public interface IStandardService extends IService<Standard> {
BaseResponse
<
String
>
overdue
(
Integer
id
);
BaseResponse
<
String
>
overdue
(
Integer
id
);
BaseResponse
<
List
<
StandardValueVo
>>
getStandardDetailList
();
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
77b114eb
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java
View file @
77b114eb
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