From 89a76ef43eb741afe707d24a2e88a266e8c94788 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Fri, 6 Jun 2025 19:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E8=84=89=EF=BC=9A1=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=A7=91=E7=9B=AE=E5=AF=B9=E7=85=A7=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82=E3=80=82=202=E3=80=81=E7=A7=91?= =?UTF-8?q?=E7=9B=AE=E5=AF=B9=E7=85=A7=E5=AD=90=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClassificationController.java | 49 ++ .../controller/ContrastBController.java | 6 +- .../controller/ContrastController.java | 14 + .../dao/IAeConfSubjectClassificationDao.java | 15 + .../AeConfSubjectClassificationDaoImpl.java | 17 + .../AeConfSubjectClassificationEntity.java | 236 ++++++++++ .../AeConfSubjectClassificationEntity.xml | 436 ++++++++++++++++++ .../entity/AeConfSubjectContrastBEntity.java | 5 + .../entity/AeConfSubjectContrastBEntity.xml | 12 +- .../IAeConfSubjectClassificationService.java | 17 + .../IAeConfSubjectContrastBService.java | 2 +- .../IAeConfSubjectContrastService.java | 2 + ...eConfSubjectClassificationServiceImpl.java | 36 ++ .../AeConfSubjectContrastBServiceImpl.java | 11 +- .../AeConfSubjectContrastServiceImpl.java | 22 + 15 files changed, 866 insertions(+), 14 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ClassificationController.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectClassificationDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectClassificationDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectClassificationEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectClassificationService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java 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 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 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 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 { + +} + 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 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + + + + + + + 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_time , + create_user , + modify_time , + modify_time , + modify_user , + sts , + sts, + + )values( + + #{code} , + #{name} , + #{pkCorp} , + #{pkglorgbook} , + #{glorgbookcode} , + #{glorgbookname} , + #{factorids} , + #{factornames} , + #{contrastId} , + #{desdocvalueDefault} , + #{remark} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + #{create_time} , + now() , + #{createUser} , + #{modify_time} , + now() , + #{modifyUser} , + #{sts} , + 'Y', + + ) + + + + 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 + + (#{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') + + + + + 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 + + (#{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}) + + 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) + + + + update ae_conf_subject_classification set + + code = #{code}, + name = #{name}, + pk_corp = #{pkCorp}, + pkglorgbook = #{pkglorgbook}, + glorgbookcode = #{glorgbookcode}, + glorgbookname = #{glorgbookname}, + factorIds = #{factorids}, + factorNames = #{factornames}, + contrast_id = #{contrastId}, + desdocvalue_default = + #{desdocvalueDefault}, + + remark = #{remark}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + create_time = #{create_time}, + create_user = #{createUser}, + modify_time = #{modify_time}, + modify_time = now(), + modify_user = #{modifyUser}, + sts = #{sts}, + + where id = #{id} + + + + update ae_conf_subject_classification + set sts= 'N', + modify_time = now() + where id = #{id} + + + + update ae_conf_subject_classification set sts= 'N' ,modify_time = #{modify_time},modify_user_id = + #{modify_user_id} + + and id = #{id} + and code = #{code} + and name = #{name} + and pk_corp = #{pkCorp} + and pkglorgbook = #{pkglorgbook} + and glorgbookcode = #{glorgbookcode} + and glorgbookname = #{glorgbookname} + and factorIds = #{factorids} + and factorNames = #{factornames} + and contrast_id = #{contrastId} + and desdocvalue_default = + #{desdocvalueDefault} + + and remark = #{remark} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and create_user = #{createUser} + and modify_user = #{modifyUser} + and sts = #{sts} + and sts='Y' + + + + + delete + from ae_conf_subject_classification + where id = #{id} + + + + 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 @@ + + @@ -66,8 +68,10 @@ id ,contrast_id ,pk_corp - ,desdocvalue - ,factortable1 + ,glorgname + ,pkAccsubj + ,desdocvalue + ,factortable1 ,factortable2 ,factortable3 ,factortable4 @@ -377,7 +381,9 @@ contrast_id , pk_corp , + glorgname , desdocvalue , + pkAccsubj , factortable1 , factortable2 , factortable3 , @@ -438,7 +444,9 @@ #{contrastId} , #{pkCorp} , + #{glorgname} , #{desdocvalue} , + #{pkAccsubj} , #{factortable1} , #{factortable2} , #{factortable3} , 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{ + List 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 updateList(List list); - void deleteList(List 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 implements IAeConfSubjectClassificationService { + + private IAeConfSubjectClassificationDao aeConfSubjectClassificationDao; + + @Autowired + public void setAeConfSubjectClassificationDao(IAeConfSubjectClassificationDao dao) { + this.aeConfSubjectClassificationDao = dao; + this.dao = dao; + } + + @Override + public List 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 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 queryAll(AeConfSubjectContrastEntity entity) { @@ -157,6 +160,25 @@ public class AeConfSubjectContrastServiceImpl extends BaseService