diff --git a/chushang-modules/chushang-module-loan/loan-service/pom.xml b/chushang-modules/chushang-module-loan/loan-service/pom.xml
index 4ee12fd..5613d97 100644
--- a/chushang-modules/chushang-module-loan/loan-service/pom.xml
+++ b/chushang-modules/chushang-module-loan/loan-service/pom.xml
@@ -28,6 +28,10 @@
+
+ com.chushang
+ loan-feign
+
com.google.zxing
core
diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java
index 72e66f5..fb208d5 100644
--- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java
+++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java
@@ -23,36 +23,23 @@ public class LoanController {
@Autowired
private ILoanService iLoanService;
-
-
- /**
- * 提交表单数据
- */
@PostMapping("/qcode")
public AjaxResult submitFormData(@RequestBody @Validated LoanFormQuery formData) throws Exception{
return AjaxResult.success(iLoanService.qcCode(formData));
}
-
- /**
- * 查询表单
- */
@GetMapping("/find")
@RequiresPermissions("loan:loan:find")
public AjaxResult queryLoan(LoanEntity query) {
return AjaxResult.success(iLoanService.queryLoan(query));
}
-
-
/**
- * 查询表单
+ * 查询统计多少人审核通过以及放款金额
*/
@GetMapping("/data")
@RequiresPermissions("loan:loan:data")
public AjaxResult data( LoanEntity query) {
return AjaxResult.success(iLoanService.queryData(query));
}
-
-
/**
* 审批
*/
diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java
index 978910f..cd44b91 100644
--- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java
+++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java
@@ -112,11 +112,10 @@ public class LoanServiceImpl extends ServiceImpl impleme
}
@Override
- @DataScope(deptAlias = "u", userAlias = "u")
+ @DataScope(deptAlias = "l")
public PageResult queryData(LoanEntity query) {
-
CommonParam commonParam = CommonParam.buildPageRequest();
- com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(),commonParam.getLimit());
+ Page page = new Page<>(commonParam.getPage(),commonParam.getLimit());
List loanVOSList = baseMapper.queryDataList(query,page);
List resultList = new ArrayList<>();
for (LoanData loanData:loanVOSList){
diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml b/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml
index 9dc5ea8..56b9038 100644
--- a/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml
+++ b/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml
@@ -11,35 +11,30 @@
COUNT(if(status = 2, id, null)) as totalOpenFlux,
SUM(if(status = 2, loan_amount, null)) as totalLoanAmount,
sum(application_amount) as totalTransactionAmount
- from loan
- where del_state = false
+ from loan l
+ where l.del_state = false
- AND channel_name like concat('%',#{query.channelName},'%')
+ AND l.channel_name like concat('%',#{query.channelName},'%')
- AND form_number = #{query.formNumber}
+ AND l.form_number = #{query.formNumber}
- AND author_phone = #{query.authorPhone}
+ AND l.author_phone = #{query.authorPhone}
- AND author_name like concat('%',#{query.authorName},'%')
-
-
- AND dept_id = #{query.deptId}
+ AND l.author_name like concat('%',#{query.authorName},'%')
- AND status = #{query.status}
+ AND l.status = #{query.status}
- AND submission_time between #{query.submissionTimes[0]} and #{query.submissionTimes[1]}
+ AND l.submission_time between #{query.submissionTimes[0]} and #{query.submissionTimes[1]}
+ ${query.sqlParam.dataScope}
group by user_id,channel_name,author_name,author_phone
-
-
- ${query.sqlParam.dataScope}