|
|
@@ -188,7 +188,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setProcessStatus(1);
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
//如果是非公出协单添加协单信息
|
|
|
- if (in.getType()==5){
|
|
|
+ if (in.getAssist()==1){
|
|
|
addPublicAssistType(in);
|
|
|
}
|
|
|
if (in.getType()==1&&in.getOrderNo()!=null){
|
|
|
@@ -683,22 +683,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
PublicAssistDetails usePd = publicAssistDetailsMapper.selectByPrid(in.getId());
|
|
|
- //如果是非公出协单添加协单信息
|
|
|
- if (in.getType()==5){
|
|
|
- PublicAssistDetails publicAssistDetails = publicAssistDetailsMapper.selectByPrid(in.getId());
|
|
|
- if (publicAssistDetails==null){
|
|
|
- //如果是非公出协单添加协单信息
|
|
|
- addPublicAssistType(in);
|
|
|
- }else {
|
|
|
- //如果是非公出协单添加协单信息
|
|
|
- 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);
|
|
|
- }
|
|
|
+ //添加协单信息
|
|
|
+ PublicAssistDetails publicAssistDetails = publicAssistDetailsMapper.selectByPrid(in.getId());
|
|
|
+ if (publicAssistDetails==null){
|
|
|
+ //如果是非公出协单添加协单信息
|
|
|
+ addPublicAssistType(in);
|
|
|
+ }else {
|
|
|
+ //如果是非公出协单添加协单信息
|
|
|
+ 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);
|
|
|
@@ -1744,7 +1742,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
//把参数放入map中
|
|
|
params.put("startTime", in.getStartTime());
|
|
|
- params.put("endTime", in.getEndTime());
|
|
|
+ if (StringUtils.isNotBlank(in.getEndTime())){
|
|
|
+ params.put("endTime", in.getEndTime()+" 23:59:59");
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
params.put("aid", in.getAid());
|
|
|
params.put("assistAid", in.getAssistAid());
|