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
d68bffe6
Commit
d68bffe6
authored
May 28, 2021
by
wangweidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
霍煤鸿骏
parent
a95d8cff
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
234 additions
and
105 deletions
+234
-105
ContractSampleController.java
...ervice/lims/hmhj/controller/ContractSampleController.java
+82
-0
EntrustSampleController.java
...service/lims/hmhj/controller/EntrustSampleController.java
+8
-0
ContractSampleMapper.java
.../cloud/service/lims/hmhj/mapper/ContractSampleMapper.java
+2
-0
IContractSampleRecordService.java
...rvice/lims/hmhj/service/IContractSampleRecordService.java
+2
-0
IContractSampleService.java
...oud/service/lims/hmhj/service/IContractSampleService.java
+10
-0
IEntrustSampleService.java
...loud/service/lims/hmhj/service/IEntrustSampleService.java
+2
-0
ContractSampleRecordServiceImpl.java
...ms/hmhj/service/impl/ContractSampleRecordServiceImpl.java
+7
-0
ContractSampleServiceImpl.java
...ice/lims/hmhj/service/impl/ContractSampleServiceImpl.java
+58
-0
EntrustSampleServiceImpl.java
...vice/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
+28
-1
ContractSampleMapper.xml
src/main/resources/mapper/hmhj/ContractSampleMapper.xml
+18
-0
20200521新增字段.sql
src/test/java/resources/db_sql/v1.0.1/hmhj/20200521新增字段.sql
+15
-0
新增sql.sql
src/test/java/resources/db_sql/v1.0.1/hmhj/新增sql.sql
+1
-53
新增表结构sql.sql
src/test/java/resources/db_sql/v1.0.1/hmhj/新增表结构sql.sql
+1
-51
No files found.
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java
View file @
d68bffe6
...
@@ -501,4 +501,86 @@ public class ContractSampleController extends ServiceController {
...
@@ -501,4 +501,86 @@ public class ContractSampleController extends ServiceController {
return
success
(
contractSampleService
.
removeByIds
(
ids
));
return
success
(
contractSampleService
.
removeByIds
(
ids
));
}
}
@ApiOperation
(
"验收结果录入提交至验收结果发布"
)
@PostMapping
(
"/submit_to_acceptance_check_publish"
)
public
RestResult
<
Boolean
>
submitToAcceptanceCheckPublish
(
@RequestParam
(
"ids"
)
Long
[]
ids
)
{
return
success
(
contractSampleService
.
submitToAcceptanceCheckPublish
(
ids
,
getAccount
()));
}
@ApiOperation
(
"验收结果发布历史分页列表"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_PAGE
,
value
=
"请求数据的页码"
,
required
=
true
,
paramType
=
"query"
,
dataTypeClass
=
Integer
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_ROWS
,
value
=
"每页条数"
,
required
=
true
,
paramType
=
"query"
,
dataTypeClass
=
Integer
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_SIDX
,
value
=
"排序字段"
,
paramType
=
"query"
,
dataTypeClass
=
String
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_SORD
,
value
=
"排序方式"
,
paramType
=
"query"
,
dataTypeClass
=
String
.
class
),
})
@PostMapping
(
"/page_acceptance_check_publish"
)
public
RestResult
<
Page
<
ContractSampleVO
>>
getPageAcceptanceCheckPublish
(
ContractSampleVO
contractSample
)
{
contractSample
.
setStatus
(
ContractSampleStatusEnum
.
ACCEPTANCE_CHECK_PUBLISH
);
return
success
(
contractSampleService
.
pageVOPublish
(
getPage
(),
contractSample
));
}
@ApiOperation
(
"二次判定维护分页列表"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_PAGE
,
value
=
"请求数据的页码"
,
required
=
true
,
paramType
=
"query"
,
dataTypeClass
=
Integer
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_ROWS
,
value
=
"每页条数"
,
required
=
true
,
paramType
=
"query"
,
dataTypeClass
=
Integer
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_SIDX
,
value
=
"排序字段"
,
paramType
=
"query"
,
dataTypeClass
=
String
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_SORD
,
value
=
"排序方式"
,
paramType
=
"query"
,
dataTypeClass
=
String
.
class
),
})
@PostMapping
(
"/page_second_judge_maintain"
)
public
RestResult
<
Page
<
ContractSampleVO
>>
getPageSecondJudgeMaintain
(
ContractSampleVO
contractSample
)
{
contractSample
.
setStatus
(
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
);
return
success
(
contractSampleService
.
pageVOPublish
(
getPage
(),
contractSample
));
}
@ApiOperation
(
"二次判定审核分页列表"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_PAGE
,
value
=
"请求数据的页码"
,
required
=
true
,
paramType
=
"query"
,
dataTypeClass
=
Integer
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_ROWS
,
value
=
"每页条数"
,
required
=
true
,
paramType
=
"query"
,
dataTypeClass
=
Integer
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_SIDX
,
value
=
"排序字段"
,
paramType
=
"query"
,
dataTypeClass
=
String
.
class
),
@ApiImplicitParam
(
name
=
RestConstants
.
PAGE_SORD
,
value
=
"排序方式"
,
paramType
=
"query"
,
dataTypeClass
=
String
.
class
),
})
@PostMapping
(
"/page_second_judge_check"
)
public
RestResult
<
Page
<
ContractSampleVO
>>
getPageSecondJudgeCheck
(
ContractSampleVO
contractSample
)
{
contractSample
.
setStatus
(
ContractSampleStatusEnum
.
SECOND_JUDGE_CHECK
);
return
success
(
contractSampleService
.
pageVOPublish
(
getPage
(),
contractSample
));
}
@ApiOperation
(
"二次判定申请"
)
@PostMapping
(
"/submit_second_judge_apply"
)
public
RestResult
<
Boolean
>
submitSecondJudgeApply
(
ContractSample
sample
)
{
return
success
(
contractSampleService
.
submitSecondJudgeApply
(
sample
,
getAccount
()));
}
@ApiOperation
(
"二次判定维护提交审核"
)
@PostMapping
(
"/submit_to_second_judge_check"
)
public
RestResult
<
Boolean
>
submitToSecondJudgeCheck
(
@RequestParam
(
"ids"
)
Long
[]
ids
)
{
return
success
(
contractSampleService
.
submitToSecondJudgeCheck
(
ids
,
getAccount
()));
}
@ApiOperation
(
"二次判定审核驳回"
)
@PostMapping
(
"/back_second_judge_check"
)
public
RestResult
<
Boolean
>
backSecondJudgeCheck
(
@RequestParam
(
"ids"
)
Long
[]
ids
,
@RequestParam
(
"reason"
)
String
reason
)
{
return
success
(
contractSampleService
.
backSecondJudgeCheck
(
ids
,
reason
,
getAccount
()));
}
// @ApiOperation("二次判定审核通过")
// @PostMapping("/pass_second_judge_check")
// public RestResult<Boolean> passToSecondJudgeCheck(@RequestParam("ids")Long [] ids) {
// return success(contractSampleService.submitToSecondJudgeCheck(ids,getAccount()));
// }
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleController.java
View file @
d68bffe6
...
@@ -307,6 +307,14 @@ public class EntrustSampleController extends ServiceController {
...
@@ -307,6 +307,14 @@ public class EntrustSampleController extends ServiceController {
}
}
@ApiOperation
(
"质量审核提交至验收结果录入"
)
@PostMapping
(
"/submit_to_acceptance_result_input"
)
public
RestResult
<
Boolean
>
submitToAcceptanceResultInput
(
@RequestParam
(
"ids"
)
Long
[]
ids
)
{
return
success
(
entrustSampleService
.
submitToAcceptanceResultInput
(
ids
,
getAccount
()));
}
@ApiOperation
(
"质量审核驳回"
)
@ApiOperation
(
"质量审核驳回"
)
@PostMapping
(
"/back_judge_check"
)
@PostMapping
(
"/back_judge_check"
)
public
RestResult
<
Boolean
>
backJudgeCheck
(
@RequestParam
(
"ids"
)
Long
[]
ids
,
@RequestParam
(
"remark"
)
String
remark
)
{
public
RestResult
<
Boolean
>
backJudgeCheck
(
@RequestParam
(
"ids"
)
Long
[]
ids
,
@RequestParam
(
"remark"
)
String
remark
)
{
...
...
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/ContractSampleMapper.java
View file @
d68bffe6
...
@@ -20,4 +20,6 @@ import java.util.List;
...
@@ -20,4 +20,6 @@ import java.util.List;
public
interface
ContractSampleMapper
extends
BatchMapper
<
ContractSample
>
{
public
interface
ContractSampleMapper
extends
BatchMapper
<
ContractSample
>
{
List
<
ContractSampleVO
>
selectVOList
(
RowBounds
rowBounds
,
@Param
(
"vo"
)
ContractSampleVO
contractSample
);
List
<
ContractSampleVO
>
selectVOList
(
RowBounds
rowBounds
,
@Param
(
"vo"
)
ContractSampleVO
contractSample
);
List
<
ContractSampleVO
>
selectVOPublishList
(
RowBounds
rowBounds
,
@Param
(
"vo"
)
ContractSampleVO
contractSample
);
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleRecordService.java
View file @
d68bffe6
...
@@ -6,6 +6,7 @@ import com.patzn.cloud.commons.service.IBaseService;
...
@@ -6,6 +6,7 @@ import com.patzn.cloud.commons.service.IBaseService;
import
com.patzn.cloud.service.hmhj.entity.ContractSampleRecord
;
import
com.patzn.cloud.service.hmhj.entity.ContractSampleRecord
;
import
com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum
;
import
com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -21,4 +22,5 @@ public interface IContractSampleRecordService extends IBaseService<ContractSampl
...
@@ -21,4 +22,5 @@ public interface IContractSampleRecordService extends IBaseService<ContractSampl
boolean
removeByIds
(
List
<
Long
>
ids
);
boolean
removeByIds
(
List
<
Long
>
ids
);
void
record
(
Long
[]
ids
,
ContractSampleStatusEnum
proTecCheck
,
ContractSampleStatusEnum
storeTransport
,
int
i
,
String
reason
,
Account
account
);
void
record
(
Long
[]
ids
,
ContractSampleStatusEnum
proTecCheck
,
ContractSampleStatusEnum
storeTransport
,
int
i
,
String
reason
,
Account
account
);
void
record
(
Collection
<
Long
>
ids
,
ContractSampleStatusEnum
proTecCheck
,
ContractSampleStatusEnum
storeTransport
,
int
i
,
String
reason
,
Account
account
);
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IContractSampleService.java
View file @
d68bffe6
...
@@ -52,4 +52,14 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
...
@@ -52,4 +52,14 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
boolean
addDTO
(
ContractSampleDTO
dto
);
boolean
addDTO
(
ContractSampleDTO
dto
);
Page
<
ContractSampleVO
>
pageCheckAcceptOrgHis
(
Page
<
ContractSampleVO
>
page
,
ContractSampleVO
contractSample
);
Page
<
ContractSampleVO
>
pageCheckAcceptOrgHis
(
Page
<
ContractSampleVO
>
page
,
ContractSampleVO
contractSample
);
boolean
submitToAcceptanceCheckPublish
(
Long
[]
ids
,
Account
account
);
Page
<
ContractSampleVO
>
pageVOPublish
(
Page
<
ContractSampleVO
>
page
,
ContractSampleVO
contractSample
);
boolean
submitSecondJudgeApply
(
ContractSample
sample
,
Account
account
);
boolean
submitToSecondJudgeCheck
(
Long
[]
ids
,
Account
account
);
boolean
backSecondJudgeCheck
(
Long
[]
ids
,
String
reason
,
Account
account
);
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java
View file @
d68bffe6
...
@@ -45,4 +45,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
...
@@ -45,4 +45,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
Page
<
EntrustSampleVO
>
pageBySampleLeftHis
(
Page
<
EntrustSampleVO
>
page
,
EntrustSampleVO
sampleVO
);
Page
<
EntrustSampleVO
>
pageBySampleLeftHis
(
Page
<
EntrustSampleVO
>
page
,
EntrustSampleVO
sampleVO
);
Page
<
EntrustSampleVO
>
pageVO
(
Page
<
EntrustSampleVO
>
page
,
EntrustSampleVO
entrustSample
);
Page
<
EntrustSampleVO
>
pageVO
(
Page
<
EntrustSampleVO
>
page
,
EntrustSampleVO
entrustSample
);
boolean
submitToAcceptanceResultInput
(
Long
[]
ids
,
Account
account
);
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleRecordServiceImpl.java
View file @
d68bffe6
...
@@ -14,6 +14,8 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
...
@@ -14,6 +14,8 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import
com.baomidou.mybatisplus.plugins.Page
;
import
com.baomidou.mybatisplus.plugins.Page
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -39,6 +41,11 @@ public class ContractSampleRecordServiceImpl extends BaseServiceImpl<ContractSam
...
@@ -39,6 +41,11 @@ public class ContractSampleRecordServiceImpl extends BaseServiceImpl<ContractSam
@Override
@Override
public
void
record
(
Long
[]
ids
,
ContractSampleStatusEnum
from
,
ContractSampleStatusEnum
to
,
int
type
,
String
reason
,
Account
account
)
{
public
void
record
(
Long
[]
ids
,
ContractSampleStatusEnum
from
,
ContractSampleStatusEnum
to
,
int
type
,
String
reason
,
Account
account
)
{
record
(
Arrays
.
asList
(
ids
),
from
,
to
,
type
,
reason
,
account
);
}
@Override
public
void
record
(
Collection
<
Long
>
ids
,
ContractSampleStatusEnum
from
,
ContractSampleStatusEnum
to
,
int
type
,
String
reason
,
Account
account
)
{
List
<
ContractSampleRecord
>
saveRecordList
=
new
ArrayList
<>();
List
<
ContractSampleRecord
>
saveRecordList
=
new
ArrayList
<>();
for
(
Long
id:
ids
)
{
for
(
Long
id:
ids
)
{
ContractSampleRecord
record
=
new
ContractSampleRecord
();
ContractSampleRecord
record
=
new
ContractSampleRecord
();
...
...
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java
View file @
d68bffe6
...
@@ -275,5 +275,63 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
...
@@ -275,5 +275,63 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
return
page
.
setRecords
(
baseMapper
.
selectVOList
(
page
,
contractSample
));
return
page
.
setRecords
(
baseMapper
.
selectVOList
(
page
,
contractSample
));
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
boolean
submitToAcceptanceCheckPublish
(
Long
[]
ids
,
Account
account
)
{
RestAssert
.
fail
(
ArrayUtils
.
isEmpty
(
ids
),
"请选择要提交至验收结果发布的数据"
);
ContractSample
sample
=
new
ContractSample
();
sample
.
setStatus
(
ContractSampleStatusEnum
.
ACCEPTANCE_CHECK_PUBLISH
);
sample
.
setStatus
(
ContractSampleStatusEnum
.
ACCEPTANCE_CHECK_PUBLISH
);
if
(
super
.
update
(
sample
,
Condition
.
create
().
in
(
"id"
,
ids
))){
contractSampleRecordService
.
record
(
ids
,
ContractSampleStatusEnum
.
CHECK_RESULT_INPUT
,
ContractSampleStatusEnum
.
ACCEPTANCE_CHECK_PUBLISH
,
0
,
"提交至验收结果发布"
,
account
);
}
return
true
;
}
@Override
public
Page
<
ContractSampleVO
>
pageVOPublish
(
Page
<
ContractSampleVO
>
page
,
ContractSampleVO
contractSample
)
{
return
page
.
setRecords
(
baseMapper
.
selectVOPublishList
(
page
,
contractSample
))
;
}
@Override
public
boolean
submitSecondJudgeApply
(
ContractSample
sample
,
Account
account
)
{
if
(
null
==
sample
.
getId
()){
RestAssert
.
fail
(
"ID不能为空"
);
}
sample
.
setStatus
(
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
);
sample
.
setProgress
(
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
);
contractSampleRecordService
.
record
(
new
Long
[]{
sample
.
getId
()},
ContractSampleStatusEnum
.
ACCEPTANCE_CHECK_PUBLISH
,
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
,
0
,
"二次判定申请"
,
account
);
return
updateById
(
sample
);
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
boolean
submitToSecondJudgeCheck
(
Long
[]
ids
,
Account
account
)
{
RestAssert
.
fail
(
ArrayUtils
.
isEmpty
(
ids
),
"请选择提交审核的数据"
);
ContractSample
sample
=
new
ContractSample
();
sample
.
setStatus
(
ContractSampleStatusEnum
.
SECOND_JUDGE_CHECK
);
sample
.
setProgress
(
ContractSampleStatusEnum
.
SECOND_JUDGE_CHECK
);
update
(
sample
,
Condition
.
create
().
in
(
"id"
,
ids
));
contractSampleRecordService
.
record
(
ids
,
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
,
ContractSampleStatusEnum
.
SECOND_JUDGE_CHECK
,
0
,
"二次判定提交至审核"
,
account
);
return
true
;
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
boolean
backSecondJudgeCheck
(
Long
[]
ids
,
String
reason
,
Account
account
)
{
RestAssert
.
fail
(
ArrayUtils
.
isEmpty
(
ids
),
"请选择驳回的数据"
);
RestAssert
.
fail
(
StringUtils
.
isBlank
(
reason
),
"请填写驳回的原因"
);
ContractSample
sample
=
new
ContractSample
();
sample
.
setStatus
(
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
);
sample
.
setProgress
(
ContractSampleStatusEnum
.
BACK_SECOND_JUDGE_MAINTAIN
);
update
(
sample
,
Condition
.
create
().
in
(
"id"
,
ids
));
contractSampleRecordService
.
record
(
ids
,
ContractSampleStatusEnum
.
SECOND_JUDGE_MAINTAIN
,
ContractSampleStatusEnum
.
SECOND_JUDGE_CHECK
,
1
,
reason
,
account
);
return
true
;
}
}
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
View file @
d68bffe6
...
@@ -11,6 +11,7 @@ import com.patzn.cloud.oss.starter.OssClient;
...
@@ -11,6 +11,7 @@ import com.patzn.cloud.oss.starter.OssClient;
import
com.patzn.cloud.service.base.entity.SysFileTemplate
;
import
com.patzn.cloud.service.base.entity.SysFileTemplate
;
import
com.patzn.cloud.service.hmhj.dto.ReportDTO
;
import
com.patzn.cloud.service.hmhj.dto.ReportDTO
;
import
com.patzn.cloud.service.hmhj.entity.*
;
import
com.patzn.cloud.service.hmhj.entity.*
;
import
com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum
;
import
com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO
;
import
com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO
;
import
com.patzn.cloud.service.hmhj.vo.EntrustSampleVO
;
import
com.patzn.cloud.service.hmhj.vo.EntrustSampleVO
;
import
com.patzn.cloud.service.lims.common.StringHandleUtils
;
import
com.patzn.cloud.service.lims.common.StringHandleUtils
;
...
@@ -74,7 +75,10 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
...
@@ -74,7 +75,10 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
@Autowired
@Autowired
private
IEntrustReportRelSampleService
entrustReportRelSampleService
;
private
IEntrustReportRelSampleService
entrustReportRelSampleService
;
@Autowired
private
IContractSampleService
contractSampleService
;
@Autowired
private
IContractSampleRecordService
contractSampleRecordService
;
@Override
@Override
public
Page
<
EntrustSample
>
page
(
Page
<
EntrustSample
>
page
,
EntrustSample
entrustSample
)
{
public
Page
<
EntrustSample
>
page
(
Page
<
EntrustSample
>
page
,
EntrustSample
entrustSample
)
{
...
@@ -95,6 +99,29 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
...
@@ -95,6 +99,29 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
return
page
.
setRecords
(
baseMapper
.
selectVOList
(
page
,
entrustSample
));
return
page
.
setRecords
(
baseMapper
.
selectVOList
(
page
,
entrustSample
));
}
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
boolean
submitToAcceptanceResultInput
(
Long
[]
ids
,
Account
account
)
{
RestAssert
.
fail
(
ArrayUtils
.
isEmpty
(
ids
),
"请选择要提交到验收结果录入的数据"
);
if
(
submitJudgeCheck
(
ids
,
account
)){
List
<
EntrustSample
>
sampleList
=
list
(
Condition
.
create
().
in
(
"id"
,
ids
));
List
<
Long
>
contractSampleIdList
=
new
ArrayList
<>();
for
(
EntrustSample
sample
:
sampleList
)
{
if
(
null
!=
sample
.
getContractSampleId
()){
contractSampleIdList
.
add
(
sample
.
getContractSampleId
());
}
}
if
(
CollectionUtils
.
isNotEmpty
(
contractSampleIdList
)){
ContractSample
sample
=
new
ContractSample
();
sample
.
setStatus
(
ContractSampleStatusEnum
.
CHECK_RESULT_INPUT
);
sample
.
setProgress
(
ContractSampleStatusEnum
.
QUALITY_AUDIT
);
contractSampleService
.
update
(
sample
,
Condition
.
create
().
in
(
"id"
,
contractSampleIdList
));
contractSampleRecordService
.
record
(
contractSampleIdList
,
ContractSampleStatusEnum
.
QUALITY_AUDIT
,
ContractSampleStatusEnum
.
CHECK_RESULT_INPUT
,
0
,
"质量审核提交至验收结果录入"
,
account
);
}
}
return
true
;
}
@Override
@Override
public
boolean
removeByIds
(
List
<
Long
>
ids
)
{
public
boolean
removeByIds
(
List
<
Long
>
ids
)
{
return
baseMapper
.
deleteBatchIds
(
ids
)
>
0
;
return
baseMapper
.
deleteBatchIds
(
ids
)
>
0
;
...
...
src/main/resources/mapper/hmhj/ContractSampleMapper.xml
View file @
d68bffe6
...
@@ -39,4 +39,22 @@
...
@@ -39,4 +39,22 @@
SELECT s.* FROM contract_sample s WHERE s.deleted = 0
SELECT s.* FROM contract_sample s WHERE s.deleted = 0
<include
refid=
"sqlWhere"
/>
<include
refid=
"sqlWhere"
/>
</select>
</select>
<select
id=
"selectVOPublishList"
resultType=
"com.patzn.cloud.service.hmhj.vo.ContractSampleVO"
>
SELECT s.*,
t.code AS "sampleCode",
t.name,
t.id AS "entrustSampleId",
e.code AS "entrustCode"
FROM contract_sample s
JOIN entrust_sample t ON s.id = t.contract_sample_id
JOIN entrust e ON t.entrust_id = e.id
WHERE s.deleted = 0
<include
refid=
"sqlWhere"
/>
</select>
</mapper>
</mapper>
src/test/java/resources/db_sql/v1.0.1/hmhj/20200521新增字段.sql
0 → 100644
View file @
d68bffe6
ALTER
TABLE
"public"
.
"contract_sample"
ALTER
TABLE
"public"
.
"contract_sample"
ADD
COLUMN
"second_judge_reason"
varchar
(
150
)
COLLATE
"pg_catalog"
.
"default"
,
ADD
COLUMN
"second_judge_applyer_id"
int8
,
ADD
COLUMN
"second_judge_applyer"
varchar
(
100
)
COLLATE
"pg_catalog"
.
"default"
,
ADD
COLUMN
"second_judge_time"
timestamp
(
6
);
COMMENT
ON
COLUMN
"public"
.
"contract_sample"
.
"second_judge_reason"
IS
'申请二次判定原因'
;
COMMENT
ON
COLUMN
"public"
.
"contract_sample"
.
"second_judge_applyer_id"
IS
'二次判定申请人ID'
;
COMMENT
ON
COLUMN
"public"
.
"contract_sample"
.
"second_judge_applyer"
IS
'二次判定申请人'
;
COMMENT
ON
COLUMN
"public"
.
"contract_sample"
.
"second_judge_time"
IS
'二次判定申请时间'
;
\ No newline at end of file
src/test/java/resources/db_sql/v1.0.1/hmhj/新增sql.sql
deleted
100644 → 0
View file @
a95d8cff
CREATE
TABLE
"public"
.
"standard_annex"
(
++ /dev/null
CREATE
TABLE
"public"
.
"standard_annex"
(
"id"
int8
NOT
NULL
DEFAULT
NULL
,
"standard_id"
int8
NOT
NULL
DEFAULT
NULL
,
"file_name"
varchar
(
150
)
COLLATE
"pg_catalog"
.
"default"
DEFAULT
NULL
::
character
varying
,
"object_key"
varchar
(
255
)
COLLATE
"pg_catalog"
.
"default"
DEFAULT
NULL
::
character
varying
,
"uid"
int8
DEFAULT
NULL
,
"ctime"
timestamp
(
0
)
DEFAULT
NULL
::
timestamp
without
time
zone
,
"type"
varchar
(
20
)
COLLATE
"pg_catalog"
.
"default"
DEFAULT
NULL
::
character
varying
,
"lid"
int8
DEFAULT
NULL
,
"ltime"
timestamp
(
0
)
DEFAULT
NULL
::
timestamp
without
time
zone
,
"deleted"
int2
DEFAULT
0
,
"remark"
varchar
(
200
)
COLLATE
"pg_catalog"
.
"default"
DEFAULT
NULL
::
character
varying
,
"company_id"
int8
DEFAULT
NULL
)
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"id"
IS
'主键'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"standard_id"
IS
'标准ID'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"file_name"
IS
'文件名称'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"object_key"
IS
'对象key'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"uid"
IS
'创建者ID'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"ctime"
IS
'创建时间'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"type"
IS
'文件类型'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"lid"
IS
'最后修改人ID'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"ltime"
IS
'最后修改时间'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"deleted"
IS
'是否删除0否1是'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"remark"
IS
'备注'
;
COMMENT
ON
COLUMN
"public"
.
"standard_annex"
.
"company_id"
IS
'企业ID'
;
COMMENT
ON
TABLE
"public"
.
"standard_annex"
IS
'标准附件表'
;
-- ----------------------------
-- Primary Key structure for table standard_annex
-- ----------------------------
ALTER
TABLE
"public"
.
"standard_annex"
ADD
CONSTRAINT
"standard_annex_pkey"
PRIMARY
KEY
(
"id"
);
ALTER
TABLE
"public"
.
"contract_ok_organizer"
ADD
COLUMN
"contract_sample_id"
int8
;
COMMENT
ON
COLUMN
"public"
.
"contract_ok_organizer"
.
"contract_sample_id"
IS
'合同ID'
;
ALTER
TABLE
"public"
.
"entrust_sample"
ADD
COLUMN
"sample_from"
varchar
(
255
);
COMMENT
ON
COLUMN
"public"
.
"entrust_sample"
.
"sample_from"
IS
'样品来源'
;
ALTER
TABLE
"public"
.
"entrust"
ADD
COLUMN
"special_ask"
varchar
(
150
);
COMMENT
ON
COLUMN
"public"
.
"entrust"
.
"special_ask"
IS
'特殊需求'
;
\ No newline at end of file
src/test/java/resources/db_sql/v1.0.1/hmhj/新增表结构sql.sql
deleted
100644 → 0
View file @
a95d8cff
CREATE
TABLE
"public"
.
"item_deviate"
(
++ /dev/null
CREATE
TABLE
"public"
.
"item_deviate"
(
"id"
int8
NOT
NULL
,
"item_id"
int8
NOT
NULL
,
"method_code"
varchar
(
255
)
COLLATE
"pg_catalog"
.
"default"
,
"reason"
varchar
(
255
)
COLLATE
"pg_catalog"
.
"default"
,
"method_desc"
varchar
(
255
)
COLLATE
"pg_catalog"
.
"default"
,
"company_id"
int8
,
"uid"
int8
,
"ctime"
timestamp
(
0
)
DEFAULT
NULL
::
timestamp
without
time
zone
,
"lid"
int8
,
"ltime"
timestamp
(
0
)
DEFAULT
NULL
::
timestamp
without
time
zone
,
"deleted"
int2
DEFAULT
0
,
"remark"
varchar
(
200
)
COLLATE
"pg_catalog"
.
"default"
DEFAULT
NULL
::
character
varying
,
"applyer"
varchar
(
50
)
COLLATE
"pg_catalog"
.
"default"
,
"applyer_id"
int8
,
"apply_time"
timestamp
(
6
),
"checker"
varchar
(
50
)
COLLATE
"pg_catalog"
.
"default"
,
"checker_id"
int8
,
"check_time"
timestamp
(
6
),
"status"
int2
,
"progress"
int2
,
"back_reason"
varchar
(
255
)
COLLATE
"pg_catalog"
.
"default"
)
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"id"
IS
'ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"item_id"
IS
'检测项目ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"method_code"
IS
'方法名称及编号'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"reason"
IS
'偏离原因'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"method_desc"
IS
'偏离方法描述及验证'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"company_id"
IS
'检测项目ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"uid"
IS
'创建者ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"ctime"
IS
'创建时间'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"lid"
IS
'最后修改人ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"ltime"
IS
'最后修改时间'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"deleted"
IS
'是否删除0否1是'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"remark"
IS
'备注'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"applyer"
IS
'申请人'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"applyer_id"
IS
'申请人ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"apply_time"
IS
'申请时间'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"checker"
IS
'审批人'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"checker_id"
IS
'审批人ID'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"check_time"
IS
'审批时间'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"status"
IS
'状态'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"progress"
IS
'进度'
;
COMMENT
ON
COLUMN
"public"
.
"item_deviate"
.
"back_reason"
IS
'驳回原因'
;
-- ----------------------------
-- Primary Key structure for table item_deviate
-- ----------------------------
ALTER
TABLE
"public"
.
"item_deviate"
ADD
CONSTRAINT
"item_deviate_pkey"
PRIMARY
KEY
(
"id"
);
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