diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java
new file mode 100644
index 00000000..77599bf0
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java
@@ -0,0 +1,49 @@
+package com.hzya.frame.voucher.ae.comf.subject.controller;
+
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
+import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectClassificationService;
+import com.hzya.frame.web.action.DefaultController;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Created by zydd on 2025-05-30 15:13
+ * 分类定义
+ */
+@RestController
+@RequestMapping("/ae/conf/subjectClassification")
+public class ClassificationController extends DefaultController {
+
+ @Autowired
+ private IAeConfSubjectClassificationService aeConfSubjectClassificationService;
+
+// @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
+// public JsonResultEntity queryAll(@RequestBody AeConfSubjectContrastEntity entity){
+// try {
+// List<AeConfSubjectContrastEntity> all = aeConfSubjectClassificationService.queryAll(entity);
+// return getSuccessMessageEntity("请求成功",all);
+// } catch (Exception e) {
+// e.printStackTrace();
+// return getFailureMessageEntity("请求失败",e.getMessage());
+// }
+// }
+
+ @RequestMapping(value = "/save", method = RequestMethod.POST)
+ public JsonResultEntity save(@RequestBody AeConfSubjectClassificationEntity entity) {
+ try {
+ List<AeConfSubjectContrastEntity> all = aeConfSubjectClassificationService.saveEntity(entity);
+ return getSuccessMessageEntity("请求成功", all);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return getFailureMessageEntity("请求失败", e.getMessage());
+ }
+ }
+
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java
index 0450cb9f..572ae4a9 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastBController.java
@@ -57,10 +57,10 @@ public class ContrastBController extends DefaultController {
}
}
- @RequestMapping(value = "/deleteList", method = RequestMethod.POST)
- public JsonResultEntity deleteList(@RequestBody List<AeConfSubjectContrastBEntity> list){
+ @RequestMapping(value = "/delete", method = RequestMethod.POST)
+ public JsonResultEntity delete(@RequestBody AeConfSubjectContrastBEntity entity){
try {
- contrastBService.deleteList(list);
+ contrastBService.deleteList(entity);
return getSuccessMessageEntity("请求成功",null);
} catch (Exception e) {
e.printStackTrace();
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
index 29b3fda9..056fe73d 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
@@ -73,4 +73,18 @@ public class ContrastController extends DefaultController {
return getFailureMessageEntity("请求失败",e.getMessage());
}
}
+
+ //1、根据入参影响因素ids，分别查询影响因素设置的对应基础档案类型
+ //2、再按顺序拼接写类型的ids，再去科目对照表中查询这个ids对应的对照表
+ //3、返回对照表对象
+ @RequestMapping(value = "/queryByInfluenceIds", method = RequestMethod.POST)
+ public JsonResultEntity queryByInfluenceIds(@RequestBody AeConfSubjectContrastEntity entity){
+ try {
+ AeConfSubjectContrastEntity aeConfSubjectContrastEntity = aeConfSubjectContrastService.queryByInfluenceIds(entity);
+ return getSuccessMessageEntity("请求成功",aeConfSubjectContrastEntity);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return getFailureMessageEntity("请求失败",e.getMessage());
+ }
+ }
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectClassificationDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectClassificationDao.java
new file mode 100644
index 00000000..d8fa9e6d
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectClassificationDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.voucher.ae.comf.subject.dao;
+
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
+import com.hzya.frame.basedao.dao.IBaseDao;
+
+/**
+ * 会计事项(accounting_event)-配置-科目分类定义(ae_conf_subject_classification: table)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-06-06 17:00:57
+ */
+public interface IAeConfSubjectClassificationDao extends IBaseDao<AeConfSubjectClassificationEntity, String> {
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectClassificationDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectClassificationDaoImpl.java
new file mode 100644
index 00000000..96d9db52
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectClassificationDaoImpl.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.voucher.ae.comf.subject.dao.impl;
+
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
+import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectClassificationDao;
+import org.springframework.stereotype.Repository;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 会计事项(accounting_event)-配置-科目分类定义(AeConfSubjectClassification)表数据库访问层
+ *
+ * @author zydd
+ * @since 2025-06-06 17:00:57
+ */
+@Repository
+public class AeConfSubjectClassificationDaoImpl extends MybatisGenericDao<AeConfSubjectClassificationEntity, String> implements IAeConfSubjectClassificationDao{
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.java
new file mode 100644
index 00000000..bed402ed
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.java
@@ -0,0 +1,236 @@
+package com.hzya.frame.voucher.ae.comf.subject.entity;
+
+import java.util.Date;
+import com.hzya.frame.web.entity.BaseEntity;
+/**
+ * 会计事项(accounting_event)-配置-科目分类定义(AeConfSubjectClassification)实体类
+ *
+ * @author zydd
+ * @since 2025-06-06 17:00:57
+ */
+public class AeConfSubjectClassificationEntity extends BaseEntity {
+
+ /** 科目分类编码 */
+ private String code;
+ /** 科目分类名称 */
+ private String name;
+ /** 公司pk */
+ private String pkCorp;
+ /** 账簿主键 */
+ private String pkglorgbook;
+ /** 账簿编码 */
+ private String glorgbookcode;
+ /** 账簿名称 */
+ private String glorgbookname;
+ /** 影响因素定义ids */
+ private String factorids;
+ /** 影响因素定义names */
+ private String factornames;
+ /** 对照表id */
+ private String contrastId;
+ /** 目标档案值（会计科目)-默认值，没有对照表时使用 */
+ private String desdocvalueDefault;
+ /** 备注 */
+ private String remark;
+ private String def1;
+ private String def2;
+ private String def3;
+ private String def4;
+ private String def5;
+ private String def6;
+ private String def7;
+ private String def8;
+ private String def9;
+ private String def10;
+ /** 创建人 */
+ private String createUser;
+ /** 修改人 */
+ private String modifyUser;
+
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPkCorp() {
+ return pkCorp;
+ }
+
+ public void setPkCorp(String pkCorp) {
+ this.pkCorp = pkCorp;
+ }
+
+ public String getPkglorgbook() {
+ return pkglorgbook;
+ }
+
+ public void setPkglorgbook(String pkglorgbook) {
+ this.pkglorgbook = pkglorgbook;
+ }
+
+ public String getGlorgbookcode() {
+ return glorgbookcode;
+ }
+
+ public void setGlorgbookcode(String glorgbookcode) {
+ this.glorgbookcode = glorgbookcode;
+ }
+
+ public String getGlorgbookname() {
+ return glorgbookname;
+ }
+
+ public void setGlorgbookname(String glorgbookname) {
+ this.glorgbookname = glorgbookname;
+ }
+
+ public String getFactorids() {
+ return factorids;
+ }
+
+ public void setFactorids(String factorids) {
+ this.factorids = factorids;
+ }
+
+ public String getFactornames() {
+ return factornames;
+ }
+
+ public void setFactornames(String factornames) {
+ this.factornames = factornames;
+ }
+
+ public String getContrastId() {
+ return contrastId;
+ }
+
+ public void setContrastId(String contrastId) {
+ this.contrastId = contrastId;
+ }
+
+ public String getDesdocvalueDefault() {
+ return desdocvalueDefault;
+ }
+
+ public void setDesdocvalueDefault(String desdocvalueDefault) {
+ this.desdocvalueDefault = desdocvalueDefault;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getDef1() {
+ return def1;
+ }
+
+ public void setDef1(String def1) {
+ this.def1 = def1;
+ }
+
+ public String getDef2() {
+ return def2;
+ }
+
+ public void setDef2(String def2) {
+ this.def2 = def2;
+ }
+
+ public String getDef3() {
+ return def3;
+ }
+
+ public void setDef3(String def3) {
+ this.def3 = def3;
+ }
+
+ public String getDef4() {
+ return def4;
+ }
+
+ public void setDef4(String def4) {
+ this.def4 = def4;
+ }
+
+ public String getDef5() {
+ return def5;
+ }
+
+ public void setDef5(String def5) {
+ this.def5 = def5;
+ }
+
+ public String getDef6() {
+ return def6;
+ }
+
+ public void setDef6(String def6) {
+ this.def6 = def6;
+ }
+
+ public String getDef7() {
+ return def7;
+ }
+
+ public void setDef7(String def7) {
+ this.def7 = def7;
+ }
+
+ public String getDef8() {
+ return def8;
+ }
+
+ public void setDef8(String def8) {
+ this.def8 = def8;
+ }
+
+ public String getDef9() {
+ return def9;
+ }
+
+ public void setDef9(String def9) {
+ this.def9 = def9;
+ }
+
+ public String getDef10() {
+ return def10;
+ }
+
+ public void setDef10(String def10) {
+ this.def10 = def10;
+ }
+
+ public String getCreateUser() {
+ return createUser;
+ }
+
+ public void setCreateUser(String createUser) {
+ this.createUser = createUser;
+ }
+
+ public String getModifyUser() {
+ return modifyUser;
+ }
+
+ public void setModifyUser(String modifyUser) {
+ this.modifyUser = modifyUser;
+ }
+
+}
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.xml
new file mode 100644
index 00000000..3b71aa52
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.xml
@@ -0,0 +1,436 @@
+<?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.subject.dao.impl.AeConfSubjectClassificationDaoImpl">
+
+ <resultMap id="get-AeConfSubjectClassificationEntity-result"
+ type="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ <result property="id" column="id" jdbcType="INTEGER"/>
+ <result property="code" column="code" jdbcType="VARCHAR"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
+ <result property="pkglorgbook" column="pkglorgbook" jdbcType="VARCHAR"/>
+ <result property="glorgbookcode" column="glorgbookcode" jdbcType="VARCHAR"/>
+ <result property="glorgbookname" column="glorgbookname" jdbcType="VARCHAR"/>
+ <result property="factorids" column="factorIds" jdbcType="VARCHAR"/>
+ <result property="factornames" column="factorNames" jdbcType="VARCHAR"/>
+ <result property="contrastId" column="contrast_id" jdbcType="VARCHAR"/>
+ <result property="desdocvalueDefault" column="desdocvalue_default" jdbcType="VARCHAR"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="def1" column="def1" jdbcType="VARCHAR"/>
+ <result property="def2" column="def2" jdbcType="VARCHAR"/>
+ <result property="def3" column="def3" jdbcType="VARCHAR"/>
+ <result property="def4" column="def4" jdbcType="VARCHAR"/>
+ <result property="def5" column="def5" jdbcType="VARCHAR"/>
+ <result property="def6" column="def6" jdbcType="VARCHAR"/>
+ <result property="def7" column="def7" jdbcType="VARCHAR"/>
+ <result property="def8" column="def8" jdbcType="VARCHAR"/>
+ <result property="def9" column="def9" jdbcType="VARCHAR"/>
+ <result property="def10" column="def10" jdbcType="VARCHAR"/>
+ <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+ <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
+ <result property="modifyUser" column="modify_user" jdbcType="VARCHAR"/>
+ <result property="sts" column="sts" jdbcType="VARCHAR"/>
+ </resultMap>
+ <!-- 查询的字段-->
+ <sql id="AeConfSubjectClassificationEntity_Base_Column_List">
+ id
+ ,code
+ ,name
+ ,pk_corp
+ ,pkglorgbook
+ ,glorgbookcode
+ ,glorgbookname
+ ,factorIds
+ ,factorNames
+ ,contrast_id
+ ,desdocvalue_default
+ ,remark
+ ,def1
+ ,def2
+ ,def3
+ ,def4
+ ,def5
+ ,def6
+ ,def7
+ ,def8
+ ,def9
+ ,def10
+ ,create_time
+ ,create_user
+ ,modify_time
+ ,modify_user
+ ,sts
+ </sql>
+ <!-- 查询 采用==查询 -->
+ <select id="entity_list_base" resultMap="get-AeConfSubjectClassificationEntity-result"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ select
+ <include refid="AeConfSubjectClassificationEntity_Base_Column_List"/>
+ from ae_conf_subject_classification
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null">and id = #{id}</if>
+ <if test="code != null and code != ''">and code = #{code}</if>
+ <if test="name != null and name != ''">and name = #{name}</if>
+ <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook = #{pkglorgbook}</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">and glorgbookcode = #{glorgbookcode}</if>
+ <if test="glorgbookname != null and glorgbookname != ''">and glorgbookname = #{glorgbookname}</if>
+ <if test="factorids != null and factorids != ''">and factorIds = #{factorids}</if>
+ <if test="factornames != null and factornames != ''">and factorNames = #{factornames}</if>
+ <if test="contrastId != null and contrastId != ''">and contrast_id = #{contrastId}</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default =
+ #{desdocvalueDefault}
+ </if>
+ <if test="remark != null and remark != ''">and remark = #{remark}</if>
+ <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+ <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+ <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+ <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+ <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+ <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+ <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+ <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+ <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+ <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+ <if test="create_time != null">and create_time = #{create_time}</if>
+ <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+ <if test="modify_time != null">and modify_time = #{modify_time}</if>
+ <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+ <if test="sts != null and sts != ''">and sts = #{sts}</if>
+ and sts='Y'
+ </trim>
+ </select>
+
+ <!-- 查询符合条件的数量 -->
+ <select id="entity_count" resultType="Integer"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ select count(1) from ae_conf_subject_classification
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null">and id = #{id}</if>
+ <if test="code != null and code != ''">and code = #{code}</if>
+ <if test="name != null and name != ''">and name = #{name}</if>
+ <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook = #{pkglorgbook}</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">and glorgbookcode = #{glorgbookcode}</if>
+ <if test="glorgbookname != null and glorgbookname != ''">and glorgbookname = #{glorgbookname}</if>
+ <if test="factorids != null and factorids != ''">and factorIds = #{factorids}</if>
+ <if test="factornames != null and factornames != ''">and factorNames = #{factornames}</if>
+ <if test="contrastId != null and contrastId != ''">and contrast_id = #{contrastId}</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default =
+ #{desdocvalueDefault}
+ </if>
+ <if test="remark != null and remark != ''">and remark = #{remark}</if>
+ <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+ <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+ <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+ <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+ <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+ <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+ <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+ <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+ <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+ <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+ <if test="create_time != null">and create_time = #{create_time}</if>
+ <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+ <if test="modify_time != null">and modify_time = #{modify_time}</if>
+ <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+ <if test="sts != null and sts != ''">and sts = #{sts}</if>
+ and sts='Y'
+ </trim>
+ </select>
+
+ <!-- 分页查询列表 采用like格式 -->
+ <select id="entity_list_like" resultMap="get-AeConfSubjectClassificationEntity-result"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ select
+ <include refid="AeConfSubjectClassificationEntity_Base_Column_List"/>
+ from ae_conf_subject_classification
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null">and id like concat('%',#{id},'%')</if>
+ <if test="code != null and code != ''">and code like concat('%',#{code},'%')</if>
+ <if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
+ <if test="pkCorp != null and pkCorp != ''">and pk_corp like concat('%',#{pkCorp},'%')</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook like concat('%',#{pkglorgbook},'%')
+ </if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">and glorgbookcode like
+ concat('%',#{glorgbookcode},'%')
+ </if>
+ <if test="glorgbookname != null and glorgbookname != ''">and glorgbookname like
+ concat('%',#{glorgbookname},'%')
+ </if>
+ <if test="factorids != null and factorids != ''">and factorIds like concat('%',#{factorids},'%')</if>
+ <if test="factornames != null and factornames != ''">and factorNames like concat('%',#{factornames},'%')
+ </if>
+ <if test="contrastId != null and contrastId != ''">and contrast_id like concat('%',#{contrastId},'%')</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default like
+ concat('%',#{desdocvalueDefault},'%')
+ </if>
+ <if test="remark != null and remark != ''">and remark like concat('%',#{remark},'%')</if>
+ <if test="def1 != null and def1 != ''">and def1 like concat('%',#{def1},'%')</if>
+ <if test="def2 != null and def2 != ''">and def2 like concat('%',#{def2},'%')</if>
+ <if test="def3 != null and def3 != ''">and def3 like concat('%',#{def3},'%')</if>
+ <if test="def4 != null and def4 != ''">and def4 like concat('%',#{def4},'%')</if>
+ <if test="def5 != null and def5 != ''">and def5 like concat('%',#{def5},'%')</if>
+ <if test="def6 != null and def6 != ''">and def6 like concat('%',#{def6},'%')</if>
+ <if test="def7 != null and def7 != ''">and def7 like concat('%',#{def7},'%')</if>
+ <if test="def8 != null and def8 != ''">and def8 like concat('%',#{def8},'%')</if>
+ <if test="def9 != null and def9 != ''">and def9 like concat('%',#{def9},'%')</if>
+ <if test="def10 != null and def10 != ''">and def10 like concat('%',#{def10},'%')</if>
+ <if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
+ <if test="createUser != null and createUser != ''">and create_user like concat('%',#{createUser},'%')</if>
+ <if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
+ <if test="modifyUser != null and modifyUser != ''">and modify_user like concat('%',#{modifyUser},'%')</if>
+ <if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
+ and sts='Y'
+ </trim>
+ </select>
+
+ <!-- 查询列表 字段采用or格式 -->
+ <select id="AeConfSubjectClassificationentity_list_or" resultMap="get-AeConfSubjectClassificationEntity-result"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ select
+ <include refid="AeConfSubjectClassificationEntity_Base_Column_List"/>
+ from ae_conf_subject_classification
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null">or id = #{id}</if>
+ <if test="code != null and code != ''">or code = #{code}</if>
+ <if test="name != null and name != ''">or name = #{name}</if>
+ <if test="pkCorp != null and pkCorp != ''">or pk_corp = #{pkCorp}</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">or pkglorgbook = #{pkglorgbook}</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">or glorgbookcode = #{glorgbookcode}</if>
+ <if test="glorgbookname != null and glorgbookname != ''">or glorgbookname = #{glorgbookname}</if>
+ <if test="factorids != null and factorids != ''">or factorIds = #{factorids}</if>
+ <if test="factornames != null and factornames != ''">or factorNames = #{factornames}</if>
+ <if test="contrastId != null and contrastId != ''">or contrast_id = #{contrastId}</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">or desdocvalue_default =
+ #{desdocvalueDefault}
+ </if>
+ <if test="remark != null and remark != ''">or remark = #{remark}</if>
+ <if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
+ <if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
+ <if test="def3 != null and def3 != ''">or def3 = #{def3}</if>
+ <if test="def4 != null and def4 != ''">or def4 = #{def4}</if>
+ <if test="def5 != null and def5 != ''">or def5 = #{def5}</if>
+ <if test="def6 != null and def6 != ''">or def6 = #{def6}</if>
+ <if test="def7 != null and def7 != ''">or def7 = #{def7}</if>
+ <if test="def8 != null and def8 != ''">or def8 = #{def8}</if>
+ <if test="def9 != null and def9 != ''">or def9 = #{def9}</if>
+ <if test="def10 != null and def10 != ''">or def10 = #{def10}</if>
+ <if test="create_time != null">or create_time = #{create_time}</if>
+ <if test="createUser != null and createUser != ''">or create_user = #{createUser}</if>
+ <if test="modify_time != null">or modify_time = #{modify_time}</if>
+ <if test="modifyUser != null and modifyUser != ''">or modify_user = #{modifyUser}</if>
+ <if test="sts != null and sts != ''">or sts = #{sts}</if>
+ and sts='Y'
+ </trim>
+ </select>
+
+ <!--新增所有列-->
+ <insert id="entity_insert"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity"
+ keyProperty="id" useGeneratedKeys="true">
+ insert into ae_conf_subject_classification(
+ <trim suffix="" suffixOverrides=",">
+ <if test="code != null and code != ''">code ,</if>
+ <if test="name != null and name != ''">name ,</if>
+ <if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">pkglorgbook ,</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">glorgbookcode ,</if>
+ <if test="glorgbookname != null and glorgbookname != ''">glorgbookname ,</if>
+ <if test="factorids != null and factorids != ''">factorIds ,</if>
+ <if test="factornames != null and factornames != ''">factorNames ,</if>
+ <if test="contrastId != null and contrastId != ''">contrast_id ,</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">desdocvalue_default ,</if>
+ <if test="remark != null and remark != ''">remark ,</if>
+ <if test="def1 != null and def1 != ''">def1 ,</if>
+ <if test="def2 != null and def2 != ''">def2 ,</if>
+ <if test="def3 != null and def3 != ''">def3 ,</if>
+ <if test="def4 != null and def4 != ''">def4 ,</if>
+ <if test="def5 != null and def5 != ''">def5 ,</if>
+ <if test="def6 != null and def6 != ''">def6 ,</if>
+ <if test="def7 != null and def7 != ''">def7 ,</if>
+ <if test="def8 != null and def8 != ''">def8 ,</if>
+ <if test="def9 != null and def9 != ''">def9 ,</if>
+ <if test="def10 != null and def10 != ''">def10 ,</if>
+ <if test="create_time != null">create_time ,</if>
+ <if test="create_time == null">create_time ,</if>
+ <if test="createUser != null and createUser != ''">create_user ,</if>
+ <if test="modify_time != null">modify_time ,</if>
+ <if test="modify_time == null">modify_time ,</if>
+ <if test="modifyUser != null and modifyUser != ''">modify_user ,</if>
+ <if test="sts != null and sts != ''">sts ,</if>
+ <if test="sts == null ">sts,</if>
+ </trim>
+ )values(
+ <trim suffix="" suffixOverrides=",">
+ <if test="code != null and code != ''">#{code} ,</if>
+ <if test="name != null and name != ''">#{name} ,</if>
+ <if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">#{pkglorgbook} ,</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">#{glorgbookcode} ,</if>
+ <if test="glorgbookname != null and glorgbookname != ''">#{glorgbookname} ,</if>
+ <if test="factorids != null and factorids != ''">#{factorids} ,</if>
+ <if test="factornames != null and factornames != ''">#{factornames} ,</if>
+ <if test="contrastId != null and contrastId != ''">#{contrastId} ,</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">#{desdocvalueDefault} ,</if>
+ <if test="remark != null and remark != ''">#{remark} ,</if>
+ <if test="def1 != null and def1 != ''">#{def1} ,</if>
+ <if test="def2 != null and def2 != ''">#{def2} ,</if>
+ <if test="def3 != null and def3 != ''">#{def3} ,</if>
+ <if test="def4 != null and def4 != ''">#{def4} ,</if>
+ <if test="def5 != null and def5 != ''">#{def5} ,</if>
+ <if test="def6 != null and def6 != ''">#{def6} ,</if>
+ <if test="def7 != null and def7 != ''">#{def7} ,</if>
+ <if test="def8 != null and def8 != ''">#{def8} ,</if>
+ <if test="def9 != null and def9 != ''">#{def9} ,</if>
+ <if test="def10 != null and def10 != ''">#{def10} ,</if>
+ <if test="create_time != null">#{create_time} ,</if>
+ <if test="create_time == null">now() ,</if>
+ <if test="createUser != null and createUser != ''">#{createUser} ,</if>
+ <if test="modify_time != null">#{modify_time} ,</if>
+ <if test="modify_time == null">now() ,</if>
+ <if test="modifyUser != null and modifyUser != ''">#{modifyUser} ,</if>
+ <if test="sts != null and sts != ''">#{sts} ,</if>
+ <if test="sts == null ">'Y',</if>
+ </trim>
+ )
+ </insert>
+ <!-- 批量新增 -->
+ <insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
+ insert into ae_conf_subject_classification(code, name, pk_corp, pkglorgbook, glorgbookcode, glorgbookname,
+ factorIds, factorNames, contrast_id, desdocvalue_default, remark, def1, def2, def3, def4, def5, def6, def7,
+ def8, def9, def10, create_time, create_user, modify_time, modify_user, sts, sts)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#{entity.code},#{entity.name},#{entity.pkCorp},#{entity.pkglorgbook},#{entity.glorgbookcode},#{entity.glorgbookname},#{entity.factorids},#{entity.factornames},#{entity.contrastId},#{entity.desdocvalueDefault},#{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')
+ </foreach>
+ </insert>
+ <!-- 批量新增或者修改-->
+ <insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+ insert into ae_conf_subject_classification(code, name, pk_corp, pkglorgbook, glorgbookcode, glorgbookname,
+ factorIds, factorNames, contrast_id, desdocvalue_default, remark, def1, def2, def3, def4, def5, def6, def7,
+ def8, def9, def10, create_time, create_user, modify_time, modify_user, sts)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#{entity.code},#{entity.name},#{entity.pkCorp},#{entity.pkglorgbook},#{entity.glorgbookcode},#{entity.glorgbookname},#{entity.factorids},#{entity.factornames},#{entity.contrastId},#{entity.desdocvalueDefault},#{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>
+ on duplicate key update
+ code = values(code),
+ name = values(name),
+ pk_corp = values(pk_corp),
+ pkglorgbook = values(pkglorgbook),
+ glorgbookcode = values(glorgbookcode),
+ glorgbookname = values(glorgbookname),
+ factorIds = values(factorIds),
+ factorNames = values(factorNames),
+ contrast_id = values(contrast_id),
+ desdocvalue_default = values(desdocvalue_default),
+ remark = values(remark),
+ def1 = values(def1),
+ def2 = values(def2),
+ def3 = values(def3),
+ def4 = values(def4),
+ def5 = values(def5),
+ def6 = values(def6),
+ def7 = values(def7),
+ def8 = values(def8),
+ def9 = values(def9),
+ def10 = values(def10),
+ create_time = values(create_time),
+ create_user = values(create_user),
+ modify_time = values(modify_time),
+ modify_user = values(modify_user),
+ sts = values(sts)
+ </insert>
+ <!--通过主键修改方法-->
+ <update id="entity_update"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ update ae_conf_subject_classification set
+ <trim suffix="" suffixOverrides=",">
+ <if test="code != null and code != ''">code = #{code},</if>
+ <if test="name != null and name != ''">name = #{name},</if>
+ <if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">pkglorgbook = #{pkglorgbook},</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">glorgbookcode = #{glorgbookcode},</if>
+ <if test="glorgbookname != null and glorgbookname != ''">glorgbookname = #{glorgbookname},</if>
+ <if test="factorids != null and factorids != ''">factorIds = #{factorids},</if>
+ <if test="factornames != null and factornames != ''">factorNames = #{factornames},</if>
+ <if test="contrastId != null and contrastId != ''">contrast_id = #{contrastId},</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">desdocvalue_default =
+ #{desdocvalueDefault},
+ </if>
+ <if test="remark != null and remark != ''">remark = #{remark},</if>
+ <if test="def1 != null and def1 != ''">def1 = #{def1},</if>
+ <if test="def2 != null and def2 != ''">def2 = #{def2},</if>
+ <if test="def3 != null and def3 != ''">def3 = #{def3},</if>
+ <if test="def4 != null and def4 != ''">def4 = #{def4},</if>
+ <if test="def5 != null and def5 != ''">def5 = #{def5},</if>
+ <if test="def6 != null and def6 != ''">def6 = #{def6},</if>
+ <if test="def7 != null and def7 != ''">def7 = #{def7},</if>
+ <if test="def8 != null and def8 != ''">def8 = #{def8},</if>
+ <if test="def9 != null and def9 != ''">def9 = #{def9},</if>
+ <if test="def10 != null and def10 != ''">def10 = #{def10},</if>
+ <if test="create_time != null">create_time = #{create_time},</if>
+ <if test="createUser != null and createUser != ''">create_user = #{createUser},</if>
+ <if test="modify_time != null">modify_time = #{modify_time},</if>
+ <if test="modify_time == null">modify_time = now(),</if>
+ <if test="modifyUser != null and modifyUser != ''">modify_user = #{modifyUser},</if>
+ <if test="sts != null and sts != ''">sts = #{sts},</if>
+ </trim>
+ where id = #{id}
+ </update>
+ <!-- 逻辑删除 -->
+ <update id="entity_logicDelete"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ update ae_conf_subject_classification
+ set sts= 'N',
+ modify_time = now()
+ where id = #{id}
+ </update>
+ <!-- 多条件逻辑删除 -->
+ <update id="entity_logicDelete_Multi_Condition"
+ parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
+ update ae_conf_subject_classification set sts= 'N' ,modify_time = #{modify_time},modify_user_id =
+ #{modify_user_id}
+ <trim prefix="where" prefixOverrides="and">
+ <if test="id != null">and id = #{id}</if>
+ <if test="code != null and code != ''">and code = #{code}</if>
+ <if test="name != null and name != ''">and name = #{name}</if>
+ <if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
+ <if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook = #{pkglorgbook}</if>
+ <if test="glorgbookcode != null and glorgbookcode != ''">and glorgbookcode = #{glorgbookcode}</if>
+ <if test="glorgbookname != null and glorgbookname != ''">and glorgbookname = #{glorgbookname}</if>
+ <if test="factorids != null and factorids != ''">and factorIds = #{factorids}</if>
+ <if test="factornames != null and factornames != ''">and factorNames = #{factornames}</if>
+ <if test="contrastId != null and contrastId != ''">and contrast_id = #{contrastId}</if>
+ <if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default =
+ #{desdocvalueDefault}
+ </if>
+ <if test="remark != null and remark != ''">and remark = #{remark}</if>
+ <if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
+ <if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
+ <if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
+ <if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
+ <if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
+ <if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
+ <if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
+ <if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
+ <if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
+ <if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
+ <if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
+ <if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
+ <if test="sts != null and sts != ''">and sts = #{sts}</if>
+ and sts='Y'
+ </trim>
+ </update>
+ <!--通过主键删除-->
+ <delete id="entity_delete">
+ delete
+ from ae_conf_subject_classification
+ where id = #{id}
+ </delete>
+
+</mapper>
+
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
index 6d01b5ad..8f2e078b 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
@@ -22,6 +22,11 @@ public class AeConfSubjectContrastBEntity extends BaseEntity {
* 公司pk
*/
private String pkCorp;
+ private String glorgname;
+ /**
+ * 目标档案id
+ */
+ private String pkAccsubj;
/**
* 目标档案值（会计科目)
*/
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
index dcd31a73..90bdae1c 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
@@ -7,7 +7,9 @@
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="contrastId" column="contrast_id" jdbcType="INTEGER"/>
<result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
+ <result property="glorgname" column="glorgname" jdbcType="VARCHAR"/>
<result property="desdocvalue" column="desdocvalue" jdbcType="VARCHAR"/>
+ <result property="pkAccsubj" column="pkAccsubj" jdbcType="VARCHAR"/>
<result property="factortable1" column="factortable1" jdbcType="VARCHAR"/>
<result property="factortable2" column="factortable2" jdbcType="VARCHAR"/>
<result property="factortable3" column="factortable3" jdbcType="VARCHAR"/>
@@ -66,8 +68,10 @@
id
,contrast_id
,pk_corp
- ,desdocvalue
- ,factortable1
+ ,glorgname
+ ,pkAccsubj
+ ,desdocvalue
+ ,factortable1
,factortable2
,factortable3
,factortable4
@@ -377,7 +381,9 @@
<trim suffix="" suffixOverrides=",">
<if test="contrastId != null">contrast_id ,</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
+ <if test="glorgname != null and glorgname != ''">glorgname ,</if>
<if test="desdocvalue != null and desdocvalue != ''">desdocvalue ,</if>
+ <if test="pkAccsubj != null and pkAccsubj != ''">pkAccsubj ,</if>
<if test="factortable1 != null and factortable1 != ''">factortable1 ,</if>
<if test="factortable2 != null and factortable2 != ''">factortable2 ,</if>
<if test="factortable3 != null and factortable3 != ''">factortable3 ,</if>
@@ -438,7 +444,9 @@
<trim suffix="" suffixOverrides=",">
<if test="contrastId != null">#{contrastId} ,</if>
<if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
+ <if test="glorgname != null and glorgname != ''">#{glorgname} ,</if>
<if test="desdocvalue != null and desdocvalue != ''">#{desdocvalue} ,</if>
+ <if test="pkAccsubj != null and pkAccsubj != ''">#{pkAccsubj} ,</if>
<if test="factortable1 != null and factortable1 != ''">#{factortable1} ,</if>
<if test="factortable2 != null and factortable2 != ''">#{factortable2} ,</if>
<if test="factortable3 != null and factortable3 != ''">#{factortable3} ,</if>
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectClassificationService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectClassificationService.java
new file mode 100644
index 00000000..de0a019a
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectClassificationService.java
@@ -0,0 +1,17 @@
+package com.hzya.frame.voucher.ae.comf.subject.service;
+
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
+
+import java.util.List;
+
+/**
+ * 会计事项(accounting_event)-配置-科目分类定义(AeConfSubjectClassification)表服务接口
+ *
+ * @author zydd
+ * @since 2025-06-06 17:00:57
+ */
+public interface IAeConfSubjectClassificationService extends IBaseService<AeConfSubjectClassificationEntity, String>{
+ List<AeConfSubjectContrastEntity> saveEntity(AeConfSubjectClassificationEntity entity);
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java
index ab857077..4bc28114 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java
@@ -18,5 +18,5 @@ public interface IAeConfSubjectContrastBService extends IBaseService<AeConfSubje
List<AeConfSubjectContrastBEntity> updateList(List<AeConfSubjectContrastBEntity> list);
- void deleteList(List<AeConfSubjectContrastBEntity> list);
+ void deleteList(AeConfSubjectContrastBEntity entity);
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java
index 0ddbce99..47f8f8ed 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastService.java
@@ -19,4 +19,6 @@ public interface IAeConfSubjectContrastService extends IBaseService<AeConfSubjec
AeConfSubjectContrastEntity saveEntity(AeConfSubjectContrastEntity entity) throws NoSuchFieldException, IllegalAccessException;
AeConfSubjectContrastEntity updateEntity(AeConfSubjectContrastEntity entity) throws Exception;
AeConfSubjectContrastEntity deleteEntity(AeConfSubjectContrastEntity entity) throws Exception;
+
+ AeConfSubjectContrastEntity queryByInfluenceIds(AeConfSubjectContrastEntity entity);
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java
new file mode 100644
index 00000000..91271af9
--- /dev/null
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java
@@ -0,0 +1,36 @@
+package com.hzya.frame.voucher.ae.comf.subject.service.impl;
+
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
+import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectClassificationDao;
+import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
+import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectClassificationService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.annotation.Resource;
+import com.hzya.frame.basedao.service.impl.BaseService;
+
+import java.util.List;
+
+/**
+ * 会计事项(accounting_event)-配置-科目分类定义(AeConfSubjectClassification)表服务实现类
+ *
+ * @author zydd
+ * @since 2025-06-06 17:00:57
+ */
+@Service
+public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSubjectClassificationEntity, String> implements IAeConfSubjectClassificationService {
+
+ private IAeConfSubjectClassificationDao aeConfSubjectClassificationDao;
+
+ @Autowired
+ public void setAeConfSubjectClassificationDao(IAeConfSubjectClassificationDao dao) {
+ this.aeConfSubjectClassificationDao = dao;
+ this.dao = dao;
+ }
+
+ @Override
+ public List<AeConfSubjectContrastEntity> saveEntity(AeConfSubjectClassificationEntity entity) {
+
+ return null;
+ }
+}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java
index 849e9202..0b61f92f 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java
@@ -99,14 +99,9 @@ public class AeConfSubjectContrastBServiceImpl extends BaseService<AeConfSubject
}
@Override
- public void deleteList(List<AeConfSubjectContrastBEntity> list) {
- for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) {
- Assert.notNull(aeConfSubjectContrastBEntity.getId(), "删除科目对照子表时，子表id不能为空");
- }
- for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : list) {
- aeConfSubjectContrastBDao.logicRemove(aeConfSubjectContrastBEntity);
- }
-
+ public void deleteList(AeConfSubjectContrastBEntity entity) {
+ Assert.notNull(entity.getId(), "删除科目对照子表时，子表id不能为空");
+ aeConfSubjectContrastBDao.logicRemove(entity);
}
diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
index 4d906291..0c12f199 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
@@ -1,6 +1,7 @@
package com.hzya.frame.voucher.ae.comf.subject.service.impl;
import cn.hutool.core.lang.Assert;
+import com.hzya.frame.voucher.ae.comf.factor.service.IAeConfInfluenceFactorService;
import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
@@ -33,6 +34,8 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
@Autowired
private IAeConfSubjectContrastBDao aeConfSubjectContrastBDao;
+ @Autowired
+ private IAeConfInfluenceFactorService iAeConfInfluenceFactorService;
@Override
public List<AeConfSubjectContrastEntity> queryAll(AeConfSubjectContrastEntity entity) {
@@ -157,6 +160,25 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : query) {
aeConfSubjectContrastBDao.logicRemove(aeConfSubjectContrastBEntity);
}
+ return null;
+ }
+
+ /**
+ * 1、根据入参影响因素ids，分别查询影响因素设置的对应基础档案类型
+ * 2、再按顺序拼接写类型的ids，再去科目对照表中查询这个ids对应的对照表
+ * 3、返回对照表对象
+ */
+ @Override
+ public AeConfSubjectContrastEntity queryByInfluenceIds(AeConfSubjectContrastEntity entity) {
+ Assert.notNull(entity.getSourceIds(), "根据影响因素ids查询时对照表时，来源档案ids不能为空！");
+ String sourceIds = entity.getSourceIds();
+ String[] sourceIdSplit = sourceIds.split(",");
+
+
+ iAeConfInfluenceFactorService.query(null);
+
+
+
return null;
}
}