|
|
@@ -84,7 +84,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (u.getAid().equals(TokenManager.getAdminId())){
|
|
|
in.setMainStatus(1);
|
|
|
}
|
|
|
- in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
+ if (in.getAssist()==1)in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
|
|
|
@@ -165,10 +165,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setStatus(1);
|
|
|
log.setStatus(PublicReleaseLog.states.xg.getCode());
|
|
|
in.setUpdateStatus(1);
|
|
|
+ if(in.getAssist()==1)in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
}else {
|
|
|
log.setStatus(PublicReleaseLog.states.cx.getCode());
|
|
|
+ List<OutPublicRelease> list = publicReleaseMapper.selectByMainId(in.getId());
|
|
|
+ for (OutPublicRelease out : list) {
|
|
|
+ PublicReleaseLog log2 = new PublicReleaseLog(out.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", new Date());
|
|
|
+ publicReleaseLogMapper.insertSelective(log2);
|
|
|
+ }
|
|
|
+
|
|
|
+ publicReleaseMapper.updateStatusByMainId(3,in.getId());
|
|
|
}
|
|
|
- in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
return publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
@@ -350,7 +357,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
AdminListBo ab=adminMapper.getDeptNameByAid(out.getAid());
|
|
|
if (!TokenManager.getAdminId().equals( out.getAid())&&
|
|
|
!TokenManager.getAdminId().equals(out.getReviewer())&&
|
|
|
- !TokenManager.getAdminId().equals(ab.getDepManager())){
|
|
|
+ !TokenManager.getAdminId().equals(ab.getDepManager())&&
|
|
|
+ !TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)){
|
|
|
flag=true;
|
|
|
}
|
|
|
if(flag){
|
|
|
@@ -481,9 +489,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
throw new BusinessException("转换异常");
|
|
|
}
|
|
|
List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
|
|
|
+ is.forEach(System.out::println);
|
|
|
+ System.out.println(in.getId());
|
|
|
if (is.size()>1) {
|
|
|
return true;
|
|
|
}else if(is.size()==1){
|
|
|
+ System.out.println(is.get(0));
|
|
|
if (in.getId()!=null && !in.getId().equals(is.get(0))){
|
|
|
return true;
|
|
|
}
|