|
|
@@ -1055,8 +1055,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setMainId(null);
|
|
|
np.setType(null);
|
|
|
np.setAssist(2);
|
|
|
- //以前是直接公出通过,现在是通过了,就出现一条需要协单审核的
|
|
|
- np.setStatus(1);
|
|
|
+ //协单审核,判定是否跳过的逻辑
|
|
|
+ pushAssist(out.getAid(), np,use);
|
|
|
np.setAid(null);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
|
updatePublicReleaseDtails(use,np);
|
|
|
@@ -1107,16 +1107,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
*/
|
|
|
private void pushAssist(String s, PublicRelease np, PublicRelease use) {
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(s);
|
|
|
+ //协单人
|
|
|
+ Admin admin = adminMapper.selectByPrimaryKey(s);
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
if (!collect.isEmpty()){
|
|
|
- Admin admin = adminMapper.selectByPrimaryKey(use.getAid());
|
|
|
+ //公出发起人
|
|
|
+ List<outPublicReleaseLog> outPublicReleaseLogs = publicReleaseLogMapper.listPublicReleaseLog(use.getId(), null);
|
|
|
+ List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream().filter(e -> e.getStatus() == 2).collect(Collectors.toList());
|
|
|
boolean flag = false;
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
- if (e.getAid().equals(admin.getReviewer())){
|
|
|
- flag=true;
|
|
|
-
|
|
|
+ for (outPublicReleaseLog log : collect1) {
|
|
|
+ if (log.getAid().equals(e.getAid())){
|
|
|
+ flag=true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(flag){
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
if (flag){
|
|
|
np.setStatus(2);
|