|
|
@@ -462,6 +462,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (in.getAssist()==1){
|
|
|
in.setAssistProcess(1);
|
|
|
+ }else if (in.getAssist()==0){
|
|
|
+ publicReleaseMapper.updateAssist(in);
|
|
|
}
|
|
|
if (in.getUids()!=null){
|
|
|
List<String> split = Arrays.asList(in.getUids().split(","));
|
|
|
@@ -482,9 +484,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
pe.setStatus(0);
|
|
|
publicExamineMapper.updateByPridSelective(pe);
|
|
|
}
|
|
|
-// //处理协单
|
|
|
-// List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
|
|
|
+ //处理协单,修改,正常不存在协单,反想操作有协单需要单独处理
|
|
|
+ List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
|
|
|
+ String[] split = in.getAssistAid().split(",");
|
|
|
+ if (split.length==0){
|
|
|
+ for (PublicRelease e : list) {
|
|
|
+ if (e.getClockIn()==1){
|
|
|
+ throw new BusinessException("协单打卡不能删除");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (PublicRelease e : list) {
|
|
|
+ publicReleaseMapper.deleteById(e.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
// List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
|
|
|
+
|
|
|
// for (PublicRelease out : list) {
|
|
|
// addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单自动更改状态");
|
|
|
// out.setStatus(1);
|
|
|
@@ -532,6 +546,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
private void pushUpdateType(InputPublicRelease in, PublicRelease use) {
|
|
|
//营销切换成技术
|
|
|
if(use.getType()==0&&in.getType()==1){
|
|
|
@@ -558,6 +574,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private void deletePRD(List<String> split, List<OutPublicReleaseDetails> prdList) {
|
|
|
for (OutPublicReleaseDetails prd : prdList) {
|
|
|
boolean flag=true;
|
|
|
+
|
|
|
for (String s : split) {
|
|
|
if (prd.getUid().equals(s)){
|
|
|
flag=false;
|