去除不必要的控制层，企业信息修改为备份的企业信息

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountListController.java

@@ -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;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-24
- */
-@RestController
-@RequestMapping("/dg-apply-amount-list")
-public class DgApplyAmountListController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsAssessmentAssetsLogController.java

@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 价值评估记录 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@RestController
-@RequestMapping("/dg-assets-assessment-assets-log")
-public class DgAssetsAssessmentAssetsLogController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgAssetsMoneyController.java

@@ -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;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-26
- */
-@RestController
-@RequestMapping("/dg-assets-money")
-public class DgAssetsMoneyController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgBusinessCompanyController.java

@@ -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;
-
-/**
- * <p>
- * 业务关联企业表 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2021-01-27
- */
-@RestController
-@RequestMapping("/dg-business-company")
-public class DgBusinessCompanyController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEnclosureInfoController.java

@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 附件 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@RestController
-@RequestMapping("/dg-enclosure-info")
-public class DgEnclosureInfoController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLegalInfoController.java

@@ -1,20 +0,0 @@
-package com.daqing.financial.guarantee.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 企业法人信息 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2020-11-05
- */
-@RestController
-@RequestMapping("/dg-legal-info")
-public class DgLegalInfoController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgProcessManageVisualController.java

@@ -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;
-
-/**
- * <p>
- * 流程管理可见表 前端控制器
- * </p>
- *
- * @author Qyq
- * @since 2021-01-15
- */
-@RestController
-@RequestMapping("/dg-process-manage-visual")
-public class DgProcessManageVisualController {
-
-}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -232,6 +232,12 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(businessApplication.getInspectionPhotos()));
         dgEnclosureInfoMapper.insert(dgEnclosureInfo);
 
+        //根据企业id查询企业详情
+        DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
+        applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
+        ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
+        LinkedHashMap linkedList = (LinkedHashMap)result.getData();
+
         //备份企业信息，以防企业信息改动从而影响业务信息变更
         DgBusinessCompany dgBusinessCompany = new DgBusinessCompany();
         BeanUtils.copyProperties(businessApplication,dgBusinessCompany);

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgApplyAmountInfoMapper.xml

@@ -51,8 +51,9 @@
         au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_apply_amount_list 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 dg_business_company cc on cc.business_id = ai.id
-        left join crms_customer cc on cc.id = ccl.customer_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
         <foreach collection="list" close=")" open="(" item="id" separator=",">

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 dg_business_company cc on cc.business_id = ai.id
-        left join crms_customer cc on cc.id = ccl.customer_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
         <foreach collection="list" close=")" open="(" item="id" separator=",">

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
+        WHERE /*c.del_or_not  = 0*/
-        AND i.id IN
+        /*AND*/ i.id IN
         <foreach collection="ids" open="(" separator="," close=")" item="id">
             #{id}
         </foreach>

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 dg_business_company cc on cc.business_id = ai.id
-        left join crms_customer cc on cc.id = ccl.customer_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
         <foreach collection="list" close=")" open="(" item="id" separator=",">

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 dg_business_company cc on cc.business_id = aai.id
-        left join crms_customer cc on ccc.customer_id = cc.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

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
+        WHERE /*c.del_or_not = 0*/
-        AND l.id IN
+        /*AND*/ l.id IN
         <foreach collection="ids" open="(" separator="," close=")" item="id">
             #{id}
         </foreach>

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 dg_business_company cc on cc.business_id = aai.id
-        left join crms_customer cc on ccc.customer_id = cc.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

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 dg_business_company cc on cc.business_id = ai.id
-        left join crms_customer cc on cc.id = ccl.customer_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
         <foreach collection="list" close=")" open="(" item="id" separator=",">

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 dg_business_company cc on cc.business_id = aai.id
-        left join crms_customer cc on ccc.customer_id = cc.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

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
+        WHERE /*c.del_or_not = 0*/
-        AND i.role_id = 70
+        /*AND*/ i.role_id = 70
         AND ass.role_id = 64
         AND m.role_id = 67
         AND w.id IN