|
@@ -93,8 +93,8 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> getAdvertisers() {
|
|
|
|
- return Result.ok(baseMapper.getAdvertisers());
|
|
|
|
|
|
+ public Result<Object> getAdvertisers(String mediaType) {
|
|
|
|
+ return Result.ok(baseMapper.getAdvertisers(mediaType));
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -190,7 +190,7 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
|
|
String auditStatus = oldApplication.getAuditStatus();//4-临时通过
|
|
String auditStatus = oldApplication.getAuditStatus();//4-临时通过
|
|
if ("4".equals(auditStatus)) {
|
|
if ("4".equals(auditStatus)) {
|
|
application.setAuditStatus("3");
|
|
application.setAuditStatus("3");
|
|
- application.setApprovalContent(Check.isNull(application.getApprovalContent()) ? "补传文件" : application.getApprovalContent());
|
|
|
|
|
|
+ application.setApprovalContent(Check.isNull(application.getApprovalContent()) ? "-" : application.getApprovalContent());
|
|
application.setReviewederId(application.getUserId());
|
|
application.setReviewederId(application.getUserId());
|
|
SysUser user = userService.getById(application.getApplicanterId());
|
|
SysUser user = userService.getById(application.getApplicanterId());
|
|
if (!Check.isNull(user)) {
|
|
if (!Check.isNull(user)) {
|
|
@@ -239,7 +239,7 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
|
|
//TODO application.setReviewederId("b161b7d9793942f980dbfe8c931cd1b0");
|
|
//TODO application.setReviewederId("b161b7d9793942f980dbfe8c931cd1b0");
|
|
// application.setRevieweder("丁兆明");
|
|
// application.setRevieweder("丁兆明");
|
|
application.setReviewederId("1506873789009489921");
|
|
application.setReviewederId("1506873789009489921");
|
|
- application.setRevieweder("芮珊珊 ");
|
|
|
|
|
|
+ application.setRevieweder("芮珊珊");
|
|
} else {
|
|
} else {
|
|
//TODO application.setReviewederId("00d630a129e4487cba5427788a1f08ce");
|
|
//TODO application.setReviewederId("00d630a129e4487cba5427788a1f08ce");
|
|
// application.setRevieweder("赵旺");
|
|
// application.setRevieweder("赵旺");
|
|
@@ -251,6 +251,9 @@ public class FinancePaymentApplicationServiceImpl extends ServiceImpl<FinancePay
|
|
}
|
|
}
|
|
|
|
|
|
private void insertRecord(Long applicationId, String operatorId, String status, String txt, String files) {
|
|
private void insertRecord(Long applicationId, String operatorId, String status, String txt, String files) {
|
|
|
|
+ if ("1".equals(status)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
FinancePaymentApplicationRecord record = new FinancePaymentApplicationRecord();
|
|
FinancePaymentApplicationRecord record = new FinancePaymentApplicationRecord();
|
|
record.setApplicationId(applicationId);
|
|
record.setApplicationId(applicationId);
|
|
record.setReviewederId(operatorId);
|
|
record.setReviewederId(operatorId);
|