提交

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -240,7 +240,7 @@ public class BizCollectionController extends BaseController {
             detail.setContractDetailId(l.getId());
             detail.setContractId(l.getContractId());
             detail.setTenantId(getTenantId());
-            detail.setCustomerId(l.getCompanyId());
+            detail.setCompanyId(l.getCompanyId());
             detail.setCustomerName(bizArchiveInput.getCompanyName());
             detail.setTaskTypeName(l.getTaskTypeName());
             detail.setTaskTypeId(l.getTaskTypeId());

src/main/java/cn/ezhizao/project/business/collection/domain/BizCollectionDetail.java

@@ -32,7 +32,7 @@ public class BizCollectionDetail extends BaseEntity implements Serializable {
     private Long contractDetailId;
 
     @ApiModelProperty(value = "客户外键")
-    private Long customerId;
+    private Long companyId;
 
     @ApiModelProperty(value = "产品外键")
     private Long taskTypeId;

src/main/java/cn/ezhizao/project/business/collection/service/impl/BizCollectionServiceImpl.java

@@ -171,7 +171,7 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
                 detail.setContractDetailId(l.getId());
                 detail.setContractId(l.getContractId());
                 detail.setTenantId(tenantId);
-                detail.setCustomerId(company.getId());
+                detail.setCompanyId(company.getId());
                 detail.setTaskTypeId(l.getTaskTypeId());
                 if (i == contractDetails.size() - 1) {
                     detail.setArriveAmount(item.getContractAmount().subtract(remain));
@@ -201,7 +201,7 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
 //                detail.setContractDetailId(l.getId());
 //                detail.setContractId(l.getContractId());
 //                detail.setTenantId(tenantId);
-//                detail.setCustomerId(company.getId());
+//                detail.setcompanyId(company.getId());
 //                detail.setTaskTypeId(l.getTaskTypeId());
 //                details.add(detail);
 //            });
@@ -334,7 +334,7 @@ public class BizCollectionServiceImpl extends ServiceImpl<BizCollectionMapper, B
                 detail.setContractDetailId(l.getId());
                 detail.setContractId(l.getContractId());
                 detail.setTenantId(tenantId);
-                detail.setCustomerId(company.getId());
+                detail.setCompanyId(company.getId());
                 detail.setTaskTypeId(l.getTaskTypeId());
                 details.add(detail);
             });

src/main/java/cn/ezhizao/project/business/payment/domain/BizPaymentDetail.java

@@ -28,7 +28,7 @@ public class BizPaymentDetail extends BaseEntity {
     private Long contractDetailId;
 
     @ApiModelProperty(value = "客户外键")
-    private Long customerId;
+    private Long companyId;
 
     @ApiModelProperty(value = "产品外键")
     private Long taskTypeId;

src/main/resources/mybatis/business/BizCollectionDetailMapper.xml

@@ -22,7 +22,7 @@
         t1.collection_id,
         t1.collection_contract_id,
         t1.task_type_id,
-        t1.customer_id,
+        t1.company_id,
         t1.contract_id,
         t1.arrive_amount,
         t4.amount as amount,
@@ -36,7 +36,7 @@
         left join biz_collection c on c.id = t1.collection_id
         left join biz_task_type t2 on t2.id = t1.task_type_id
         LEFT JOIN
-        biz_company t3 on t1.customer_id = t3.id
+        biz_company t3 on t1.company_id = t3.id
         left join biz_archive_input_detail t4 on t4.id = t1.contract_detail_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 AND
@@ -65,8 +65,8 @@
             <if test="contractId != null  ">
                 t1.contract_id = #{contractId} AND
             </if>
-            <if test="customerId != null  ">
-                t1.customer_id = #{customerId} AND
+            <if test="companyId != null  ">
+                t1.company_id = #{companyId} AND
             </if>
             <if test="taskTypeId != null  ">
                 t1.task_type_id = #{taskTypeId} AND

src/main/resources/mybatis/business/BizPaymentDetailMapper.xml

@@ -49,8 +49,8 @@
         <if test="contractId != null">
             AND t1.contract_id = #{contractId}
         </if>
-        <if test="customerId != null">
-            AND t1.customer_id = #{customerId}
+        <if test="companyId != null">
+            AND t1.company_id = #{companyId}
         </if>
         <if test="buyNum != null">
             AND t1.buy_num = #{buyNum}