广脉：1、重构科目对照表子表

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectContrastBDao.java

@@ -7,7 +7,7 @@ import com.hzya.frame.basedao.dao.IBaseDao;
  * 会计事项(accounting_event)-配置-科目对照_子表(ae_conf_subject_contrast_b: table)表数据库访问层
  *
  * @author zydd
- * @since 2025-06-04 10:30:42
+ * @since 2025-06-05 15:13:29
  */
 public interface IAeConfSubjectContrastBDao extends IBaseDao<AeConfSubjectContrastBEntity, String> {
 

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectContrastBDaoImpl.java

@@ -8,7 +8,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao;
  * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表数据库访问层
  *
  * @author zydd
- * @since 2025-06-04 10:30:42
+ * @since 2025-06-05 15:13:29
  */
 @Repository
 public class AeConfSubjectContrastBDaoImpl extends MybatisGenericDao<AeConfSubjectContrastBEntity, String> implements IAeConfSubjectContrastBDao{

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java

@@ -1,70 +1,76 @@
 package com.hzya.frame.voucher.ae.comf.subject.entity;
 
 import java.util.Date;
-
 import com.hzya.frame.web.entity.BaseEntity;
-import lombok.Data;
-
 /**
  * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)实体类
  *
  * @author zydd
- * @since 2025-06-04 10:30:42
+ * @since 2025-06-05 15:13:29
  */
-@Data
 public class AeConfSubjectContrastBEntity extends BaseEntity {
  
-    /**
-     * 对照表id
-     */
+  /**  对照表id */
    private Long contrastId;
-    /**
-     * 公司pk
-     */
+  /**  公司pk */
    private String pkCorp;
-    /**
-     * 目标档案值（会计科目)
-     */
+  /**  目标档案值（会计科目) */
    private String desdocvalue;
-    /**
-     * 来源档案值1
-     */
-    private String factorvalue1;
-    /**
-     * 来源档案值2
-     */
-    private String factorvalue2;
-    /**
-     * 来源档案值3
-     */
-    private String factorvalue3;
-    /**
-     * 来源档案值4
-     */
-    private String factorvalue4;
-    /**
-     * 来源档案值5
-     */
-    private String factorvalue5;
-    /**
-     * 来源档案值6
-     */
-    private String factorvalue6;
-    /**
-     * 来源档案值7
-     */
-    private String factorvalue7;
-    /**
-     * 来源档案值8
-     */
-    private String factorvalue8;
-    /**
-     * 来源档案值9
-     */
-    private String factorvalue9;
-    /**
-     * 备注
-     */
+  /**  来源档案表1 */
+   private String factortable1;
+  /**  来源档案表2 */
+   private String factortable2;
+  /**  来源档案表3 */
+   private String factortable3;
+  /**  来源档案表4 */
+   private String factortable4;
+  /**  来源档案表5 */
+   private String factortable5;
+  /**  来源档案表6 */
+   private String factortable6;
+  /**  来源档案表7 */
+   private String factortable7;
+  /**  来源档案表8 */
+   private String factortable8;
+  /**  来源档案表9 */
+   private String factortable9;
+  /**  来源档案主键1 */
+   private String factorpk1;
+  /**  来源档案主键2 */
+   private String factorpk2;
+  /**  来源档案主键3 */
+   private String factorpk3;
+  /**  来源档案主键4 */
+   private String factorpk4;
+  /**  来源档案主键5 */
+   private String factorpk5;
+  /**  来源档案主键6 */
+   private String factorpk6;
+  /**  来源档案主键7 */
+   private String factorpk7;
+  /**  来源档案主键8 */
+   private String factorpk8;
+  /**  来源档案主键9 */
+   private String factorpk9;
+  /**  来源档案值1 */
+   private String factorid1;
+  /**  来源档案值2 */
+   private String factorid2;
+  /**  来源档案值3 */
+   private String factorid3;
+  /**  来源档案值4 */
+   private String factorid4;
+  /**  来源档案值5 */
+   private String factorid5;
+  /**  来源档案值6 */
+   private String factorid6;
+  /**  来源档案值7 */
+   private String factorid7;
+  /**  来源档案值8 */
+   private String factorid8;
+  /**  来源档案值9 */
+   private String factorid9;
+  /**  备注 */
    private String remark;
  private String def1;
  private String def2;
@@ -76,15 +82,355 @@ public class AeConfSubjectContrastBEntity extends BaseEntity {
  private String def8;
  private String def9;
  private String def10;
-    /**
-     * 创建人
-     */
+  /**  创建人 */
    private String createUser;
-    /**
-     * 修改人
-     */
+  /**  修改人 */
    private String modifyUser;
 
 
+    public Long getContrastId() {
+        return contrastId;
+    }
+
+    public void setContrastId(Long contrastId) {
+        this.contrastId = contrastId;
+    }
+
+    public String getPkCorp() {
+        return pkCorp;
+    }
+
+    public void setPkCorp(String pkCorp) {
+        this.pkCorp = pkCorp;
+    }
+
+    public String getDesdocvalue() {
+        return desdocvalue;
+    }
+
+    public void setDesdocvalue(String desdocvalue) {
+        this.desdocvalue = desdocvalue;
+    }
+
+    public String getFactortable1() {
+        return factortable1;
+    }
+
+    public void setFactortable1(String factortable1) {
+        this.factortable1 = factortable1;
+    }
+
+    public String getFactortable2() {
+        return factortable2;
+    }
+
+    public void setFactortable2(String factortable2) {
+        this.factortable2 = factortable2;
+    }
+
+    public String getFactortable3() {
+        return factortable3;
+    }
+
+    public void setFactortable3(String factortable3) {
+        this.factortable3 = factortable3;
+    }
+
+    public String getFactortable4() {
+        return factortable4;
+    }
+
+    public void setFactortable4(String factortable4) {
+        this.factortable4 = factortable4;
+    }
+
+    public String getFactortable5() {
+        return factortable5;
+    }
+
+    public void setFactortable5(String factortable5) {
+        this.factortable5 = factortable5;
+    }
+
+    public String getFactortable6() {
+        return factortable6;
+    }
+
+    public void setFactortable6(String factortable6) {
+        this.factortable6 = factortable6;
+    }
+
+    public String getFactortable7() {
+        return factortable7;
+    }
+
+    public void setFactortable7(String factortable7) {
+        this.factortable7 = factortable7;
+    }
+
+    public String getFactortable8() {
+        return factortable8;
+    }
+
+    public void setFactortable8(String factortable8) {
+        this.factortable8 = factortable8;
+    }
+
+    public String getFactortable9() {
+        return factortable9;
+    }
+
+    public void setFactortable9(String factortable9) {
+        this.factortable9 = factortable9;
+    }
+
+    public String getFactorpk1() {
+        return factorpk1;
+    }
+
+    public void setFactorpk1(String factorpk1) {
+        this.factorpk1 = factorpk1;
+    }
+
+    public String getFactorpk2() {
+        return factorpk2;
+    }
+
+    public void setFactorpk2(String factorpk2) {
+        this.factorpk2 = factorpk2;
+    }
+
+    public String getFactorpk3() {
+        return factorpk3;
+    }
+
+    public void setFactorpk3(String factorpk3) {
+        this.factorpk3 = factorpk3;
+    }
+
+    public String getFactorpk4() {
+        return factorpk4;
+    }
+
+    public void setFactorpk4(String factorpk4) {
+        this.factorpk4 = factorpk4;
+    }
+
+    public String getFactorpk5() {
+        return factorpk5;
+    }
+
+    public void setFactorpk5(String factorpk5) {
+        this.factorpk5 = factorpk5;
+    }
+
+    public String getFactorpk6() {
+        return factorpk6;
+    }
+
+    public void setFactorpk6(String factorpk6) {
+        this.factorpk6 = factorpk6;
+    }
+
+    public String getFactorpk7() {
+        return factorpk7;
+    }
+
+    public void setFactorpk7(String factorpk7) {
+        this.factorpk7 = factorpk7;
+    }
+
+    public String getFactorpk8() {
+        return factorpk8;
+    }
+
+    public void setFactorpk8(String factorpk8) {
+        this.factorpk8 = factorpk8;
+    }
+
+    public String getFactorpk9() {
+        return factorpk9;
+    }
+
+    public void setFactorpk9(String factorpk9) {
+        this.factorpk9 = factorpk9;
+    }
+
+    public String getFactorid1() {
+        return factorid1;
+    }
+
+    public void setFactorid1(String factorid1) {
+        this.factorid1 = factorid1;
+    }
+
+    public String getFactorid2() {
+        return factorid2;
+    }
+
+    public void setFactorid2(String factorid2) {
+        this.factorid2 = factorid2;
+    }
+
+    public String getFactorid3() {
+        return factorid3;
+    }
+
+    public void setFactorid3(String factorid3) {
+        this.factorid3 = factorid3;
+    }
+
+    public String getFactorid4() {
+        return factorid4;
+    }
+
+    public void setFactorid4(String factorid4) {
+        this.factorid4 = factorid4;
+    }
+
+    public String getFactorid5() {
+        return factorid5;
+    }
+
+    public void setFactorid5(String factorid5) {
+        this.factorid5 = factorid5;
+    }
+
+    public String getFactorid6() {
+        return factorid6;
+    }
+
+    public void setFactorid6(String factorid6) {
+        this.factorid6 = factorid6;
+    }
+
+    public String getFactorid7() {
+        return factorid7;
+    }
+
+    public void setFactorid7(String factorid7) {
+        this.factorid7 = factorid7;
+    }
+
+    public String getFactorid8() {
+        return factorid8;
+    }
+
+    public void setFactorid8(String factorid8) {
+        this.factorid8 = factorid8;
+    }
+
+    public String getFactorid9() {
+        return factorid9;
+    }
+
+    public void setFactorid9(String factorid9) {
+        this.factorid9 = factorid9;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getDef1() {
+        return def1;
+    }
+
+    public void setDef1(String def1) {
+        this.def1 = def1;
+    }
+
+    public String getDef2() {
+        return def2;
+    }
+
+    public void setDef2(String def2) {
+        this.def2 = def2;
+    }
+
+    public String getDef3() {
+        return def3;
+    }
+
+    public void setDef3(String def3) {
+        this.def3 = def3;
+    }
+
+    public String getDef4() {
+        return def4;
+    }
+
+    public void setDef4(String def4) {
+        this.def4 = def4;
+    }
+
+    public String getDef5() {
+        return def5;
+    }
+
+    public void setDef5(String def5) {
+        this.def5 = def5;
+    }
+
+    public String getDef6() {
+        return def6;
+    }
+
+    public void setDef6(String def6) {
+        this.def6 = def6;
+    }
+
+    public String getDef7() {
+        return def7;
+    }
+
+    public void setDef7(String def7) {
+        this.def7 = def7;
+    }
+
+    public String getDef8() {
+        return def8;
+    }
+
+    public void setDef8(String def8) {
+        this.def8 = def8;
+    }
+
+    public String getDef9() {
+        return def9;
+    }
+
+    public void setDef9(String def9) {
+        this.def9 = def9;
+    }
+
+    public String getDef10() {
+        return def10;
+    }
+
+    public void setDef10(String def10) {
+        this.def10 = def10;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getModifyUser() {
+        return modifyUser;
+    }
+
+    public void setModifyUser(String modifyUser) {
+        this.modifyUser = modifyUser;
+    }
+
 }
 

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml

@@ -8,15 +8,33 @@
         <result property="contrastId" column="contrast_id" jdbcType="INTEGER"/>
         <result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
         <result property="desdocvalue" column="desdocvalue" jdbcType="VARCHAR"/>
-        <result property="factorvalue1" column="factorvalue1" jdbcType="VARCHAR"/>
-        <result property="factorvalue2" column="factorvalue2" jdbcType="VARCHAR"/>
-        <result property="factorvalue3" column="factorvalue3" jdbcType="VARCHAR"/>
-        <result property="factorvalue4" column="factorvalue4" jdbcType="VARCHAR"/>
-        <result property="factorvalue5" column="factorvalue5" jdbcType="VARCHAR"/>
-        <result property="factorvalue6" column="factorvalue6" jdbcType="VARCHAR"/>
-        <result property="factorvalue7" column="factorvalue7" jdbcType="VARCHAR"/>
-        <result property="factorvalue8" column="factorvalue8" jdbcType="VARCHAR"/>
-        <result property="factorvalue9" column="factorvalue9" jdbcType="VARCHAR"/>
+        <result property="factortable1" column="factortable1" jdbcType="VARCHAR"/>
+        <result property="factortable2" column="factortable2" jdbcType="VARCHAR"/>
+        <result property="factortable3" column="factortable3" jdbcType="VARCHAR"/>
+        <result property="factortable4" column="factortable4" jdbcType="VARCHAR"/>
+        <result property="factortable5" column="factortable5" jdbcType="VARCHAR"/>
+        <result property="factortable6" column="factortable6" jdbcType="VARCHAR"/>
+        <result property="factortable7" column="factortable7" jdbcType="VARCHAR"/>
+        <result property="factortable8" column="factortable8" jdbcType="VARCHAR"/>
+        <result property="factortable9" column="factortable9" jdbcType="VARCHAR"/>
+        <result property="factorpk1" column="factorpk1" jdbcType="VARCHAR"/>
+        <result property="factorpk2" column="factorpk2" jdbcType="VARCHAR"/>
+        <result property="factorpk3" column="factorpk3" jdbcType="VARCHAR"/>
+        <result property="factorpk4" column="factorpk4" jdbcType="VARCHAR"/>
+        <result property="factorpk5" column="factorpk5" jdbcType="VARCHAR"/>
+        <result property="factorpk6" column="factorpk6" jdbcType="VARCHAR"/>
+        <result property="factorpk7" column="factorpk7" jdbcType="VARCHAR"/>
+        <result property="factorpk8" column="factorpk8" jdbcType="VARCHAR"/>
+        <result property="factorpk9" column="factorpk9" jdbcType="VARCHAR"/>
+        <result property="factorid1" column="factorid1" jdbcType="VARCHAR"/>
+        <result property="factorid2" column="factorid2" jdbcType="VARCHAR"/>
+        <result property="factorid3" column="factorid3" jdbcType="VARCHAR"/>
+        <result property="factorid4" column="factorid4" jdbcType="VARCHAR"/>
+        <result property="factorid5" column="factorid5" jdbcType="VARCHAR"/>
+        <result property="factorid6" column="factorid6" jdbcType="VARCHAR"/>
+        <result property="factorid7" column="factorid7" jdbcType="VARCHAR"/>
+        <result property="factorid8" column="factorid8" jdbcType="VARCHAR"/>
+        <result property="factorid9" column="factorid9" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <result property="def1" column="def1" jdbcType="VARCHAR"/>
         <result property="def2" column="def2" jdbcType="VARCHAR"/>
@@ -40,15 +58,33 @@
         ,contrast_id
         ,pk_corp 
         ,desdocvalue 
-        ,factorvalue1 
-        ,factorvalue2 
-        ,factorvalue3 
-        ,factorvalue4 
-        ,factorvalue5 
-        ,factorvalue6 
-        ,factorvalue7 
-        ,factorvalue8 
-        ,factorvalue9 
+        ,factortable1 
+        ,factortable2 
+        ,factortable3 
+        ,factortable4 
+        ,factortable5 
+        ,factortable6 
+        ,factortable7 
+        ,factortable8 
+        ,factortable9 
+        ,factorpk1 
+        ,factorpk2 
+        ,factorpk3 
+        ,factorpk4 
+        ,factorpk5 
+        ,factorpk6 
+        ,factorpk7 
+        ,factorpk8 
+        ,factorpk9 
+        ,factorid1 
+        ,factorid2 
+        ,factorid3 
+        ,factorid4 
+        ,factorid5 
+        ,factorid6 
+        ,factorid7 
+        ,factorid8 
+        ,factorid9 
         ,remark 
         ,def1 
         ,def2 
@@ -77,15 +113,33 @@
             <if test="contrastId != null">and contrast_id = #{contrastId}</if>
             <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
             <if test="desdocvalue != null and desdocvalue != ''">and desdocvalue = #{desdocvalue}</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">and factorvalue1 = #{factorvalue1}</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">and factorvalue2 = #{factorvalue2}</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">and factorvalue3 = #{factorvalue3}</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">and factorvalue4 = #{factorvalue4}</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">and factorvalue5 = #{factorvalue5}</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">and factorvalue6 = #{factorvalue6}</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">and factorvalue7 = #{factorvalue7}</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">and factorvalue8 = #{factorvalue8}</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">and factorvalue9 = #{factorvalue9}</if>
+            <if test="factortable1 != null and factortable1 != ''">and factortable1 = #{factortable1}</if>
+            <if test="factortable2 != null and factortable2 != ''">and factortable2 = #{factortable2}</if>
+            <if test="factortable3 != null and factortable3 != ''">and factortable3 = #{factortable3}</if>
+            <if test="factortable4 != null and factortable4 != ''">and factortable4 = #{factortable4}</if>
+            <if test="factortable5 != null and factortable5 != ''">and factortable5 = #{factortable5}</if>
+            <if test="factortable6 != null and factortable6 != ''">and factortable6 = #{factortable6}</if>
+            <if test="factortable7 != null and factortable7 != ''">and factortable7 = #{factortable7}</if>
+            <if test="factortable8 != null and factortable8 != ''">and factortable8 = #{factortable8}</if>
+            <if test="factortable9 != null and factortable9 != ''">and factortable9 = #{factortable9}</if>
+            <if test="factorpk1 != null and factorpk1 != ''">and factorpk1 = #{factorpk1}</if>
+            <if test="factorpk2 != null and factorpk2 != ''">and factorpk2 = #{factorpk2}</if>
+            <if test="factorpk3 != null and factorpk3 != ''">and factorpk3 = #{factorpk3}</if>
+            <if test="factorpk4 != null and factorpk4 != ''">and factorpk4 = #{factorpk4}</if>
+            <if test="factorpk5 != null and factorpk5 != ''">and factorpk5 = #{factorpk5}</if>
+            <if test="factorpk6 != null and factorpk6 != ''">and factorpk6 = #{factorpk6}</if>
+            <if test="factorpk7 != null and factorpk7 != ''">and factorpk7 = #{factorpk7}</if>
+            <if test="factorpk8 != null and factorpk8 != ''">and factorpk8 = #{factorpk8}</if>
+            <if test="factorpk9 != null and factorpk9 != ''">and factorpk9 = #{factorpk9}</if>
+            <if test="factorid1 != null and factorid1 != ''">and factorid1 = #{factorid1}</if>
+            <if test="factorid2 != null and factorid2 != ''">and factorid2 = #{factorid2}</if>
+            <if test="factorid3 != null and factorid3 != ''">and factorid3 = #{factorid3}</if>
+            <if test="factorid4 != null and factorid4 != ''">and factorid4 = #{factorid4}</if>
+            <if test="factorid5 != null and factorid5 != ''">and factorid5 = #{factorid5}</if>
+            <if test="factorid6 != null and factorid6 != ''">and factorid6 = #{factorid6}</if>
+            <if test="factorid7 != null and factorid7 != ''">and factorid7 = #{factorid7}</if>
+            <if test="factorid8 != null and factorid8 != ''">and factorid8 = #{factorid8}</if>
+            <if test="factorid9 != null and factorid9 != ''">and factorid9 = #{factorid9}</if>
             <if test="remark != null and remark != ''">and remark = #{remark}</if>
             <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
             <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
@@ -115,15 +169,33 @@
             <if test="contrastId != null">and contrast_id = #{contrastId}</if>
             <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
             <if test="desdocvalue != null and desdocvalue != ''">and desdocvalue = #{desdocvalue}</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">and factorvalue1 = #{factorvalue1}</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">and factorvalue2 = #{factorvalue2}</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">and factorvalue3 = #{factorvalue3}</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">and factorvalue4 = #{factorvalue4}</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">and factorvalue5 = #{factorvalue5}</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">and factorvalue6 = #{factorvalue6}</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">and factorvalue7 = #{factorvalue7}</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">and factorvalue8 = #{factorvalue8}</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">and factorvalue9 = #{factorvalue9}</if>
+            <if test="factortable1 != null and factortable1 != ''">and factortable1 = #{factortable1}</if>
+            <if test="factortable2 != null and factortable2 != ''">and factortable2 = #{factortable2}</if>
+            <if test="factortable3 != null and factortable3 != ''">and factortable3 = #{factortable3}</if>
+            <if test="factortable4 != null and factortable4 != ''">and factortable4 = #{factortable4}</if>
+            <if test="factortable5 != null and factortable5 != ''">and factortable5 = #{factortable5}</if>
+            <if test="factortable6 != null and factortable6 != ''">and factortable6 = #{factortable6}</if>
+            <if test="factortable7 != null and factortable7 != ''">and factortable7 = #{factortable7}</if>
+            <if test="factortable8 != null and factortable8 != ''">and factortable8 = #{factortable8}</if>
+            <if test="factortable9 != null and factortable9 != ''">and factortable9 = #{factortable9}</if>
+            <if test="factorpk1 != null and factorpk1 != ''">and factorpk1 = #{factorpk1}</if>
+            <if test="factorpk2 != null and factorpk2 != ''">and factorpk2 = #{factorpk2}</if>
+            <if test="factorpk3 != null and factorpk3 != ''">and factorpk3 = #{factorpk3}</if>
+            <if test="factorpk4 != null and factorpk4 != ''">and factorpk4 = #{factorpk4}</if>
+            <if test="factorpk5 != null and factorpk5 != ''">and factorpk5 = #{factorpk5}</if>
+            <if test="factorpk6 != null and factorpk6 != ''">and factorpk6 = #{factorpk6}</if>
+            <if test="factorpk7 != null and factorpk7 != ''">and factorpk7 = #{factorpk7}</if>
+            <if test="factorpk8 != null and factorpk8 != ''">and factorpk8 = #{factorpk8}</if>
+            <if test="factorpk9 != null and factorpk9 != ''">and factorpk9 = #{factorpk9}</if>
+            <if test="factorid1 != null and factorid1 != ''">and factorid1 = #{factorid1}</if>
+            <if test="factorid2 != null and factorid2 != ''">and factorid2 = #{factorid2}</if>
+            <if test="factorid3 != null and factorid3 != ''">and factorid3 = #{factorid3}</if>
+            <if test="factorid4 != null and factorid4 != ''">and factorid4 = #{factorid4}</if>
+            <if test="factorid5 != null and factorid5 != ''">and factorid5 = #{factorid5}</if>
+            <if test="factorid6 != null and factorid6 != ''">and factorid6 = #{factorid6}</if>
+            <if test="factorid7 != null and factorid7 != ''">and factorid7 = #{factorid7}</if>
+            <if test="factorid8 != null and factorid8 != ''">and factorid8 = #{factorid8}</if>
+            <if test="factorid9 != null and factorid9 != ''">and factorid9 = #{factorid9}</if>
             <if test="remark != null and remark != ''">and remark = #{remark}</if>
             <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
             <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
@@ -156,33 +228,51 @@
             <if test="pkCorp != null and pkCorp != ''">and pk_corp like concat('%',#{pkCorp},'%')</if>
             <if test="desdocvalue != null and desdocvalue != ''">and desdocvalue like concat('%',#{desdocvalue},'%')
             </if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">and factorvalue1 like
-                concat('%',#{factorvalue1},'%')
+            <if test="factortable1 != null and factortable1 != ''">and factortable1 like
+                concat('%',#{factortable1},'%')
             </if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">and factorvalue2 like
-                concat('%',#{factorvalue2},'%')
+            <if test="factortable2 != null and factortable2 != ''">and factortable2 like
+                concat('%',#{factortable2},'%')
             </if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">and factorvalue3 like
-                concat('%',#{factorvalue3},'%')
+            <if test="factortable3 != null and factortable3 != ''">and factortable3 like
+                concat('%',#{factortable3},'%')
             </if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">and factorvalue4 like
-                concat('%',#{factorvalue4},'%')
+            <if test="factortable4 != null and factortable4 != ''">and factortable4 like
+                concat('%',#{factortable4},'%')
             </if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">and factorvalue5 like
-                concat('%',#{factorvalue5},'%')
+            <if test="factortable5 != null and factortable5 != ''">and factortable5 like
+                concat('%',#{factortable5},'%')
             </if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">and factorvalue6 like
-                concat('%',#{factorvalue6},'%')
+            <if test="factortable6 != null and factortable6 != ''">and factortable6 like
+                concat('%',#{factortable6},'%')
             </if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">and factorvalue7 like
-                concat('%',#{factorvalue7},'%')
+            <if test="factortable7 != null and factortable7 != ''">and factortable7 like
+                concat('%',#{factortable7},'%')
             </if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">and factorvalue8 like
-                concat('%',#{factorvalue8},'%')
+            <if test="factortable8 != null and factortable8 != ''">and factortable8 like
+                concat('%',#{factortable8},'%')
             </if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">and factorvalue9 like
-                concat('%',#{factorvalue9},'%')
+            <if test="factortable9 != null and factortable9 != ''">and factortable9 like
+                concat('%',#{factortable9},'%')
             </if>
+            <if test="factorpk1 != null and factorpk1 != ''">and factorpk1 like concat('%',#{factorpk1},'%')</if>
+            <if test="factorpk2 != null and factorpk2 != ''">and factorpk2 like concat('%',#{factorpk2},'%')</if>
+            <if test="factorpk3 != null and factorpk3 != ''">and factorpk3 like concat('%',#{factorpk3},'%')</if>
+            <if test="factorpk4 != null and factorpk4 != ''">and factorpk4 like concat('%',#{factorpk4},'%')</if>
+            <if test="factorpk5 != null and factorpk5 != ''">and factorpk5 like concat('%',#{factorpk5},'%')</if>
+            <if test="factorpk6 != null and factorpk6 != ''">and factorpk6 like concat('%',#{factorpk6},'%')</if>
+            <if test="factorpk7 != null and factorpk7 != ''">and factorpk7 like concat('%',#{factorpk7},'%')</if>
+            <if test="factorpk8 != null and factorpk8 != ''">and factorpk8 like concat('%',#{factorpk8},'%')</if>
+            <if test="factorpk9 != null and factorpk9 != ''">and factorpk9 like concat('%',#{factorpk9},'%')</if>
+            <if test="factorid1 != null and factorid1 != ''">and factorid1 like concat('%',#{factorid1},'%')</if>
+            <if test="factorid2 != null and factorid2 != ''">and factorid2 like concat('%',#{factorid2},'%')</if>
+            <if test="factorid3 != null and factorid3 != ''">and factorid3 like concat('%',#{factorid3},'%')</if>
+            <if test="factorid4 != null and factorid4 != ''">and factorid4 like concat('%',#{factorid4},'%')</if>
+            <if test="factorid5 != null and factorid5 != ''">and factorid5 like concat('%',#{factorid5},'%')</if>
+            <if test="factorid6 != null and factorid6 != ''">and factorid6 like concat('%',#{factorid6},'%')</if>
+            <if test="factorid7 != null and factorid7 != ''">and factorid7 like concat('%',#{factorid7},'%')</if>
+            <if test="factorid8 != null and factorid8 != ''">and factorid8 like concat('%',#{factorid8},'%')</if>
+            <if test="factorid9 != null and factorid9 != ''">and factorid9 like concat('%',#{factorid9},'%')</if>
             <if test="remark != null and remark != ''">and remark like concat('%',#{remark},'%')</if>
             <if test="def1 != null and def1 != ''">and def1 like concat('%',#{def1},'%')</if>
             <if test="def2 != null and def2 != ''">and def2 like concat('%',#{def2},'%')</if>
@@ -214,15 +304,33 @@
             <if test="contrastId != null">or contrast_id = #{contrastId}</if>
             <if test="pkCorp != null and pkCorp != ''">or pk_corp = #{pkCorp}</if>
             <if test="desdocvalue != null and desdocvalue != ''">or desdocvalue = #{desdocvalue}</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">or factorvalue1 = #{factorvalue1}</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">or factorvalue2 = #{factorvalue2}</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">or factorvalue3 = #{factorvalue3}</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">or factorvalue4 = #{factorvalue4}</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">or factorvalue5 = #{factorvalue5}</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">or factorvalue6 = #{factorvalue6}</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">or factorvalue7 = #{factorvalue7}</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">or factorvalue8 = #{factorvalue8}</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">or factorvalue9 = #{factorvalue9}</if>
+            <if test="factortable1 != null and factortable1 != ''">or factortable1 = #{factortable1}</if>
+            <if test="factortable2 != null and factortable2 != ''">or factortable2 = #{factortable2}</if>
+            <if test="factortable3 != null and factortable3 != ''">or factortable3 = #{factortable3}</if>
+            <if test="factortable4 != null and factortable4 != ''">or factortable4 = #{factortable4}</if>
+            <if test="factortable5 != null and factortable5 != ''">or factortable5 = #{factortable5}</if>
+            <if test="factortable6 != null and factortable6 != ''">or factortable6 = #{factortable6}</if>
+            <if test="factortable7 != null and factortable7 != ''">or factortable7 = #{factortable7}</if>
+            <if test="factortable8 != null and factortable8 != ''">or factortable8 = #{factortable8}</if>
+            <if test="factortable9 != null and factortable9 != ''">or factortable9 = #{factortable9}</if>
+            <if test="factorpk1 != null and factorpk1 != ''">or factorpk1 = #{factorpk1}</if>
+            <if test="factorpk2 != null and factorpk2 != ''">or factorpk2 = #{factorpk2}</if>
+            <if test="factorpk3 != null and factorpk3 != ''">or factorpk3 = #{factorpk3}</if>
+            <if test="factorpk4 != null and factorpk4 != ''">or factorpk4 = #{factorpk4}</if>
+            <if test="factorpk5 != null and factorpk5 != ''">or factorpk5 = #{factorpk5}</if>
+            <if test="factorpk6 != null and factorpk6 != ''">or factorpk6 = #{factorpk6}</if>
+            <if test="factorpk7 != null and factorpk7 != ''">or factorpk7 = #{factorpk7}</if>
+            <if test="factorpk8 != null and factorpk8 != ''">or factorpk8 = #{factorpk8}</if>
+            <if test="factorpk9 != null and factorpk9 != ''">or factorpk9 = #{factorpk9}</if>
+            <if test="factorid1 != null and factorid1 != ''">or factorid1 = #{factorid1}</if>
+            <if test="factorid2 != null and factorid2 != ''">or factorid2 = #{factorid2}</if>
+            <if test="factorid3 != null and factorid3 != ''">or factorid3 = #{factorid3}</if>
+            <if test="factorid4 != null and factorid4 != ''">or factorid4 = #{factorid4}</if>
+            <if test="factorid5 != null and factorid5 != ''">or factorid5 = #{factorid5}</if>
+            <if test="factorid6 != null and factorid6 != ''">or factorid6 = #{factorid6}</if>
+            <if test="factorid7 != null and factorid7 != ''">or factorid7 = #{factorid7}</if>
+            <if test="factorid8 != null and factorid8 != ''">or factorid8 = #{factorid8}</if>
+            <if test="factorid9 != null and factorid9 != ''">or factorid9 = #{factorid9}</if>
             <if test="remark != null and remark != ''">or remark = #{remark}</if>
             <if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
             <if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
@@ -253,15 +361,33 @@
             <if test="contrastId != null">contrast_id ,</if>
             <if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
             <if test="desdocvalue != null and desdocvalue != ''">desdocvalue ,</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">factorvalue1 ,</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">factorvalue2 ,</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">factorvalue3 ,</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">factorvalue4 ,</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">factorvalue5 ,</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">factorvalue6 ,</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">factorvalue7 ,</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">factorvalue8 ,</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">factorvalue9 ,</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>
+            <if test="factortable4 != null and factortable4 != ''">factortable4 ,</if>
+            <if test="factortable5 != null and factortable5 != ''">factortable5 ,</if>
+            <if test="factortable6 != null and factortable6 != ''">factortable6 ,</if>
+            <if test="factortable7 != null and factortable7 != ''">factortable7 ,</if>
+            <if test="factortable8 != null and factortable8 != ''">factortable8 ,</if>
+            <if test="factortable9 != null and factortable9 != ''">factortable9 ,</if>
+            <if test="factorpk1 != null and factorpk1 != ''">factorpk1 ,</if>
+            <if test="factorpk2 != null and factorpk2 != ''">factorpk2 ,</if>
+            <if test="factorpk3 != null and factorpk3 != ''">factorpk3 ,</if>
+            <if test="factorpk4 != null and factorpk4 != ''">factorpk4 ,</if>
+            <if test="factorpk5 != null and factorpk5 != ''">factorpk5 ,</if>
+            <if test="factorpk6 != null and factorpk6 != ''">factorpk6 ,</if>
+            <if test="factorpk7 != null and factorpk7 != ''">factorpk7 ,</if>
+            <if test="factorpk8 != null and factorpk8 != ''">factorpk8 ,</if>
+            <if test="factorpk9 != null and factorpk9 != ''">factorpk9 ,</if>
+            <if test="factorid1 != null and factorid1 != ''">factorid1 ,</if>
+            <if test="factorid2 != null and factorid2 != ''">factorid2 ,</if>
+            <if test="factorid3 != null and factorid3 != ''">factorid3 ,</if>
+            <if test="factorid4 != null and factorid4 != ''">factorid4 ,</if>
+            <if test="factorid5 != null and factorid5 != ''">factorid5 ,</if>
+            <if test="factorid6 != null and factorid6 != ''">factorid6 ,</if>
+            <if test="factorid7 != null and factorid7 != ''">factorid7 ,</if>
+            <if test="factorid8 != null and factorid8 != ''">factorid8 ,</if>
+            <if test="factorid9 != null and factorid9 != ''">factorid9 ,</if>
             <if test="remark != null and remark != ''">remark ,</if>
             <if test="def1 != null and def1 != ''">def1 ,</if>
             <if test="def2 != null and def2 != ''">def2 ,</if>
@@ -288,15 +414,33 @@
             <if test="contrastId != null">#{contrastId} ,</if>
             <if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
             <if test="desdocvalue != null and desdocvalue != ''">#{desdocvalue} ,</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">#{factorvalue1} ,</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">#{factorvalue2} ,</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">#{factorvalue3} ,</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">#{factorvalue4} ,</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">#{factorvalue5} ,</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">#{factorvalue6} ,</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">#{factorvalue7} ,</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">#{factorvalue8} ,</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">#{factorvalue9} ,</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>
+            <if test="factortable4 != null and factortable4 != ''">#{factortable4} ,</if>
+            <if test="factortable5 != null and factortable5 != ''">#{factortable5} ,</if>
+            <if test="factortable6 != null and factortable6 != ''">#{factortable6} ,</if>
+            <if test="factortable7 != null and factortable7 != ''">#{factortable7} ,</if>
+            <if test="factortable8 != null and factortable8 != ''">#{factortable8} ,</if>
+            <if test="factortable9 != null and factortable9 != ''">#{factortable9} ,</if>
+            <if test="factorpk1 != null and factorpk1 != ''">#{factorpk1} ,</if>
+            <if test="factorpk2 != null and factorpk2 != ''">#{factorpk2} ,</if>
+            <if test="factorpk3 != null and factorpk3 != ''">#{factorpk3} ,</if>
+            <if test="factorpk4 != null and factorpk4 != ''">#{factorpk4} ,</if>
+            <if test="factorpk5 != null and factorpk5 != ''">#{factorpk5} ,</if>
+            <if test="factorpk6 != null and factorpk6 != ''">#{factorpk6} ,</if>
+            <if test="factorpk7 != null and factorpk7 != ''">#{factorpk7} ,</if>
+            <if test="factorpk8 != null and factorpk8 != ''">#{factorpk8} ,</if>
+            <if test="factorpk9 != null and factorpk9 != ''">#{factorpk9} ,</if>
+            <if test="factorid1 != null and factorid1 != ''">#{factorid1} ,</if>
+            <if test="factorid2 != null and factorid2 != ''">#{factorid2} ,</if>
+            <if test="factorid3 != null and factorid3 != ''">#{factorid3} ,</if>
+            <if test="factorid4 != null and factorid4 != ''">#{factorid4} ,</if>
+            <if test="factorid5 != null and factorid5 != ''">#{factorid5} ,</if>
+            <if test="factorid6 != null and factorid6 != ''">#{factorid6} ,</if>
+            <if test="factorid7 != null and factorid7 != ''">#{factorid7} ,</if>
+            <if test="factorid8 != null and factorid8 != ''">#{factorid8} ,</if>
+            <if test="factorid9 != null and factorid9 != ''">#{factorid9} ,</if>
             <if test="remark != null and remark != ''">#{remark} ,</if>
             <if test="def1 != null and def1 != ''">#{def1} ,</if>
             <if test="def2 != null and def2 != ''">#{def2} ,</if>
@@ -309,10 +453,10 @@
             <if test="def9 != null and def9 != ''">#{def9} ,</if>
             <if test="def10 != null and def10 != ''">#{def10} ,</if>
             <if test="create_time != null">#{create_time} ,</if>
-            <if test="create_time == null">now() ,</if>
+            <if test="create_time != null">now() ,</if>
             <if test="createUser != null and createUser != ''">#{createUser} ,</if>
             <if test="modify_time != null">#{modify_time} ,</if>
-            <if test="modify_time == null">now() ,</if>
+            <if test="modify_time != null">now() ,</if>
             <if test="modifyUser != null and modifyUser != ''">#{modifyUser} ,</if>
             <if test="sts != null and sts != ''">#{sts} ,</if>
             <if test="sts == null ">'Y',</if>
@@ -321,38 +465,59 @@
     </insert>
     <!-- 批量新增 -->
     <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into ae_conf_subject_contrast_b(contrast_id, pk_corp, desdocvalue, factorvalue1, factorvalue2,
-        factorvalue3, factorvalue4, factorvalue5, factorvalue6, factorvalue7, factorvalue8, factorvalue9, remark, def1,
-        def2, def3, def4, def5, def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts,
-        sts)
+        insert into ae_conf_subject_contrast_b(contrast_id, pk_corp, desdocvalue, factortable1, factortable2,
+        factortable3, factortable4, factortable5, factortable6, factortable7, factortable8, factortable9, factorpk1,
+        factorpk2, factorpk3, factorpk4, factorpk5, factorpk6, factorpk7, factorpk8, factorpk9, factorid1, factorid2,
+        factorid3, factorid4, factorid5, factorid6, factorid7, factorid8, factorid9, remark, def1, def2, def3, def4,
+        def5, def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts, sts)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.contrastId},#{entity.pkCorp},#{entity.desdocvalue},#{entity.factorvalue1},#{entity.factorvalue2},#{entity.factorvalue3},#{entity.factorvalue4},#{entity.factorvalue5},#{entity.factorvalue6},#{entity.factorvalue7},#{entity.factorvalue8},#{entity.factorvalue9},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts},
+            (#{entity.contrastId},#{entity.pkCorp},#{entity.desdocvalue},#{entity.factortable1},#{entity.factortable2},#{entity.factortable3},#{entity.factortable4},#{entity.factortable5},#{entity.factortable6},#{entity.factortable7},#{entity.factortable8},#{entity.factortable9},#{entity.factorpk1},#{entity.factorpk2},#{entity.factorpk3},#{entity.factorpk4},#{entity.factorpk5},#{entity.factorpk6},#{entity.factorpk7},#{entity.factorpk8},#{entity.factorpk9},#{entity.factorid1},#{entity.factorid2},#{entity.factorid3},#{entity.factorid4},#{entity.factorid5},#{entity.factorid6},#{entity.factorid7},#{entity.factorid8},#{entity.factorid9},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},now(),#{entity.createUser},now(),#{entity.modifyUser},#{entity.sts},
             'Y')
         </foreach>
     </insert>
     <!-- 批量新增或者修改-->
     <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into ae_conf_subject_contrast_b(contrast_id, pk_corp, desdocvalue, factorvalue1, factorvalue2,
-        factorvalue3, factorvalue4, factorvalue5, factorvalue6, factorvalue7, factorvalue8, factorvalue9, remark, def1,
-        def2, def3, def4, def5, def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts)
+        insert into ae_conf_subject_contrast_b(contrast_id, pk_corp, desdocvalue, factortable1, factortable2,
+        factortable3, factortable4, factortable5, factortable6, factortable7, factortable8, factortable9, factorpk1,
+        factorpk2, factorpk3, factorpk4, factorpk5, factorpk6, factorpk7, factorpk8, factorpk9, factorid1, factorid2,
+        factorid3, factorid4, factorid5, factorid6, factorid7, factorid8, factorid9, remark, def1, def2, def3, def4,
+        def5, def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.contrastId},#{entity.pkCorp},#{entity.desdocvalue},#{entity.factorvalue1},#{entity.factorvalue2},#{entity.factorvalue3},#{entity.factorvalue4},#{entity.factorvalue5},#{entity.factorvalue6},#{entity.factorvalue7},#{entity.factorvalue8},#{entity.factorvalue9},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts})
+            (#{entity.contrastId},#{entity.pkCorp},#{entity.desdocvalue},#{entity.factortable1},#{entity.factortable2},#{entity.factortable3},#{entity.factortable4},#{entity.factortable5},#{entity.factortable6},#{entity.factortable7},#{entity.factortable8},#{entity.factortable9},#{entity.factorpk1},#{entity.factorpk2},#{entity.factorpk3},#{entity.factorpk4},#{entity.factorpk5},#{entity.factorpk6},#{entity.factorpk7},#{entity.factorpk8},#{entity.factorpk9},#{entity.factorid1},#{entity.factorid2},#{entity.factorid3},#{entity.factorid4},#{entity.factorid5},#{entity.factorid6},#{entity.factorid7},#{entity.factorid8},#{entity.factorid9},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},now(),#{entity.createUser},now(),#{entity.modifyUser},#{entity.sts})
         </foreach>
         on duplicate key update
         contrast_id = values(contrast_id),
         pk_corp = values(pk_corp),
         desdocvalue = values(desdocvalue),
-        factorvalue1 = values(factorvalue1),
-        factorvalue2 = values(factorvalue2),
-        factorvalue3 = values(factorvalue3),
-        factorvalue4 = values(factorvalue4),
-        factorvalue5 = values(factorvalue5),
-        factorvalue6 = values(factorvalue6),
-        factorvalue7 = values(factorvalue7),
-        factorvalue8 = values(factorvalue8),
-        factorvalue9 = values(factorvalue9),
+        factortable1 = values(factortable1),
+        factortable2 = values(factortable2),
+        factortable3 = values(factortable3),
+        factortable4 = values(factortable4),
+        factortable5 = values(factortable5),
+        factortable6 = values(factortable6),
+        factortable7 = values(factortable7),
+        factortable8 = values(factortable8),
+        factortable9 = values(factortable9),
+        factorpk1 = values(factorpk1),
+        factorpk2 = values(factorpk2),
+        factorpk3 = values(factorpk3),
+        factorpk4 = values(factorpk4),
+        factorpk5 = values(factorpk5),
+        factorpk6 = values(factorpk6),
+        factorpk7 = values(factorpk7),
+        factorpk8 = values(factorpk8),
+        factorpk9 = values(factorpk9),
+        factorid1 = values(factorid1),
+        factorid2 = values(factorid2),
+        factorid3 = values(factorid3),
+        factorid4 = values(factorid4),
+        factorid5 = values(factorid5),
+        factorid6 = values(factorid6),
+        factorid7 = values(factorid7),
+        factorid8 = values(factorid8),
+        factorid9 = values(factorid9),
         remark = values(remark),
         def1 = values(def1),
         def2 = values(def2),
@@ -378,15 +543,33 @@
             <if test="contrastId != null">contrast_id = #{contrastId},</if>
             <if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>
             <if test="desdocvalue != null and desdocvalue != ''">desdocvalue = #{desdocvalue},</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">factorvalue1 = #{factorvalue1},</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">factorvalue2 = #{factorvalue2},</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">factorvalue3 = #{factorvalue3},</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">factorvalue4 = #{factorvalue4},</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">factorvalue5 = #{factorvalue5},</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">factorvalue6 = #{factorvalue6},</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">factorvalue7 = #{factorvalue7},</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">factorvalue8 = #{factorvalue8},</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">factorvalue9 = #{factorvalue9},</if>
+            <if test="factortable1 != null and factortable1 != ''">factortable1 = #{factortable1},</if>
+            <if test="factortable2 != null and factortable2 != ''">factortable2 = #{factortable2},</if>
+            <if test="factortable3 != null and factortable3 != ''">factortable3 = #{factortable3},</if>
+            <if test="factortable4 != null and factortable4 != ''">factortable4 = #{factortable4},</if>
+            <if test="factortable5 != null and factortable5 != ''">factortable5 = #{factortable5},</if>
+            <if test="factortable6 != null and factortable6 != ''">factortable6 = #{factortable6},</if>
+            <if test="factortable7 != null and factortable7 != ''">factortable7 = #{factortable7},</if>
+            <if test="factortable8 != null and factortable8 != ''">factortable8 = #{factortable8},</if>
+            <if test="factortable9 != null and factortable9 != ''">factortable9 = #{factortable9},</if>
+            <if test="factorpk1 != null and factorpk1 != ''">factorpk1 = #{factorpk1},</if>
+            <if test="factorpk2 != null and factorpk2 != ''">factorpk2 = #{factorpk2},</if>
+            <if test="factorpk3 != null and factorpk3 != ''">factorpk3 = #{factorpk3},</if>
+            <if test="factorpk4 != null and factorpk4 != ''">factorpk4 = #{factorpk4},</if>
+            <if test="factorpk5 != null and factorpk5 != ''">factorpk5 = #{factorpk5},</if>
+            <if test="factorpk6 != null and factorpk6 != ''">factorpk6 = #{factorpk6},</if>
+            <if test="factorpk7 != null and factorpk7 != ''">factorpk7 = #{factorpk7},</if>
+            <if test="factorpk8 != null and factorpk8 != ''">factorpk8 = #{factorpk8},</if>
+            <if test="factorpk9 != null and factorpk9 != ''">factorpk9 = #{factorpk9},</if>
+            <if test="factorid1 != null and factorid1 != ''">factorid1 = #{factorid1},</if>
+            <if test="factorid2 != null and factorid2 != ''">factorid2 = #{factorid2},</if>
+            <if test="factorid3 != null and factorid3 != ''">factorid3 = #{factorid3},</if>
+            <if test="factorid4 != null and factorid4 != ''">factorid4 = #{factorid4},</if>
+            <if test="factorid5 != null and factorid5 != ''">factorid5 = #{factorid5},</if>
+            <if test="factorid6 != null and factorid6 != ''">factorid6 = #{factorid6},</if>
+            <if test="factorid7 != null and factorid7 != ''">factorid7 = #{factorid7},</if>
+            <if test="factorid8 != null and factorid8 != ''">factorid8 = #{factorid8},</if>
+            <if test="factorid9 != null and factorid9 != ''">factorid9 = #{factorid9},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="def1 != null and def1 != ''">def1 = #{def1},</if>
             <if test="def2 != null and def2 != ''">def2 = #{def2},</if>
@@ -418,21 +601,39 @@
     <!-- 多条件逻辑删除 -->
     <update id="entity_logicDelete_Multi_Condition"
             parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity">
-        update ae_conf_subject_contrast_b set sts= 'N' ,modify_time = now()
+        update ae_conf_subject_contrast_b set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
         <trim prefix="where" prefixOverrides="and">
             <if test="id != null">and id = #{id}</if>
             <if test="contrastId != null">and contrast_id = #{contrastId}</if>
             <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
             <if test="desdocvalue != null and desdocvalue != ''">and desdocvalue = #{desdocvalue}</if>
-            <if test="factorvalue1 != null and factorvalue1 != ''">and factorvalue1 = #{factorvalue1}</if>
-            <if test="factorvalue2 != null and factorvalue2 != ''">and factorvalue2 = #{factorvalue2}</if>
-            <if test="factorvalue3 != null and factorvalue3 != ''">and factorvalue3 = #{factorvalue3}</if>
-            <if test="factorvalue4 != null and factorvalue4 != ''">and factorvalue4 = #{factorvalue4}</if>
-            <if test="factorvalue5 != null and factorvalue5 != ''">and factorvalue5 = #{factorvalue5}</if>
-            <if test="factorvalue6 != null and factorvalue6 != ''">and factorvalue6 = #{factorvalue6}</if>
-            <if test="factorvalue7 != null and factorvalue7 != ''">and factorvalue7 = #{factorvalue7}</if>
-            <if test="factorvalue8 != null and factorvalue8 != ''">and factorvalue8 = #{factorvalue8}</if>
-            <if test="factorvalue9 != null and factorvalue9 != ''">and factorvalue9 = #{factorvalue9}</if>
+            <if test="factortable1 != null and factortable1 != ''">and factortable1 = #{factortable1}</if>
+            <if test="factortable2 != null and factortable2 != ''">and factortable2 = #{factortable2}</if>
+            <if test="factortable3 != null and factortable3 != ''">and factortable3 = #{factortable3}</if>
+            <if test="factortable4 != null and factortable4 != ''">and factortable4 = #{factortable4}</if>
+            <if test="factortable5 != null and factortable5 != ''">and factortable5 = #{factortable5}</if>
+            <if test="factortable6 != null and factortable6 != ''">and factortable6 = #{factortable6}</if>
+            <if test="factortable7 != null and factortable7 != ''">and factortable7 = #{factortable7}</if>
+            <if test="factortable8 != null and factortable8 != ''">and factortable8 = #{factortable8}</if>
+            <if test="factortable9 != null and factortable9 != ''">and factortable9 = #{factortable9}</if>
+            <if test="factorpk1 != null and factorpk1 != ''">and factorpk1 = #{factorpk1}</if>
+            <if test="factorpk2 != null and factorpk2 != ''">and factorpk2 = #{factorpk2}</if>
+            <if test="factorpk3 != null and factorpk3 != ''">and factorpk3 = #{factorpk3}</if>
+            <if test="factorpk4 != null and factorpk4 != ''">and factorpk4 = #{factorpk4}</if>
+            <if test="factorpk5 != null and factorpk5 != ''">and factorpk5 = #{factorpk5}</if>
+            <if test="factorpk6 != null and factorpk6 != ''">and factorpk6 = #{factorpk6}</if>
+            <if test="factorpk7 != null and factorpk7 != ''">and factorpk7 = #{factorpk7}</if>
+            <if test="factorpk8 != null and factorpk8 != ''">and factorpk8 = #{factorpk8}</if>
+            <if test="factorpk9 != null and factorpk9 != ''">and factorpk9 = #{factorpk9}</if>
+            <if test="factorid1 != null and factorid1 != ''">and factorid1 = #{factorid1}</if>
+            <if test="factorid2 != null and factorid2 != ''">and factorid2 = #{factorid2}</if>
+            <if test="factorid3 != null and factorid3 != ''">and factorid3 = #{factorid3}</if>
+            <if test="factorid4 != null and factorid4 != ''">and factorid4 = #{factorid4}</if>
+            <if test="factorid5 != null and factorid5 != ''">and factorid5 = #{factorid5}</if>
+            <if test="factorid6 != null and factorid6 != ''">and factorid6 = #{factorid6}</if>
+            <if test="factorid7 != null and factorid7 != ''">and factorid7 = #{factorid7}</if>
+            <if test="factorid8 != null and factorid8 != ''">and factorid8 = #{factorid8}</if>
+            <if test="factorid9 != null and factorid9 != ''">and factorid9 = #{factorid9}</if>
             <if test="remark != null and remark != ''">and remark = #{remark}</if>
             <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
             <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java

@@ -6,7 +6,7 @@ import com.hzya.frame.basedao.service.IBaseService;
  * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表服务接口
  *
  * @author zydd
- * @since 2025-06-04 10:30:42
+ * @since 2025-06-05 15:13:29
  */
 public interface IAeConfSubjectContrastBService extends IBaseService<AeConfSubjectContrastBEntity, String>{
 }

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java

@@ -11,7 +11,7 @@ import com.hzya.frame.basedao.service.impl.BaseService;
  * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表服务实现类
  *
  * @author zydd
- * @since 2025-06-04 10:30:42
+ * @since 2025-06-05 15:13:29
  */
 @Service
 public class AeConfSubjectContrastBServiceImpl extends BaseService<AeConfSubjectContrastBEntity, String> implements IAeConfSubjectContrastBService {

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java

@@ -5,16 +5,12 @@ import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
 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;
-import com.hzya.frame.voucher.ae.comf.subject.entity.MappingFileVO;
 import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectContrastService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.Resource;
-
 import com.hzya.frame.basedao.service.impl.BaseService;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**