|
|
@@ -447,6 +447,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
pe.setStatus(0);
|
|
|
publicExamineMapper.updateByPridSelective(pe);
|
|
|
}
|
|
|
+ //处理协单
|
|
|
+ List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
|
|
|
+ List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
|
|
|
+ for (PublicRelease out : list) {
|
|
|
+ addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单自动更改状态");
|
|
|
+ out.setStatus(1);
|
|
|
+ publicReleaseMapper.updateByPrimaryKeySelective(out);
|
|
|
+ }
|
|
|
+ for (PublicRelease out : list2) {
|
|
|
+ addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单助手自动更改状态");
|
|
|
+ out.setStatus(1);
|
|
|
+ publicReleaseMapper.updateByPrimaryKeySelective(out);
|
|
|
+ }
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
|
String str=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
|
|
|
@@ -1008,7 +1021,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setMainId(null);
|
|
|
np.setType(null);
|
|
|
np.setAssist(2);
|
|
|
- np.setStatus(status);
|
|
|
+ //以前是直接公出通过,现在是通过了,就出现一条需要协单审核的
|
|
|
+ np.setStatus(1);
|
|
|
np.setAid(null);
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(np);
|
|
|
updatePublicReleaseDtails(use,np);
|