diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
index 17d9a24e..a7bc7ef7 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
@@ -108,7 +108,8 @@ public class BdController extends DefaultController {
                 dbFiledVO.setPkBdinfo(dbFiledVO.getMdmId());
                 dbFiledVO.setBdcode(dbFiledVO.getMdmCode());
                 dbFiledVO.setBdname(dbFiledVO.getMdmName());
-                dbFiledVO.setTablepkname("id");
+//                dbFiledVO.setTablepkname("id");
+                dbFiledVO.setTablepkname(dbFiledVO.getTablepkname());
             }
 
             if (entity.getMdmName() != null) {
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
index 199a1414..68725379 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
@@ -28,13 +28,16 @@
 
             <if test="prop6 !=null and propValue6 != null">${prop6}=#{propValue6}</if>
 
-            <if test="prop7 !=null and propValue7 != null">and ${prop7}=#{propValue7}</if>
-            <if test="prop8 !=null and propValue8 != null">or ${prop8}=#{propValue8}</if>
+            <if test="prop7 !=null and prop7 !='' and propValue7 != null and propValue7 !=''">and ${prop7}=#{propValue7}</if>
+            <if test="prop8 !=null and prop8 !='' and propValue8 != null and propValue8 !=''">or ${prop8}=#{propValue8}</if>
             <if test="prop9 !=null and propValue9 != null">${prop9}=#{propValue9}</if>
             <if test="prop10 !=null and propValue10 != null">${prop10}=#{propValue10}</if>
         </trim>
     </select>
 
+    <!--
+
+    -->
     <select id="queryDataByMdmIdGroupBy" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map">
         select
         ${prop1} as bill_code,
@@ -188,8 +191,14 @@
             sealflag,
             dr,
             ts
-        FROM mdm_bd_vouchertype
+        FROM
+            mdm_bd_vouchertype
+        where
+            1=1
+            <if test="id != null and id != ''">AND id=#{id}</if>
     </select>
+
+
     <select id="queryBdCurrtype" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.BdCurrtypeVO" resultType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.BdCurrtypeVO">
         SELECT id,pk_currtype as pkCurrtype,code,name,currtypesign,dr,ts from mdm_bd_currtype
     </select>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java
index c299d501..d71de402 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/factor/service/impl/AeConfInfluenceFactorCorrelationServiceImpl.java
@@ -57,8 +57,8 @@ public class AeConfInfluenceFactorCorrelationServiceImpl extends BaseService<AeC
             Assert.notNull(factorCorrelation.getMdmName(), "影响因素关联保存时，主数据name不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
             Assert.notNull(factorCorrelation.getFactorId(), "影响因素关联保存时，影响因素id不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
             Assert.notNull(factorCorrelation.getFactorName(), "影响因素关联保存时，影响因素name不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
-            Assert.notNull(factorCorrelation.getMappingFieldId(), "影响因素关联保存时，映射字段id不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
-            Assert.notNull(factorCorrelation.getMappingFieldCode(), "影响因素关联保存时，映射字段code不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
+//            Assert.notNull(factorCorrelation.getMappingFieldId(), "影响因素关联保存时，映射字段id不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
+//            Assert.notNull(factorCorrelation.getMappingFieldCode(), "影响因素关联保存时，映射字段code不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
             Assert.notNull(factorCorrelation.getMappingFieldName(), "影响因素关联保存时，映射字段name不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
         }
         List<AeConfInfluenceFactorCorrelationEntity> saveList = new ArrayList<>();
@@ -81,8 +81,8 @@ public class AeConfInfluenceFactorCorrelationServiceImpl extends BaseService<AeC
             Assert.notNull(factorCorrelation.getMdmName(), "影响因素关联保存时，主数据name不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
             Assert.notNull(factorCorrelation.getFactorId(), "影响因素关联保存时，影响因素id不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
             Assert.notNull(factorCorrelation.getFactorName(), "影响因素关联保存时，影响因素name不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
-            Assert.notNull(factorCorrelation.getMappingFieldId(), "影响因素关联保存时，映射字段id不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
-            Assert.notNull(factorCorrelation.getMappingFieldCode(), "影响因素关联保存时，映射字段code不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
+//            Assert.notNull(factorCorrelation.getMappingFieldId(), "影响因素关联保存时，映射字段id不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
+//            Assert.notNull(factorCorrelation.getMappingFieldCode(), "影响因素关联保存时，映射字段code不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
             Assert.notNull(factorCorrelation.getMappingFieldName(), "影响因素关联保存时，映射字段name不能为空！检验数据为：{}", JSONUtil.toJsonStr(factorCorrelation));
         }
         List<AeConfInfluenceFactorCorrelationEntity> updateList = new ArrayList<>();
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
index d034e14c..f56931c7 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
@@ -18,186 +18,186 @@ public class AeConfSubjectContrastBEntity extends BaseEntity {
     /**
      * 对照表id
      */
-    private Long contrastId;
+    public Long contrastId;
     /**
      * 公司pk
      */
-    private String pkCorp;
-    private String glorgname;
+    public String pkCorp;
+    public String glorgname;
     /**
      * 目标档案id
      */
-    private String pkAccsubj;
+    public String pkAccsubj;
     /**
      * 目标档案值（会计科目)
      */
-    private String desdocvalue;
+    public String desdocvalue;
     /**
      * 来源档案表1
      */
-    private String factortable1;
+    public String factortable1;
     /**
      * 来源档案表2
      */
-    private String factortable2;
+    public String factortable2;
     /**
      * 来源档案表3
      */
-    private String factortable3;
+    public String factortable3;
     /**
      * 来源档案表4
      */
-    private String factortable4;
+    public String factortable4;
     /**
      * 来源档案表5
      */
-    private String factortable5;
+    public String factortable5;
     /**
      * 来源档案表6
      */
-    private String factortable6;
+    public String factortable6;
     /**
      * 来源档案表7
      */
-    private String factortable7;
+    public String factortable7;
     /**
      * 来源档案表8
      */
-    private String factortable8;
+    public String factortable8;
     /**
      * 来源档案表9
      */
-    private String factortable9;
+    public String factortable9;
     /**
      * 来源档案主键1
      */
-    private String factorpk1;
+    public String factorpk1;
     /**
      * 来源档案主键2
      */
-    private String factorpk2;
+    public String factorpk2;
     /**
      * 来源档案主键3
      */
-    private String factorpk3;
+    public String factorpk3;
     /**
      * 来源档案主键4
      */
-    private String factorpk4;
+    public String factorpk4;
     /**
      * 来源档案主键5
      */
-    private String factorpk5;
+    public String factorpk5;
     /**
      * 来源档案主键6
      */
-    private String factorpk6;
+    public String factorpk6;
     /**
      * 来源档案主键7
      */
-    private String factorpk7;
+    public String factorpk7;
     /**
      * 来源档案主键8
      */
-    private String factorpk8;
+    public String factorpk8;
     /**
      * 来源档案主键9
      */
-    private String factorpk9;
+    public String factorpk9;
     /**
      * 来源档案值1
      */
-    private String factorid1;
+    public String factorid1;
     /**
      * 来源档案值2
      */
-    private String factorid2;
+    public String factorid2;
     /**
      * 来源档案值3
      */
-    private String factorid3;
+    public String factorid3;
     /**
      * 来源档案值4
      */
-    private String factorid4;
+    public String factorid4;
     /**
      * 来源档案值5
      */
-    private String factorid5;
+    public String factorid5;
     /**
      * 来源档案值6
      */
-    private String factorid6;
+    public String factorid6;
     /**
      * 来源档案值7
      */
-    private String factorid7;
+    public String factorid7;
     /**
      * 来源档案值8
      */
-    private String factorid8;
+    public String factorid8;
     /**
      * 来源档案值9
      */
-    private String factorid9;
+    public String factorid9;
     /**
      * 来源档案名称1
      */
-    private String factorname1;
+    public String factorname1;
     /**
      * 来源档案名称2
      */
-    private String factorname2;
+    public String factorname2;
     /**
      * 来源档案名称3
      */
-    private String factorname3;
+    public String factorname3;
     /**
      * 来源档案名称4
      */
-    private String factorname4;
+    public String factorname4;
     /**
      * 来源档案名称5
      */
-    private String factorname5;
+    public String factorname5;
     /**
      * 来源档案名称6
      */
-    private String factorname6;
+    public String factorname6;
     /**
      * 来源档案名称7
      */
-    private String factorname7;
+    public String factorname7;
     /**
      * 来源档案名称8
      */
-    private String factorname8;
+    public String factorname8;
     /**
      * 来源档案名称9
      */
-    private String factorname9;
+    public String factorname9;
     /**
      * 备注
      */
-    private String remark;
-    private String def1;
-    private String def2;
-    private String def3;
-    private String def4;
-    private String def5;
-    private String def6;
-    private String def7;
-    private String def8;
-    private String def9;
-    private String def10;
+    public String remark;
+    public String def1;
+    public String def2;
+    public String def3;
+    public String def4;
+    public String def5;
+    public String def6;
+    public String def7;
+    public String def8;
+    public String def9;
+    public String def10;
     /**
      * 创建人
      */
-    private String createUser;
+    public String createUser;
     /**
      * 修改人
      */
-    private String modifyUser;
+    public String modifyUser;
 
 
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
index 90bdae1c..86e4652f 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
@@ -9,7 +9,7 @@
         <result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
         <result property="glorgname" column="glorgname" jdbcType="VARCHAR"/>
         <result property="desdocvalue" column="desdocvalue" jdbcType="VARCHAR"/>
-        <result property="pkAccsubj" column="pkAccsubj" jdbcType="VARCHAR"/>
+        <result property="pkAccsubj" column="pk_accsubj" jdbcType="VARCHAR"/>
         <result property="factortable1" column="factortable1" jdbcType="VARCHAR"/>
         <result property="factortable2" column="factortable2" jdbcType="VARCHAR"/>
         <result property="factortable3" column="factortable3" jdbcType="VARCHAR"/>
@@ -69,7 +69,7 @@
         ,contrast_id
         ,pk_corp 
         ,glorgname
-        ,pkAccsubj
+        ,pk_accsubj
         ,desdocvalue
         ,factortable1
         ,factortable2 
@@ -383,7 +383,7 @@
             <if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
             <if test="glorgname != null and glorgname != ''">glorgname ,</if>
             <if test="desdocvalue != null and desdocvalue != ''">desdocvalue ,</if>
-            <if test="pkAccsubj != null and pkAccsubj != ''">pkAccsubj ,</if>
+            <if test="pkAccsubj != null and pkAccsubj != ''">pk_accsubj ,</if>
             <if test="factortable1 != null and factortable1 != ''">factortable1 ,</if>
             <if test="factortable2 != null and factortable2 != ''">factortable2 ,</if>
             <if test="factortable3 != null and factortable3 != ''">factortable3 ,</if>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java
index 0b61f92f..630269d9 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java
@@ -45,6 +45,9 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService<AeConfSubject
         AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity();
         aeConfSubjectContrastBEntity.setContrastId(entity.getContrastId());
         List<AeConfSubjectContrastBEntity> query = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity);
+        for (AeConfSubjectContrastBEntity confSubjectContrastBEntity : query) {
+            transFactorname(confSubjectContrastBEntity);
+        }
         return query;
     }
 
@@ -75,6 +78,7 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService<AeConfSubject
         return all;
     }
 
+
     @Override
     public List<AeConfSubjectContrastBEntity> updateList(List<AeConfSubjectContrastBEntity> list) {
         if (list == null || list.size() == 0) {
@@ -100,9 +104,56 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService<AeConfSubject
 
     @Override
     public void deleteList(AeConfSubjectContrastBEntity entity) {
-            Assert.notNull(entity.getId(), "删除科目对照子表时，子表id不能为空");
-            aeConfSubjectContrastBDao.logicRemove(entity);
-        }
+        Assert.notNull(entity.getId(), "删除科目对照子表时，子表id不能为空");
+        aeConfSubjectContrastBDao.logicRemove(entity);
+    }
 
+    private void transFactorname(AeConfSubjectContrastBEntity bEntity) {
+        // 处理factorid1和factorname1
+        String factorid1 = bEntity.getFactorid1();
+        if (factorid1 != null) {
+            bEntity.setFactorname1(factorid1 + "-" + bEntity.getFactorname1());
+        }
+        // 处理factorid2和factorname2
+        String factorid2 = bEntity.getFactorid2();
+        if (factorid2 != null) {
+            bEntity.setFactorname2(factorid2 + "-" + bEntity.getFactorname2());
+        }
+        // 处理factorid3和factorname3
+        String factorid3 = bEntity.getFactorid3();
+        if (factorid3 != null) {
+            bEntity.setFactorname3(factorid3 + "-" + bEntity.getFactorname3());
+        }
+        // 处理factorid4和factorname4
+        String factorid4 = bEntity.getFactorid4();
+        if (factorid4 != null) {
+            bEntity.setFactorname4(factorid4 + "-" + bEntity.getFactorname4());
+        }
+        // 处理factorid5和factorname5
+        String factorid5 = bEntity.getFactorid5();
+        if (factorid5 != null) {
+            bEntity.setFactorname5(factorid5 + "-" + bEntity.getFactorname5());
+        }
+        // 处理factorid6和factorname6
+        String factorid6 = bEntity.getFactorid6();
+        if (factorid6 != null) {
+            bEntity.setFactorname6(factorid6 + "-" + bEntity.getFactorname6());
+        }
+        // 处理factorid7和factorname7
+        String factorid7 = bEntity.getFactorid7();
+        if (factorid7 != null) {
+            bEntity.setFactorname7(factorid7 + "-" + bEntity.getFactorname7());
+        }
+        // 处理factorid8和factorname8
+        String factorid8 = bEntity.getFactorid8();
+        if (factorid8 != null) {
+            bEntity.setFactorname8(factorid8 + "-" + bEntity.getFactorname8());
+        }
+        // 处理factorid9和factorname9
+        String factorid9 = bEntity.getFactorid9();
+        if (factorid9 != null) {
+            bEntity.setFactorname9(factorid9 + "-" + bEntity.getFactorname9());
+        }
+    }
 
 }
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
index ba147a88..129a777b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
@@ -3,7 +3,9 @@ package com.hzya.frame.voucher.ae.comf.subject.service.impl;
 import cn.hutool.core.lang.Assert;
 import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity;
 import com.hzya.frame.voucher.ae.comf.factor.service.IAeConfInfluenceFactorService;
+import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectClassificationDao;
 import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
 import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity;
 import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
 import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastDao;
@@ -38,6 +40,8 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
     private IAeConfSubjectContrastBDao aeConfSubjectContrastBDao;
     @Autowired
     private IAeConfInfluenceFactorService iAeConfInfluenceFactorService;
+    @Autowired
+    private IAeConfSubjectClassificationDao aeConfSubjectClassificationDao;
 
     @Override
     public List<AeConfSubjectContrastEntity> queryAll(AeConfSubjectContrastEntity entity) {
@@ -48,6 +52,9 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
             AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity();
             aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(confSubjectContrastEntity.getId()));
             List<AeConfSubjectContrastBEntity> aeConfSubjectContrastBEntityList = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity);
+            for (AeConfSubjectContrastBEntity confSubjectContrastBEntity : aeConfSubjectContrastBEntityList) {
+                transFactorname(confSubjectContrastBEntity);
+            }
             confSubjectContrastEntity.setContrastBEntityList(aeConfSubjectContrastBEntityList);
         }
         return aeConfSubjectContrastEntityList;
@@ -136,6 +143,7 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
      */
     @Override
     public AeConfSubjectContrastEntity updateEntity(AeConfSubjectContrastEntity entity) throws Exception {
+        String id = entity.getId();
         Assert.notNull(entity.getId(), "科目对照表修改时，科目对照表id不能为空！");
         AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity();
         aeConfSubjectContrastEntity.setId(entity.getId());
@@ -144,7 +152,19 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
             Assert.state(false, "科目对照表修改时，科目对照表id：{}，未查询到科目对照！", entity.getId());
         }
         deleteEntity(entity);
-        saveEntity(entity);
+        AeConfSubjectContrastEntity aeConfSubjectContrastEntity1 = saveEntity(entity);
+
+        //更新分类定义
+        AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity = new AeConfSubjectClassificationEntity();
+        aeConfSubjectClassificationEntity.setContrastId(id);
+        List<AeConfSubjectClassificationEntity> aeConfSubjectClassificationEntityList = aeConfSubjectClassificationDao.query(aeConfSubjectClassificationEntity);
+        for (AeConfSubjectClassificationEntity confSubjectClassificationEntity : aeConfSubjectClassificationEntityList) {
+            confSubjectClassificationEntity.setContrastId(aeConfSubjectContrastEntity1.getId());
+            confSubjectClassificationEntity.setContrastCode(aeConfSubjectContrastEntity1.getCode());
+            confSubjectClassificationEntity.setContrastName(aeConfSubjectContrastEntity1.getName());
+            aeConfSubjectClassificationDao.update(confSubjectClassificationEntity);
+        }
+
         return null;
     }
 
@@ -199,4 +219,52 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
         }
         return query;
     }
+
+    private void transFactorname(AeConfSubjectContrastBEntity bEntity) {
+        // 处理factorid1和factorname1
+        String factorid1 = bEntity.getFactorid1();
+        if (factorid1 != null) {
+            bEntity.setFactorname1(factorid1 + "-" + bEntity.getFactorname1());
+        }
+        // 处理factorid2和factorname2
+        String factorid2 = bEntity.getFactorid2();
+        if (factorid2 != null) {
+            bEntity.setFactorname2(factorid2 + "-" + bEntity.getFactorname2());
+        }
+        // 处理factorid3和factorname3
+        String factorid3 = bEntity.getFactorid3();
+        if (factorid3 != null) {
+            bEntity.setFactorname3(factorid3 + "-" + bEntity.getFactorname3());
+        }
+        // 处理factorid4和factorname4
+        String factorid4 = bEntity.getFactorid4();
+        if (factorid4 != null) {
+            bEntity.setFactorname4(factorid4 + "-" + bEntity.getFactorname4());
+        }
+        // 处理factorid5和factorname5
+        String factorid5 = bEntity.getFactorid5();
+        if (factorid5 != null) {
+            bEntity.setFactorname5(factorid5 + "-" + bEntity.getFactorname5());
+        }
+        // 处理factorid6和factorname6
+        String factorid6 = bEntity.getFactorid6();
+        if (factorid6 != null) {
+            bEntity.setFactorname6(factorid6 + "-" + bEntity.getFactorname6());
+        }
+        // 处理factorid7和factorname7
+        String factorid7 = bEntity.getFactorid7();
+        if (factorid7 != null) {
+            bEntity.setFactorname7(factorid7 + "-" + bEntity.getFactorname7());
+        }
+        // 处理factorid8和factorname8
+        String factorid8 = bEntity.getFactorid8();
+        if (factorid8 != null) {
+            bEntity.setFactorname8(factorid8 + "-" + bEntity.getFactorname8());
+        }
+        // 处理factorid9和factorname9
+        String factorid9 = bEntity.getFactorid9();
+        if (factorid9 != null) {
+            bEntity.setFactorname9(factorid9 + "-" + bEntity.getFactorname9());
+        }
+    }
 }