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