Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
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
ba9b09a9
Commit
ba9b09a9
authored
4 years ago
by
竹天卫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
委托管理 还差校核计算 和校核保存功能 其他功能接口完成
parent
b01afe4c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
1571 additions
and
255 deletions
+1571
-255
EntrustController.java
...wise/sc/cement/business/controller/EntrustController.java
+145
-31
TeamController.java
...cn/wise/sc/cement/business/controller/TeamController.java
+13
-0
Sample.java
...c/main/java/cn/wise/sc/cement/business/entity/Sample.java
+4
-2
SampleCheckTeam.java
...va/cn/wise/sc/cement/business/entity/SampleCheckTeam.java
+14
-9
SampleDistribution.java
...cn/wise/sc/cement/business/entity/SampleDistribution.java
+15
-0
SampleHandleEnclosure.java
...wise/sc/cement/business/entity/SampleHandleEnclosure.java
+62
-0
TeamGroup.java
...ain/java/cn/wise/sc/cement/business/entity/TeamGroup.java
+3
-0
EntrustMapper.java
...java/cn/wise/sc/cement/business/mapper/EntrustMapper.java
+6
-0
SampleDistributionMapper.java
...e/sc/cement/business/mapper/SampleDistributionMapper.java
+4
-1
SampleHandleEnclosureMapper.java
...c/cement/business/mapper/SampleHandleEnclosureMapper.java
+23
-0
SampleHandleMapper.java
...cn/wise/sc/cement/business/mapper/SampleHandleMapper.java
+2
-1
SampleMapper.java
.../java/cn/wise/sc/cement/business/mapper/SampleMapper.java
+20
-0
TeamMapper.java
...in/java/cn/wise/sc/cement/business/mapper/TeamMapper.java
+2
-0
EntrustMapper.xml
...a/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
+145
-1
SampleDistributionMapper.xml
...c/cement/business/mapper/xml/SampleDistributionMapper.xml
+26
-26
SampleHandleEnclosureMapper.xml
...ement/business/mapper/xml/SampleHandleEnclosureMapper.xml
+27
-0
SampleHandleMapper.xml
...wise/sc/cement/business/mapper/xml/SampleHandleMapper.xml
+32
-6
TeamMapper.xml
...java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
+8
-5
DistributionQuery.java
...ise/sc/cement/business/model/query/DistributionQuery.java
+0
-11
HandleQuery.java
...a/cn/wise/sc/cement/business/model/query/HandleQuery.java
+1
-1
SampleCheckTeamQuery.java
.../sc/cement/business/model/query/SampleCheckTeamQuery.java
+15
-10
SampleDistributionEnclosureQuery.java
...usiness/model/query/SampleDistributionEnclosureQuery.java
+24
-0
SampleDistributionTeamQuery.java
...ent/business/model/query/SampleDistributionTeamQuery.java
+5
-16
SampleHandleEnclosureQuery.java
...ment/business/model/query/SampleHandleEnclosureQuery.java
+25
-0
SampleHandleQuery.java
...ise/sc/cement/business/model/query/SampleHandleQuery.java
+1
-1
EntrustVo.java
...n/java/cn/wise/sc/cement/business/model/vo/EntrustVo.java
+6
-3
SampleCheckGroupVo.java
.../wise/sc/cement/business/model/vo/SampleCheckGroupVo.java
+41
-0
SampleCheckVo.java
...va/cn/wise/sc/cement/business/model/vo/SampleCheckVo.java
+49
-0
SampleDistributionTeamVo.java
...sc/cement/business/model/vo/SampleDistributionTeamVo.java
+30
-4
SampleHandleEnclosureVo.java
.../sc/cement/business/model/vo/SampleHandleEnclosureVo.java
+62
-0
SampleHandleVo.java
...a/cn/wise/sc/cement/business/model/vo/SampleHandleVo.java
+10
-1
TeamListVo.java
.../java/cn/wise/sc/cement/business/model/vo/TeamListVo.java
+3
-0
IEntrustService.java
...a/cn/wise/sc/cement/business/service/IEntrustService.java
+38
-12
ISampleHandleEnclosureService.java
...ement/business/service/ISampleHandleEnclosureService.java
+16
-0
ITeamService.java
...java/cn/wise/sc/cement/business/service/ITeamService.java
+3
-0
EntrustServiceImpl.java
...e/sc/cement/business/service/impl/EntrustServiceImpl.java
+646
-113
SampleHandleEnclosureServiceImpl.java
...siness/service/impl/SampleHandleEnclosureServiceImpl.java
+20
-0
TeamServiceImpl.java
...wise/sc/cement/business/service/impl/TeamServiceImpl.java
+24
-0
application.yml
cement-business/src/main/resources/application.yml
+1
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java
View file @
ba9b09a9
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/TeamController.java
View file @
ba9b09a9
...
...
@@ -121,6 +121,19 @@ public class TeamController {
}
}
@ApiOperation
(
value
=
"根据检测组id获取检测项信息"
)
@GetMapping
(
"/getByGroup"
)
public
BaseResponse
getByGroup
(
Integer
id
)
{
try
{
return
teamService
.
getByGroup
(
id
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"根据检测组id获取检测项信息{}"
,
e
);
}
return
BaseResponse
.
errorMsg
(
"失败!"
);
}
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/Sample.java
View file @
ba9b09a9
...
...
@@ -113,9 +113,11 @@ public class Sample implements Serializable {
@ApiModelProperty
(
"销毁时间"
)
private
LocalDateTime
destructionTime
;
@ApiModelProperty
(
"样品处理是否全部完成(0未处理完成,1处理完成"
)
private
Integer
isHandle
;
@ApiModelProperty
(
"样品是否检测完成(0未检测完成, 1检测完成,)"
)
private
Integer
isCheck
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleCheckTeam.java
View file @
ba9b09a9
...
...
@@ -34,19 +34,24 @@ public class SampleCheckTeam implements Serializable {
@ApiModelProperty
(
"样品检测表id"
)
private
Integer
checkId
;
@ApiModelProperty
(
"检测
项目id(检测项目表)
"
)
private
Integer
te
stItem
Id
;
@ApiModelProperty
(
"检测
组id
"
)
private
Integer
te
amGroup
Id
;
@ApiModelProperty
(
"检测
项目
"
)
private
String
te
stItem
;
@ApiModelProperty
(
"检测
组名称
"
)
private
String
te
amGroupName
;
/**
* 检测项目信息 json串
{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
* json串
{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
*/
@ApiModelProperty
(
"检测项目信息json串"
)
private
String
testTeams
;
@ApiModelProperty
(
"主样检测结果 json串"
)
private
String
main_result
;
@ApiModelProperty
(
"次样检测结果json串"
)
private
String
secondary_result
;
@ApiModelProperty
(
"最终校核计算结果json串"
)
private
String
end_result
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleDistribution.java
View file @
ba9b09a9
...
...
@@ -34,6 +34,9 @@ public class SampleDistribution implements Serializable {
@ApiModelProperty
(
"样品表d"
)
private
Integer
sampleId
;
@ApiModelProperty
(
"检测组id"
)
private
Integer
teamGroupId
;
@ApiModelProperty
(
"检测项id"
)
private
Integer
teamId
;
...
...
@@ -55,5 +58,17 @@ public class SampleDistribution implements Serializable {
@ApiModelProperty
(
"备注"
)
private
String
remark
;
@ApiModelProperty
(
"附件地址"
)
private
String
enclosureUrl
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
@ApiModelProperty
(
"上传图片时间"
)
private
LocalDateTime
updateTime
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/SampleHandleEnclosure.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
java.time.LocalDateTime
;
import
java.io.Serializable
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-09-14
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@Accessors
(
chain
=
true
)
public
class
SampleHandleEnclosure
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
@ApiModelProperty
(
"样品处理表id"
)
private
Integer
sampleHandleId
;
@ApiModelProperty
(
"处理项表id"
)
private
Integer
handleId
;
@ApiModelProperty
(
"操作人id"
)
private
Integer
userId
;
@ApiModelProperty
(
"附件地址"
)
private
String
enclosureUrl
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
@ApiModelProperty
(
"上传图片时间"
)
private
LocalDateTime
updateTime
;
@ApiModelProperty
(
"状态(0未上传,1成功,2上传失败)"
)
private
Integer
status
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/entity/TeamGroup.java
View file @
ba9b09a9
...
...
@@ -31,6 +31,9 @@ public class TeamGroup implements Serializable {
@ApiModelProperty
(
"检测组名称"
)
private
String
name
;
@ApiModelProperty
(
"校核元素 json串"
)
private
String
checkElement
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EntrustMapper.java
View file @
ba9b09a9
...
...
@@ -28,4 +28,10 @@ public interface EntrustMapper extends BaseMapper<Entrust> {
@Select
(
"select count(*) from entrust where day(create_time) = day(now())"
)
Integer
counts
();
IPage
<
EntrustVo
>
getSampleHandlePage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
IPage
<
EntrustVo
>
getSampleDistributionPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
IPage
<
EntrustVo
>
getCheckPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionMapper.java
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
mapper
;
import
cn.wise.sc.cement.business.entity.SampleDistribution
;
import
cn.wise.sc.cement.business.model.vo.SampleCheckGroupVo
;
import
cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo
;
import
cn.wise.sc.cement.business.model.vo.SampleDistributionVo
;
import
cn.wise.sc.cement.business.model.vo.SampleHandleVo
;
...
...
@@ -24,5 +25,7 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
IPage
<
SampleDistributionVo
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
SampleDistributionTeamVo
>
getDistributionTeamList
(
Integer
sampleId
);
List
<
SampleDistributionTeamVo
>
getDistributionTeamList
(
@Param
(
"sampleId"
)
Integer
sampleId
,
@Param
(
"userId"
)
Integer
userId
);
List
<
SampleCheckGroupVo
>
getSampleCheckGroupList
(
@Param
(
"sampleId"
)
Integer
sampleId
);
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleHandleEnclosureMapper.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
mapper
;
import
cn.wise.sc.cement.business.entity.SampleHandleEnclosure
;
import
cn.wise.sc.cement.business.model.vo.SampleHandleEnclosureVo
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author ztw
* @since 2020-09-14
*/
public
interface
SampleHandleEnclosureMapper
extends
BaseMapper
<
SampleHandleEnclosure
>
{
List
<
SampleHandleEnclosureVo
>
getList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleHandleMapper.java
View file @
ba9b09a9
...
...
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -21,7 +22,7 @@ import java.util.Map;
public
interface
SampleHandleMapper
extends
BaseMapper
<
SampleHandle
>
{
IPage
<
SampleHandleVo
>
getPage
(
@Param
(
"page"
)
Page
page
,
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
SampleHandleVo
>
getSampleHandleList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
SampleHandleVo
getDetail
(
Integer
id
);
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleMapper.java
View file @
ba9b09a9
...
...
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -28,4 +29,23 @@ public interface SampleMapper extends BaseMapper<Sample> {
@Select
(
"select max(parallel_code) from sample"
)
String
getMaxCementCode
();
@Select
(
"select * from sample where cement_code = parallel_code and entrust_id = #{entrustId}"
+
" order by id asc "
)
List
<
Sample
>
getSampleList
(
Integer
entrustId
);
@Select
(
"select * from sample where cement_code = parallel_code and entrust_id = #{entrustId} "
+
" and is_handle != 1 order by id asc"
)
List
<
Sample
>
getNoHandleList
(
Integer
entrustId
);
@Select
(
"select * from sample where entrust_id = #{entrustId} and is_check != 1 order by id asc"
)
List
<
Sample
>
getNoDistributionList
(
Integer
entrustId
);
//校核详情样品列表(不展示平行样副样)
@Select
(
"select * from sample where cement_code = parallel_code and entrust_id = #{entrustId} "
+
"and is_handle = 1 and is_check = 1 order by id asc"
)
List
<
Sample
>
getCheckSampleList
(
Integer
entrustId
);
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/TeamMapper.java
View file @
ba9b09a9
...
...
@@ -30,4 +30,6 @@ public interface TeamMapper extends BaseMapper<Team> {
List
<
Map
<
String
,
Object
>>
exportList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
);
List
<
String
>
getByGroup
(
Integer
groupId
);
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
View file @
ba9b09a9
...
...
@@ -20,6 +20,9 @@
<if
test=
"params.projectName != null and params.projectName != ''"
>
and p.name like concat('%', #{params.projectName}, '%')
</if>
<if
test=
"params.projectCode != null and params.projectCode != ''"
>
and p.code like concat('%', #{params.projectCode}, '%')
</if>
<if
test=
"params.userId != null"
>
and e.user_id = #{params.userId}
</if>
...
...
@@ -51,7 +54,22 @@
</select>
<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.*,
(
CASE e.status
WHEN 0 THEN '未评审'
WHEN 1 THEN '已通过'
WHEN 2 THEN '未通过'
WHEN 3 THEN '样品处理中'
WHEN 4 THEN '样品处理完成'
WHEN 5 THEN '样品检测中'
WHEN 6 THEN '样品检测完成'
WHEN 7 THEN '校核中'
WHEN 8 THEN '校核完成'
ELSE ''
END
) as statusValue,
p.name as projectName, c.name as clientName, su.name as userName,
su.phone as userPhone, su.fax as userFax
from entrust e
left join project p on p.id = e.project_id
...
...
@@ -62,4 +80,130 @@
<select
id=
"getSampleHandlePage"
resultType=
"cn.wise.sc.cement.business.model.vo.EntrustVo"
>
select e.id as id, e.sample_num as sampleNum,
(
CASE e.status
WHEN 0 THEN '未评审'
WHEN 1 THEN '已通过'
WHEN 2 THEN '未通过'
WHEN 3 THEN '样品处理中'
WHEN 4 THEN '样品处理完成'
WHEN 5 THEN '样品检测中'
WHEN 6 THEN '样品检测完成'
WHEN 7 THEN '校核中'
WHEN 8 THEN '校核完成'
ELSE ''
END
) as statusValue,
p.id as projectId, p.name as projectName, p.code as projectCode,
su.name as userName
from sample_handle t
left join sys_user su on su.id = t.user_id
left join sample s on s.id = t.sample_id
left join entrust e on e.id = s.entrust_id
left join project p on p.id = e.project_id
where 1=1
<if
test=
"params.userId != null"
>
and t.user_id = #{params.userId}
</if>
<if
test=
"params.projectCode != null and params.projectCode != ''"
>
and p.code like concat('%', #{params.projectCode}, '%')
</if>
group by e.id
order by e.update_time desc
</select>
<select
id=
"getSampleDistributionPage"
resultType=
"cn.wise.sc.cement.business.model.vo.EntrustVo"
>
select e.id as id, e.sample_num as sampleNum,e.entrust_date as entrustDate,
(
CASE e.status
WHEN 0 THEN '未评审'
WHEN 1 THEN '已通过'
WHEN 2 THEN '未通过'
WHEN 3 THEN '样品处理中'
WHEN 4 THEN '样品处理完成'
WHEN 5 THEN '样品检测中'
WHEN 6 THEN '样品检测完成'
WHEN 7 THEN '校核中'
WHEN 8 THEN '校核完成'
ELSE ''
END
) as statusValue,
p.id as projectId, p.name as projectName, p.code as projectCode,
su.name as userName
from sample_distribution t
left join sys_user su on su.id = t.user_id
left join sample s on s.id = t.sample_id
left join entrust e on e.id = s.entrust_id
left join project p on p.id = e.project_id
where 1=1
<if
test=
"params.userId != null"
>
and t.user_id = #{params.userId}
</if>
<if
test=
"params.projectCode != null and params.projectCode != ''"
>
and p.code like concat('%', #{params.projectCode}, '%')
</if>
<if
test=
"params.projectName != null and params.projectName != ''"
>
and p.name like concat('%', #{params.projectName}, '%')
</if>
GROUP BY e.id
order by e.update_time desc
</select>
<!--数据校核分页列表-->
<select
id=
"getCheckPage"
resultType=
"cn.wise.sc.cement.business.model.vo.EntrustVo"
>
select e.*, p.name as projectName, c.name as clientName, su.name as userName,
(
CASE e.status
WHEN 0 THEN '未评审'
WHEN 1 THEN '已通过'
WHEN 2 THEN '未通过'
WHEN 3 THEN '样品处理中'
WHEN 4 THEN '样品处理完成'
WHEN 5 THEN '样品检测中'
WHEN 6 THEN '样品检测完成'
WHEN 7 THEN '校核中'
WHEN 8 THEN '校核完成'
ELSE ''
END
) as statusValue
from entrust e
left join project p on p.id = e.project_id
left join client c on c.id = e.client_id
left join sys_user su on su.id = e.user_id
<include
refid=
"checkWhere"
/>
order by e.update_time desc
</select>
<sql
id=
"checkWhere"
>
<where>
and e.is_delete = 1 and e.status >= 6
<if
test=
"params.startDate != null and params.startDate != ''"
>
and DATE(e.entrust_date)
>
= #{params.startDate}
</if>
<if
test=
"params.endDate != null and params.endDate != ''"
>
and DATE(e.entrust_date)
<
= #{params.endDate}
</if>
<if
test=
"params.status != null"
>
and e.status = #{params.status}
</if>
<if
test=
"params.clientId != null"
>
and e.client_id = #{params.clientId}
</if>
<if
test=
"params.projectName != null and params.projectName != ''"
>
and p.name like concat('%', #{params.projectName}, '%')
</if>
<if
test=
"params.projectCode != null and params.projectCode != ''"
>
and p.code like concat('%', #{params.projectCode}, '%')
</if>
<if
test=
"params.userId != null"
>
and e.user_id = #{params.userId}
</if>
</where>
</sql>
</mapper>
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml
View file @
ba9b09a9
...
...
@@ -38,41 +38,41 @@
</select>
<select
id=
"getDistributionTeamList"
resultType=
"cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo"
>
select t.id as distributionId, su.id as userId, su.name as userName, s.id as teamId, s.name as teamName
select t.id as distributionId, su.id as userId, su.name as userName,
t.team_group_id as teamGroupId, tg.name as teamGroupName, s.id as teamId, s.name as teamName,
t.enclosure_url as enclosureUrl, t.alias as alias, t.ext_name as extName,
t.status as status,
(
CASE t.status
WHEN 0 THEN '未接受'
WHEN 1 THEN '已接受'
WHEN 2 THEN '已完成'
ELSE ''
END
) as statusValue
from sample_distribution t
left join sys_user su on su.id = t.user_id
left join team s on s.id = t.team_id
left join team_group tg on tg.id = t.team_group_id
where t.sample_id = #{sampleId}
<if
test=
"userId != null"
>
and t.user_id = #{userId}
</if>
order by t.id asc
</select>
<select
id=
"getSampleCheckGroupList"
resultType=
"cn.wise.sc.cement.business.model.vo.SampleCheckGroupVo"
>
select sd.team_group_id as teamGroupId, tg.name as teamGroupName,
sd.user_id as userId, su.name as userName
from sample_distribution sd
left join team_group tg on tg.id = sd.team_group_id
left join sys_user su on su.id = sd.user_id
where sd.sample_id = #{sampleId}
group by sd.team_group_id,sd.user_id
order by sd.team_group_id
</select>
</mapper>
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleHandleEnclosureMapper.xml
0 → 100644
View file @
ba9b09a9
<?xml version="1.0" encoding="UTF-8"?>
<!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.SampleHandleEnclosureMapper"
>
<select
id=
"getList"
resultType=
"cn.wise.sc.cement.business.model.vo.SampleHandleEnclosureVo"
>
select t.*,
su.name as userName,
(
CASE t.status
WHEN 0 THEN '未上传'
WHEN 1 THEN '成功'
WHEN 2 THEN '上传失败'
ELSE ''
END
) as statusValue
from sample_handle_enclosure t
left join sys_user su on su.id = t.user_id
where t.sample_handle_id = #{params.sampleHandleId}
<if
test=
"params.userId != null"
>
and t.user_id = #{params.userId}
</if>
order by t.id ASC
</select>
</mapper>
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleHandleMapper.xml
View file @
ba9b09a9
...
...
@@ -20,28 +20,54 @@
<if
test=
"params.projectName != null and params.projectName != ''"
>
and p.name like concat('%', #{params.projectName}, '%')
</if>
<if
test=
"params.projectCode != null and params.projectCode != ''"
>
and p.code like concat('%', #{params.projectCode}, '%')
</if>
<if
test=
"params.userId != null"
>
and t.user_id = #{params.userId}
</if>
</where>
</sql>
<select
id=
"getPage"
resultType=
"cn.wise.sc.cement.business.model.vo.SampleHandleVo"
>
select t.*, su.name as userName, s.name as sampleName, s.sample_code as sampleCode,
s.cement_code as cementCode, p.id as projectId, p.name as projectName, p.code as projectCode
<select
id=
"getSampleHandleList"
resultType=
"cn.wise.sc.cement.business.model.vo.SampleHandleVo"
>
select t.*, p.id as projectId, p.name as projectName, p.code as projectCode,
e.sample_num as sampleNum,
s.name as sampleName, s.sample_code as sampleCode,s.cement_code as cementCode,
su.name as userName,
(
CASE t.status
WHEN 0 THEN '未接受'
WHEN 1 THEN '已接受'
WHEN 2 THEN '已完成'
ELSE ''
END
) as statusValue
from sample_handle t
left join sys_user su on su.id = t.user_id
left join sample s on s.id = t.sample_id
left join entrust e on e.id = s.entrust_id
left join project p on p.id = e.project_id
<include
refid=
"where"
/>
order by t.create_time desc
where e.id = #{params.id} and s.cement_code = s.parallel_code
<if
test=
"params.userId != null"
>
and t.user_id = #{params.userId}
</if>
order by t.id ASC
</select>
<select
id=
"getDetail"
resultType=
"cn.wise.sc.cement.business.model.vo.SampleHandleVo"
>
select t.*, su.name as userName, s.name as sampleName, s.sample_code as sampleCode,
s.cement_code as cementCode, p.id as projectId, p.name as projectName, p.code as projectCode
s.cement_code as cementCode, p.id as projectId, p.name as projectName, p.code as projectCode,
(
CASE t.status
WHEN 0 THEN '未接受'
WHEN 1 THEN '已接受'
WHEN 2 THEN '已完成'
ELSE ''
END
) as statusValue
from sample_handle t
left join sys_user su on su.id = t.user_id
left join sample s on s.id = t.sample_id
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/TeamMapper.xml
View file @
ba9b09a9
...
...
@@ -27,7 +27,7 @@
<select
id=
"getList"
resultType=
"cn.wise.sc.cement.business.model.vo.TeamListVo"
>
SELECT t.id as id, t.name as name, t.method_id as methodId,
SELECT t.id as id, t.name as name, t.
group_id as groupId, t.
method_id as methodId,
m.name as methodName, m.number as number
FROM team t
left join method m on m.id = t.method_id
...
...
@@ -41,7 +41,7 @@
FROM team t
left join team_group tg on tg.id = t.group_id
left join method m on m.id = t.method_id
where t.id =
$
{id}
where t.id =
#
{id}
</select>
...
...
@@ -62,9 +62,12 @@
<include
refid=
"where"
/>
</select>
<!--根据检测组id 获取所有检测项信息-->
<select
id=
"getByGroup"
resultType=
"java.lang.String"
>
SELECT t.name
FROM team t
WHERE t.group_id = #{groupId} and t.status = 1
</select>
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/DistributionQuery.java
View file @
ba9b09a9
...
...
@@ -18,11 +18,6 @@ public class DistributionQuery {
@ApiModelProperty
(
"委托表id"
)
private
Integer
id
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
@ApiModelProperty
(
"样品信息列表"
)
private
List
<
SampleDistributionQuery
>
sampleDistributionQueryList
;
...
...
@@ -34,13 +29,7 @@ public class DistributionQuery {
this
.
id
=
id
;
}
public
String
getRemark
()
{
return
remark
;
}
public
void
setRemark
(
String
remark
)
{
this
.
remark
=
remark
;
}
public
List
<
SampleDistributionQuery
>
getSampleDistributionQueryList
()
{
return
sampleDistributionQueryList
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/HandleQuery.java
View file @
ba9b09a9
...
...
@@ -18,7 +18,7 @@ public class HandleQuery {
@ApiModelProperty
(
"委托表id"
)
private
Integer
id
;
@ApiModelProperty
(
"样品
及检测
项列表"
)
@ApiModelProperty
(
"样品
处理
项列表"
)
private
List
<
SampleHandleQuery
>
sampleHandleQueryList
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleCheckTeamQuery.java
View file @
ba9b09a9
...
...
@@ -28,19 +28,24 @@ public class SampleCheckTeamQuery {
@TableId
(
value
=
"id"
,
type
=
IdType
.
AUTO
)
private
Integer
id
;
@ApiModelProperty
(
"检测
项目id(检测项目表)
"
)
private
Integer
te
stItem
Id
;
@ApiModelProperty
(
"检测
组id
"
)
private
Integer
te
amGroup
Id
;
@ApiModelProperty
(
"检测
项目
"
)
private
String
te
stItem
;
@ApiModelProperty
(
"检测
组名称
"
)
private
String
te
amGroupName
;
/**
* 检测项目信息 json串
/**
* json串
{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
*/
@ApiModelProperty
(
"主样检测结果 json串"
)
private
String
main_result
;
{"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
*/
@ApiModelProperty
(
"检测项目信息 json串"
)
private
String
testTeams
;
@ApiModelProperty
(
"次样检测结果json串"
)
private
String
secondary_result
;
@ApiModelProperty
(
"最终校核计算结果json串"
)
private
String
end_result
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleDistributionEnclosureQuery.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
model
.
query
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
"委托-样品派发检测项上传附件请求"
)
public
class
SampleDistributionEnclosureQuery
{
@ApiModelProperty
(
"样品派发表id"
)
private
Integer
id
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
@ApiModelProperty
(
"路径"
)
private
String
enclosureUrl
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleDistributionTeamQuery.java
View file @
ba9b09a9
...
...
@@ -9,29 +9,18 @@ import lombok.Data;
* @author: ztw
* @create: 2020-08-07 14:58
**/
//
@Data
@Data
@ApiModel
(
"委托-样品检测项派发请求"
)
public
class
SampleDistributionTeamQuery
{
@ApiModelProperty
(
"检测组id"
)
private
Integer
teamGroupId
;
@ApiModelProperty
(
"检测项id"
)
private
Integer
teamId
;
@ApiModelProperty
(
"检测人员id"
)
private
Integer
userId
;
public
Integer
getTeamId
()
{
return
teamId
;
}
public
void
setTeamId
(
Integer
teamId
)
{
this
.
teamId
=
teamId
;
}
public
Integer
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
Integer
userId
)
{
this
.
userId
=
userId
;
}
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleHandleEnclosureQuery.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
model
.
query
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.experimental.Accessors
;
@Data
@ApiModel
(
"委托-样品处理项数据上传附件请求"
)
public
class
SampleHandleEnclosureQuery
{
@ApiModelProperty
(
"样品处理附件表id"
)
private
Integer
id
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
@ApiModelProperty
(
"路径"
)
private
String
enclosureUrl
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleHandleQuery.java
View file @
ba9b09a9
...
...
@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel
(
"委托-样品处理请求"
)
@ApiModel
(
"委托-样品处理
项
请求"
)
public
class
SampleHandleQuery
{
@ApiModelProperty
(
"样品表d"
)
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/EntrustVo.java
View file @
ba9b09a9
...
...
@@ -93,18 +93,21 @@ public class EntrustVo {
/**
* 样品及检测项
*/
@ApiModelProperty
(
"样品临时列表"
)
@ApiModelProperty
(
"样品临时列表
新建的时候展示
"
)
private
List
<
SampleTmpVo
>
sampleTmpList
;
@ApiModelProperty
(
"样品列表(展示平行样的样品)"
)
@ApiModelProperty
(
"样品列表(展示平行样的样品)
派发的时候展示
"
)
private
List
<
SampleVo
>
sampleList
;
@ApiModelProperty
(
"样品处理列表(不展示平行样的样品)"
)
@ApiModelProperty
(
"样品处理列表(不展示平行样的样品)
样品处理的时候展示
"
)
private
List
<
SampleVo
>
sampleHandleList
;
@ApiModelProperty
(
"检测项 只显示第一个样品的"
)
private
String
checkTeam
;
@ApiModelProperty
(
"所有样品名称"
)
private
String
sampleNames
;
@ApiModelProperty
(
"检测依据编号 只显示第一个样品的"
)
private
String
checkMethodNumber
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleCheckGroupVo.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
model
.
vo
;
import
com.alibaba.fastjson.JSONArray
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.util.List
;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel
(
"校核-检测组Vo"
)
public
class
SampleCheckGroupVo
{
@ApiModelProperty
(
"检测组id"
)
private
Integer
teamGroupId
;
@ApiModelProperty
(
"检测组名称"
)
private
String
teamGroupName
;
@ApiModelProperty
(
"检测人id"
)
private
Integer
userId
;
@ApiModelProperty
(
"检测人姓名"
)
private
String
userName
;
@ApiModelProperty
(
"校核元素 json串"
)
private
String
checkElement
;
@ApiModelProperty
(
"校核元素 json数组"
)
private
JSONArray
checkElementList
;
@ApiModelProperty
(
"校核结果 json串"
)
private
List
<
String
>
checkResult
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleCheckVo.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
model
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.List
;
/**
* @description:
* @author: qh
* @create: 2020-08-07 14:58
**/
@Data
@ApiModel
(
"校核-样品Vo"
)
public
class
SampleCheckVo
{
@ApiModelProperty
(
"样品表id"
)
private
Integer
id
;
@ApiModelProperty
(
"样品名"
)
private
String
name
;
@ApiModelProperty
(
"来样编号"
)
private
String
sampleCode
;
@ApiModelProperty
(
"本所编号"
)
private
String
cementCode
;
@ApiModelProperty
(
"平行样编号"
)
private
String
parallelCode
;
@ApiModelProperty
(
"检测组列表"
)
public
List
<
SampleCheckGroupVo
>
sampleCheckGroupVoList
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionTeamVo.java
View file @
ba9b09a9
...
...
@@ -16,20 +16,46 @@ public class SampleDistributionTeamVo {
@ApiModelProperty
(
"派发表id"
)
private
Integer
distributionId
;
/**
* 检测项id
*/
@ApiModelProperty
(
"检测组id"
)
private
Integer
teamGroupId
;
@ApiModelProperty
(
"检测组名称"
)
private
String
teamGroupName
;
@ApiModelProperty
(
"检测项id"
)
private
Integer
teamId
;
@ApiModelProperty
(
"检测项名称"
)
private
String
teamName
;
@ApiModelProperty
(
"检测人员id"
)
private
Integer
userId
;
@ApiModelProperty
(
"检测人员姓名"
)
private
String
userName
;
@ApiModelProperty
(
"(0未接受,1接受,2完成)"
)
private
Integer
status
;
@ApiModelProperty
(
" 状态值(0未接受,1已接受,2已完成)"
)
private
String
statusValue
;
@ApiModelProperty
(
"附件地址"
)
private
String
enclosureUrl
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleHandleEnclosureVo.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
model
.
vo
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
/**
* <p>
*
* </p>
*
* @author ztw
* @since 2020-09-14
*/
@Data
@ApiModel
(
"样品处理-数据上传Vo"
)
public
class
SampleHandleEnclosureVo
{
private
Integer
id
;
@ApiModelProperty
(
"样品处理表id"
)
private
Integer
sampleHandleId
;
@ApiModelProperty
(
"处理项表id"
)
private
Integer
handleId
;
@ApiModelProperty
(
"操作人id"
)
private
Integer
userId
;
@ApiModelProperty
(
"操作人姓名"
)
private
String
userName
;
@ApiModelProperty
(
"附件地址"
)
private
String
enclosureUrl
;
@ApiModelProperty
(
"创建时间"
)
private
LocalDateTime
createTime
;
@ApiModelProperty
(
"上传图片时间"
)
private
LocalDateTime
updateTime
;
@ApiModelProperty
(
"状态(0未上传,1成功,2上传失败)"
)
private
Integer
status
;
@ApiModelProperty
(
" 状态值(0未接受,1接受,2完成)"
)
private
String
statusValue
;
@ApiModelProperty
(
"文件名"
)
private
String
alias
;
@ApiModelProperty
(
"扩展名"
)
private
String
extName
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleHandleVo.java
View file @
ba9b09a9
...
...
@@ -30,6 +30,9 @@ public class SampleHandleVo {
@ApiModelProperty
(
"项目编号"
)
private
String
projectCode
;
@ApiModelProperty
(
"样品数量"
)
private
Integer
sampleNum
;
@ApiModelProperty
(
"样品表d"
)
private
Integer
sampleId
;
...
...
@@ -48,9 +51,12 @@ public class SampleHandleVo {
@ApiModelProperty
(
"处理人员姓名"
)
private
String
userName
;
@ApiModelProperty
(
"处理项"
)
@ApiModelProperty
(
"处理项
(1、2、3)
"
)
private
String
content
;
@ApiModelProperty
(
"处理项名称(打磨、棍磨)"
)
private
String
contentName
;
@ApiModelProperty
(
"要求完成日期(计划完成日期)"
)
private
LocalDate
planFinishDate
;
...
...
@@ -60,4 +66,7 @@ public class SampleHandleVo {
@ApiModelProperty
(
"(0未接受,1接受,2完成)"
)
private
Integer
status
;
@ApiModelProperty
(
" 状态值(0未接受,1接受,2完成)"
)
private
String
statusValue
;
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/TeamListVo.java
View file @
ba9b09a9
...
...
@@ -21,6 +21,9 @@ public class TeamListVo {
@ApiModelProperty
(
"检测项目"
)
private
String
name
;
@ApiModelProperty
(
"检测组表id"
)
private
Integer
groupId
;
@ApiModelProperty
(
"检测依据表id"
)
private
Integer
methodId
;
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
service
;
import
cn.wise.sc.cement.business.entity.Entrust
;
import
cn.wise.sc.cement.business.entity.SampleDistribution
;
import
cn.wise.sc.cement.business.entity.SampleHandleEnclosure
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.PageQuery
;
import
cn.wise.sc.cement.business.model.query.*
;
import
cn.wise.sc.cement.business.model.vo.EntrustVo
;
import
cn.wise.sc.cement.business.model.vo.SampleDistributionVo
;
import
cn.wise.sc.cement.business.model.vo.SampleHandleVo
;
import
cn.wise.sc.cement.business.model.vo.*
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
java.util.List
;
import
java.util.Map
;
/**
* <p>
* 服务类
...
...
@@ -21,7 +24,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
public
interface
IEntrustService
extends
IService
<
Entrust
>
{
BaseResponse
<
IPage
<
EntrustVo
>>
getPage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
status
,
Integer
clientId
,
String
projectName
);
Integer
clientId
,
String
projectName
,
String
projectCode
);
BaseResponse
<
String
>
setTopping
(
Integer
id
);
...
...
@@ -34,19 +37,42 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse
<
String
>
approval
(
ApprovalQuery
query
);
BaseResponse
<
String
>
handle
(
HandleQuery
query
);
BaseResponse
<
IPage
<
SampleHandleVo
>>
getSampleHandlePage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
status
,
Integer
clientId
,
String
projectName
);
BaseResponse
<
String
>
acceptHandle
(
Integer
id
);
BaseResponse
<
IPage
<
EntrustVo
>>
getSampleHandlePage
(
PageQuery
pageQuery
,
String
projectCode
);
BaseResponse
<
Map
<
String
,
Object
>>
getSampleHandleList
(
Integer
id
);
BaseResponse
<
String
>
acceptHandle
(
Integer
[]
ids
);
BaseResponse
<
List
<
SampleHandleEnclosureVo
>>
getSampleHandleEnclosureList
(
Integer
sampleHandleId
);
BaseResponse
<
SampleHandleEnclosure
>
uploadEnclosureCL
(
SampleHandleEnclosureQuery
query
);
BaseResponse
<
SampleHandleVo
>
getHandleDtail
(
Integer
id
);
BaseResponse
<
String
>
finishHandle
(
Integer
id
);
BaseResponse
<
String
>
finishHandle
(
Integer
[]
ids
);
BaseResponse
<
String
>
distribution
(
DistributionQuery
query
);
BaseResponse
<
IPage
<
SampleDistributionVo
>>
getSampleDistributionPage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
status
,
Integer
clientId
,
String
projectName
);
BaseResponse
<
String
>
acceptDistribution
(
Integer
id
);
BaseResponse
<
String
>
finishDistribution
(
Integer
id
);
BaseResponse
<
IPage
<
EntrustVo
>>
getSampleDistributionPage
(
PageQuery
pageQuery
,
String
projectName
,
String
projectCode
);
BaseResponse
<
Map
<
String
,
Object
>>
getSampleDistributionList
(
Integer
id
);
BaseResponse
<
String
>
acceptDistribution
(
Integer
[]
ids
);
BaseResponse
<
SampleDistribution
>
uploadEnclosurePF
(
SampleDistributionEnclosureQuery
query
);
BaseResponse
<
String
>
finishDistribution
(
Integer
[]
ids
);
BaseResponse
<
IPage
<
EntrustVo
>>
getCheckPage
(
PageQuery
pageQuery
,
String
startDate
,
String
endDate
,
Integer
status
,
Integer
clientId
,
String
projectName
,
String
projectCode
);
BaseResponse
<
Map
<
String
,
Object
>>
getCheckList
(
Integer
id
);
BaseResponse
<
List
<
SampleCheckVo
>>
getCheckDetail
(
String
cementCode
);
BaseResponse
<
List
<
SampleDistribution
>>
getEnclosureList
(
Integer
sampleId
,
Integer
teamGroupId
,
Integer
userId
);
BaseResponse
<
String
>
check
(
CheckQuery
query
);
...
...
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/ISampleHandleEnclosureService.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
service
;
import
cn.wise.sc.cement.business.entity.SampleHandleEnclosure
;
import
com.baomidou.mybatisplus.extension.service.IService
;
/**
* <p>
* 服务类
* </p>
*
* @author ztw
* @since 2020-09-14
*/
public
interface
ISampleHandleEnclosureService
extends
IService
<
SampleHandleEnclosure
>
{
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/ITeamService.java
View file @
ba9b09a9
...
...
@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
import
java.util.Map
;
/**
* <p>
...
...
@@ -36,5 +37,7 @@ public interface ITeamService extends IService<Team> {
void
export
(
Integer
status
,
Integer
gourpId
,
String
name
,
String
fileName
,
HttpServletResponse
response
);
BaseResponse
<
List
<
String
>>
getByGroup
(
Integer
id
);
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @
ba9b09a9
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleHandleEnclosureServiceImpl.java
0 → 100644
View file @
ba9b09a9
package
cn
.
wise
.
sc
.
cement
.
business
.
service
.
impl
;
import
cn.wise.sc.cement.business.entity.SampleHandleEnclosure
;
import
cn.wise.sc.cement.business.mapper.SampleHandleEnclosureMapper
;
import
cn.wise.sc.cement.business.service.ISampleHandleEnclosureService
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.springframework.stereotype.Service
;
/**
* <p>
* 服务实现类
* </p>
*
* @author ztw
* @since 2020-09-14
*/
@Service
public
class
SampleHandleEnclosureServiceImpl
extends
ServiceImpl
<
SampleHandleEnclosureMapper
,
SampleHandleEnclosure
>
implements
ISampleHandleEnclosureService
{
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java
View file @
ba9b09a9
...
...
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.CollectionUtils
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
io.swagger.models.auth.In
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.BeanUtils
;
...
...
@@ -197,4 +198,27 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
}
}
/**
* 根据检测组id获取检测项信息
* @param id
* @return
*/
@Override
public
BaseResponse
<
List
<
String
>>
getByGroup
(
Integer
id
){
List
<
String
>
map
=
teamMapper
.
getByGroup
(
id
);
return
BaseResponse
.
okData
(
map
);
}
}
This diff is collapsed.
Click to expand it.
cement-business/src/main/resources/application.yml
View file @
ba9b09a9
...
...
@@ -7,7 +7,7 @@ spring:
profiles
:
active
:
dev
datasource
:
#admin!@#123
#
192.168.110.85
admin!@#123
url
:
jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username
:
root
password
:
admin!@#123
...
...
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