|
|
@@ -1223,7 +1223,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
|
|
|
if (adminPublicReviewerBos.isEmpty()){
|
|
|
p.setStatus(2);
|
|
|
- p.setProcessStatus(3);
|
|
|
//如果是协单公出主公出,在审核通过
|
|
|
if (use.getAssist()==1){
|
|
|
pushPublicReleaseAssist(use, p, date, a);
|
|
|
@@ -1928,7 +1927,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param date
|
|
|
*/
|
|
|
private void updatePushassist(PublicRelease use, PublicRelease updatePR, Date date, Admin a) {
|
|
|
-
|
|
|
//协单
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
String []ss= use.getAssistAid().split(",");
|
|
|
@@ -1998,7 +1996,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
//判定是审核还是完成,取决于协单是否通过
|
|
|
- List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
+ List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),null,null);
|
|
|
int count = 0;
|
|
|
for (PublicRelease e : newList) {
|
|
|
//如果是完成或者拒绝则标记,全中断则修改状态
|