|
@@ -68,6 +68,8 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
|
|
|
//财务审核角色ID
|
|
|
public static final String FINANCIAL_REVIEW_ROLE_ID = "32825ea6b43cb61bffa09bf05ad69cf2";
|
|
|
+ //财务角色ID
|
|
|
+ public static final String FINANCIAL_ROLE_ID = "5f3ee6bbd66cbd2df404cdec4ad7e5a3";
|
|
|
//媒介审核角色ID
|
|
|
public static final String MEIDA_MANAGER_ROLE_ID = "4e9ba2fe611ef62a8ce1d4df086f94c3";
|
|
|
|
|
@@ -156,14 +158,15 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
}
|
|
|
rechargeAccountService.saveBatch(accountList);
|
|
|
data.put("displayAmount", displayAmount);
|
|
|
- data.put("amends",recharge.getAmends());
|
|
|
+ data.put("amends", recharge.getAmends());
|
|
|
//消息通知内容
|
|
|
String message = null;
|
|
|
List<SysUser> users = null;
|
|
|
- if ("financialReview".equals(recharge.getReviewederId())) {
|
|
|
+ if (recharge.getReviewederId().contains("financ")) {
|
|
|
//财务
|
|
|
message = messageTemplate.getFinancePaymentApplicationCWRechargeMessage(data);
|
|
|
users = userService.getUserListByRoleId(FINANCIAL_REVIEW_ROLE_ID);
|
|
|
+ users.addAll(userService.getUserListByRoleId(FINANCIAL_ROLE_ID));
|
|
|
} else {
|
|
|
//媒介
|
|
|
data.put("accountIds", accountIds.substring(0, accountIds.length() - 1));
|
|
@@ -247,14 +250,15 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
rechargeAccountService.saveBatch(accountList);
|
|
|
|
|
|
data.put("displayAmount", displayAmount);
|
|
|
- data.put("amends",recharge.getAmends());
|
|
|
+ data.put("amends", recharge.getAmends());
|
|
|
//消息通知内容
|
|
|
String message = null;
|
|
|
List<SysUser> users = null;
|
|
|
- if ("financialReview".equals(recharge.getReviewederId())) {
|
|
|
+ if (recharge.getReviewederId().contains("financ")) {
|
|
|
//财务
|
|
|
message = messageTemplate.getFinancePaymentApplicationCWRechargeMessage(data);
|
|
|
users = userService.getUserListByRoleId(FINANCIAL_REVIEW_ROLE_ID);
|
|
|
+ users.addAll(userService.getUserListByRoleId(FINANCIAL_ROLE_ID));
|
|
|
} else {
|
|
|
//媒介
|
|
|
data.put("accountIds", accountIds.substring(0, accountIds.length() - 1));
|
|
@@ -283,7 +287,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
//添加审核记录 1:财务审核完成
|
|
|
insertRecord(recharge.getId(), recharge.getUserId(), "6", recharge.getApprovalContent(), recharge.getFiles(), new Date());
|
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
|
- oldData.put("amends",oldRecharge.getAmends());
|
|
|
+ oldData.put("amends", oldRecharge.getAmends());
|
|
|
JSONObject amount = rechargeAccountService.queryAmounts(recharge.getId());
|
|
|
if (!Check.isNull(amount)) {
|
|
|
oldData.put("accountIds", amount.getString("accountIds"));
|
|
@@ -306,7 +310,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
poolService.reduce(oldRecharge, null);
|
|
|
|
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
|
- oldData.put("amends",oldRecharge.getAmends());
|
|
|
+ oldData.put("amends", oldRecharge.getAmends());
|
|
|
JSONObject amount = rechargeAccountService.queryAmounts(recharge.getId());
|
|
|
if (!Check.isNull(amount)) {
|
|
|
oldData.put("accountIds", amount.getString("accountIds"));
|
|
@@ -330,12 +334,13 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
//添加审核记录
|
|
|
insertRecord(recharge.getId(), recharge.getUserId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
|
- oldData.put("amends",oldRecharge.getAmends());
|
|
|
+ oldData.put("amends", oldRecharge.getAmends());
|
|
|
String failMessage = null;
|
|
|
List<SysUser> users = null;
|
|
|
- if ("financialReview".equals(oldRecharge.getReviewederId())) {
|
|
|
+ if (oldRecharge.getReviewederId().contains("financ")) {
|
|
|
failMessage = messageTemplate.getFinancePaymentApplicationCWRechargeRefuseMessage(oldData);
|
|
|
users = userService.getUserListByRoleId(FINANCIAL_REVIEW_ROLE_ID);
|
|
|
+ users.addAll(userService.getUserListByRoleId(FINANCIAL_ROLE_ID));
|
|
|
} else {
|
|
|
failMessage = messageTemplate.getFinancePaymentApplicationMJRechargeRefuseMessage(oldData);
|
|
|
users = userService.getUserListByRoleId(MEIDA_MANAGER_ROLE_ID);
|
|
@@ -383,7 +388,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
private void getReviewedRole(FinancePaymentRechargeApplication recharge) {
|
|
|
String financialReview = recharge.getFinancialReview();
|
|
|
if (!Check.isNull(financialReview) && "1".equals(financialReview)) {
|
|
|
- recharge.setReviewederId("financialReview");
|
|
|
+ recharge.setReviewederId("financ");
|
|
|
recharge.setRevieweder("-");
|
|
|
recharge.setAuditStatus("1");//待审核
|
|
|
} else {
|