|
|
@@ -190,12 +190,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//如果是非公出协单添加协单信息
|
|
|
if (in.getType()==5){
|
|
|
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());
|
|
|
@@ -718,11 +712,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
PublicAssistDetails usePd = publicAssistDetailsMapper.selectByPrid(in.getId());
|
|
|
- if (!in.getAssistType().equals(usePd.getType())){
|
|
|
- publicReleaseTypeMapper.deleteByPrid(in.getId());
|
|
|
- if (in.getAssistType().contains(",")){
|
|
|
- addPublicReleaseType(in.getId(),in.getAssistType());
|
|
|
- }
|
|
|
+ //如果是非公出协单添加协单信息
|
|
|
+ if (in.getType()==5){
|
|
|
+ PublicAssistDetails publicAssistDetails = publicAssistDetailsMapper.selectById(in.getId());
|
|
|
+ PublicAssistDetails pad=new PublicAssistDetails();
|
|
|
+ pad.setId(publicAssistDetails.getId());
|
|
|
+ pad.setPrid(in.getId());
|
|
|
+ pad.setType(in.getAssistType());
|
|
|
+ pad.setContentType(in.getAssistContentType());
|
|
|
+ pad.setContent(in.getAssistContent());
|
|
|
+ publicAssistDetailsMapper.update(pad);
|
|
|
}
|
|
|
}else if (in.getAssist()==0){
|
|
|
publicReleaseMapper.updateAssist(in);
|
|
|
@@ -1774,11 +1773,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//把参数放入map中
|
|
|
params.put("startTime", in.getStartTime());
|
|
|
params.put("endTime", in.getEndTime());
|
|
|
- params.put("contentType", in.getContentType());
|
|
|
+
|
|
|
params.put("aid", in.getAid());
|
|
|
params.put("assistAid", in.getAssistAid());
|
|
|
params.put("uid", in.getUid());
|
|
|
params.put("type", in.getType());
|
|
|
+ if (in.getContentType() != null){
|
|
|
+ params.put("contentType", in.getContentType().split(","));
|
|
|
+ }
|
|
|
if (in.getAssistType()!=null){
|
|
|
params.put("assistType", in.getAssistType().split(","));
|
|
|
}
|