Merge branch 'qtz1' of SH-Arbitrate/Mediation-Backend into dev
This commit was merged in pull request #80.
This commit is contained in:
+5
-4
@@ -286,9 +286,10 @@ public class FixSelectFlowDetailUtils {
|
|||||||
List<Integer> psnsignStatusListnew = psnsignStatusList.stream().distinct().collect(Collectors.toList());
|
List<Integer> psnsignStatusListnew = psnsignStatusList.stream().distinct().collect(Collectors.toList());
|
||||||
|
|
||||||
MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
|
MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
|
||||||
Integer isReconci = caseApplicationselect.getIsReconci();
|
// Integer isReconci = caseApplicationselect.getIsReconci();
|
||||||
if(isReconci!=null){
|
Integer mediaResult = caseApplicationselect.getMediaResult();
|
||||||
if(isReconci.intValue()==1){
|
if(mediaResult!=null){
|
||||||
|
if(mediaResult.intValue()==5){
|
||||||
if (( psnsignStatusListnew.size()==1 && (psnsignStatusListnew.get(0).intValue() == 2))) {
|
if (( psnsignStatusListnew.size()==1 && (psnsignStatusListnew.get(0).intValue() == 2))) {
|
||||||
//更新立案申请状态为待送达
|
//更新立案申请状态为待送达
|
||||||
// MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
|
// MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
|
||||||
@@ -350,7 +351,7 @@ public class FixSelectFlowDetailUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else {
|
}else if(mediaResult.intValue()==1){
|
||||||
if (( psnsignStatusListnew.size()==1 && (psnsignStatusListnew.get(0).intValue() == 2)) && (orgsignStatus.intValue() == 1)) {
|
if (( psnsignStatusListnew.size()==1 && (psnsignStatusListnew.get(0).intValue() == 2)) && (orgsignStatus.intValue() == 1)) {
|
||||||
//更新立案申请状态为待用印
|
//更新立案申请状态为待用印
|
||||||
// MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
|
// MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(sealSignRecord.getCaseAppliId());
|
||||||
|
|||||||
Reference in New Issue
Block a user