【线上来佣比对】

查询全部2-公司，分公司，没有显示

yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java

@@ -401,9 +401,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
             }
             if (null != comeCommissionVO.getYdBranchId()) {
                 insurerBranch = aclInsurerBranchMap.get(Long.valueOf(comeCommissionVO.getYdBranchId()));
-                comeCommissionVO.setYdBrachName(insurerBranch != null ? insurerBranch.getBranchName() : "总公司直属");
+                comeCommissionVO.setYdBranchName(insurerBranch != null ? insurerBranch.getBranchName() : "总公司直属");
             } else {
-                comeCommissionVO.setYdBrachName("总公司直属");
+                comeCommissionVO.setYdBranchName("总公司直属");
             }
         }
     }
@@ -557,9 +557,9 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
                 buf.append("\t").append(info.getCommissionYear()).append("\t").append(CSV_COLUMN_SEPARATOR);
                 buf.append("\t").append(info.getCommissionTime()).append("\t").append(CSV_COLUMN_SEPARATOR);
                 buf.append("\t").append(info.getCheckDate()).append("\t").append(CSV_COLUMN_SEPARATOR);
-                buf.append(info.getYdBrachName()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getYdBranchName()).append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getInsurerName()).append(CSV_COLUMN_SEPARATOR);
-                buf.append(info.getInsurerBrachName()).append(CSV_COLUMN_SEPARATOR);
+                buf.append(info.getInsurerBranchName()).append(CSV_COLUMN_SEPARATOR);
                 buf.append("\t").append(info.getPolicyNo()).append("\t").append(CSV_COLUMN_SEPARATOR);
                 buf.append(info.getOrderPrice()).append(CSV_COLUMN_SEPARATOR);
 

yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/ComeCommissionVO.java

@@ -4,7 +4,6 @@ import org.apache.commons.lang.StringUtils;
 
 public class ComeCommissionVO {
     private Long orderId;
-    private String ydBranchId;//银盾出单机构
     private String checkDate;//比对日期
     private String insurerName;//保险公司
     private String planName;//购买方案
@@ -36,11 +35,11 @@ public class ComeCommissionVO {
     private String commissionItem;//佣金项目(1:销售拥金;2:销售奖金;3:销售津贴;4:续期佣金;5:服务津贴;等等)
     private String commissionItemName;
 
-    private String insurerBrachId;
-    private String insurerBrachName;
+    private String insurerBranchId;
+    private String insurerBranchName;
 
-    private Long ydBrachId;//银盾出单机构id
-    private String ydBrachName;//银盾出单机构
+    private Long ydBranchId;//银盾出单机构id
+    private String ydBranchName;//银盾出单机构
 
     private String s3SubordinateSystemName;//s3所属体系名称
     private String s2SubordinateSystemName;//s2所属体系名称
@@ -57,13 +56,6 @@ public class ComeCommissionVO {
         this.orderId = orderId;
     }
 
-    public String getYdBranchId() {
-        return ydBranchId;
-    }
-
-    public void setYdBranchId(String ydBranchId) {
-        this.ydBranchId = ydBranchId;
-    }
 
     public String getCheckDate() {
         if (StringUtils.isBlank(checkDate)) {
@@ -317,34 +309,23 @@ public class ComeCommissionVO {
         this.commissionItemName = commissionItemName;
     }
 
-    public String getInsurerBrachId() {
-        return insurerBrachId;
-    }
-
-    public void setInsurerBrachId(String insurerBrachId) {
-        this.insurerBrachId = insurerBrachId;
+    public String getInsurerBranchId() {
+        return insurerBranchId;
     }
 
-    public String getInsurerBrachName() {
-        if (StringUtils.isBlank(insurerBrachName)) {
-            return StringUtils.EMPTY;
-        }
-        return insurerBrachName;
-    }
-
-    public void setInsurerBrachName(String insurerBrachName) {
-        this.insurerBrachName = insurerBrachName;
+    public void setInsurerBranchId(String insurerBranchId) {
+        this.insurerBranchId = insurerBranchId;
     }
 
-    public String getYdBrachName() {
-        if (StringUtils.isBlank(ydBrachName)) {
+    public String getInsurerBranchName() {
+        if (StringUtils.isBlank(insurerBranchName)) {
             return StringUtils.EMPTY;
         }
-        return ydBrachName;
+        return insurerBranchName;
     }
 
-    public void setYdBrachName(String ydBrachName) {
-        this.ydBrachName = ydBrachName;
+    public void setInsurerBranchName(String insurerBranchName) {
+        this.insurerBranchName = insurerBranchName;
     }
 
     public String getS3SubordinateSystemName() {
@@ -380,14 +361,6 @@ public class ComeCommissionVO {
         this.subordinateSystemName = subordinateSystemName;
     }
 
-    public Long getYdBrachId() {
-        return ydBrachId;
-    }
-
-    public void setYdBrachId(Long ydBrachId) {
-        this.ydBrachId = ydBrachId;
-    }
-
     public Long getS1Id() {
         return s1Id;
     }
@@ -411,4 +384,23 @@ public class ComeCommissionVO {
     public void setS3Id(Long s3Id) {
         this.s3Id = s3Id;
     }
+
+    public Long getYdBranchId() {
+        return ydBranchId;
+    }
+
+    public void setYdBranchId(Long ydBranchId) {
+        this.ydBranchId = ydBranchId;
+    }
+
+    public String getYdBranchName() {
+        if (StringUtils.isBlank(ydBranchName)) {
+            return StringUtils.EMPTY;
+        }
+        return ydBranchName;
+    }
+
+    public void setYdBranchName(String ydBranchName) {
+        this.ydBranchName = ydBranchName;
+    }
 }

yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml

@@ -6,8 +6,8 @@
             resultType="com.yd.api.commission.vo.lifecommission.ComeCommissionVO">
         select
                 t.*,
-                ib.insurer_name insurerName,
-                ib.branch_name insurerBrachName,
+                i.name insurerName,
+                ib.branch_name insurerBranchName,
                 c.check_yearmonth checkDate,
                 IFNULL(a.name,p.name) planName,
 
@@ -62,6 +62,7 @@
                         left join ag_product_life_commission_base b on oc.commission_base_id = b.id
                 ) t
         left join ag_acl_insurer_branch ib on t.insurer_branch_id = ib.id
+        left join ag_acl_insurer i ON t.insurer_id = i.id
         left join ag_po_order_commission_check c on t.commission_check_id = c.id
         left join ag_product_plan a on t.plan_id = a.id
         left join ag_product p on t.product_id = p.id
@@ -211,6 +212,7 @@
                     left join ag_product_life_commission_base b on oc.commission_base_id = b.id
             ) t
         left join ag_acl_insurer_branch ib on t.insurer_branch_id = ib.id
+        left join ag_acl_insurer i ON t.insurer_id = i.id
         left join ag_po_order_commission_check c on t.commission_check_id = c.id
         left join ag_product_plan a on t.plan_id = a.id
         left join ag_product p on t.product_id = p.id