Ver código fonte

通知消息修改

anderx 1 ano atrás
pai
commit
e402e5e8fc

+ 3 - 3
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -60,9 +60,9 @@ public enum NoticeStatus {
 	CUSTOMER_LOSE270(51,"客户释放(270天)"),
 	CUSTOMER_CHENNEL_RECOVERY(52,"渠道客户回收"),
 	CUSTOMER_CHENNEL_LOSE(53,"渠道客户丢失"),
-	PUBLIC_RELEASE_START(54,"出打卡申请"),
-	PUBLIC_RELEASE_YES(55,"出打卡通过"),
-	PUBLIC_RELEASE_NO(56,"出打卡驳回"),
+	PUBLIC_RELEASE_START(54,"出打卡申请"),
+	PUBLIC_RELEASE_YES(55,"出打卡通过"),
+	PUBLIC_RELEASE_NO(56,"出打卡驳回"),
 	ITEM_CHECK_START(57,"发起专利核对"),
 	ITEM_CHECK_END(58,"完成专利核对"),
 	MENBER_DUN(59,"会员催款信息"),

+ 6 - 0
src/main/java/com/goafanti/common/enums/NoticeTypes.java

@@ -20,6 +20,8 @@ public enum NoticeTypes {
 	DDKP(6,"订单开票"),
 
 	HYCS(7,"会员催收"),
+
+	GCXX(8,"公出"),
 	ELSE(0,"其他");
 
 	/**
@@ -69,6 +71,10 @@ public enum NoticeTypes {
 			return 6;
 		}else if (i == NoticeStatus.MENBER_DUN.getCode()) {
 			return 7;
+		}else if ( i== NoticeStatus.PUBLIC_OTHERS_USER.getCode() || i== NoticeStatus.PUBLIC_RELEASE_START.getCode()
+				|| i== NoticeStatus.PUBLIC_RELEASE_YES.getCode()|| i== NoticeStatus.PUBLIC_RELEASE_NO.getCode()
+				|| i== NoticeStatus.PUBLIC_CARBON_COPY.getCode()) {
+			return 8;
 		}
 		return 0;
 	}

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

@@ -159,9 +159,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		publicReleaseMapper.updateByPrimaryKeySelective(updateName);
 		addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
 		if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
-			asyncUtils.addNoticAndEmail(NoticeStatus.MENBER_START.getCode(),my.getPublicCarbonCopy()
-					,String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),in.getReleaseStart(),in.getReleaseEnd(),
-							userNames));
+			String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
+					DateUtils.formatDateYYYYMMddHHmm(in.getReleaseStart()),
+					DateUtils.formatDateYYYYMMddHHmm(in.getReleaseEnd()),
+					userNames);
+			asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(),my.getPublicCarbonCopy()
+					,str2);
 		}
         return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
 	}
@@ -440,11 +443,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				publicExamineMapper.updateByPridSelective(pe);
 			}
 			AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-			String str=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
-					DateUtils.formatDateYYYYMMddHHmm(in.getReleaseStart()),
-					DateUtils.formatDateYYYYMMddHHmm(in.getReleaseEnd()),
-					userNames);
 			if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
+				String str=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
+						DateUtils.formatDateYYYYMMddHHmm(in.getReleaseStart()),
+						DateUtils.formatDateYYYYMMddHHmm(in.getReleaseEnd()),
+						userNames);
 				asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(),my.getPublicCarbonCopy()
 						,str);
 			}