|
|
@@ -1974,10 +1974,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return 1;
|
|
|
// return true;
|
|
|
}
|
|
|
-
|
|
|
+ //判定协单时间重复
|
|
|
Integer x = checkTech(in);
|
|
|
if (x != null) return x;
|
|
|
}else if(in.getAssist()==1&&in.getAlone()==2){
|
|
|
+ //判定协单时间重复
|
|
|
Integer x = checkTech(in);
|
|
|
if (x != null) return x;
|
|
|
}else {
|
|
|
@@ -1995,27 +1996,37 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private Integer checkTech(InputPublicRelease in) {
|
|
|
String[] split = in.getAssistAid().split(",");
|
|
|
for (String s : split) {
|
|
|
+ //先查审核中和完成的时间有没有冲突的
|
|
|
if(checkPublicTime(s, in)){
|
|
|
//第二种,协单人时间重复
|
|
|
return 2;
|
|
|
// return true;
|
|
|
}
|
|
|
- List<PublicRelease> is = publicReleaseMapper.checkTech(s,in.getReleaseStart(),in.getReleaseEnd());
|
|
|
- if (is.size()>1) {
|
|
|
+ //再查发起前营销审核中时间有没有冲突的
|
|
|
+ Integer x = checkSalesmanExamine(in, s);
|
|
|
+ if (x != null) return x;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ private Integer checkSalesmanExamine(InputPublicRelease in, String s) {
|
|
|
+ List<PublicRelease> is = publicReleaseMapper.checkTech(s, in.getReleaseStart(), in.getReleaseEnd());
|
|
|
+ if (is.size()>1) {
|
|
|
+ return 2;
|
|
|
+ }else if(is.size()==1){
|
|
|
+ //如果id为新增那么直接不允许时间重复
|
|
|
+ if (in.getId()==null){
|
|
|
return 2;
|
|
|
- }else if(is.size()==1){
|
|
|
- //如果id为新增那么直接不允许时间重复
|
|
|
- if (in.getId()==null){
|
|
|
- return 2;
|
|
|
+ }else {
|
|
|
+ //如果有id,与获取id一直,则为当前修改可以
|
|
|
+ if (in.getId().equals(is.get(0))){
|
|
|
+ return 0;
|
|
|
}else {
|
|
|
- //如果有id,与获取id一直,则为当前修改可以
|
|
|
- if (in.getId().equals(is.get(0))){
|
|
|
- return 0;
|
|
|
- }
|
|
|
+ return 2;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return 0;
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
/**
|