|
|
@@ -156,24 +156,28 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
//公出信息抄送
|
|
|
pushPublicCarbonCopy(in, my, userNames);
|
|
|
+ //协单抄送
|
|
|
if (in.getAssist()==1){
|
|
|
- String[] split = in.getAssistAid().split(",");
|
|
|
- for (String aid2 : split) {
|
|
|
- AdminListBo my2 = adminMapper.getDeptNameByAid(aid2);
|
|
|
- PublicRelease p=new PublicRelease();
|
|
|
- p.setId(in.getId());
|
|
|
- p.setAid(aid2);
|
|
|
- p.setReleaseStart(in.getReleaseStart());
|
|
|
- p.setReleaseEnd(in.getReleaseEnd());
|
|
|
- p.setPlan(in.getPlan());
|
|
|
- p.setType(3);
|
|
|
- pushPublicCarbonCopy(p, my2, userNames);
|
|
|
- }
|
|
|
+ pushPublicAssistCarbonCopy(in, my, userNames);
|
|
|
|
|
|
}
|
|
|
return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
}
|
|
|
|
|
|
+ private void pushPublicAssistCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
+ String[] split = in.getAssistAid().split(",");
|
|
|
+ for (String aid2 : split) {
|
|
|
+ AdminListBo my2 = adminMapper.getDeptNameByAid(aid2);
|
|
|
+ PublicRelease p=new PublicRelease();
|
|
|
+ p.setId(in.getId());
|
|
|
+ p.setAid(aid2);
|
|
|
+ p.setReleaseStart(in.getReleaseStart());
|
|
|
+ p.setReleaseEnd(in.getReleaseEnd());
|
|
|
+ p.setPlan(in.getPlan());
|
|
|
+ p.setType(3);
|
|
|
+ pushPublicCarbonCopy(p, my2, userNames);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
private void pushUserArchivesInterview(InputPublicRelease in) {
|