|
@@ -53,31 +53,31 @@ public class TranProessProvider implements BeanWorkFlowProvider {
|
|
if (info == null) {
|
|
if (info == null) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
- String staffName = "XXX";
|
|
|
|
- CommonStaff commitUserInfo = staffService.getInfo(info.getUpdateUserId());
|
|
|
|
- if (commitUserInfo != null) {
|
|
|
|
- staffName = commitUserInfo.getMajorRole() != null
|
|
|
|
- ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
|
|
|
|
- : commitUserInfo.getStaffName();
|
|
|
|
- }
|
|
|
|
|
|
+ String staffName = "王永辛";
|
|
|
|
+// CommonStaff commitUserInfo = staffService.getInfo(info.getCreateUserId());
|
|
|
|
+// if (commitUserInfo != null) {
|
|
|
|
+// staffName = commitUserInfo.getMajorRole() != null
|
|
|
|
+// ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
|
|
|
|
+// : commitUserInfo.getStaffName();
|
|
|
|
+// }
|
|
//汽运
|
|
//汽运
|
|
if("1".equals(info.getTranTypeKey())){
|
|
if("1".equals(info.getTranTypeKey())){
|
|
//按吨
|
|
//按吨
|
|
if("1".equals(info.getBillingMethod())){
|
|
if("1".equals(info.getBillingMethod())){
|
|
- return MessageFormat.format(MESSAGE_KG_CONTENT, commitUserInfo.getStaffName(),info.getTranPriceIng());
|
|
|
|
|
|
+ return MessageFormat.format(MESSAGE_KG_CONTENT, staffName,info.getTranPriceIng());
|
|
}
|
|
}
|
|
//按车
|
|
//按车
|
|
else {
|
|
else {
|
|
- return MessageFormat.format(MESSAGE_CAR_CONTENT, commitUserInfo.getStaffName(),info.getTranPriceIngCar());
|
|
|
|
|
|
+ return MessageFormat.format(MESSAGE_CAR_CONTENT, staffName,info.getTranPriceIngCar());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//火运
|
|
//火运
|
|
else if("2".equals(info.getTranTypeKey())){
|
|
else if("2".equals(info.getTranTypeKey())){
|
|
- return MessageFormat.format(MESSAGE_FIRE_CONTENT, commitUserInfo.getStaffName(),info.getTranPriceIng());
|
|
|
|
|
|
+ return MessageFormat.format(MESSAGE_FIRE_CONTENT,staffName,info.getTranPriceIng());
|
|
}
|
|
}
|
|
//船运
|
|
//船运
|
|
else{
|
|
else{
|
|
- return MessageFormat.format(MESSAGE_SHIP_CONTENT, commitUserInfo.getStaffName(),info.getTranPriceIng());
|
|
|
|
|
|
+ return MessageFormat.format(MESSAGE_SHIP_CONTENT, staffName,info.getTranPriceIng());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|