|
|
@@ -76,6 +76,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private final PublicAssistDetailsMapper publicAssistDetailsMapper;
|
|
|
private final PublicReleaseTypeMapper publicReleaseTypeMapper;
|
|
|
private final UserMidMapper userMidMapper;
|
|
|
+ private final PublicReleaseContentTypeMapper publicReleaseContentTypeMapper;
|
|
|
|
|
|
public PublicReleaseServiceImpl(
|
|
|
PublicReleaseMapper publicReleaseMapper,
|
|
|
@@ -111,7 +112,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
UserInterviewProjectMapper userInterviewProjectMapper,
|
|
|
PublicAssistDetailsMapper publicAssistDetailsMapper,
|
|
|
PublicReleaseTypeMapper publicReleaseTypeMapper,
|
|
|
- UserMidMapper userMidMapper
|
|
|
+ UserMidMapper userMidMapper,
|
|
|
+ PublicReleaseContentTypeMapper publicReleaseContentTypeMapper
|
|
|
) {
|
|
|
super();
|
|
|
this.publicReleaseMapper = publicReleaseMapper;
|
|
|
@@ -148,6 +150,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
this.publicAssistDetailsMapper = publicAssistDetailsMapper;
|
|
|
this.publicReleaseTypeMapper = publicReleaseTypeMapper;
|
|
|
this.userMidMapper = userMidMapper;
|
|
|
+ this.publicReleaseContentTypeMapper = publicReleaseContentTypeMapper;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -186,15 +189,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
//如果是非公出协单添加协单信息
|
|
|
if (in.getType()==5){
|
|
|
- PublicAssistDetails pad=new PublicAssistDetails();
|
|
|
- pad.setPrid(in.getId());
|
|
|
- pad.setType(in.getAssistType());
|
|
|
- pad.setContentType(in.getAssistContentType());
|
|
|
- pad.setContent(in.getAssistContent());
|
|
|
- publicAssistDetailsMapper.insert(pad);
|
|
|
- if (in.getAssistType().contains(",")){
|
|
|
+ addPublicAssistType(in);
|
|
|
+ if (StringUtils.isNotBlank(in.getAssistType())){
|
|
|
addPublicReleaseType(in.getId(),in.getAssistType());
|
|
|
}
|
|
|
+ if (StringUtils.isNotBlank(in.getAssistContent())){
|
|
|
+ addPublicCotentType(in.getId(),in.getAssistContentType());
|
|
|
+ }
|
|
|
}
|
|
|
if (in.getType()==1&&in.getOrderNo()!=null){
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
|
|
|
@@ -223,6 +224,27 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
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) {
|
|
|
+ PublicAssistDetails pad=new PublicAssistDetails();
|
|
|
+ pad.setPrid(in.getId());
|
|
|
+ pad.setType(in.getAssistType());
|
|
|
+ pad.setContentType(in.getAssistContentType());
|
|
|
+ pad.setContent(in.getAssistContent());
|
|
|
+ publicAssistDetailsMapper.insert(pad);
|
|
|
+ }
|
|
|
+
|
|
|
private void addPublicReleaseType(Integer id,String type) {
|
|
|
String[] split = type.split(",");
|
|
|
List<PublicReleaseType> list =new ArrayList<>();
|
|
|
@@ -742,6 +764,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setProcessStatus(0);
|
|
|
}
|
|
|
publicReleaseMapper.update(in);
|
|
|
+ //如果是非公出协单添加协单信息
|
|
|
+ if (in.getType()==5){
|
|
|
+ addPublicAssistType(in);
|
|
|
+ if (StringUtils.isNotBlank(in.getAssistType())){
|
|
|
+ publicAssistDetailsMapper.deeleteByPrid(in.getId());
|
|
|
+ addPublicReleaseType(in.getId(),in.getAssistType());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotBlank(in.getAssistContent())){
|
|
|
+ publicReleaseContentTypeMapper.deleteByPrid(in.getId());
|
|
|
+ addPublicCotentType(in.getId(),in.getAssistContentType());
|
|
|
+ }
|
|
|
+ }
|
|
|
if (in.getOrderNo()!=null){
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
|
|
|
orderNewService.pushOrderPublicReleaseCount(tOrderNew);
|