融信日志title修改，修改查询接收方的sql

sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -94,7 +94,7 @@ public class CreditHandleController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasPermi = "credit:credit:approve")
-    @Log(title = "融信管理", businessType = BusinessType.UPDATE)
+    @Log(title = "融信确权", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping
     public AjaxResult approve(@RequestBody Map<String,Object> map)throws Exception
@@ -257,7 +257,7 @@ public class CreditHandleController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasPermi = "credit:credit:addInfor")
-    @Log(title = "融信", businessType = BusinessType.UPDATE)
+    @Log(title = "融信补充资料", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PostMapping
     public AjaxResult addinfor(@RequestBody Map<String,Object> map)throws Exception
@@ -314,7 +314,7 @@ public class CreditHandleController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasPermi = "credit:credit:signFor")
-    @Log(title = "融信", businessType = BusinessType.UPDATE)
+    @Log(title = "融信签收", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/signFor")
     public AjaxResult signFor(@RequestBody Map<String,Object> map)throws Exception
@@ -403,7 +403,7 @@ public class CreditHandleController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasPermi = "credit:credit:refuse")
-    @Log(title = "融信", businessType = BusinessType.UPDATE)
+    @Log(title = "融信拒签", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/creditRefuse")
     public AjaxResult creditRefuse(@RequestBody Map<String,Object> map)throws Exception
@@ -492,7 +492,7 @@ public class CreditHandleController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasPermi = "credit:credit:del")
-    @Log(title = "融信", businessType = BusinessType.UPDATE)
+    @Log(title = "融信删除", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/creditDel")
     public AjaxResult creditDel(@RequestBody Map<String,Object> map)throws Exception
@@ -526,7 +526,7 @@ public class CreditHandleController extends BaseController {
      * @return
      * @throws Exception
      */
-    @Log(title = "融信", businessType = BusinessType.UPDATE)
+    @Log(title = "融信盖章拒签", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/sealRefuse")
     public AjaxResult sealRefuse(@RequestBody Map<String,Object> map)throws Exception

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -345,7 +345,7 @@ public class OwnCreditController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasPermi = "credit:credit:update")
-    @Log(title = "融信管理", businessType = BusinessType.UPDATE)
+    @Log(title = "融信修改", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping
     public AjaxResult edit(@RequestBody Map<String, Object> map)  throws Exception{
@@ -660,7 +660,7 @@ public class OwnCreditController extends BaseController {
      * @throws Exception
      */
     @PreAuthorize(hasAnyPermi = {"credit:credit:add","finanOpening:finanOpening:add","finanOpening:finanOpening:apply"})
-    @Log(title = "融信开立", businessType = BusinessType.INSERT)
+    @Log(title = "融信开立/申请", businessType = BusinessType.INSERT)
     @Transactional(rollbackFor = Exception.class)
     @PostMapping
     public AjaxResult add(@RequestBody Map<String,Object> map)throws Exception

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -239,7 +239,7 @@ public class OwnMessageController extends BaseController {
      * @return
      * @throws Exception
      */
-    @Log(title = "融信开立", businessType = BusinessType.UPDATE)
+    @Log(title = "融信盖章", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("/contractSigning")
     public AjaxResult contractSigning(@RequestBody Map<String,Object> map) throws Exception {

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -170,44 +170,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getReceiverList" parameterType="map" resultType="map">
-            SELECT     scy_name     'scyName',
-                       scy_id       'scyId',
-                      CASE  WHEN scy_id =#{paramMap.zfiSupplierId}  THEN 0  ELSE  1  END  'flag'
-            FROM sys_company_rel
-            INNER JOIN sys_company
-            ON scr_launch_type = '01'
-            AND scr_receive_company_id = scy_id
-            WHERE  scr_status = '01'
+        SELECT
+                c.scy_id                            'scyId',
+                r.scr_status                        'scrStatus',
+                c.scy_name                          'scyName',
+                c.scy_social_code                   'scySocialCode',
+                c.scy_address                       'scyAddress',
+                c.scy_phone                         'scyPhone',
+                c.scy_legal                         'scyLegal',
+                c.scy_type                          'scyType',
+                r.create_time                       'createTime',
+            CASE  WHEN scy_id = #{paramMap.zfiSupplierId}  THEN 0  ELSE  1  END  'flag'
+            FROM sys_company_rel r
+            LEFT JOIN sys_company  c
+            ON (r.scr_receive_company_id = c.scy_id OR r.scr_launch_company_id = c.scy_id)
+        WHERE 1=1
+            AND (r.scr_launch_company_id = #{paramMap.companyId} OR r.scr_receive_company_id = #{paramMap.companyId})
             <if test="paramMap.companyId != null  and paramMap.companyId != ''">
                 AND scr_launch_company_id = #{paramMap.companyId}
             </if>
             <if test="paramMap.zfiSupplierId != null  and paramMap.zfiSupplierId != ''">
-                AND (scy_id = #{paramMap.zfiSupplierId} or  (scr_status = '01' and  scy_status= '00'))
-            </if>
-            <if test="paramMap.zfiSupplierId == null  or paramMap.zfiSupplierId == ''">
-                and scr_status = '01' and scy_status= '00'
-            </if>
-
-            UNION
-
-            SELECT     scy_name     'scyName',
-                       scy_id       'scyId',
-                       CASE  WHEN scy_id =#{paramMap.zfiSupplierId}  THEN 0  ELSE  1  END  'flag'
-            FROM sys_company_rel
-            INNER JOIN sys_company
-            ON scr_receive_type = '01'
-            AND scr_launch_company_id = scy_id
-            WHERE  scr_status = '01'
-            <if test="paramMap.companyId != null  and paramMap.companyId != ''">
-                AND scr_receive_company_id = #{paramMap.companyId}
-            </if>
-            <if test="paramMap.zfiSupplierId != null  and paramMap.zfiSupplierId != ''">
-                AND (scy_id = #{paramMap.zfiSupplierId} or  (scr_status = '01' and  scy_status= '00'))
+                AND (scy_id = #{paramMap.zfiSupplierId}
+                        OR
+                    (r.scr_status = '01'AND c.scy_status = '00' AND c.scy_type = '02')
+                )
             </if>
             <if test="paramMap.zfiSupplierId == null  or paramMap.zfiSupplierId == ''">
-                and scr_status = '01' and scy_status= '00'
+                AND r.scr_status = '01'
+                AND c.scy_status = '00'
+                AND c.scy_type = '02'
             </if>
-            ORDER BY  flag asc
+            ORDER BY flag DESC
     </select>
     <select id="getAccountsPay" parameterType="map" resultType="map">
             SELECT