anderx преди 1 година
родител
ревизия
27f4976dfd
променени са 1 файла, в които са добавени 15 реда и са изтрити 15 реда
  1. 15 15
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

+ 15 - 15
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -450,19 +450,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				pe.setStatus(0);
 				publicExamineMapper.updateByPridSelective(pe);
 			}
-			//处理协单
-			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
-			List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
-			for (PublicRelease out : list) {
-				addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单自动更改状态");
-				out.setStatus(1);
-				publicReleaseMapper.updateByPrimaryKeySelective(out);
-			}
-			for (PublicRelease out : list2) {
-				addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单助手自动更改状态");
-				out.setStatus(1);
-				publicReleaseMapper.updateByPrimaryKeySelective(out);
-			}
+//			//处理协单
+//			List<PublicRelease> list = publicReleaseMapper.selectByMainId(in.getId(),3,null);
+//			List<PublicRelease> list2 = publicReleaseMapper.selectByMainId(in.getId(),4,null);
+//			for (PublicRelease out : list) {
+//				addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单自动更改状态");
+//				out.setStatus(1);
+//				publicReleaseMapper.updateByPrimaryKeySelective(out);
+//			}
+//			for (PublicRelease out : list2) {
+//				addpublicLog(out.getId(), PublicReleaseLog.states.xg.getCode(), "修改公出信息,协单助手自动更改状态");
+//				out.setStatus(1);
+//				publicReleaseMapper.updateByPrimaryKeySelective(out);
+//			}
 			AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
 				String str=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
@@ -1067,8 +1067,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				sendNoticeAndSoucket(np.getAid(),np.getStatus(),str.toString());
 				publicReleaseLogMapper.insertSelective(log);
 				if (np.getStatus()==2){
-					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单无需审核自动通过", new Date());
-					publicReleaseLogMapper.insertSelective(log);
+					PublicReleaseLog log2 = new PublicReleaseLog(np.getId(), "1", PublicReleaseLog.states.ty.getCode(), "协单未设置审核人,自动通过", new Date());
+					publicReleaseLogMapper.insertSelective(log2);
 				}
 			}
 		}