ccjgmwz 3 سال پیش
والد
کامیت
b2d85d133a

+ 3 - 3
pom.xml

@@ -184,9 +184,6 @@
             <properties>
                 <env>local</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
         <profile>
             <id>dev</id>
@@ -205,6 +202,9 @@
             <properties>
                 <env>prod</env>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 
         </profile>
     </profiles>

+ 3 - 2
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -1000,10 +1000,11 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellValue("卡号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(18);
-        cell.setCellValue("开户行");
+        cell.setCellValue("开户行");
         cell.setCellStyle(styleDetail);
 
         rownum++;
+        DecimalFormat decimalFormat=new DecimalFormat(".00");
         String compName = commonCompanyService.selectById(AuthSecurityUtils.getCurrentUserInfo().getCompId()).getCompName();
         // 详情信息
         if (org.apache.commons.collections.CollectionUtils.isNotEmpty(paymentManagement.getPaymentManagementList())) {
@@ -1063,7 +1064,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankCard()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(18);
-                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit()));
+                cell.setCellValue(editString(paymentManagement1.getIdentityAuthenticationInfo().getBankDeposit() + "-" +paymentManagement1.getIdentityAuthenticationInfo().getBankDepositBranch()));
                 cell.setCellStyle(styleDetail);
                 rownum++;
             }