Merge remote-tracking branch 'origin/0507' into 0507

# Conflicts:
#	dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

dxhy-core/src/main/java/com/dxhy/core/service/export/impl/RzFpxxServiceImpl.java

@@ -95,7 +95,8 @@ public class RzFpxxServiceImpl extends MpBaseServiceImpl<FpxxZhDao, FpRzRespVO>
                         dataArray[17] = pageList.get(i).getImageNumber();
                         dataArray[18] = pageList.get(i).getAccountPeriod();
                         dataArray[19] = pageList.get(i).getBzdh();
-                        dataArray[20] = pageList.get(i).getCompCode();
+                        dataArray[20] = pageList.get(i).getBzr();
+                        dataArray[21] = pageList.get(i).getCompCode();
 
                         returnList.add(dataArray);
                     }

dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java

@@ -66,7 +66,8 @@ public class ManualAthensThread extends BaseThread {
      * 导出excel的列名
      */
     private final String[] titleColumns = {"序号", "发票代码", "发票号码", "发票类型","发票状态", "开票日期","购方名称", "销方名称", "金额", "税额",
-            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号","报账人", "所属组织"};
+            "抵扣税额", "签收状态", "签收日期", "签收方式",  "签收人","凭证号", "过账时间", "影像号", "账期", "报账单号", "报账人","所属组织"};
+
 
     /**
      * 导出excel的列名
@@ -131,7 +132,6 @@ public class ManualAthensThread extends BaseThread {
                 JSONObject prams = JSONObject.parseObject(condition);
                 String businessCode = prams.getString("businessCode");
                 String bzdh = prams.getString("bzdh");
-                String bzr = prams.getString("bzr");
                 String company = prams.getString("company");
                 String companyCode = prams.getString("companyCode");
                 String keyWord = prams.getString("keyWord");
@@ -147,6 +147,7 @@ public class ManualAthensThread extends BaseThread {
                 String cjksyf = prams.getString("cjksyf");
                 String cjjsyf = prams.getString("cjjsyf");
                 String gfTaxNo = prams.getString("gfTaxNo");
+                String bzr = prams.getString("bzr");
                 String inAccountStatus = prams.getString("inAccountStatus");
                 String inAccountMonth = prams.getString("inAccountMonth");
                 JSONArray companyCodeArray = prams.getJSONArray("companyCodes");

dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java

@@ -59,7 +59,8 @@ public class RzFpxxExportThread extends BaseThread {
      */
     private String[] titleColumns =
         {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称", "销方税号", "金额", "税额", "抵扣税额", "发票状态", "签收状态",
-            "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","报账单号","入账状态","所属组织"};
+            "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态", "认证类型", "认证人", "税款所属期", "撤销认证处理状态",
+                "业务单元","报账单号","报账人","入账状态","所属组织"};
 
     private final IExcelExportlogService exportLogService;
 
@@ -133,6 +134,8 @@ public class RzFpxxExportThread extends BaseThread {
                 String company = prams.getString("company");
                 String menuId = prams.getString("menuId");
                 String companyCode = prams.getString("companyCode");
+                String bzdh = prams.getString("bzdh");
+                String bzr = prams.getString("bzr");
                 JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId);
                 List<Business> businesses = (List<Business>)prams.get("userBusiness");
                 String inAccountStatus = prams.getString("inAccountStatus");
@@ -145,6 +148,8 @@ public class RzFpxxExportThread extends BaseThread {
                 pramsMap.put("paymentDateEnd", prams.getString("paymentDateEnd"));
                 pramsMap.put("paymentStatus", prams.getString("paymentStatus"));
                 pramsMap.put("voucherNumber", prams.getString("voucherNumber"));
+                pramsMap.put("bzdh",bzdh);
+                pramsMap.put("bzr",bzr);
 
                 List<String> gfshList = new ArrayList<>();
                 if (!StringHelper.isBlank(gfsh)) {
@@ -234,7 +239,7 @@ public class RzFpxxExportThread extends BaseThread {
                 if (StringUtils.isNotBlank(inAccountStatus)) {
                     titleColumns = new String[] {"序号", "打款状态", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称",
                         "销方税号", "金额", "税额", "抵扣税额", "发票状态", "签收状态", "签收日期", "签收方式", "签收人", "认证时间", "认证状态", "认证处理状态",
-                        "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","报账单号","入账状态","所属组织"};
+                        "认证类型", "认证人", "税款所属期", "撤销认证处理状态", "业务单元","报账单号","报账人","入账状态","所属组织"};
                 }
                 if ("1".equals(prams.getString("payment"))) {
                     titleColumns = new String[] {"序号", "发票代码", "发票号码", "发票类型", "开票日期", "购方名称", "购方税号", "销方名称", "销方税号",

dxhy-core/src/main/resources/mapper/FpZhMapper.xml

@@ -36,6 +36,7 @@
         <result column="voucher_number" property="voucherNumber"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="bzr" property="bzr"/>
         <result column="inAccountStatus" property="inAccountStatus"/>
         <result column="compCode" property="compCode"/>
     </resultMap>
@@ -83,7 +84,7 @@
         select
         t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no
         gfsh,t.gf_name
-        gfmc,t.dept_id deptId,t.dept_name deptName,
+        gfmc,t.dept_id deptId,t.dept_name deptName,t.bzdh,t.bzr
         t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,
         date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date, '%Y-%m-%d')
         qs_date,t.rzh_type,