Browse Source

提示消息修改

anderx 1 year ago
parent
commit
67c3c9563d

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

@@ -250,15 +250,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	private String getString(AdminListBo my, CheckOrderNoOut data) {
 		String amountName="";
-		if (data.getAmountType()==0)amountName="低于1万";
-		if (data.getAmountType()==1)amountName="在1~3万";
-		if (data.getAmountType()==2)amountName="在3~5万";
-		if (data.getAmountType()==3)amountName="在5~10万";
+		String amountType="";
+		if (data.getAmountType()==0){
+			amountName="低于1万";
+			amountType="原则上技术人员不可下户";
+		}else if (data.getAmountType()==1){
+			amountName="在1~3万";
+			amountType="已超出"+data.getDurationMax()+"小时";
+		}else if (data.getAmountType()==2){
+			amountName="在3~5万";
+			amountType="已超出"+data.getDurationMax()+"小时";
+		}else if (data.getAmountType()==3){
+			amountName="在5~10万";
+			amountType="已超出"+data.getDurationMax()+"小时";
+		}
 		String format = String.format("%s准备公出%s(%s)," +
-						"总计公出:%s人,%s次,%s时。本合同%s,本次公出申请,已超出%s小时。超出公出时长,将计入您的第三方成本," +
+						"总计公出:%s人,%s次,%s时。本合同%s,本次公出申请,%s。超出公出时长,将计入您的第三方成本," +
 						"从奖金计算基数中扣除!请确认是否同意本次公出?", my.getName(), data.getUserName(), data.getContractNo(),
 				data.getPeopleCount(), data.getTimesCount(), data.getDurationCount().stripTrailingZeros(), amountName,
-				data.getDurationMax());
+				amountType);
 		return format;
 	}