Compare commits

..

No commits in common. "500bf1e32213c08ceeaaec78606dfbc27da12836" and "07b3d8cdcb20672e74a90a3b50037eae66eeb2a4" have entirely different histories.

15 changed files with 394 additions and 1291 deletions

View File

@ -1,14 +1,9 @@
package com.hzya.frame.voucher.ae.comf.bd.controller; package com.hzya.frame.voucher.ae.comf.bd.controller;
import cn.hutool.core.lang.Assert;
import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdAccsubjDao;
import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdBdinfoDao; import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdBdinfoDao;
import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao; import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao;
import com.hzya.frame.voucher.ae.comf.bd.entity.AccsubjTreeNode;
import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity;
import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdBdinfoEntity; import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdBdinfoEntity;
import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO;
import com.hzya.frame.voucher.ae.comf.bd.utils.AccsubjTreeBuilder;
import com.hzya.frame.web.action.DefaultController; import com.hzya.frame.web.action.DefaultController;
import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.entity.JsonResultEntity;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -30,8 +25,6 @@ public class BdController extends DefaultController {
private IAeConfBdOrgBookVODao aeConfBdOrgBookVODao; private IAeConfBdOrgBookVODao aeConfBdOrgBookVODao;
@Autowired @Autowired
private IAeConfBdBdinfoDao aeConfBdBdinfoDao; private IAeConfBdBdinfoDao aeConfBdBdinfoDao;
@Autowired
private IAeConfBdAccsubjDao aeConfBdAccsubjDao;
/** /**
* 查询所有公司账簿信息 * 查询所有公司账簿信息
@ -61,20 +54,4 @@ public class BdController extends DefaultController {
} }
} }
/**
* 查询科目表根据账簿id
*/
@RequestMapping(value = "/queryAccSubjByOrgBookId", method = RequestMethod.POST)
public JsonResultEntity queryAccSubjByOrgBookId(@RequestBody AeConfBdAccsubjEntity entity) {
try {
Assert.notNull(entity.getPkGlorgbook(),"查询科目表时账簿id不允许为空");
List<AeConfBdAccsubjEntity> all = aeConfBdAccsubjDao.query(entity);
List<AccsubjTreeNode> tree = AccsubjTreeBuilder.buildTree(all);
return getSuccessMessageEntity("请求成功", tree);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败", e.getMessage());
}
}
} }

View File

@ -1,15 +0,0 @@
package com.hzya.frame.voucher.ae.comf.bd.dao;
import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**
* 会计事项(accounting_event)-配置-数据配置-科目表(ae_conf_bd_accsubj: table)表数据库访问层
*
* @author zydd
* @since 2025-06-05 17:20:09
*/
public interface IAeConfBdAccsubjDao extends IBaseDao<AeConfBdAccsubjEntity, String> {
}

View File

@ -1,17 +0,0 @@
package com.hzya.frame.voucher.ae.comf.bd.dao.impl;
import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity;
import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdAccsubjDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**
* 会计事项(accounting_event)-配置-数据配置-科目表(AeConfBdAccsubj)表数据库访问层
*
* @author zydd
* @since 2025-06-05 17:20:09
*/
@Repository
public class AeConfBdAccsubjDaoImpl extends MybatisGenericDao<AeConfBdAccsubjEntity, String> implements IAeConfBdAccsubjDao{
}

View File

@ -1,16 +0,0 @@
package com.hzya.frame.voucher.ae.comf.bd.entity;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Created by zydd on 2025-06-05 17:51
* 科目表树形结构
*/
@Data
public class AccsubjTreeNode {
private AeConfBdAccsubjEntity data; // 当前节点的数据
private List<AccsubjTreeNode> children = new ArrayList<>(); // 子节点列表
}

View File

@ -1,108 +0,0 @@
package com.hzya.frame.voucher.ae.comf.bd.entity;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hzya.frame.web.entity.BaseEntity;
import lombok.Data;
/**
* 会计事项(accounting_event)-配置-数据配置-科目表(AeConfBdAccsubj)实体类
*
* @author zydd
* @since 2025-06-05 17:20:09
*/
@Data
public class AeConfBdAccsubjEntity extends BaseEntity {
private String accremove;
private String balanflag;
private Long balanorient;
private String beginperiod;
private String beginyear;
private String bothorient;
private Long cashbankflag;
private Long checkdouble;
private Long checktype;
private String createcorp;
private String createperiod;
private String createyear;
private String ctlsystem;
private String currency;
private String dispname;
private Long dr;
private String endflag;
private String endperiod;
private String endyear;
private String engsubjname;
@JsonIgnore
private String free1;
@JsonIgnore
private String free10;
@JsonIgnore
private String free11;
@JsonIgnore
private String free12;
@JsonIgnore
private String free13;
@JsonIgnore
private String free14;
@JsonIgnore
private String free15;
@JsonIgnore
private String free16;
@JsonIgnore
private String free17;
@JsonIgnore
private String free18;
@JsonIgnore
private String free19;
@JsonIgnore
private String free2;
@JsonIgnore
private String free20;
@JsonIgnore
private String free3;
@JsonIgnore
private String free4;
@JsonIgnore
private String free5;
@JsonIgnore
private String free6;
@JsonIgnore
private String free7;
@JsonIgnore
private String free8;
@JsonIgnore
private String free9;
private String incurflag;
private String innerinfonull;
private String innersubj;
private String outflag;
private String pkAccsubj;
private String pkCorp;
private String pkCreateGlorgbook;
private String pkGlorgbook;
private String pkGrpaccsubj;
private String pkSubjscheme;
private String pkSubjtype;
@JsonIgnore
private String property1;
@JsonIgnore
private String property2;
@JsonIgnore
private String property3;
@JsonIgnore
private String property4;
@JsonIgnore
private String property5;
private String remcode;
private String sealflag;
private String stoped;
private String subjcode;
private Long subjlev;
private String subjname;
private Long sumprintLevel;
private Date ts;
private String unit;
}

View File

@ -1,603 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdAccsubjDaoImpl">
<resultMap id="get-AeConfBdAccsubjEntity-result"
type="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
<result property="accremove" column="ACCREMOVE" jdbcType="VARCHAR"/>
<result property="balanflag" column="BALANFLAG" jdbcType="VARCHAR"/>
<result property="balanorient" column="BALANORIENT" jdbcType="INTEGER"/>
<result property="beginperiod" column="BEGINPERIOD" jdbcType="VARCHAR"/>
<result property="beginyear" column="BEGINYEAR" jdbcType="VARCHAR"/>
<result property="bothorient" column="BOTHORIENT" jdbcType="VARCHAR"/>
<result property="cashbankflag" column="CASHBANKFLAG" jdbcType="INTEGER"/>
<result property="checkdouble" column="CHECKDOUBLE" jdbcType="INTEGER"/>
<result property="checktype" column="CHECKTYPE" jdbcType="INTEGER"/>
<result property="createcorp" column="CREATECORP" jdbcType="VARCHAR"/>
<result property="createperiod" column="CREATEPERIOD" jdbcType="VARCHAR"/>
<result property="createyear" column="CREATEYEAR" jdbcType="VARCHAR"/>
<result property="ctlsystem" column="CTLSYSTEM" jdbcType="VARCHAR"/>
<result property="currency" column="CURRENCY" jdbcType="VARCHAR"/>
<result property="dispname" column="DISPNAME" jdbcType="VARCHAR"/>
<result property="dr" column="DR" jdbcType="INTEGER"/>
<result property="endflag" column="ENDFLAG" jdbcType="VARCHAR"/>
<result property="endperiod" column="ENDPERIOD" jdbcType="VARCHAR"/>
<result property="endyear" column="ENDYEAR" jdbcType="VARCHAR"/>
<result property="engsubjname" column="ENGSUBJNAME" jdbcType="VARCHAR"/>
<result property="free1" column="FREE1" jdbcType="VARCHAR"/>
<result property="free10" column="FREE10" jdbcType="VARCHAR"/>
<result property="free11" column="FREE11" jdbcType="VARCHAR"/>
<result property="free12" column="FREE12" jdbcType="VARCHAR"/>
<result property="free13" column="FREE13" jdbcType="VARCHAR"/>
<result property="free14" column="FREE14" jdbcType="VARCHAR"/>
<result property="free15" column="FREE15" jdbcType="VARCHAR"/>
<result property="free16" column="FREE16" jdbcType="VARCHAR"/>
<result property="free17" column="FREE17" jdbcType="VARCHAR"/>
<result property="free18" column="FREE18" jdbcType="VARCHAR"/>
<result property="free19" column="FREE19" jdbcType="VARCHAR"/>
<result property="free2" column="FREE2" jdbcType="VARCHAR"/>
<result property="free20" column="FREE20" jdbcType="VARCHAR"/>
<result property="free3" column="FREE3" jdbcType="VARCHAR"/>
<result property="free4" column="FREE4" jdbcType="VARCHAR"/>
<result property="free5" column="FREE5" jdbcType="VARCHAR"/>
<result property="free6" column="FREE6" jdbcType="VARCHAR"/>
<result property="free7" column="FREE7" jdbcType="VARCHAR"/>
<result property="free8" column="FREE8" jdbcType="VARCHAR"/>
<result property="free9" column="FREE9" jdbcType="VARCHAR"/>
<result property="incurflag" column="INCURFLAG" jdbcType="VARCHAR"/>
<result property="innerinfonull" column="INNERINFONULL" jdbcType="VARCHAR"/>
<result property="innersubj" column="INNERSUBJ" jdbcType="VARCHAR"/>
<result property="outflag" column="OUTFLAG" jdbcType="VARCHAR"/>
<result property="pkAccsubj" column="PK_ACCSUBJ" jdbcType="VARCHAR"/>
<result property="pkCorp" column="PK_CORP" jdbcType="VARCHAR"/>
<result property="pkCreateGlorgbook" column="PK_CREATE_GLORGBOOK" jdbcType="VARCHAR"/>
<result property="pkGlorgbook" column="PK_GLORGBOOK" jdbcType="VARCHAR"/>
<result property="pkGrpaccsubj" column="PK_GRPACCSUBJ" jdbcType="VARCHAR"/>
<result property="pkSubjscheme" column="PK_SUBJSCHEME" jdbcType="VARCHAR"/>
<result property="pkSubjtype" column="PK_SUBJTYPE" jdbcType="VARCHAR"/>
<result property="property1" column="PROPERTY1" jdbcType="VARCHAR"/>
<result property="property2" column="PROPERTY2" jdbcType="VARCHAR"/>
<result property="property3" column="PROPERTY3" jdbcType="VARCHAR"/>
<result property="property4" column="PROPERTY4" jdbcType="VARCHAR"/>
<result property="property5" column="PROPERTY5" jdbcType="VARCHAR"/>
<result property="remcode" column="REMCODE" jdbcType="VARCHAR"/>
<result property="sealflag" column="SEALFLAG" jdbcType="VARCHAR"/>
<result property="stoped" column="STOPED" jdbcType="VARCHAR"/>
<result property="subjcode" column="SUBJCODE" jdbcType="VARCHAR"/>
<result property="subjlev" column="SUBJLEV" jdbcType="INTEGER"/>
<result property="subjname" column="SUBJNAME" jdbcType="VARCHAR"/>
<result property="sumprintLevel" column="SUMPRINT_LEVEL" jdbcType="INTEGER"/>
<result property="ts" column="TS" jdbcType="TIMESTAMP"/>
<result property="unit" column="UNIT" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id="AeConfBdAccsubjEntity_Base_Column_List">
ACCREMOVE
,BALANFLAG
,BALANORIENT
,BEGINPERIOD
,BEGINYEAR
,BOTHORIENT
,CASHBANKFLAG
,CHECKDOUBLE
,CHECKTYPE
,CREATECORP
,CREATEPERIOD
,CREATEYEAR
,CTLSYSTEM
,CURRENCY
,DISPNAME
,DR
,ENDFLAG
,ENDPERIOD
,ENDYEAR
,ENGSUBJNAME
,FREE1
,FREE10
,FREE11
,FREE12
,FREE13
,FREE14
,FREE15
,FREE16
,FREE17
,FREE18
,FREE19
,FREE2
,FREE20
,FREE3
,FREE4
,FREE5
,FREE6
,FREE7
,FREE8
,FREE9
,INCURFLAG
,INNERINFONULL
,INNERSUBJ
,OUTFLAG
,PK_ACCSUBJ
,PK_CORP
,PK_CREATE_GLORGBOOK
,PK_GLORGBOOK
,PK_GRPACCSUBJ
,PK_SUBJSCHEME
,PK_SUBJTYPE
,PROPERTY1
,PROPERTY2
,PROPERTY3
,PROPERTY4
,PROPERTY5
,REMCODE
,SEALFLAG
,STOPED
,SUBJCODE
,SUBJLEV
,SUBJNAME
,SUMPRINT_LEVEL
,TS
,UNIT
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-AeConfBdAccsubjEntity-result"
parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
select
<include refid="AeConfBdAccsubjEntity_Base_Column_List"/>
from ae_conf_bd_accsubj
<trim prefix="where" prefixOverrides="and">
<if test="accremove != null and accremove != ''">and ACCREMOVE = #{accremove}</if>
<if test="balanflag != null and balanflag != ''">and BALANFLAG = #{balanflag}</if>
<if test="balanorient != null">and BALANORIENT = #{balanorient}</if>
<if test="beginperiod != null and beginperiod != ''">and BEGINPERIOD = #{beginperiod}</if>
<if test="beginyear != null and beginyear != ''">and BEGINYEAR = #{beginyear}</if>
<if test="bothorient != null and bothorient != ''">and BOTHORIENT = #{bothorient}</if>
<if test="cashbankflag != null">and CASHBANKFLAG = #{cashbankflag}</if>
<if test="checkdouble != null">and CHECKDOUBLE = #{checkdouble}</if>
<if test="checktype != null">and CHECKTYPE = #{checktype}</if>
<if test="createcorp != null and createcorp != ''">and CREATECORP = #{createcorp}</if>
<if test="createperiod != null and createperiod != ''">and CREATEPERIOD = #{createperiod}</if>
<if test="createyear != null and createyear != ''">and CREATEYEAR = #{createyear}</if>
<if test="ctlsystem != null and ctlsystem != ''">and CTLSYSTEM = #{ctlsystem}</if>
<if test="currency != null and currency != ''">and CURRENCY = #{currency}</if>
<if test="dispname != null and dispname != ''">and DISPNAME = #{dispname}</if>
<if test="dr != null">and DR = #{dr}</if>
<if test="endflag != null and endflag != ''">and ENDFLAG = #{endflag}</if>
<if test="endperiod != null and endperiod != ''">and ENDPERIOD = #{endperiod}</if>
<if test="endyear != null and endyear != ''">and ENDYEAR = #{endyear}</if>
<if test="engsubjname != null and engsubjname != ''">and ENGSUBJNAME = #{engsubjname}</if>
<if test="free1 != null and free1 != ''">and FREE1 = #{free1}</if>
<if test="free10 != null and free10 != ''">and FREE10 = #{free10}</if>
<if test="free11 != null and free11 != ''">and FREE11 = #{free11}</if>
<if test="free12 != null and free12 != ''">and FREE12 = #{free12}</if>
<if test="free13 != null and free13 != ''">and FREE13 = #{free13}</if>
<if test="free14 != null and free14 != ''">and FREE14 = #{free14}</if>
<if test="free15 != null and free15 != ''">and FREE15 = #{free15}</if>
<if test="free16 != null and free16 != ''">and FREE16 = #{free16}</if>
<if test="free17 != null and free17 != ''">and FREE17 = #{free17}</if>
<if test="free18 != null and free18 != ''">and FREE18 = #{free18}</if>
<if test="free19 != null and free19 != ''">and FREE19 = #{free19}</if>
<if test="free2 != null and free2 != ''">and FREE2 = #{free2}</if>
<if test="free20 != null and free20 != ''">and FREE20 = #{free20}</if>
<if test="free3 != null and free3 != ''">and FREE3 = #{free3}</if>
<if test="free4 != null and free4 != ''">and FREE4 = #{free4}</if>
<if test="free5 != null and free5 != ''">and FREE5 = #{free5}</if>
<if test="free6 != null and free6 != ''">and FREE6 = #{free6}</if>
<if test="free7 != null and free7 != ''">and FREE7 = #{free7}</if>
<if test="free8 != null and free8 != ''">and FREE8 = #{free8}</if>
<if test="free9 != null and free9 != ''">and FREE9 = #{free9}</if>
<if test="incurflag != null and incurflag != ''">and INCURFLAG = #{incurflag}</if>
<if test="innerinfonull != null and innerinfonull != ''">and INNERINFONULL = #{innerinfonull}</if>
<if test="innersubj != null and innersubj != ''">and INNERSUBJ = #{innersubj}</if>
<if test="outflag != null and outflag != ''">and OUTFLAG = #{outflag}</if>
<if test="pkAccsubj != null and pkAccsubj != ''">and PK_ACCSUBJ = #{pkAccsubj}</if>
<if test="pkCorp != null and pkCorp != ''">and PK_CORP = #{pkCorp}</if>
<if test="pkCreateGlorgbook != null and pkCreateGlorgbook != ''">and PK_CREATE_GLORGBOOK =
#{pkCreateGlorgbook}
</if>
<if test="pkGlorgbook != null and pkGlorgbook != ''">and PK_GLORGBOOK = #{pkGlorgbook}</if>
<if test="pkGrpaccsubj != null and pkGrpaccsubj != ''">and PK_GRPACCSUBJ = #{pkGrpaccsubj}</if>
<if test="pkSubjscheme != null and pkSubjscheme != ''">and PK_SUBJSCHEME = #{pkSubjscheme}</if>
<if test="pkSubjtype != null and pkSubjtype != ''">and PK_SUBJTYPE = #{pkSubjtype}</if>
<if test="property1 != null and property1 != ''">and PROPERTY1 = #{property1}</if>
<if test="property2 != null and property2 != ''">and PROPERTY2 = #{property2}</if>
<if test="property3 != null and property3 != ''">and PROPERTY3 = #{property3}</if>
<if test="property4 != null and property4 != ''">and PROPERTY4 = #{property4}</if>
<if test="property5 != null and property5 != ''">and PROPERTY5 = #{property5}</if>
<if test="remcode != null and remcode != ''">and REMCODE = #{remcode}</if>
<if test="sealflag != null and sealflag != ''">and SEALFLAG = #{sealflag}</if>
<if test="stoped != null and stoped != ''">and STOPED = #{stoped}</if>
<if test="subjcode != null and subjcode != ''">and SUBJCODE = #{subjcode}</if>
<if test="subjlev != null">and SUBJLEV = #{subjlev}</if>
<if test="subjname != null and subjname != ''">and SUBJNAME = #{subjname}</if>
<if test="sumprintLevel != null">and SUMPRINT_LEVEL = #{sumprintLevel}</if>
<if test="ts != null">and TS = #{ts}</if>
<if test="unit != null and unit != ''">and UNIT = #{unit}</if>
</trim>
ORDER BY ae_conf_bd_accsubj.subjcode ASC
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer"
parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
select count(1) from ae_conf_bd_accsubj
<trim prefix="where" prefixOverrides="and">
<if test="accremove != null and accremove != ''">and ACCREMOVE = #{accremove}</if>
<if test="balanflag != null and balanflag != ''">and BALANFLAG = #{balanflag}</if>
<if test="balanorient != null">and BALANORIENT = #{balanorient}</if>
<if test="beginperiod != null and beginperiod != ''">and BEGINPERIOD = #{beginperiod}</if>
<if test="beginyear != null and beginyear != ''">and BEGINYEAR = #{beginyear}</if>
<if test="bothorient != null and bothorient != ''">and BOTHORIENT = #{bothorient}</if>
<if test="cashbankflag != null">and CASHBANKFLAG = #{cashbankflag}</if>
<if test="checkdouble != null">and CHECKDOUBLE = #{checkdouble}</if>
<if test="checktype != null">and CHECKTYPE = #{checktype}</if>
<if test="createcorp != null and createcorp != ''">and CREATECORP = #{createcorp}</if>
<if test="createperiod != null and createperiod != ''">and CREATEPERIOD = #{createperiod}</if>
<if test="createyear != null and createyear != ''">and CREATEYEAR = #{createyear}</if>
<if test="ctlsystem != null and ctlsystem != ''">and CTLSYSTEM = #{ctlsystem}</if>
<if test="currency != null and currency != ''">and CURRENCY = #{currency}</if>
<if test="dispname != null and dispname != ''">and DISPNAME = #{dispname}</if>
<if test="dr != null">and DR = #{dr}</if>
<if test="endflag != null and endflag != ''">and ENDFLAG = #{endflag}</if>
<if test="endperiod != null and endperiod != ''">and ENDPERIOD = #{endperiod}</if>
<if test="endyear != null and endyear != ''">and ENDYEAR = #{endyear}</if>
<if test="engsubjname != null and engsubjname != ''">and ENGSUBJNAME = #{engsubjname}</if>
<if test="free1 != null and free1 != ''">and FREE1 = #{free1}</if>
<if test="free10 != null and free10 != ''">and FREE10 = #{free10}</if>
<if test="free11 != null and free11 != ''">and FREE11 = #{free11}</if>
<if test="free12 != null and free12 != ''">and FREE12 = #{free12}</if>
<if test="free13 != null and free13 != ''">and FREE13 = #{free13}</if>
<if test="free14 != null and free14 != ''">and FREE14 = #{free14}</if>
<if test="free15 != null and free15 != ''">and FREE15 = #{free15}</if>
<if test="free16 != null and free16 != ''">and FREE16 = #{free16}</if>
<if test="free17 != null and free17 != ''">and FREE17 = #{free17}</if>
<if test="free18 != null and free18 != ''">and FREE18 = #{free18}</if>
<if test="free19 != null and free19 != ''">and FREE19 = #{free19}</if>
<if test="free2 != null and free2 != ''">and FREE2 = #{free2}</if>
<if test="free20 != null and free20 != ''">and FREE20 = #{free20}</if>
<if test="free3 != null and free3 != ''">and FREE3 = #{free3}</if>
<if test="free4 != null and free4 != ''">and FREE4 = #{free4}</if>
<if test="free5 != null and free5 != ''">and FREE5 = #{free5}</if>
<if test="free6 != null and free6 != ''">and FREE6 = #{free6}</if>
<if test="free7 != null and free7 != ''">and FREE7 = #{free7}</if>
<if test="free8 != null and free8 != ''">and FREE8 = #{free8}</if>
<if test="free9 != null and free9 != ''">and FREE9 = #{free9}</if>
<if test="incurflag != null and incurflag != ''">and INCURFLAG = #{incurflag}</if>
<if test="innerinfonull != null and innerinfonull != ''">and INNERINFONULL = #{innerinfonull}</if>
<if test="innersubj != null and innersubj != ''">and INNERSUBJ = #{innersubj}</if>
<if test="outflag != null and outflag != ''">and OUTFLAG = #{outflag}</if>
<if test="pkAccsubj != null and pkAccsubj != ''">and PK_ACCSUBJ = #{pkAccsubj}</if>
<if test="pkCorp != null and pkCorp != ''">and PK_CORP = #{pkCorp}</if>
<if test="pkCreateGlorgbook != null and pkCreateGlorgbook != ''">and PK_CREATE_GLORGBOOK =
#{pkCreateGlorgbook}
</if>
<if test="pkGlorgbook != null and pkGlorgbook != ''">and PK_GLORGBOOK = #{pkGlorgbook}</if>
<if test="pkGrpaccsubj != null and pkGrpaccsubj != ''">and PK_GRPACCSUBJ = #{pkGrpaccsubj}</if>
<if test="pkSubjscheme != null and pkSubjscheme != ''">and PK_SUBJSCHEME = #{pkSubjscheme}</if>
<if test="pkSubjtype != null and pkSubjtype != ''">and PK_SUBJTYPE = #{pkSubjtype}</if>
<if test="property1 != null and property1 != ''">and PROPERTY1 = #{property1}</if>
<if test="property2 != null and property2 != ''">and PROPERTY2 = #{property2}</if>
<if test="property3 != null and property3 != ''">and PROPERTY3 = #{property3}</if>
<if test="property4 != null and property4 != ''">and PROPERTY4 = #{property4}</if>
<if test="property5 != null and property5 != ''">and PROPERTY5 = #{property5}</if>
<if test="remcode != null and remcode != ''">and REMCODE = #{remcode}</if>
<if test="sealflag != null and sealflag != ''">and SEALFLAG = #{sealflag}</if>
<if test="stoped != null and stoped != ''">and STOPED = #{stoped}</if>
<if test="subjcode != null and subjcode != ''">and SUBJCODE = #{subjcode}</if>
<if test="subjlev != null">and SUBJLEV = #{subjlev}</if>
<if test="subjname != null and subjname != ''">and SUBJNAME = #{subjname}</if>
<if test="sumprintLevel != null">and SUMPRINT_LEVEL = #{sumprintLevel}</if>
<if test="ts != null">and TS = #{ts}</if>
<if test="unit != null and unit != ''">and UNIT = #{unit}</if>
</trim>
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-AeConfBdAccsubjEntity-result"
parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
select
<include refid="AeConfBdAccsubjEntity_Base_Column_List"/>
from ae_conf_bd_accsubj
<trim prefix="where" prefixOverrides="and">
<if test="accremove != null and accremove != ''">and ACCREMOVE like concat('%',#{accremove},'%')</if>
<if test="balanflag != null and balanflag != ''">and BALANFLAG like concat('%',#{balanflag},'%')</if>
<if test="balanorient != null">and BALANORIENT like concat('%',#{balanorient},'%')</if>
<if test="beginperiod != null and beginperiod != ''">and BEGINPERIOD like concat('%',#{beginperiod},'%')
</if>
<if test="beginyear != null and beginyear != ''">and BEGINYEAR like concat('%',#{beginyear},'%')</if>
<if test="bothorient != null and bothorient != ''">and BOTHORIENT like concat('%',#{bothorient},'%')</if>
<if test="cashbankflag != null">and CASHBANKFLAG like concat('%',#{cashbankflag},'%')</if>
<if test="checkdouble != null">and CHECKDOUBLE like concat('%',#{checkdouble},'%')</if>
<if test="checktype != null">and CHECKTYPE like concat('%',#{checktype},'%')</if>
<if test="createcorp != null and createcorp != ''">and CREATECORP like concat('%',#{createcorp},'%')</if>
<if test="createperiod != null and createperiod != ''">and CREATEPERIOD like
concat('%',#{createperiod},'%')
</if>
<if test="createyear != null and createyear != ''">and CREATEYEAR like concat('%',#{createyear},'%')</if>
<if test="ctlsystem != null and ctlsystem != ''">and CTLSYSTEM like concat('%',#{ctlsystem},'%')</if>
<if test="currency != null and currency != ''">and CURRENCY like concat('%',#{currency},'%')</if>
<if test="dispname != null and dispname != ''">and DISPNAME like concat('%',#{dispname},'%')</if>
<if test="dr != null">and DR like concat('%',#{dr},'%')</if>
<if test="endflag != null and endflag != ''">and ENDFLAG like concat('%',#{endflag},'%')</if>
<if test="endperiod != null and endperiod != ''">and ENDPERIOD like concat('%',#{endperiod},'%')</if>
<if test="endyear != null and endyear != ''">and ENDYEAR like concat('%',#{endyear},'%')</if>
<if test="engsubjname != null and engsubjname != ''">and ENGSUBJNAME like concat('%',#{engsubjname},'%')
</if>
<if test="free1 != null and free1 != ''">and FREE1 like concat('%',#{free1},'%')</if>
<if test="free10 != null and free10 != ''">and FREE10 like concat('%',#{free10},'%')</if>
<if test="free11 != null and free11 != ''">and FREE11 like concat('%',#{free11},'%')</if>
<if test="free12 != null and free12 != ''">and FREE12 like concat('%',#{free12},'%')</if>
<if test="free13 != null and free13 != ''">and FREE13 like concat('%',#{free13},'%')</if>
<if test="free14 != null and free14 != ''">and FREE14 like concat('%',#{free14},'%')</if>
<if test="free15 != null and free15 != ''">and FREE15 like concat('%',#{free15},'%')</if>
<if test="free16 != null and free16 != ''">and FREE16 like concat('%',#{free16},'%')</if>
<if test="free17 != null and free17 != ''">and FREE17 like concat('%',#{free17},'%')</if>
<if test="free18 != null and free18 != ''">and FREE18 like concat('%',#{free18},'%')</if>
<if test="free19 != null and free19 != ''">and FREE19 like concat('%',#{free19},'%')</if>
<if test="free2 != null and free2 != ''">and FREE2 like concat('%',#{free2},'%')</if>
<if test="free20 != null and free20 != ''">and FREE20 like concat('%',#{free20},'%')</if>
<if test="free3 != null and free3 != ''">and FREE3 like concat('%',#{free3},'%')</if>
<if test="free4 != null and free4 != ''">and FREE4 like concat('%',#{free4},'%')</if>
<if test="free5 != null and free5 != ''">and FREE5 like concat('%',#{free5},'%')</if>
<if test="free6 != null and free6 != ''">and FREE6 like concat('%',#{free6},'%')</if>
<if test="free7 != null and free7 != ''">and FREE7 like concat('%',#{free7},'%')</if>
<if test="free8 != null and free8 != ''">and FREE8 like concat('%',#{free8},'%')</if>
<if test="free9 != null and free9 != ''">and FREE9 like concat('%',#{free9},'%')</if>
<if test="incurflag != null and incurflag != ''">and INCURFLAG like concat('%',#{incurflag},'%')</if>
<if test="innerinfonull != null and innerinfonull != ''">and INNERINFONULL like
concat('%',#{innerinfonull},'%')
</if>
<if test="innersubj != null and innersubj != ''">and INNERSUBJ like concat('%',#{innersubj},'%')</if>
<if test="outflag != null and outflag != ''">and OUTFLAG like concat('%',#{outflag},'%')</if>
<if test="pkAccsubj != null and pkAccsubj != ''">and PK_ACCSUBJ like concat('%',#{pkAccsubj},'%')</if>
<if test="pkCorp != null and pkCorp != ''">and PK_CORP like concat('%',#{pkCorp},'%')</if>
<if test="pkCreateGlorgbook != null and pkCreateGlorgbook != ''">and PK_CREATE_GLORGBOOK like
concat('%',#{pkCreateGlorgbook},'%')
</if>
<if test="pkGlorgbook != null and pkGlorgbook != ''">and PK_GLORGBOOK like concat('%',#{pkGlorgbook},'%')
</if>
<if test="pkGrpaccsubj != null and pkGrpaccsubj != ''">and PK_GRPACCSUBJ like
concat('%',#{pkGrpaccsubj},'%')
</if>
<if test="pkSubjscheme != null and pkSubjscheme != ''">and PK_SUBJSCHEME like
concat('%',#{pkSubjscheme},'%')
</if>
<if test="pkSubjtype != null and pkSubjtype != ''">and PK_SUBJTYPE like concat('%',#{pkSubjtype},'%')</if>
<if test="property1 != null and property1 != ''">and PROPERTY1 like concat('%',#{property1},'%')</if>
<if test="property2 != null and property2 != ''">and PROPERTY2 like concat('%',#{property2},'%')</if>
<if test="property3 != null and property3 != ''">and PROPERTY3 like concat('%',#{property3},'%')</if>
<if test="property4 != null and property4 != ''">and PROPERTY4 like concat('%',#{property4},'%')</if>
<if test="property5 != null and property5 != ''">and PROPERTY5 like concat('%',#{property5},'%')</if>
<if test="remcode != null and remcode != ''">and REMCODE like concat('%',#{remcode},'%')</if>
<if test="sealflag != null and sealflag != ''">and SEALFLAG like concat('%',#{sealflag},'%')</if>
<if test="stoped != null and stoped != ''">and STOPED like concat('%',#{stoped},'%')</if>
<if test="subjcode != null and subjcode != ''">and SUBJCODE like concat('%',#{subjcode},'%')</if>
<if test="subjlev != null">and SUBJLEV like concat('%',#{subjlev},'%')</if>
<if test="subjname != null and subjname != ''">and SUBJNAME like concat('%',#{subjname},'%')</if>
<if test="sumprintLevel != null">and SUMPRINT_LEVEL like concat('%',#{sumprintLevel},'%')</if>
<if test="ts != null">and TS like concat('%',#{ts},'%')</if>
<if test="unit != null and unit != ''">and UNIT like concat('%',#{unit},'%')</if>
</trim>
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="AeConfBdAccsubjentity_list_or" resultMap="get-AeConfBdAccsubjEntity-result"
parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
select
<include refid="AeConfBdAccsubjEntity_Base_Column_List"/>
from ae_conf_bd_accsubj
<trim prefix="where" prefixOverrides="and">
<if test="accremove != null and accremove != ''">or ACCREMOVE = #{accremove}</if>
<if test="balanflag != null and balanflag != ''">or BALANFLAG = #{balanflag}</if>
<if test="balanorient != null">or BALANORIENT = #{balanorient}</if>
<if test="beginperiod != null and beginperiod != ''">or BEGINPERIOD = #{beginperiod}</if>
<if test="beginyear != null and beginyear != ''">or BEGINYEAR = #{beginyear}</if>
<if test="bothorient != null and bothorient != ''">or BOTHORIENT = #{bothorient}</if>
<if test="cashbankflag != null">or CASHBANKFLAG = #{cashbankflag}</if>
<if test="checkdouble != null">or CHECKDOUBLE = #{checkdouble}</if>
<if test="checktype != null">or CHECKTYPE = #{checktype}</if>
<if test="createcorp != null and createcorp != ''">or CREATECORP = #{createcorp}</if>
<if test="createperiod != null and createperiod != ''">or CREATEPERIOD = #{createperiod}</if>
<if test="createyear != null and createyear != ''">or CREATEYEAR = #{createyear}</if>
<if test="ctlsystem != null and ctlsystem != ''">or CTLSYSTEM = #{ctlsystem}</if>
<if test="currency != null and currency != ''">or CURRENCY = #{currency}</if>
<if test="dispname != null and dispname != ''">or DISPNAME = #{dispname}</if>
<if test="dr != null">or DR = #{dr}</if>
<if test="endflag != null and endflag != ''">or ENDFLAG = #{endflag}</if>
<if test="endperiod != null and endperiod != ''">or ENDPERIOD = #{endperiod}</if>
<if test="endyear != null and endyear != ''">or ENDYEAR = #{endyear}</if>
<if test="engsubjname != null and engsubjname != ''">or ENGSUBJNAME = #{engsubjname}</if>
<if test="free1 != null and free1 != ''">or FREE1 = #{free1}</if>
<if test="free10 != null and free10 != ''">or FREE10 = #{free10}</if>
<if test="free11 != null and free11 != ''">or FREE11 = #{free11}</if>
<if test="free12 != null and free12 != ''">or FREE12 = #{free12}</if>
<if test="free13 != null and free13 != ''">or FREE13 = #{free13}</if>
<if test="free14 != null and free14 != ''">or FREE14 = #{free14}</if>
<if test="free15 != null and free15 != ''">or FREE15 = #{free15}</if>
<if test="free16 != null and free16 != ''">or FREE16 = #{free16}</if>
<if test="free17 != null and free17 != ''">or FREE17 = #{free17}</if>
<if test="free18 != null and free18 != ''">or FREE18 = #{free18}</if>
<if test="free19 != null and free19 != ''">or FREE19 = #{free19}</if>
<if test="free2 != null and free2 != ''">or FREE2 = #{free2}</if>
<if test="free20 != null and free20 != ''">or FREE20 = #{free20}</if>
<if test="free3 != null and free3 != ''">or FREE3 = #{free3}</if>
<if test="free4 != null and free4 != ''">or FREE4 = #{free4}</if>
<if test="free5 != null and free5 != ''">or FREE5 = #{free5}</if>
<if test="free6 != null and free6 != ''">or FREE6 = #{free6}</if>
<if test="free7 != null and free7 != ''">or FREE7 = #{free7}</if>
<if test="free8 != null and free8 != ''">or FREE8 = #{free8}</if>
<if test="free9 != null and free9 != ''">or FREE9 = #{free9}</if>
<if test="incurflag != null and incurflag != ''">or INCURFLAG = #{incurflag}</if>
<if test="innerinfonull != null and innerinfonull != ''">or INNERINFONULL = #{innerinfonull}</if>
<if test="innersubj != null and innersubj != ''">or INNERSUBJ = #{innersubj}</if>
<if test="outflag != null and outflag != ''">or OUTFLAG = #{outflag}</if>
<if test="pkAccsubj != null and pkAccsubj != ''">or PK_ACCSUBJ = #{pkAccsubj}</if>
<if test="pkCorp != null and pkCorp != ''">or PK_CORP = #{pkCorp}</if>
<if test="pkCreateGlorgbook != null and pkCreateGlorgbook != ''">or PK_CREATE_GLORGBOOK =
#{pkCreateGlorgbook}
</if>
<if test="pkGlorgbook != null and pkGlorgbook != ''">or PK_GLORGBOOK = #{pkGlorgbook}</if>
<if test="pkGrpaccsubj != null and pkGrpaccsubj != ''">or PK_GRPACCSUBJ = #{pkGrpaccsubj}</if>
<if test="pkSubjscheme != null and pkSubjscheme != ''">or PK_SUBJSCHEME = #{pkSubjscheme}</if>
<if test="pkSubjtype != null and pkSubjtype != ''">or PK_SUBJTYPE = #{pkSubjtype}</if>
<if test="property1 != null and property1 != ''">or PROPERTY1 = #{property1}</if>
<if test="property2 != null and property2 != ''">or PROPERTY2 = #{property2}</if>
<if test="property3 != null and property3 != ''">or PROPERTY3 = #{property3}</if>
<if test="property4 != null and property4 != ''">or PROPERTY4 = #{property4}</if>
<if test="property5 != null and property5 != ''">or PROPERTY5 = #{property5}</if>
<if test="remcode != null and remcode != ''">or REMCODE = #{remcode}</if>
<if test="sealflag != null and sealflag != ''">or SEALFLAG = #{sealflag}</if>
<if test="stoped != null and stoped != ''">or STOPED = #{stoped}</if>
<if test="subjcode != null and subjcode != ''">or SUBJCODE = #{subjcode}</if>
<if test="subjlev != null">or SUBJLEV = #{subjlev}</if>
<if test="subjname != null and subjname != ''">or SUBJNAME = #{subjname}</if>
<if test="sumprintLevel != null">or SUMPRINT_LEVEL = #{sumprintLevel}</if>
<if test="ts != null">or TS = #{ts}</if>
<if test="unit != null and unit != ''">or UNIT = #{unit}</if>
and sts='Y'
</trim>
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity"
keyProperty="" useGeneratedKeys="true">
insert into ae_conf_bd_accsubj(
<trim suffix="" suffixOverrides=",">
<if test="accremove != null and accremove != ''">ACCREMOVE ,</if>
<if test="balanflag != null and balanflag != ''">BALANFLAG ,</if>
<if test="balanorient != null">BALANORIENT ,</if>
<if test="beginperiod != null and beginperiod != ''">BEGINPERIOD ,</if>
<if test="beginyear != null and beginyear != ''">BEGINYEAR ,</if>
<if test="bothorient != null and bothorient != ''">BOTHORIENT ,</if>
<if test="cashbankflag != null">CASHBANKFLAG ,</if>
<if test="checkdouble != null">CHECKDOUBLE ,</if>
<if test="checktype != null">CHECKTYPE ,</if>
<if test="createcorp != null and createcorp != ''">CREATECORP ,</if>
<if test="createperiod != null and createperiod != ''">CREATEPERIOD ,</if>
<if test="createyear != null and createyear != ''">CREATEYEAR ,</if>
<if test="ctlsystem != null and ctlsystem != ''">CTLSYSTEM ,</if>
<if test="currency != null and currency != ''">CURRENCY ,</if>
<if test="dispname != null and dispname != ''">DISPNAME ,</if>
<if test="dr != null">DR ,</if>
<if test="endflag != null and endflag != ''">ENDFLAG ,</if>
<if test="endperiod != null and endperiod != ''">ENDPERIOD ,</if>
<if test="endyear != null and endyear != ''">ENDYEAR ,</if>
<if test="engsubjname != null and engsubjname != ''">ENGSUBJNAME ,</if>
<if test="free1 != null and free1 != ''">FREE1 ,</if>
<if test="free10 != null and free10 != ''">FREE10 ,</if>
<if test="free11 != null and free11 != ''">FREE11 ,</if>
<if test="free12 != null and free12 != ''">FREE12 ,</if>
<if test="free13 != null and free13 != ''">FREE13 ,</if>
<if test="free14 != null and free14 != ''">FREE14 ,</if>
<if test="free15 != null and free15 != ''">FREE15 ,</if>
<if test="free16 != null and free16 != ''">FREE16 ,</if>
<if test="free17 != null and free17 != ''">FREE17 ,</if>
<if test="free18 != null and free18 != ''">FREE18 ,</if>
<if test="free19 != null and free19 != ''">FREE19 ,</if>
<if test="free2 != null and free2 != ''">FREE2 ,</if>
<if test="free20 != null and free20 != ''">FREE20 ,</if>
<if test="free3 != null and free3 != ''">FREE3 ,</if>
<if test="free4 != null and free4 != ''">FREE4 ,</if>
<if test="free5 != null and free5 != ''">FREE5 ,</if>
<if test="free6 != null and free6 != ''">FREE6 ,</if>
<if test="free7 != null and free7 != ''">FREE7 ,</if>
<if test="free8 != null and free8 != ''">FREE8 ,</if>
<if test="free9 != null and free9 != ''">FREE9 ,</if>
<if test="incurflag != null and incurflag != ''">INCURFLAG ,</if>
<if test="innerinfonull != null and innerinfonull != ''">INNERINFONULL ,</if>
<if test="innersubj != null and innersubj != ''">INNERSUBJ ,</if>
<if test="outflag != null and outflag != ''">OUTFLAG ,</if>
<if test="pkAccsubj != null and pkAccsubj != ''">PK_ACCSUBJ ,</if>
<if test="pkCorp != null and pkCorp != ''">PK_CORP ,</if>
<if test="pkCreateGlorgbook != null and pkCreateGlorgbook != ''">PK_CREATE_GLORGBOOK ,</if>
<if test="pkGlorgbook != null and pkGlorgbook != ''">PK_GLORGBOOK ,</if>
<if test="pkGrpaccsubj != null and pkGrpaccsubj != ''">PK_GRPACCSUBJ ,</if>
<if test="pkSubjscheme != null and pkSubjscheme != ''">PK_SUBJSCHEME ,</if>
<if test="pkSubjtype != null and pkSubjtype != ''">PK_SUBJTYPE ,</if>
<if test="property1 != null and property1 != ''">PROPERTY1 ,</if>
<if test="property2 != null and property2 != ''">PROPERTY2 ,</if>
<if test="property3 != null and property3 != ''">PROPERTY3 ,</if>
<if test="property4 != null and property4 != ''">PROPERTY4 ,</if>
<if test="property5 != null and property5 != ''">PROPERTY5 ,</if>
<if test="remcode != null and remcode != ''">REMCODE ,</if>
<if test="sealflag != null and sealflag != ''">SEALFLAG ,</if>
<if test="stoped != null and stoped != ''">STOPED ,</if>
<if test="subjcode != null and subjcode != ''">SUBJCODE ,</if>
<if test="subjlev != null">SUBJLEV ,</if>
<if test="subjname != null and subjname != ''">SUBJNAME ,</if>
<if test="sumprintLevel != null">SUMPRINT_LEVEL ,</if>
<if test="ts != null">TS ,</if>
<if test="unit != null and unit != ''">UNIT ,</if>
</trim>
)values(
<trim suffix="" suffixOverrides=",">
<if test="accremove != null and accremove != ''">#{accremove} ,</if>
<if test="balanflag != null and balanflag != ''">#{balanflag} ,</if>
<if test="balanorient != null">#{balanorient} ,</if>
<if test="beginperiod != null and beginperiod != ''">#{beginperiod} ,</if>
<if test="beginyear != null and beginyear != ''">#{beginyear} ,</if>
<if test="bothorient != null and bothorient != ''">#{bothorient} ,</if>
<if test="cashbankflag != null">#{cashbankflag} ,</if>
<if test="checkdouble != null">#{checkdouble} ,</if>
<if test="checktype != null">#{checktype} ,</if>
<if test="createcorp != null and createcorp != ''">#{createcorp} ,</if>
<if test="createperiod != null and createperiod != ''">#{createperiod} ,</if>
<if test="createyear != null and createyear != ''">#{createyear} ,</if>
<if test="ctlsystem != null and ctlsystem != ''">#{ctlsystem} ,</if>
<if test="currency != null and currency != ''">#{currency} ,</if>
<if test="dispname != null and dispname != ''">#{dispname} ,</if>
<if test="dr != null">#{dr} ,</if>
<if test="endflag != null and endflag != ''">#{endflag} ,</if>
<if test="endperiod != null and endperiod != ''">#{endperiod} ,</if>
<if test="endyear != null and endyear != ''">#{endyear} ,</if>
<if test="engsubjname != null and engsubjname != ''">#{engsubjname} ,</if>
<if test="free1 != null and free1 != ''">#{free1} ,</if>
<if test="free10 != null and free10 != ''">#{free10} ,</if>
<if test="free11 != null and free11 != ''">#{free11} ,</if>
<if test="free12 != null and free12 != ''">#{free12} ,</if>
<if test="free13 != null and free13 != ''">#{free13} ,</if>
<if test="free14 != null and free14 != ''">#{free14} ,</if>
<if test="free15 != null and free15 != ''">#{free15} ,</if>
<if test="free16 != null and free16 != ''">#{free16} ,</if>
<if test="free17 != null and free17 != ''">#{free17} ,</if>
<if test="free18 != null and free18 != ''">#{free18} ,</if>
<if test="free19 != null and free19 != ''">#{free19} ,</if>
<if test="free2 != null and free2 != ''">#{free2} ,</if>
<if test="free20 != null and free20 != ''">#{free20} ,</if>
<if test="free3 != null and free3 != ''">#{free3} ,</if>
<if test="free4 != null and free4 != ''">#{free4} ,</if>
<if test="free5 != null and free5 != ''">#{free5} ,</if>
<if test="free6 != null and free6 != ''">#{free6} ,</if>
<if test="free7 != null and free7 != ''">#{free7} ,</if>
<if test="free8 != null and free8 != ''">#{free8} ,</if>
<if test="free9 != null and free9 != ''">#{free9} ,</if>
<if test="incurflag != null and incurflag != ''">#{incurflag} ,</if>
<if test="innerinfonull != null and innerinfonull != ''">#{innerinfonull} ,</if>
<if test="innersubj != null and innersubj != ''">#{innersubj} ,</if>
<if test="outflag != null and outflag != ''">#{outflag} ,</if>
<if test="pkAccsubj != null and pkAccsubj != ''">#{pkAccsubj} ,</if>
<if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
<if test="pkCreateGlorgbook != null and pkCreateGlorgbook != ''">#{pkCreateGlorgbook} ,</if>
<if test="pkGlorgbook != null and pkGlorgbook != ''">#{pkGlorgbook} ,</if>
<if test="pkGrpaccsubj != null and pkGrpaccsubj != ''">#{pkGrpaccsubj} ,</if>
<if test="pkSubjscheme != null and pkSubjscheme != ''">#{pkSubjscheme} ,</if>
<if test="pkSubjtype != null and pkSubjtype != ''">#{pkSubjtype} ,</if>
<if test="property1 != null and property1 != ''">#{property1} ,</if>
<if test="property2 != null and property2 != ''">#{property2} ,</if>
<if test="property3 != null and property3 != ''">#{property3} ,</if>
<if test="property4 != null and property4 != ''">#{property4} ,</if>
<if test="property5 != null and property5 != ''">#{property5} ,</if>
<if test="remcode != null and remcode != ''">#{remcode} ,</if>
<if test="sealflag != null and sealflag != ''">#{sealflag} ,</if>
<if test="stoped != null and stoped != ''">#{stoped} ,</if>
<if test="subjcode != null and subjcode != ''">#{subjcode} ,</if>
<if test="subjlev != null">#{subjlev} ,</if>
<if test="subjname != null and subjname != ''">#{subjname} ,</if>
<if test="sumprintLevel != null">#{sumprintLevel} ,</if>
<if test="ts != null">#{ts} ,</if>
<if test="unit != null and unit != ''">#{unit} ,</if>
</trim>
)
</insert>
</mapper>

View File

@ -2,9 +2,7 @@ package com.hzya.frame.voucher.ae.comf.bd.entity;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hzya.frame.web.entity.BaseEntity; import com.hzya.frame.web.entity.BaseEntity;
import lombok.Data;
/** /**
* 会计事项(accounting_event)-配置-数据配置-基础数据资源表(AeConfBdBdinfo)实体类 * 会计事项(accounting_event)-配置-数据配置-基础数据资源表(AeConfBdBdinfo)实体类
@ -12,74 +10,297 @@ import lombok.Data;
* @author zydd * @author zydd
* @since 2025-06-05 10:33:48 * @since 2025-06-05 10:33:48
*/ */
@Data
public class AeConfBdBdinfoEntity extends BaseEntity { public class AeConfBdBdinfoEntity extends BaseEntity {
@JsonIgnore
private String accessclass; private String accessclass;
@JsonIgnore
private String basedoctablename; private String basedoctablename;
@JsonIgnore
private String basedoctablepkname; private String basedoctablepkname;
@JsonIgnore
private String bdcode; private String bdcode;
@JsonIgnore
private String bdname; private String bdname;
@JsonIgnore
private Long bdtype; private Long bdtype;
@JsonIgnore
private String budgetconst; private String budgetconst;
@JsonIgnore
private String classcheme; private String classcheme;
@JsonIgnore
private String codefieldname; private String codefieldname;
@JsonIgnore
private String coderulegetter; private String coderulegetter;
@JsonIgnore
private String corpfieldname; private String corpfieldname;
@JsonIgnore
private Long dr; private Long dr;
@JsonIgnore
private String fatherfieldname; private String fatherfieldname;
@JsonIgnore
private String funccode; private String funccode;
@JsonIgnore
private String isdef; private String isdef;
@JsonIgnore
private String isincludegroupdata; private String isincludegroupdata;
@JsonIgnore
private String isparaLevscheme; private String isparaLevscheme;
@JsonIgnore
private String isselfref; private String isselfref;
@JsonIgnore
private String namefieldname; private String namefieldname;
@JsonIgnore
private String orgbookfieldname; private String orgbookfieldname;
@JsonIgnore
private String orgtypecode; private String orgtypecode;
@JsonIgnore
private String pkBdinfo; private String pkBdinfo;
@JsonIgnore
private String pkCorp; private String pkCorp;
@JsonIgnore
private String pkDefdef; private String pkDefdef;
@JsonIgnore
private String refnodename; private String refnodename;
@JsonIgnore
private String refsystem; private String refsystem;
@JsonIgnore
private String reserved1; private String reserved1;
@JsonIgnore
private String reserved2; private String reserved2;
@JsonIgnore
private String selfrefclass; private String selfrefclass;
@JsonIgnore
private String tablename; private String tablename;
@JsonIgnore
private String tablepkname; private String tablepkname;
@JsonIgnore
private Date ts; private Date ts;
public String getAccessclass() {
return accessclass;
}
public void setAccessclass(String accessclass) {
this.accessclass = accessclass;
}
public String getBasedoctablename() {
return basedoctablename;
}
public void setBasedoctablename(String basedoctablename) {
this.basedoctablename = basedoctablename;
}
public String getBasedoctablepkname() {
return basedoctablepkname;
}
public void setBasedoctablepkname(String basedoctablepkname) {
this.basedoctablepkname = basedoctablepkname;
}
public String getBdcode() {
return bdcode;
}
public void setBdcode(String bdcode) {
this.bdcode = bdcode;
}
public String getBdname() {
return bdname;
}
public void setBdname(String bdname) {
this.bdname = bdname;
}
public Long getBdtype() {
return bdtype;
}
public void setBdtype(Long bdtype) {
this.bdtype = bdtype;
}
public String getBudgetconst() {
return budgetconst;
}
public void setBudgetconst(String budgetconst) {
this.budgetconst = budgetconst;
}
public String getClasscheme() {
return classcheme;
}
public void setClasscheme(String classcheme) {
this.classcheme = classcheme;
}
public String getCodefieldname() {
return codefieldname;
}
public void setCodefieldname(String codefieldname) {
this.codefieldname = codefieldname;
}
public String getCoderulegetter() {
return coderulegetter;
}
public void setCoderulegetter(String coderulegetter) {
this.coderulegetter = coderulegetter;
}
public String getCorpfieldname() {
return corpfieldname;
}
public void setCorpfieldname(String corpfieldname) {
this.corpfieldname = corpfieldname;
}
public Long getDr() {
return dr;
}
public void setDr(Long dr) {
this.dr = dr;
}
public String getFatherfieldname() {
return fatherfieldname;
}
public void setFatherfieldname(String fatherfieldname) {
this.fatherfieldname = fatherfieldname;
}
public String getFunccode() {
return funccode;
}
public void setFunccode(String funccode) {
this.funccode = funccode;
}
public String getIsdef() {
return isdef;
}
public void setIsdef(String isdef) {
this.isdef = isdef;
}
public String getIsincludegroupdata() {
return isincludegroupdata;
}
public void setIsincludegroupdata(String isincludegroupdata) {
this.isincludegroupdata = isincludegroupdata;
}
public String getIsparaLevscheme() {
return isparaLevscheme;
}
public void setIsparaLevscheme(String isparaLevscheme) {
this.isparaLevscheme = isparaLevscheme;
}
public String getIsselfref() {
return isselfref;
}
public void setIsselfref(String isselfref) {
this.isselfref = isselfref;
}
public String getNamefieldname() {
return namefieldname;
}
public void setNamefieldname(String namefieldname) {
this.namefieldname = namefieldname;
}
public String getOrgbookfieldname() {
return orgbookfieldname;
}
public void setOrgbookfieldname(String orgbookfieldname) {
this.orgbookfieldname = orgbookfieldname;
}
public String getOrgtypecode() {
return orgtypecode;
}
public void setOrgtypecode(String orgtypecode) {
this.orgtypecode = orgtypecode;
}
public String getPkBdinfo() {
return pkBdinfo;
}
public void setPkBdinfo(String pkBdinfo) {
this.pkBdinfo = pkBdinfo;
}
public String getPkCorp() {
return pkCorp;
}
public void setPkCorp(String pkCorp) {
this.pkCorp = pkCorp;
}
public String getPkDefdef() {
return pkDefdef;
}
public void setPkDefdef(String pkDefdef) {
this.pkDefdef = pkDefdef;
}
public String getRefnodename() {
return refnodename;
}
public void setRefnodename(String refnodename) {
this.refnodename = refnodename;
}
public String getRefsystem() {
return refsystem;
}
public void setRefsystem(String refsystem) {
this.refsystem = refsystem;
}
public String getReserved1() {
return reserved1;
}
public void setReserved1(String reserved1) {
this.reserved1 = reserved1;
}
public String getReserved2() {
return reserved2;
}
public void setReserved2(String reserved2) {
this.reserved2 = reserved2;
}
public String getSelfrefclass() {
return selfrefclass;
}
public void setSelfrefclass(String selfrefclass) {
this.selfrefclass = selfrefclass;
}
public String getTablename() {
return tablename;
}
public void setTablename(String tablename) {
this.tablename = tablename;
}
public String getTablepkname() {
return tablepkname;
}
public void setTablepkname(String tablepkname) {
this.tablepkname = tablepkname;
}
public Date getTs() {
return ts;
}
public void setTs(Date ts) {
this.ts = ts;
}
} }

View File

@ -1,67 +0,0 @@
package com.hzya.frame.voucher.ae.comf.bd.utils;
import com.hzya.frame.voucher.ae.comf.bd.entity.AccsubjTreeNode;
import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity;
import java.util.ArrayList;
import java.util.List;
/**
* Created by zydd on 2025-06-05 17:52
*/
public class AccsubjTreeBuilder {
public static List<AccsubjTreeNode> buildTree(List<AeConfBdAccsubjEntity> list) {
List<AccsubjTreeNode> rootNodes = new ArrayList<>();
int index = 0;
while (index < list.size()) {
AeConfBdAccsubjEntity current = list.get(index);
if (current.getSubjlev() == 1) {
AccsubjTreeNode node = new AccsubjTreeNode();
node.setData(current);
index++;
// 构建该一级节点下的子树
node.setChildren(buildChildren(list, index, 1));
rootNodes.add(node);
} else {
// 如果第一个不是一级节点跳过
index++;
}
}
return rootNodes;
}
// 递归构建子节点
private static List<AccsubjTreeNode> buildChildren(List<AeConfBdAccsubjEntity> list, int startIndex, int parentLevel) {
List<AccsubjTreeNode> children = new ArrayList<>();
int index = startIndex;
while (index < list.size()) {
AeConfBdAccsubjEntity current = list.get(index);
int currentLevel = Math.toIntExact(current.getSubjlev());
if (currentLevel == parentLevel + 1) {
// 当前是父级的直接下级
AccsubjTreeNode node = new AccsubjTreeNode();
node.setData(current);
index++;
// 递归构建其子节点
node.setChildren(buildChildren(list, index, parentLevel + 1));
children.add(node);
} else if (currentLevel <= parentLevel) {
// 当前等级小于等于父级说明当前分支结束
break;
} else {
// 跳过非法层级如从1跳到3
index++;
}
}
return children;
}
}

View File

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

View File

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

View File

@ -9,7 +9,7 @@ import lombok.Data;
* 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)实体类 * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)实体类
* *
* @author zydd * @author zydd
* @since 2025-06-05 15:13:29 * @since 2025-06-04 10:30:42
*/ */
@Data @Data
public class AeConfSubjectContrastBEntity extends BaseEntity { public class AeConfSubjectContrastBEntity extends BaseEntity {
@ -26,114 +26,42 @@ public class AeConfSubjectContrastBEntity extends BaseEntity {
* 目标档案值会计科目) * 目标档案值会计科目)
*/ */
private String desdocvalue; private String desdocvalue;
/**
* 来源档案表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 * 来源档案值1
*/ */
private String factorid1; private String factorvalue1;
/** /**
* 来源档案值2 * 来源档案值2
*/ */
private String factorid2; private String factorvalue2;
/** /**
* 来源档案值3 * 来源档案值3
*/ */
private String factorid3; private String factorvalue3;
/** /**
* 来源档案值4 * 来源档案值4
*/ */
private String factorid4; private String factorvalue4;
/** /**
* 来源档案值5 * 来源档案值5
*/ */
private String factorid5; private String factorvalue5;
/** /**
* 来源档案值6 * 来源档案值6
*/ */
private String factorid6; private String factorvalue6;
/** /**
* 来源档案值7 * 来源档案值7
*/ */
private String factorid7; private String factorvalue7;
/** /**
* 来源档案值8 * 来源档案值8
*/ */
private String factorid8; private String factorvalue8;
/** /**
* 来源档案值9 * 来源档案值9
*/ */
private String factorid9; private String factorvalue9;
/** /**
* 备注 * 备注
*/ */

View File

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

View File

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

View File

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

View File

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