Merge branch 'v24.2_company_owner_20240902' of…

performance-api/src/main/java/com/clx/performance/vo/pc/OwnerCaseOutVO.java

@@ -67,6 +67,11 @@ public class OwnerCaseOutVO {
      */
     @ApiModelProperty(value = "操作人")
     private String createBy;
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
     /**
      * 付款时间
      */
@@ -103,4 +108,4 @@ public class OwnerCaseOutVO {
     @ApiModelProperty(value = "修改时间")
     private String modifiedTime;
 
-}
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/pc/OwnerTopUpVO.java

@@ -75,6 +75,11 @@ public class OwnerTopUpVO {
      */
     @ApiModelProperty(value = "操作人")
     private String createBy;
+    /**
+     * 公司名称
+     */
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
     /**
      * 审批时间
      */
@@ -97,4 +102,4 @@ public class OwnerTopUpVO {
     @ApiModelProperty(value = "收款人账户账号")
     private String accountNumber;
 
-}
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OwnerCaseOut.java

@@ -71,6 +71,11 @@ public class OwnerCaseOut implements HasKey<Integer> {
      */
     @TableField("create_by")
     private String createBy;
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
+    private String companyName;
     /**
      * 付款时间
      */
@@ -118,4 +123,4 @@ public class OwnerCaseOut implements HasKey<Integer> {
     public Integer gainKey() {
         return id;
     }
-}
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OwnerTopUp.java

@@ -79,6 +79,11 @@ public class OwnerTopUp implements HasKey<Integer> {
      */
     @TableField("create_by")
     private String createBy;
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
+    private String companyName;
     /**
      * 审批时间
      */
@@ -130,4 +135,4 @@ public class OwnerTopUp implements HasKey<Integer> {
     public Integer gainKey() {
         return id;
     }
-}
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -185,7 +185,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         entity.setDrawingBank(param.getDrawingBank());
         entity.setDrawingBankNumber(param.getDrawingBankNumber());
         entity.setDrawingProof(param.getDrawingProof());
-        entity.setCreateBy(loginUserInfo.getCompanyName());
+        entity.setCreateBy(loginUserInfo.getUserName());
+        entity.setCompanyName(loginUserInfo.getCompanyName());
         entity.setEnterpriseName(param.getEnterpriseName());
         entity.setOpenAccountBank(param.getOpenAccountBank());
         entity.setOpenAccountBankNumber(param.getOpenAccountBankNumber());
@@ -258,7 +259,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 entity.setStatus(OwnerAccountEnum.CaseOutStatus.PENDING_PAYMENT.getCode());
                 entity.setCaseOutBank(param.getOwnerOpenBank());
                 entity.setCaseOutBankNumber(param.getOwnerBankAccount());
-                entity.setCreateBy(loginUserInfo.getCompanyName());
+                entity.setCreateBy(loginUserInfo.getUserName());
+                entity.setCompanyName(loginUserInfo.getCompanyName());
 
                 ownerCaseOutDao.saveEntity(entity);
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerCaseOutProvider.java

@@ -12,7 +12,7 @@ public class OwnerCaseOutProvider {
     public String ownerCaseOutPageList(@Param("param") PageOwnerCaseOutListParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
-                    " a.case_out_no, a.case_out_balance, a.account_type, " +
+                    " a.case_out_no, a.case_out_balance, a.account_type,a.company_name, " +
                     " a.status,a.case_out_bank,a.case_out_bank_number,date_format(a.payment_time, '%Y-%m-%d %H:%i:%s') as payment_time,a.create_by,a.platform_payment_bank_number,a.platform_payment_bank,a.payment_by,a.payment_proof,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
             FROM("owner_case_out a");
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerTopUpProvider.java

@@ -12,7 +12,7 @@ public class OwnerTopUpProvider {
     public String ownerTopUpPageList(@Param("param") PageOwnerTopUpListParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
-                    " a.top_up_no, a.top_up_balance, a.account_type, " +
+                    " a.top_up_no, a.top_up_balance, a.account_type,a.company_name, " +
                     " a.status,a.drawing_bank,a.enterprise_name,a.account_number,a.drawing_bank_number,a.drawing_proof,date_format(a.approval_time, '%Y-%m-%d %H:%i:%s') as approval_time,a.approval_by,a.approval_turn_down,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.modified_time");
             FROM("owner_top_up a");
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {