Browse Source

公出新增技术协单抄送

anderx 5 months ago
parent
commit
81c479188c

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

@@ -157,10 +157,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		//公出信息抄送
 		pushPublicCarbonCopy(in, my, userNames);
 		if (in.getAssist()==1){
-			List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(in.getId(), null, null);
-			for (PublicRelease publicRelease : publicReleases) {
-				AdminListBo my2 = adminMapper.getDeptNameByAid(publicRelease.getAid());
-				pushPublicCarbonCopy(publicRelease, my2, userNames);
+			String[] split = in.getAssistAid().split(",");
+			for (String aid2 : split) {
+				AdminListBo my2 = adminMapper.getDeptNameByAid(aid2);
+				PublicRelease p=new PublicRelease();
+				p.setId(in.getId());
+				p.setAid(aid2);
+				p.setReleaseStart(in.getReleaseStart());
+				p.setReleaseEnd(in.getReleaseEnd());
+				p.setPlan(in.getPlan());
+				p.setType(3);
+				pushPublicCarbonCopy(p, my2, userNames);
 			}
 
 		}
@@ -278,17 +285,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					if(p.getType()==0)typeName="业务公出";
 					else if(p.getType()==1)typeName="技术公出";
 					else if(p.getType()==2)typeName="行政公出";
-					String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!", my.getName(),
+					else if(p.getType()==3)typeName="技术协单";
+					String str=String.format("%s,%s - %s,将公出%s,请知悉!", my.getName(),
 							startTime,
 							endTime,
 							userNames);
+					String str2=String.format("协单%s,请知悉!",
+							userNames);
 					asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(), e.getReviewerId()
-							,str2);
+							,str);
 					asyncUtils.sendCarbonCopyWeChat(e.getReviewerId(), p.getId(),
 							my.getName(), startTime,
 							endTime,
 							typeName,
-							p.getPlan());
+							str2);
 				}
 
 			}
@@ -711,10 +721,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		pushPublicCarbonCopy( in,  my,  userNames);
 		if (in.getAssist()==1){
-			List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(in.getId(), null, null);
-			for (PublicRelease publicRelease : publicReleases) {
-				AdminListBo my2 = adminMapper.getDeptNameByAid(publicRelease.getAid());
-				pushPublicCarbonCopy(publicRelease, my2, userNames);
+			String[] split2 = in.getAssistAid().split(",");
+			for (String aid2 : split2) {
+				AdminListBo my2 = adminMapper.getDeptNameByAid(aid2);
+				PublicRelease p=new PublicRelease();
+				p.setId(in.getId());
+				p.setAid(aid2);
+				p.setReleaseStart(in.getReleaseStart());
+				p.setReleaseEnd(in.getReleaseEnd());
+				p.setPlan(in.getPlan());
+				p.setType(3);
+				pushPublicCarbonCopy(p, my2, userNames);
 			}
 
 		}

+ 6 - 0
src/main/resources/log4j.properties

@@ -3,6 +3,9 @@ log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.Target=System.out
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 log4j.appender.Console.layout.ConversionPattern=[%p][%d{yyyy-MM-dd HH\:mm\:ss,SSS}][%c]%m%n
+log4j.appender.console.encoding=UTF-8
+log4j.appender.file.encoding=UTF-8
+
 
 log4j.logger.com.springframework=ERROR
 log4j.logger.com.ibatis=ERROR  
@@ -13,6 +16,9 @@ log4j.logger.java.sql.Connection=ERROR
 log4j.logger.java.sql.Statement=ERROR  
 log4j.logger.java.sql.PreparedStatement=ERROR  
 log4j.logger.java.sql.ResultSet=ERROR
+#\u8BBE\u7F6E\u5B57\u4F53
+
+
 
 # Druid
 log4j.logger.druid.sql=ERROR