Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-service-hmhj
Overview
Overview
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
wangweidong
patzn-cloud-service-hmhj
Commits
9a8a6aa0
Commit
9a8a6aa0
authored
Mar 16, 2022
by
lijingjing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改原始记录关联问题;
修改可输入委托下样品编号重复问题; 修改委托进度查询状态不准问题;
parent
81445f50
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
65 additions
and
95 deletions
+65
-95
EntrustController.java
...cloud/service/lims/hmhj/controller/EntrustController.java
+1
-1
IEntrustService.java
...atzn/cloud/service/lims/hmhj/service/IEntrustService.java
+1
-1
EntrustServiceImpl.java
...ud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
+54
-86
EntrustMapper.xml
src/main/resources/mapper/hmhj/EntrustMapper.xml
+3
-2
OriginalTemplateItemMapper.xml
...main/resources/mapper/hmhj/OriginalTemplateItemMapper.xml
+6
-5
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java
View file @
9a8a6aa0
...
@@ -297,7 +297,7 @@ public class EntrustController extends ServiceController {
...
@@ -297,7 +297,7 @@ public class EntrustController extends ServiceController {
@ApiOperation
(
value
=
"编辑委托单"
,
notes
=
"编辑报价单"
)
@ApiOperation
(
value
=
"编辑委托单"
,
notes
=
"编辑报价单"
)
@PostMapping
(
"/edit_entrust"
)
@PostMapping
(
"/edit_entrust"
)
public
RestResult
<
Boolean
>
editEntrust
(
@RequestBody
EntrustDTO
entrustDTO
)
{
public
RestResult
<
Boolean
>
editEntrust
(
@RequestBody
EntrustDTO
entrustDTO
)
{
return
success
(
entrustService
.
editEntrust
(
entrustDTO
,
getAccount
()));
return
success
(
entrustService
.
editEntrust
(
entrustDTO
,
false
,
getAccount
()));
}
}
@ApiOperation
(
"保存并提交委托"
)
@ApiOperation
(
"保存并提交委托"
)
...
...
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java
View file @
9a8a6aa0
...
@@ -36,7 +36,7 @@ public interface IEntrustService extends IBaseService<Entrust> {
...
@@ -36,7 +36,7 @@ public interface IEntrustService extends IBaseService<Entrust> {
boolean
registerSubmitToMake
(
Long
[]
ids
,
Account
account
);
boolean
registerSubmitToMake
(
Long
[]
ids
,
Account
account
);
boolean
editEntrust
(
EntrustDTO
entrustDTO
,
Account
account
);
boolean
editEntrust
(
EntrustDTO
entrustDTO
,
boolean
isSubmit
,
Account
account
);
EntrustDTO
getDTOById
(
Long
id
);
EntrustDTO
getDTOById
(
Long
id
);
...
...
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java
View file @
9a8a6aa0
This diff is collapsed.
Click to expand it.
src/main/resources/mapper/hmhj/EntrustMapper.xml
View file @
9a8a6aa0
...
@@ -269,8 +269,9 @@
...
@@ -269,8 +269,9 @@
<select
id=
"selectEntrustProgressList"
resultType=
"com.patzn.cloud.service.hmhj.vo.EntrustVO"
>
<select
id=
"selectEntrustProgressList"
resultType=
"com.patzn.cloud.service.hmhj.vo.EntrustVO"
>
SELECT id,code,client,client_tel,entrust_time,assignor,test_side,status,progress,sample_name,
SELECT
s."sample_num"
id,code,client,client_tel,entrust_time,assignor,test_side,status,progress,sample_name,flow_status,
s."sample_num"
FROM entrust e
FROM entrust e
left join (select s.entrust_id,count(1) "sample_num" from entrust_sample s
left join (select s.entrust_id,count(1) "sample_num" from entrust_sample s
where s.deleted = 0 group by s.entrust_id
where s.deleted = 0 group by s.entrust_id
...
...
src/main/resources/mapper/hmhj/OriginalTemplateItemMapper.xml
View file @
9a8a6aa0
...
@@ -7,23 +7,24 @@
...
@@ -7,23 +7,24 @@
distinct ot.id
distinct ot.id
from original_template ot
from original_template ot
left join (
left join (
select st.company_id,st.template_id,string_agg(st.name,'~~') || '~~' "sname"
select st.company_id,st.template_id,string_agg(
distinct
st.name,'~~') || '~~' "sname"
from original_template_item st where st.deleted = 0 and st.type = 'sample'
from original_template_item st where st.deleted = 0 and st.type = 'sample'
group by st.company_id,st.template_id
group by st.company_id,st.template_id
) st ON st.template_id = ot.id
) st ON st.template_id = ot.id
left join (
left join (
select it.company_id,it.template_id,string_agg(it.name,'~~') || '~~' "iname"
select it.company_id,it.template_id,string_agg(
distinct
it.name,'~~') || '~~' "iname"
from original_template_item it where it.deleted = 0 and it.type = 'item'
from original_template_item it where it.deleted = 0 and it.type = 'item'
group by it.company_id,it.template_id
group by it.company_id,it.template_id
) it ON it.template_id = ot.id
) it ON it.template_id = ot.id
where ot.deleted = 0 and (
where ot.deleted = 0 and (
<foreach
collection=
"sampleItemList"
index=
"index"
item=
"sampleItem"
separator=
"or"
open=
"("
close=
")"
>
<foreach
collection=
"sampleItemList"
index=
"index"
item=
"sampleItem"
separator=
"or"
open=
"("
close=
")"
>
1 != 2
(st.sname is not null or it.iname is not null)
<if
test=
"null != sampleItem.name"
>
<if
test=
"null != sampleItem.name"
>
and
strpos(st.sname,concat(#{sampleItem.name},'~~')) > 0
and
( st.sname is null or strpos(st.sname,concat(#{sampleItem.name},'~~')) > 0)
</if>
</if>
<if
test=
"null != sampleItem.itemList"
>
<if
test=
"null != sampleItem.itemList"
>
and (
and (
it.iname is null or
<foreach
collection=
"sampleItem.itemList"
index=
"ix"
item=
"item"
separator=
"or"
open=
"("
close=
")"
>
<foreach
collection=
"sampleItem.itemList"
index=
"ix"
item=
"item"
separator=
"or"
open=
"("
close=
")"
>
strpos(it.iname,concat(#{item},'~~')) > 0
strpos(it.iname,concat(#{item},'~~')) > 0
</foreach>
</foreach>
...
...
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