|
@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -133,7 +134,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
rechargeAccountService.saveBatch(accountList);
|
|
rechargeAccountService.saveBatch(accountList);
|
|
//添加申请记录
|
|
//添加申请记录
|
|
- insertRecord(recharge.getId(), recharge.getApplicanterId(), "0", null, recharge.getFiles());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getApplicanterId(), "0", null, recharge.getFiles(), new Date());
|
|
//消息通知内容
|
|
//消息通知内容
|
|
String message = null;
|
|
String message = null;
|
|
List<SysUser> users = null;
|
|
List<SysUser> users = null;
|
|
@@ -208,7 +209,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
rechargeAccountService.saveBatch(accountList);
|
|
rechargeAccountService.saveBatch(accountList);
|
|
|
|
|
|
//添加申请记录 -1 退回修改
|
|
//添加申请记录 -1 退回修改
|
|
- insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles(), new Date());
|
|
//消息通知内容
|
|
//消息通知内容
|
|
String message = null;
|
|
String message = null;
|
|
List<SysUser> users = null;
|
|
List<SysUser> users = null;
|
|
@@ -258,7 +259,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
sendMessageService.sendMessage(u.getId(), message);
|
|
sendMessageService.sendMessage(u.getId(), message);
|
|
}
|
|
}
|
|
//添加审核记录 1:财务审核完成
|
|
//添加审核记录 1:财务审核完成
|
|
- insertRecord(recharge.getId(), recharge.getUserId(), "1", recharge.getApprovalContent(), recharge.getFiles());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getUserId(), "1", recharge.getApprovalContent(), recharge.getFiles(), new Date());
|
|
} else if ("3".equals(auditStatus) || "4".equals(auditStatus)) {
|
|
} else if ("3".equals(auditStatus) || "4".equals(auditStatus)) {
|
|
recharge.setReviewederId(recharge.getUserId());
|
|
recharge.setReviewederId(recharge.getUserId());
|
|
SysUser user = userService.getById(recharge.getUserId());
|
|
SysUser user = userService.getById(recharge.getUserId());
|
|
@@ -279,7 +280,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
this.updateById(recharge);
|
|
this.updateById(recharge);
|
|
//添加审核记录
|
|
//添加审核记录
|
|
- insertRecord(recharge.getId(), recharge.getUserId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getUserId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
String failMessage = null;
|
|
String failMessage = null;
|
|
List<SysUser> users = null;
|
|
List<SysUser> users = null;
|
|
@@ -315,7 +316,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
this.updateById(recharge);
|
|
this.updateById(recharge);
|
|
//添加审核记录
|
|
//添加审核记录
|
|
- insertRecord(recharge.getId(), oldApplication.getRevieweder(), auditStatus, oldApplication.getApprovalContent(), oldApplication.getFiles());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), oldApplication.getRevieweder(), auditStatus, oldApplication.getApprovalContent(), oldApplication.getFiles(), oldApplication.getUpdateTime());
|
|
}
|
|
}
|
|
return Result.ok();
|
|
return Result.ok();
|
|
}
|
|
}
|
|
@@ -337,16 +338,14 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- private void insertRecord(Long rechargeId, String operatorId, String status, String txt, String files) {
|
|
|
|
- if ("1".equals(status)) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ private void insertRecord(Long rechargeId, String operatorId, String status, String txt, String files, Date time) {
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|
|
record.setRechargeId(rechargeId);
|
|
record.setRechargeId(rechargeId);
|
|
record.setReviewederId(operatorId);
|
|
record.setReviewederId(operatorId);
|
|
record.setAuditStatus(status);
|
|
record.setAuditStatus(status);
|
|
record.setApprovalContent(txt);
|
|
record.setApprovalContent(txt);
|
|
record.setFiles(files);
|
|
record.setFiles(files);
|
|
|
|
+ record.setCreateTime(time);
|
|
recordMapper.insert(record);
|
|
recordMapper.insert(record);
|
|
}
|
|
}
|
|
|
|
|