From 6af91b13d43b06a31027e20123745d4a26a1491a Mon Sep 17 00:00:00 2001
From: leewand <1005070037@qq.com>
Date: Mon, 8 Jun 2020 17:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gitee/neuray/security/wb/ribs/biz/WechatBiz.java  | 10 +++++++++-
 .../main/resources/mapper/ribs/ApproRoleMapper.xml    |  8 +++++---
 .../src/main/resources/mapper/ribs/RibsMapper.xml     | 11 +++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java
index e0f1747..f6fbbfd 100644
--- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java
+++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java
@@ -425,7 +425,15 @@ public class WechatBiz {
 
         //取第四行，签发日期，结算方式
         ribsSheet.getRow(3).getCell(1).setCellValue(ribsVo.getQfrq());
-        ribsSheet.getRow(3).getCell(9).setCellValue(ribsVo.getJsfs());
+        String jsfs = "";
+        if("1".equals(ribsVo.getJsfs())){
+            jsfs = "电汇";
+        }else if("2".equals(ribsVo.getJsfs())){
+            jsfs = "现金";
+        }else if("3".equals(ribsVo.getJsfs())){
+            jsfs = "其他";
+        }
+        ribsSheet.getRow(3).getCell(9).setCellValue(jsfs);
         //取第五行，收款单位，项目组(现在是组织机构)
         ribsSheet.getRow(4).getCell(1).setCellValue(staffInfo.get("name").toString());
         ribsSheet.getRow(4).getCell(8).setCellValue(staffInfo.get("orgName").toString());
diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml
index 725549e..a6d5c09 100644
--- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml
+++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/ApproRoleMapper.xml
@@ -13,18 +13,19 @@
                       fyhj,
                       jsfs,
                       jsfs.code_name jsfs_name,
-                      yhkh,
+                      b.yhkh,
                       yhmc,
                       bxsy,
                       bz,
                       b.qfrq qfrq,
                       to_char(b.crt_time,'yyyy-mm-dd') cjsj,
-                      (select name from NeurayPM_Admin.admin_staff where id = b.STAFF_ID) as crtName,
+                      ast.name as crtName,
                       bxzt,
                       bxzt.code_name bxzt_name,
                       b.STAFF_ID,
                       b.tp
                  from t_wb_bxd b,
+                      NeurayPM_Admin.admin_staff ast,
                       NeurayPM_Admin.Sys_Codelist bxlx,
                       NeurayPM_Admin.Sys_Codelist jsfs,
                       NeurayPM_Admin.Sys_Codelist bxzt
@@ -34,6 +35,7 @@
                   and jsfs.name = 'JSFS'
                   and b.bxzt = bxzt.code_value
                   and bxzt.name = 'BXZT'
+                  and ast.id = b.STAFF_ID
                   <if test="staffId != null and staffId != ''">
                       and b.STAFF_ID
                       in (SELECT ast.ID
@@ -60,7 +62,7 @@
             and JSFS LIKE CONCAT(CONCAT('%',#{jsfs}),'%')
         </if>
         <if test="crtName != null and crtName != ''">
-            and CRT_NAME LIKE CONCAT(CONCAT('%',#{crtName}),'%')
+            and crtName LIKE CONCAT(CONCAT('%',#{crtName}),'%')
         </if>
         <if test="bxztCode != null and bxztCode != ''">
             and bxzt LIKE CONCAT(CONCAT('%',#{bxztCode}),'%')
diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/RibsMapper.xml b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/RibsMapper.xml
index 869c489..9468d5f 100644
--- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/RibsMapper.xml
+++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/mapper/ribs/RibsMapper.xml
@@ -25,12 +25,14 @@
 
     <select id="page" resultType="com.gitee.neuray.security.wb.ribs.vo.RibsVo">
         select * from (
-        select b.id, bxdh, bxlx ,bxlx.code_name bxlx_name, fyhj, jsfs , jsfs.code_name jsfs_name,
-        yhkh,yhmc,bxsy,bz,b.qfrq qfrq,to_char(b.crt_time,'yyyy-mm-dd') cjsj,
-        (select name from NeurayPM_Admin.admin_staff where id = b.STAFF_ID) as crtName,
+        select b.id, bxdh, bxlx ,bxlx.code_name bxlx_name, fyhj, jsfs ,
+         jsfs.code_name jsfs_name,
+        b.yhkh,yhmc,bxsy,bz,b.qfrq qfrq,to_char(b.crt_time,'yyyy-mm-dd') cjsj,
+        ast.name as crtName,
         bxzt ,
         bxzt.code_name bxzt_name
         from t_wb_bxd b,
+        NeurayPM_Admin.admin_staff ast,
         NeurayPM_Admin.Sys_Codelist bxlx,
         NeurayPM_Admin.Sys_Codelist jsfs,
         NeurayPM_Admin.Sys_Codelist bxzt
@@ -40,6 +42,7 @@
         and jsfs.name = 'JSFS'
         and b.bxzt = bxzt.code_value
         and bxzt.name = 'BXZT'
+        and ast.id = b.STAFF_ID
         )
         where 1 = 1
         <if test="bxdh != null and bxdh != ''">
@@ -52,7 +55,7 @@
             and JSFS LIKE CONCAT(CONCAT('%',#{jsfs}),'%')
         </if>
         <if test="crtName != null and crtName != ''">
-            and CRT_NAME LIKE CONCAT(CONCAT('%',#{crtName}),'%')
+            and crtName LIKE CONCAT(CONCAT('%',#{crtName}),'%')
         </if>
         <if test="bxztCode != null and bxztCode != ''">
             and BXZT_CODE LIKE CONCAT(CONCAT('%',#{bxztCode}),'%')
-- 
Gitee