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
e726ec82
Commit
e726ec82
authored
Nov 05, 2020
by
qinhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改质量控制
parent
6ed334c1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
665 additions
and
500 deletions
+665
-500
NormProductionController.java
.../cement/business/controller/NormProductionController.java
+2
-2
QualityController.java
...wise/sc/cement/business/controller/QualityController.java
+2
-1
StandardController.java
...ise/sc/cement/business/controller/StandardController.java
+157
-147
GroupStandard.java
...java/cn/wise/sc/cement/business/entity/GroupStandard.java
+26
-0
NormProduction.java
...ava/cn/wise/sc/cement/business/entity/NormProduction.java
+2
-2
StandardGroupDto.java
...a/cn/wise/sc/cement/business/entity/StandardGroupDto.java
+18
-0
StandardMapper.java
...ava/cn/wise/sc/cement/business/mapper/StandardMapper.java
+9
-0
StandardMapper.xml
.../cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml
+7
-0
NormProductionVo.java
...cn/wise/sc/cement/business/model/vo/NormProductionVo.java
+3
-3
IStandardService.java
.../cn/wise/sc/cement/business/service/IStandardService.java
+7
-0
KeyValueMap.java
.../cn/wise/sc/cement/business/service/impl/KeyValueMap.java
+17
-0
NormProductionServiceImpl.java
...ment/business/service/impl/NormProductionServiceImpl.java
+6
-1
StandardServiceImpl.java
.../sc/cement/business/service/impl/StandardServiceImpl.java
+386
-343
ObjUtils.java
...c/main/java/cn/wise/sc/cement/business/util/ObjUtils.java
+22
-0
PageUtil.java
...c/main/java/cn/wise/sc/cement/business/util/PageUtil.java
+1
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java
View file @
e726ec82
...
@@ -134,7 +134,7 @@ public class NormProductionController {
...
@@ -134,7 +134,7 @@ public class NormProductionController {
}
}
}
}
return
BaseResponse
.
okData
(
n
ull
);
return
BaseResponse
.
okData
(
n
ew
Page
<>()
);
}
}
@GetMapping
(
"/statistics/detail"
)
@GetMapping
(
"/statistics/detail"
)
...
@@ -158,7 +158,7 @@ public class NormProductionController {
...
@@ -158,7 +158,7 @@ public class NormProductionController {
Page
<
NormProduction
.
NormProductionDetail
>
rts
=
PageUtil
.
listConvertToPage
(
collect
,
pageQuery
);
Page
<
NormProduction
.
NormProductionDetail
>
rts
=
PageUtil
.
listConvertToPage
(
collect
,
pageQuery
);
return
BaseResponse
.
okData
(
rts
);
return
BaseResponse
.
okData
(
rts
);
}
}
return
BaseResponse
.
okData
(
n
ull
);
return
BaseResponse
.
okData
(
n
ew
Page
<>()
);
}
}
@GetMapping
(
"/total/production"
)
@GetMapping
(
"/total/production"
)
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityController.java
View file @
e726ec82
...
@@ -7,6 +7,7 @@ import cn.wise.sc.cement.business.model.vo.QualityDetailVo;
...
@@ -7,6 +7,7 @@ import cn.wise.sc.cement.business.model.vo.QualityDetailVo;
import
cn.wise.sc.cement.business.service.IEntrustService
;
import
cn.wise.sc.cement.business.service.IEntrustService
;
import
cn.wise.sc.cement.business.service.IQualityApplyService
;
import
cn.wise.sc.cement.business.service.IQualityApplyService
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiImplicitParams
;
...
@@ -61,7 +62,7 @@ public class QualityController {
...
@@ -61,7 +62,7 @@ public class QualityController {
List
<
EntrustVo
>
records
=
baseResponse
.
getData
().
getRecords
();
List
<
EntrustVo
>
records
=
baseResponse
.
getData
().
getRecords
();
if
(
records
.
size
()
==
0
)
{
if
(
records
.
size
()
==
0
)
{
return
BaseResponse
.
okData
(
n
ull
);
return
BaseResponse
.
okData
(
n
ew
Page
<>()
);
}
}
List
<
Integer
>
projectIds
=
records
.
stream
().
map
(
EntrustVo:
:
getId
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
projectIds
=
records
.
stream
().
map
(
EntrustVo:
:
getId
).
collect
(
Collectors
.
toList
());
Set
<
Integer
>
qualityApplyIds
=
iQualityApplyService
.
selectQualityApplyStatusByProIds
(
projectIds
);
Set
<
Integer
>
qualityApplyIds
=
iQualityApplyService
.
selectQualityApplyStatusByProIds
(
projectIds
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/StandardController.java
View file @
e726ec82
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/GroupStandard.java
0 → 100644
View file @
e726ec82
package
cn
.
wise
.
sc
.
cement
.
business
.
entity
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Map
;
/**
* @description: 标样值
* @author: qh
* @create: 2020-11-05 10:11
**/
@Data
public
class
GroupStandard
implements
Serializable
{
private
static
final
long
serialVersionUID
=
42L
;
/**
* 检测组id
*/
private
String
groupName
;
/**
* 标准样品key:value
*/
private
Map
<
String
,
String
>
map
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NormProduction.java
View file @
e726ec82
...
@@ -40,9 +40,9 @@ public class NormProduction implements Serializable {
...
@@ -40,9 +40,9 @@ public class NormProduction implements Serializable {
private
Integer
assessId
;
private
Integer
assessId
;
/**
/**
* 类型
0:检测组 1
:处理项
* 类型
1:检测组 0
:处理项
*/
*/
@ApiModelProperty
(
"类型
0:检测组 1
:处理项"
)
@ApiModelProperty
(
"类型
1:检测组 0
:处理项"
)
private
Integer
type
;
private
Integer
type
;
/**
/**
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/StandardGroupDto.java
0 → 100644
View file @
e726ec82
package
cn
.
wise
.
sc
.
cement
.
business
.
entity
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @description:
* @author: qh
* @create: 2020-11-05 11:02
**/
@Data
public
class
StandardGroupDto
implements
Serializable
{
private
String
groupName
;
private
Integer
groupId
;
private
String
elementName
;
private
String
elementValue
;
}
\ No newline at end of file
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/StandardMapper.java
View file @
e726ec82
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.entity.StandardGroupDto
;
import
cn.wise.sc.cement.business.model.vo.StandardValueVo
;
import
cn.wise.sc.cement.business.model.vo.StandardValueVo
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
...
@@ -21,4 +22,12 @@ public interface StandardMapper extends BaseMapper<Standard> {
...
@@ -21,4 +22,12 @@ public interface StandardMapper extends BaseMapper<Standard> {
List
<
StandardValueVo
>
getStandardDetaulList
();
List
<
StandardValueVo
>
getStandardDetaulList
();
List
<
Map
<
String
,
Object
>>
exportList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
Map
<
String
,
Object
>>
exportList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
/**
* @return
*
*/
List
<
StandardGroupDto
>
getStandardsByGroup
();
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml
View file @
e726ec82
...
@@ -43,5 +43,12 @@
...
@@ -43,5 +43,12 @@
<include
refid=
"where"
/>
<include
refid=
"where"
/>
ORDER BY t.id DESC
ORDER BY t.id DESC
</select>
</select>
<select
id=
"getStandardsByGroup"
resultType=
"cn.wise.sc.cement.business.entity.StandardGroupDto"
>
select s.id as group_id,s.`name` as group_name,sv.element_name,sv.element_value FROM standard s
INNER JOIN
(SELECT * FROM standard_value) sv
ON s.id = sv.standard_id AND s.`status` = 1
</select>
</mapper>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/NormProductionVo.java
View file @
e726ec82
...
@@ -26,10 +26,10 @@ public class NormProductionVo {
...
@@ -26,10 +26,10 @@ public class NormProductionVo {
private
Integer
assessId
;
private
Integer
assessId
;
/**
/**
* 类型
0:检测组 1
:处理项
* 类型
1:检测组 0
:处理项
*/
*/
@ApiModelProperty
(
"类型
0:检测组 1
:处理项"
)
@ApiModelProperty
(
"类型
1:检测组 0
:处理项"
)
private
Integer
type
;
private
String
type
;
/**
/**
* 定额工日
* 定额工日
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/IStandardService.java
View file @
e726ec82
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.EntityEnclosure
;
import
cn.wise.sc.cement.business.entity.GroupStandard
;
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
;
...
@@ -46,4 +47,10 @@ public interface IStandardService extends IService<Standard> {
...
@@ -46,4 +47,10 @@ public interface IStandardService extends IService<Standard> {
BaseResponse
<
String
>
overdue
(
Integer
id
);
BaseResponse
<
String
>
overdue
(
Integer
id
);
BaseResponse
<
List
<
StandardValueVo
>>
getStandardDetailList
();
BaseResponse
<
List
<
StandardValueVo
>>
getStandardDetailList
();
/**
* 按检测组获取标样信息
* @return GroupStandard
*/
List
<
GroupStandard
>
getStandards
();
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/KeyValueMap.java
0 → 100644
View file @
e726ec82
package
cn
.
wise
.
sc
.
cement
.
business
.
service
.
impl
;
import
lombok.Data
;
/**
* @description: key:"",vale:""的映射对象
* @author: qh
* @create: 2020-11-05 10:47
**/
@Data
public
class
KeyValueMap
{
private
String
name
;
private
String
value
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java
View file @
e726ec82
...
@@ -185,6 +185,11 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
...
@@ -185,6 +185,11 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
.
findFirst
()
.
findFirst
()
.
ifPresent
(
opt
->
normProductionVo
.
setAssessName
(
opt
.
getName
()));
.
ifPresent
(
opt
->
normProductionVo
.
setAssessName
(
opt
.
getName
()));
}
}
if
(
arg
.
getType
()
==
1
)
{
normProductionVo
.
setType
(
"检测项"
);
}
else
{
normProductionVo
.
setType
(
"处理项"
);
}
records
.
add
(
normProductionVo
);
records
.
add
(
normProductionVo
);
});
});
rts
.
setRecords
(
records
);
rts
.
setRecords
(
records
);
...
@@ -436,7 +441,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
...
@@ -436,7 +441,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
//处理非标准产值没有用名职位信息
//处理非标准产值没有用名职位信息
QueryWrapper
<
SysUser
>
qw
=
new
QueryWrapper
<>();
QueryWrapper
<
SysUser
>
qw
=
new
QueryWrapper
<>();
qw
.
in
(
"id"
,
userIds
);
qw
.
in
(
"id"
,
userIds
);
if
(
CollectionUtil
.
isEmpty
(
userIds
))
{
if
(
CollectionUtil
.
isEmpty
(
userIds
))
{
return
null
;
return
null
;
}
}
List
<
SysUser
>
users
=
iSysUserService
.
list
(
qw
);
List
<
SysUser
>
users
=
iSysUserService
.
list
(
qw
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/StandardServiceImpl.java
View file @
e726ec82
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/util/ObjUtils.java
0 → 100644
View file @
e726ec82
package
cn
.
wise
.
sc
.
cement
.
business
.
util
;
import
cn.hutool.core.lang.Assert
;
import
cn.wise.sc.cement.business.service.impl.KeyValueMap
;
import
com.alibaba.fastjson.JSON
;
import
java.util.List
;
/**
* @description:
* @author: qh
* @create: 2020-11-05 10:48
**/
public
class
ObjUtils
{
public
static
List
<
KeyValueMap
>
str2Obj
(
String
str
){
Assert
.
notBlank
(
str
,
"带解析字符串不允许为空!"
);
return
JSON
.
parseArray
(
str
,
KeyValueMap
.
class
);
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/util/PageUtil.java
View file @
e726ec82
...
@@ -15,7 +15,7 @@ public class PageUtil {
...
@@ -15,7 +15,7 @@ public class PageUtil {
public
static
<
T
>
Page
<
T
>
listConvertToPage
(
List
<
T
>
list
,
PageQuery
pageQuery
)
{
public
static
<
T
>
Page
<
T
>
listConvertToPage
(
List
<
T
>
list
,
PageQuery
pageQuery
)
{
if
(
CollectionUtil
.
isEmpty
(
list
)){
if
(
CollectionUtil
.
isEmpty
(
list
)){
return
n
ull
;
return
n
ew
Page
<>()
;
}
}
int
start
=
pageQuery
.
getPageNo
()
>
0
?
pageQuery
.
getPageNo
()
:
1
;
int
start
=
pageQuery
.
getPageNo
()
>
0
?
pageQuery
.
getPageNo
()
:
1
;
int
pageSize
=
pageQuery
.
getPageSize
()
>
0
?
pageQuery
.
getPageSize
()
:
10
;
int
pageSize
=
pageQuery
.
getPageSize
()
>
0
?
pageQuery
.
getPageSize
()
:
10
;
...
...
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