|
|
@@ -247,7 +247,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
str=str.append("(").append(ad.getName()).append(")");
|
|
|
if (status==0){
|
|
|
str=str.append("驳回,");
|
|
|
- publicReleaseMapper.updateStatusByMainId(status,use.getId());
|
|
|
}else if(status==2){
|
|
|
str=str.append("同意,");
|
|
|
//如果是协单公出主公出,在审核通过
|
|
|
@@ -363,6 +362,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (String s : ss) {
|
|
|
if (out.getAid().equals(s)){
|
|
|
flag=true;
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
if (!flag){
|
|
|
@@ -370,7 +370,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setId(out.getId());
|
|
|
in.setStatus(3);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
- PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.sc.getCode(), "修改撤销协单", date);
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(in.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), "同意修改,撤销此协单", date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}else {
|
|
|
use.setId(out.getId());
|
|
|
@@ -401,7 +401,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
use.setMainId(useId);
|
|
|
use.setId(null);
|
|
|
publicReleaseMapper.insert(use);
|
|
|
- PublicReleaseLog log = new PublicReleaseLog(use.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(), "修改协单信息", date);
|
|
|
+ PublicReleaseLog log = new PublicReleaseLog(use.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.ty.getCode(), "同意协单信息", date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
}
|
|
|
}
|