From 8f714d52f446a879710b72a39ae707c17b5c82ad Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Thu, 18 Feb 2021 10:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E6=8E=A7=E5=88=B6=E5=B1=82=EF=BC=8C=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E7=9A=84=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgApplyAmountListController.java | 21 ------------------- ...DgAssetsAssessmentAssetsLogController.java | 20 ------------------ .../controller/DgAssetsMoneyController.java | 21 ------------------- .../DgBusinessCompanyController.java | 21 ------------------- .../controller/DgEnclosureInfoController.java | 20 ------------------ .../controller/DgLegalInfoController.java | 20 ------------------ .../DgProcessManageVisualController.java | 21 ------------------- .../impl/DgApplyAmountInfoServiceImpl.java | 6 ++++++ .../guarantee/DgApplyAmountInfoMapper.xml | 5 +++-- .../guarantee/DgAssetsInvestigationMapper.xml | 5 +++-- .../DgComplianceInvestigationMapper.xml | 9 ++++---- .../guarantee/DgGuaranteeAssignUserMapper.xml | 5 +++-- .../DgGuaranteeLetterAssignUserMapper.xml | 5 +++-- .../DgLoanCommitteeConsiderMapper.xml | 9 ++++---- .../mapper/guarantee/DgLoanNoticeMapper.xml | 5 +++-- .../DgMessageInvestigationMapper.xml | 5 +++-- .../DgPaymentConfirmationConsiderMapper.xml | 5 +++-- .../DgWorkConferenceConsiderMapper.xml | 9 ++++---- 18 files changed, 42 insertions(+), 170 deletions(-) delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountListController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsAssessmentAssetsLogController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessCompanyController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEnclosureInfoController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLegalInfoController.java delete mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageVisualController.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountListController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountListController.java deleted file mode 100644 index 3fd4df85..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountListController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author Qyq - * @since 2020-11-24 - */ -@RestController -@RequestMapping("/dg-apply-amount-list") -public class DgApplyAmountListController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsAssessmentAssetsLogController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsAssessmentAssetsLogController.java deleted file mode 100644 index aef8d19e..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsAssessmentAssetsLogController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 价值评估记录 前端控制器 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@RestController -@RequestMapping("/dg-assets-assessment-assets-log") -public class DgAssetsAssessmentAssetsLogController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java deleted file mode 100644 index 705626ea..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 前端控制器 - *

- * - * @author Qyq - * @since 2020-11-26 - */ -@RestController -@RequestMapping("/dg-assets-money") -public class DgAssetsMoneyController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessCompanyController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessCompanyController.java deleted file mode 100644 index 39fcf09f..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessCompanyController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 业务关联企业表 前端控制器 - *

- * - * @author Qyq - * @since 2021-01-27 - */ -@RestController -@RequestMapping("/dg-business-company") -public class DgBusinessCompanyController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEnclosureInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEnclosureInfoController.java deleted file mode 100644 index f727b9ff..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEnclosureInfoController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 附件 前端控制器 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@RestController -@RequestMapping("/dg-enclosure-info") -public class DgEnclosureInfoController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLegalInfoController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLegalInfoController.java deleted file mode 100644 index d05ea884..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLegalInfoController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 企业法人信息 前端控制器 - *

- * - * @author Qyq - * @since 2020-11-05 - */ -@RestController -@RequestMapping("/dg-legal-info") -public class DgLegalInfoController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageVisualController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageVisualController.java deleted file mode 100644 index 9b45bf9b..00000000 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageVisualController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.daqing.financial.guarantee.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 流程管理可见表 前端控制器 - *

- * - * @author Qyq - * @since 2021-01-15 - */ -@RestController -@RequestMapping("/dg-process-manage-visual") -public class DgProcessManageVisualController { - -} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java index 653b6ee8..98831544 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java @@ -232,6 +232,12 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml index f2406605..47e81903 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgAssetsInvestigationMapper.xml @@ -68,8 +68,9 @@ au.status,au.operating_status,cc.name,cc.phone,ps.business_status from dg_assets_investigation au left join dg_apply_amount_info ai on au.business_id = ai.id - left join crms_company_customer ccl on ai.company_id = ccl.id - left join crms_customer cc on cc.id = ccl.customer_id + left join dg_business_company cc on cc.business_id = ai.id +/* left join crms_company_customer ccl on ai.company_id = ccl.id + left join crms_customer cc on cc.id = ccl.customer_id*/ left JOIN dg_business_process_status ps ON ps.business_id = au.business_id where au.id in diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml index 03103f2e..055d77e7 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml @@ -53,14 +53,15 @@ FROM dg_compliance_investigation AS i LEFT JOIN dg_apply_amount_info AS a ON a.id = i.business_id - LEFT JOIN crms_company_customer AS cc + left join dg_business_company c on c.business_id = a.id +/* LEFT JOIN crms_company_customer AS cc ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON c.id = cc.customer_id + ON c.id = cc.customer_id*/ LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id - WHERE c.del_or_not = 0 - AND i.id IN + WHERE /*c.del_or_not = 0*/ + /*AND*/ i.id IN #{id} diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml index 5f9e292a..6f003d19 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml @@ -51,8 +51,9 @@ au.status,au.operating_status,cc.name,cc.phone,ps.business_status from dg_guarantee_assign_user au left join dg_apply_amount_info ai on au.business_id = ai.id - left join crms_company_customer ccl on ai.company_id = ccl.id - left join crms_customer cc on cc.id = ccl.customer_id + left join dg_business_company cc on cc.business_id = ai.id +/* left join crms_company_customer ccl on ai.company_id = ccl.id + left join crms_customer cc on cc.id = ccl.customer_id*/ left JOIN dg_business_process_status ps ON ps.business_id = au.business_id where au.id in diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml index 3630a7d9..b12828a3 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml @@ -66,8 +66,9 @@ lau.status,lau.operating_status,bps.business_status from dg_guarantee_letter_assign_user lau left join dg_apply_amount_info aai on lau.business_id = aai.id - left join crms_company_customer ccc on lau.company_id = ccc.id - left join crms_customer cc on ccc.customer_id = cc.id + left join dg_business_company cc on cc.business_id = aai.id +/* left join crms_company_customer ccc on lau.company_id = ccc.id + left join crms_customer cc on ccc.customer_id = cc.id*/ left join dg_loan_committee_consider lcc on lau.business_id = lcc.business_id left join dg_business_process_status bps on lau.business_id = bps.business_id where lau.id in diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index e3b69611..18718210 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -52,14 +52,15 @@ FROM dg_loan_committee_consider AS l LEFT JOIN dg_apply_amount_info AS a ON a.id = l.business_id - LEFT JOIN crms_company_customer AS cc + left join dg_business_company c on c.business_id = a.id +/* LEFT JOIN crms_company_customer AS cc ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON cc.customer_id = c.id + ON cc.customer_id = c.id*/ LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id - WHERE c.del_or_not = 0 - AND l.id IN + WHERE /*c.del_or_not = 0*/ + /*AND*/ l.id IN #{id} diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml index 74832c58..559c64f0 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml @@ -64,8 +64,9 @@ aai.create_time,ln.status,ln.operating_status,bps.business_status from dg_loan_notice ln left join dg_apply_amount_info aai on ln.business_id = aai.id - left join crms_company_customer ccc on ln.company_id = ccc.id - left join crms_customer cc on ccc.customer_id = cc.id + left join dg_business_company cc on cc.business_id = aai.id +/* left join crms_company_customer ccc on ln.company_id = ccc.id + left join crms_customer cc on ccc.customer_id = cc.id*/ left join dg_loan_committee_consider lcc on ln.business_id = lcc.business_id left join dg_business_process_status bps on ln.business_id = bps.business_id where ln.id in diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml index 19d7e49c..b6988c27 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgMessageInvestigationMapper.xml @@ -50,8 +50,9 @@ au.status,au.operating_status,cc.name,cc.phone,ps.business_status from dg_message_investigation au left join dg_apply_amount_info ai on au.business_id = ai.id - left join crms_company_customer ccl on ai.company_id = ccl.id - left join crms_customer cc on cc.id = ccl.customer_id + left join dg_business_company cc on cc.business_id = ai.id +/* left join crms_company_customer ccl on ai.company_id = ccl.id + left join crms_customer cc on cc.id = ccl.customer_id*/ left JOIN dg_business_process_status ps ON ps.business_id = au.business_id where au.id in diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml index cd9764ef..b4e15b30 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml @@ -68,8 +68,9 @@ lcc.loan_tern,aai.create_time,pcc.status,pcc.operating_status,bps.business_status from dg_payment_confirmation_consider pcc left join dg_apply_amount_info aai on pcc.business_id = aai.id - left join crms_company_customer ccc on pcc.company_id = ccc.id - left join crms_customer cc on ccc.customer_id = cc.id + left join dg_business_company cc on cc.business_id = aai.id +/* left join crms_company_customer ccc on pcc.company_id = ccc.id + left join crms_customer cc on ccc.customer_id = cc.id*/ left join dg_loan_committee_consider lcc on pcc.business_id = lcc.business_id left join dg_business_process_status bps on pcc.business_id = bps.business_id where pcc.id in diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml index 0c914bd1..b64b300c 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml @@ -62,10 +62,11 @@ FROM dg_work_conference_consider AS w LEFT JOIN dg_apply_amount_info AS a ON a.id = w.business_id - LEFT JOIN crms_company_customer AS cc + left join dg_business_company c on c.business_id = a.id +/* LEFT JOIN crms_company_customer AS cc ON a.company_id = cc.id LEFT JOIN crms_customer AS c - ON cc.customer_id = c.id + ON cc.customer_id = c.id*/ LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id LEFT JOIN (SELECT business_id,SUM(CASE role_id WHEN 59 THEN emp_id ELSE 0 END) AS A, @@ -78,8 +79,8 @@ ON a.id = ass.business_id LEFT JOIN dg_message_investigation AS m ON a.id = m.business_id - WHERE c.del_or_not = 0 - AND i.role_id = 70 + WHERE /*c.del_or_not = 0*/ + /*AND*/ i.role_id = 70 AND ass.role_id = 64 AND m.role_id = 67 AND w.id IN