|
|
@@ -1479,18 +1479,31 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
+ //如果完成了所有协单审核,主项目修改状态
|
|
|
+ int assistProcess = use.getAssistProcess();
|
|
|
if(count==newList.size()){
|
|
|
+ assistProcess=4;
|
|
|
PublicRelease newPublic2=new PublicRelease();
|
|
|
newPublic2.setId(use.getId());
|
|
|
newPublic2.setStatus(2);
|
|
|
+ newPublic2.setAssistProcess(assistProcess);
|
|
|
publicReleaseMapper.update(newPublic2);
|
|
|
addUserMidCount(outPublicReleaseDetails);
|
|
|
//添加
|
|
|
sendNoticeAndSoucket(use.getAid(),status,content.toString());
|
|
|
}else {
|
|
|
+ assistProcess=3;
|
|
|
PublicRelease newPublic2=new PublicRelease();
|
|
|
newPublic2.setId(use.getId());
|
|
|
newPublic2.setStatus(1);
|
|
|
+ newPublic2.setAssistProcess(assistProcess);
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
+ }
|
|
|
+ //再根据主协单的状态修改子协单的状态
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
+ PublicRelease newPublic2=new PublicRelease();
|
|
|
+ newPublic2.setId(e.getId());
|
|
|
+ newPublic2.setAssistProcess(assistProcess);
|
|
|
publicReleaseMapper.update(newPublic2);
|
|
|
}
|
|
|
if (evaluateType==1){
|
|
|
@@ -1969,7 +1982,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setAid(s);
|
|
|
np.setAname(my2.getName());
|
|
|
//协单审核,判定是否跳过的逻辑
|
|
|
- np.setType(3);
|
|
|
+ if (use.getType()==0){
|
|
|
+ np.setType(3);
|
|
|
+ }else {
|
|
|
+ np.setType(6);
|
|
|
+ }
|
|
|
np.setMainId(use.getId());
|
|
|
np.setId(null);
|
|
|
pushAssist(use, date, a, np, np);
|