|
@@ -218,17 +218,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void addPublicCotentType(Integer id,String type) {
|
|
|
|
|
- String[] split = type.split(",");
|
|
|
|
|
- List<PublicReleaseContentType> list =new ArrayList<>();
|
|
|
|
|
- for (String s : split) {
|
|
|
|
|
- PublicReleaseContentType pct=new PublicReleaseContentType();
|
|
|
|
|
- pct.setPrid(id);
|
|
|
|
|
- pct.setType(s);
|
|
|
|
|
- list.add(pct);
|
|
|
|
|
- }
|
|
|
|
|
- publicReleaseContentTypeMapper.insertBatch(list);
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
private void addPublicAssistType(InputPublicRelease in) {
|
|
private void addPublicAssistType(InputPublicRelease in) {
|
|
|
PublicAssistDetails pad=new PublicAssistDetails();
|
|
PublicAssistDetails pad=new PublicAssistDetails();
|
|
@@ -239,17 +228,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicAssistDetailsMapper.insert(pad);
|
|
publicAssistDetailsMapper.insert(pad);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void addPublicReleaseType(Integer id,String type) {
|
|
|
|
|
- String[] split = type.split(",");
|
|
|
|
|
- List<PublicReleaseType> list =new ArrayList<>();
|
|
|
|
|
- for (String s : split) {
|
|
|
|
|
- PublicReleaseType pt=new PublicReleaseType();
|
|
|
|
|
- pt.setPrid(id);
|
|
|
|
|
- pt.setType(s);
|
|
|
|
|
- list.add(pt);
|
|
|
|
|
- }
|
|
|
|
|
- publicReleaseTypeMapper.insertBatch(list);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
private void pushPublicAssistCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
private void pushPublicAssistCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
String[] split = in.getAssistAid().split(",");
|
|
String[] split = in.getAssistAid().split(",");
|
|
@@ -2010,6 +1989,24 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]修改了公出").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.xg.getCode(),str.toString(), date);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
|
|
+ if (use.getType()==5){
|
|
|
|
|
+ //主非协单内容
|
|
|
|
|
+ PublicAssistDetails up = publicAssistDetailsMapper.selectByPrid(use.getId());
|
|
|
|
|
+ //子非协单内容如果子不存在则新增,否则修改
|
|
|
|
|
+ PublicAssistDetails up2 = publicAssistDetailsMapper.selectByPrid(np.getId());
|
|
|
|
|
+ if (up2==null){
|
|
|
|
|
+ PublicAssistDetails np2 = new PublicAssistDetails();
|
|
|
|
|
+ BeanUtils.copyProperties(up,np2);
|
|
|
|
|
+ np2.setPrid(np.getId());
|
|
|
|
|
+ np2.setId(null);
|
|
|
|
|
+ publicAssistDetailsMapper.insert(np2);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ PublicAssistDetails np2 = new PublicAssistDetails();
|
|
|
|
|
+ BeanUtils.copyProperties(up,np2);
|
|
|
|
|
+ np2.setId(up2.getId());
|
|
|
|
|
+ publicAssistDetailsMapper.update(np2);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
sendNoticeAndSoucket(out.getAid(),np.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(out.getAid(),np.getStatus(),str.toString());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -2037,6 +2034,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
np.setMainId(use.getId());
|
|
np.setMainId(use.getId());
|
|
|
np.setId(null);
|
|
np.setId(null);
|
|
|
pushAssist(use, date, a, np, np);
|
|
pushAssist(use, date, a, np, np);
|
|
|
|
|
+ if (use.getType()==5){
|
|
|
|
|
+ //主非协单内容
|
|
|
|
|
+ PublicAssistDetails up = publicAssistDetailsMapper.selectByPrid(use.getId());
|
|
|
|
|
+ PublicAssistDetails np2 = new PublicAssistDetails();
|
|
|
|
|
+ BeanUtils.copyProperties(up,np2);
|
|
|
|
|
+ np2.setPrid(np.getId());
|
|
|
|
|
+ np2.setId(null);
|
|
|
|
|
+ publicAssistDetailsMapper.insert(np2);
|
|
|
|
|
+ }
|
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
|
|
StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(use.getUserNames()).append("]。");
|
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
|
|
PublicReleaseLog log = new PublicReleaseLog(np.getId(), TokenManager.getAdminId(), PublicReleaseLog.states.fq.getCode(), str.toString(), date);
|
|
|
sendNoticeAndSoucket(s,np.getStatus(),str.toString());
|
|
sendNoticeAndSoucket(s,np.getStatus(),str.toString());
|