From 07b3d8cdcb20672e74a90a3b50037eae66eeb2a4 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Thu, 5 Jun 2025 15:11:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E8=84=89=EF=BC=9A1=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=9F=BA=E7=A1=80=E6=A1=A3=E6=A1=88=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E8=B4=A6=E7=B0=BF=E6=9F=A5=E8=AF=A2=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ae/comf/bd/controller/BdController.java | 57 +++ .../ae/comf/bd/dao/IAeConfBdBdinfoDao.java | 15 + .../ae/comf/bd/dao/IAeConfBdOrgBookVODao.java | 20 + .../bd/dao/impl/AeConfBdBdinfoDaoImpl.java | 17 + .../bd/dao/impl/AeConfBdOrgBookVODaoImpl.java | 20 + .../comf/bd/entity/AeConfBdBdinfoEntity.java | 306 ++++++++++++ .../comf/bd/entity/AeConfBdBdinfoEntity.xml | 288 +++++++++++ .../voucher/ae/comf/bd/entity/OrgBookVO.java | 34 ++ .../voucher/ae/comf/bd/entity/OrgBookVO.xml | 58 +++ .../controller/ContrastController.java | 4 +- .../dao/IAeConfSubjectContrastBDao.java | 15 + .../impl/AeConfSubjectContrastBDaoImpl.java | 17 + .../entity/AeConfSubjectContrastBEntity.java | 90 ++++ .../entity/AeConfSubjectContrastBEntity.xml | 461 ++++++++++++++++++ .../entity/AeConfSubjectContrastEntity.java | 296 ++++------- .../entity/AeConfSubjectContrastEntity.xml | 36 +- .../ae/comf/subject/entity/MappingFileVO.java | 14 + .../IAeConfSubjectContrastBService.java | 12 + .../IAeConfSubjectContrastService.java | 2 +- .../AeConfSubjectContrastBServiceImpl.java | 26 + .../AeConfSubjectContrastServiceImpl.java | 94 +++- 21 files changed, 1648 insertions(+), 234 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdBdinfoDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdBdinfoDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectContrastBDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectContrastBDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/MappingFileVO.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java new file mode 100644 index 00000000..09edf404 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java @@ -0,0 +1,57 @@ +package com.hzya.frame.voucher.ae.comf.bd.controller; + +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.entity.AeConfBdBdinfoEntity; +import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; +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-06-04 15:04 + */ +@RestController +@RequestMapping("/ae/conf/bd") +public class BdController extends DefaultController { + + @Autowired + private IAeConfBdOrgBookVODao aeConfBdOrgBookVODao; + @Autowired + private IAeConfBdBdinfoDao aeConfBdBdinfoDao; + + /** + * 查询所有公司账簿信息 + */ + @RequestMapping(value = "/queryOrgBookVO", method = RequestMethod.POST) + public JsonResultEntity queryOrgBookVO(@RequestBody OrgBookVO vo) { + try { + List all = aeConfBdOrgBookVODao.queryOrgBookVO(vo); + return getSuccessMessageEntity("请求成功", all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity("请求失败", e.getMessage()); + } + } + + /** + * 查询基础数据资源表 + */ + @RequestMapping(value = "/queryBdinfoList", method = RequestMethod.POST) + public JsonResultEntity queryBdinfoList(@RequestBody AeConfBdBdinfoEntity entity) { + try { + List all = aeConfBdBdinfoDao.queryByLike(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/bd/dao/IAeConfBdBdinfoDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdBdinfoDao.java new file mode 100644 index 00000000..e388cd41 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdBdinfoDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.voucher.ae.comf.bd.dao; + +import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdBdinfoEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 会计事项(accounting_event)-配置-数据配置-基础数据资源表(ae_conf_bd_bdinfo: table)表数据库访问层 + * + * @author zydd + * @since 2025-06-05 10:33:48 + */ +public interface IAeConfBdBdinfoDao extends IBaseDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java new file mode 100644 index 00000000..f988e60b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IAeConfBdOrgBookVODao.java @@ -0,0 +1,20 @@ +package com.hzya.frame.voucher.ae.comf.bd.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; +import com.hzya.frame.voucher.ae.comf.module.entity.AeConfBusinessModuleEntity; + +import java.util.List; + +/** + * 会计事项(accounting_event)-配置-业务模块(ae_conf_business_module: table)表数据库访问层 + * + * @author zydd + * @since 2025-05-22 14:48:27 + */ +public interface IAeConfBdOrgBookVODao extends IBaseDao { + + public List queryOrgBookVO(OrgBookVO vo); + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdBdinfoDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdBdinfoDaoImpl.java new file mode 100644 index 00000000..aa80dcaa --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdBdinfoDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.voucher.ae.comf.bd.dao.impl; + +import com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdBdinfoEntity; +import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdBdinfoDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 会计事项(accounting_event)-配置-数据配置-基础数据资源表(AeConfBdBdinfo)表数据库访问层 + * + * @author zydd + * @since 2025-06-05 10:33:48 + */ +@Repository +public class AeConfBdBdinfoDaoImpl extends MybatisGenericDao implements IAeConfBdBdinfoDao{ + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java new file mode 100644 index 00000000..560e7141 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/AeConfBdOrgBookVODaoImpl.java @@ -0,0 +1,20 @@ +package com.hzya.frame.voucher.ae.comf.bd.dao.impl; + +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.voucher.ae.comf.bd.dao.IAeConfBdOrgBookVODao; +import com.hzya.frame.voucher.ae.comf.bd.entity.OrgBookVO; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by zydd on 2025-06-04 15:10 + */ +@Repository +public class AeConfBdOrgBookVODaoImpl extends MybatisGenericDao implements IAeConfBdOrgBookVODao { + @Override + public List queryOrgBookVO(OrgBookVO vo) { + List orgBookVOList = (List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgBookVO", vo); + return orgBookVOList; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java new file mode 100644 index 00000000..2515da97 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.java @@ -0,0 +1,306 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity; + +import java.util.Date; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * 会计事项(accounting_event)-配置-数据配置-基础数据资源表(AeConfBdBdinfo)实体类 + * + * @author zydd + * @since 2025-06-05 10:33:48 + */ +public class AeConfBdBdinfoEntity extends BaseEntity { + + private String accessclass; + private String basedoctablename; + private String basedoctablepkname; + private String bdcode; + private String bdname; + private Long bdtype; + private String budgetconst; + private String classcheme; + private String codefieldname; + private String coderulegetter; + private String corpfieldname; + private Long dr; + private String fatherfieldname; + private String funccode; + private String isdef; + private String isincludegroupdata; + private String isparaLevscheme; + private String isselfref; + private String namefieldname; + private String orgbookfieldname; + private String orgtypecode; + private String pkBdinfo; + private String pkCorp; + private String pkDefdef; + private String refnodename; + private String refsystem; + private String reserved1; + private String reserved2; + private String selfrefclass; + private String tablename; + private String tablepkname; + 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; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.xml new file mode 100644 index 00000000..5d9dd16d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdBdinfoEntity.xml @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ACCESSCLASS + ,BASEDOCTABLENAME + ,BASEDOCTABLEPKNAME + ,BDCODE + ,BDNAME + ,BDTYPE + ,BUDGETCONST + ,CLASSCHEME + ,CODEFIELDNAME + ,CODERULEGETTER + ,CORPFIELDNAME + ,DR + ,FATHERFIELDNAME + ,FUNCCODE + ,ISDEF + ,ISINCLUDEGROUPDATA + ,ISPARA_LEVSCHEME + ,ISSELFREF + ,NAMEFIELDNAME + ,ORGBOOKFIELDNAME + ,ORGTYPECODE + ,PK_BDINFO + ,PK_CORP + ,PK_DEFDEF + ,REFNODENAME + ,REFSYSTEM + ,RESERVED1 + ,RESERVED2 + ,SELFREFCLASS + ,TABLENAME + ,TABLEPKNAME + ,TS + + + + + + + + + + + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java new file mode 100644 index 00000000..2266f43c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.java @@ -0,0 +1,34 @@ +package com.hzya.frame.voucher.ae.comf.bd.entity; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +import java.util.Date; + +/** + * Created by zydd on 2025-06-04 14:57 + * 公司，账簿主体集合VO + */ +@Data +public class OrgBookVO extends BaseEntity { + /** 公司主键 */ + private String pkentityorg; + /** 公司编码 */ + private String glorgcode; + /** 公司名称 */ + private String glorgname; + /** 账簿类型主键 */ + private String pkglbook; + /** 账簿类型编码 */ + private String glbookcode; + /** 账簿类型名称 */ + private String glbookname; + /** 账簿主键 */ + private String pkglorgbook; + /** 账簿编码 */ + private String glorgbookcode; + /** 账簿名称 */ + private String glorgbookname; + /** 时间戳 */ + private Date ts; +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml new file mode 100644 index 00000000..7d6694eb --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/OrgBookVO.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + pkentityorg, + glorgcode, + glorgname, + pkglbook, + glbookcode, + glbookname, + pkglorgbook, + glorgbookcode, + glorgbookname, + ts + + + + + + 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 3ae984c5..0f8351f9 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 @@ -35,8 +35,8 @@ public class ContrastController extends DefaultController { @RequestMapping(value = "/queryById", method = RequestMethod.POST) public JsonResultEntity queryById(@RequestBody AeConfSubjectContrastEntity entity){ try { - List all = aeConfSubjectContrastService.queryById(entity); - return getSuccessMessageEntity("请求成功",all); + AeConfSubjectContrastEntity queryById = aeConfSubjectContrastService.queryById(entity); + return getSuccessMessageEntity("请求成功",queryById); } 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/IAeConfSubjectContrastBDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectContrastBDao.java new file mode 100644 index 00000000..dbcfc208 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/IAeConfSubjectContrastBDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.voucher.ae.comf.subject.dao; + +import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 会计事项(accounting_event)-配置-科目对照_子表(ae_conf_subject_contrast_b: table)表数据库访问层 + * + * @author zydd + * @since 2025-06-04 10:30:42 + */ +public interface IAeConfSubjectContrastBDao extends IBaseDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectContrastBDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectContrastBDaoImpl.java new file mode 100644 index 00000000..e9c3b7d1 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/dao/impl/AeConfSubjectContrastBDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.voucher.ae.comf.subject.dao.impl; + +import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; +import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表数据库访问层 + * + * @author zydd + * @since 2025-06-04 10:30:42 + */ +@Repository +public class AeConfSubjectContrastBDaoImpl extends MybatisGenericDao implements IAeConfSubjectContrastBDao{ + +} + 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 new file mode 100644 index 00000000..186742b5 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java @@ -0,0 +1,90 @@ +package com.hzya.frame.voucher.ae.comf.subject.entity; + +import java.util.Date; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)实体类 + * + * @author zydd + * @since 2025-06-04 10:30:42 + */ +@Data +public class AeConfSubjectContrastBEntity extends BaseEntity { + + /** + * 对照表id + */ + private Long contrastId; + /** + * 公司pk + */ + private String pkCorp; + /** + * 目标档案值（会计科目) + */ + private String desdocvalue; + /** + * 来源档案值1 + */ + private String factorvalue1; + /** + * 来源档案值2 + */ + private String factorvalue2; + /** + * 来源档案值3 + */ + private String factorvalue3; + /** + * 来源档案值4 + */ + private String factorvalue4; + /** + * 来源档案值5 + */ + private String factorvalue5; + /** + * 来源档案值6 + */ + private String factorvalue6; + /** + * 来源档案值7 + */ + private String factorvalue7; + /** + * 来源档案值8 + */ + private String factorvalue8; + /** + * 来源档案值9 + */ + private String factorvalue9; + /** + * 备注 + */ + 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; + + +} + 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 new file mode 100644 index 00000000..af4db127 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,contrast_id + ,pk_corp + ,desdocvalue + ,factorvalue1 + ,factorvalue2 + ,factorvalue3 + ,factorvalue4 + ,factorvalue5 + ,factorvalue6 + ,factorvalue7 + ,factorvalue8 + ,factorvalue9 + ,remark + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,create_time + ,create_user + ,modify_time + ,modify_user + ,sts + + + + + + + + + + + + + + + + insert into ae_conf_subject_contrast_b( + + id , + contrast_id , + pk_corp , + desdocvalue , + factorvalue1 , + factorvalue2 , + factorvalue3 , + factorvalue4 , + factorvalue5 , + factorvalue6 , + factorvalue7 , + factorvalue8 , + factorvalue9 , + remark , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + create_time , + create_time , + create_user , + modify_time , + modify_time , + modify_user , + sts , + sts, + + )values( + + #{id} , + #{contrastId} , + #{pkCorp} , + #{desdocvalue} , + #{factorvalue1} , + #{factorvalue2} , + #{factorvalue3} , + #{factorvalue4} , + #{factorvalue5} , + #{factorvalue6} , + #{factorvalue7} , + #{factorvalue8} , + #{factorvalue9} , + #{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_contrast_b(contrast_id, pk_corp, desdocvalue, factorvalue1, factorvalue2, + factorvalue3, factorvalue4, factorvalue5, factorvalue6, factorvalue7, factorvalue8, factorvalue9, remark, def1, + def2, def3, def4, def5, def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts, + sts) + values + + (#{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') + + + + + insert into ae_conf_subject_contrast_b(contrast_id, pk_corp, desdocvalue, factorvalue1, factorvalue2, + factorvalue3, factorvalue4, factorvalue5, factorvalue6, factorvalue7, factorvalue8, factorvalue9, remark, def1, + def2, def3, def4, def5, def6, def7, def8, def9, def10, create_time, create_user, modify_time, modify_user, sts) + values + + (#{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}) + + on duplicate key update + contrast_id = values(contrast_id), + pk_corp = values(pk_corp), + desdocvalue = values(desdocvalue), + factorvalue1 = values(factorvalue1), + factorvalue2 = values(factorvalue2), + factorvalue3 = values(factorvalue3), + factorvalue4 = values(factorvalue4), + factorvalue5 = values(factorvalue5), + factorvalue6 = values(factorvalue6), + factorvalue7 = values(factorvalue7), + factorvalue8 = values(factorvalue8), + factorvalue9 = values(factorvalue9), + 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_contrast_b set + + contrast_id = #{contrastId}, + pk_corp = #{pkCorp}, + desdocvalue = #{desdocvalue}, + factorvalue1 = #{factorvalue1}, + factorvalue2 = #{factorvalue2}, + factorvalue3 = #{factorvalue3}, + factorvalue4 = #{factorvalue4}, + factorvalue5 = #{factorvalue5}, + factorvalue6 = #{factorvalue6}, + factorvalue7 = #{factorvalue7}, + factorvalue8 = #{factorvalue8}, + factorvalue9 = #{factorvalue9}, + 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_contrast_b + set sts= 'N', + modify_time = now() + where id = #{id} + + + + update ae_conf_subject_contrast_b set sts= 'N' ,modify_time = now() + + and id = #{id} + and contrast_id = #{contrastId} + and pk_corp = #{pkCorp} + and desdocvalue = #{desdocvalue} + and factorvalue1 = #{factorvalue1} + and factorvalue2 = #{factorvalue2} + and factorvalue3 = #{factorvalue3} + and factorvalue4 = #{factorvalue4} + and factorvalue5 = #{factorvalue5} + and factorvalue6 = #{factorvalue6} + and factorvalue7 = #{factorvalue7} + and factorvalue8 = #{factorvalue8} + and factorvalue9 = #{factorvalue9} + 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_contrast_b + where id = #{id} + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.java index 067d03fc..09817ba6 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.java @@ -1,226 +1,102 @@ package com.hzya.frame.voucher.ae.comf.subject.entity; import java.util.Date; +import java.util.List; + import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + /** * 会计事项(accounting_event)-配置-科目对照(AeConfSubjectContrast)实体类 - * + * ncc:fip_docview * @author zydd * @since 2025-05-30 15:04:47 */ +@Data public class AeConfSubjectContrastEntity extends BaseEntity { - - /** 对照表code */ - private String code; - /** 对照便name */ - private String name; - /** 账簿id */ - private String accountBookId; - /** 账簿code */ - private String accountBookCode; - /** 账簿名称 */ - private String accountBookName; - /** 公司pk */ - private String pkCorp; - /** 公司类型 */ - private String corpType; - /** 目标档案类型 */ - private String desdocid; - /** 关联公司 */ - private String pkSetcorp1; - /** 备注 */ - 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; + /** + * 对照表code + */ + private String code; + /** + * 对照便name + */ + private String name; + /** + * 账簿id + */ + private String accountBookId; + /** + * 账簿code + */ + private String accountBookCode; + /** + * 账簿名称 + */ + private String accountBookName; + + /** + * 账簿类型id + */ + private String accountBookTypeId; + private String accountBookTypeCode; + private String accountBookTypeName; + + /** + * 公司pk + */ + private String pkCorp; + /** + * 公司类型 + */ + private String corpType; + /** + * 目标档案类型 + */ + private String desdocId; + private String desdocCode; + private String desdocName; + /** + * 关联公司 + */ + private String pkSetcorp1; + /** + * 备注 + */ + 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; + /** + * 来源ids ,隔开 + */ + private String sourceIds; + /** + * 来源names ,隔开 + */ + private String sourceNames; + /** + * 创建人 + */ + private String createUser; + /** + * 修改人 + */ + private String modifyUser; + + private List contrastBEntityList; - public String getCode() { - return code; - } + /** 多选来源档案时接收参数使用，在逐一保存自白哦 */ + private List mappingFileVOS; - public void setCode(String code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAccountBookId() { - return accountBookId; - } - - public void setAccountBookId(String accountBookId) { - this.accountBookId = accountBookId; - } - - public String getAccountBookCode() { - return accountBookCode; - } - - public void setAccountBookCode(String accountBookCode) { - this.accountBookCode = accountBookCode; - } - - public String getAccountBookName() { - return accountBookName; - } - - public void setAccountBookName(String accountBookName) { - this.accountBookName = accountBookName; - } - - public String getPkCorp() { - return pkCorp; - } - - public void setPkCorp(String pkCorp) { - this.pkCorp = pkCorp; - } - - public String getCorpType() { - return corpType; - } - - public void setCorpType(String corpType) { - this.corpType = corpType; - } - - public String getDesdocid() { - return desdocid; - } - - public void setDesdocid(String desdocid) { - this.desdocid = desdocid; - } - - public String getPkSetcorp1() { - return pkSetcorp1; - } - - public void setPkSetcorp1(String pkSetcorp1) { - this.pkSetcorp1 = pkSetcorp1; - } - - 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/AeConfSubjectContrastEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml index f6fb1817..55e8531a 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastEntity.xml @@ -10,9 +10,12 @@ + + + - + @@ -29,6 +32,8 @@ + + @@ -39,7 +44,10 @@ ,account_book_id ,account_book_code ,account_book_name - ,pk_corp + ,account_book_type_id + ,account_book_type_code + ,account_book_type_name + ,pk_corp ,corp_type ,desdocid ,pk_setcorp1 @@ -58,6 +66,8 @@ ,create_user ,modify_time ,modify_user + ,sourceIds + ,sourceNames ,sts @@ -73,6 +83,11 @@ and account_book_id = #{accountBookId} and account_book_code = #{accountBookCode} and account_book_name = #{accountBookName} + and account_book_type_id = #{accountBookTypeId} + and account_book_type_code = #{accountBookTypeCode} + and account_book_type_name = #{accountBookTypeName} + and sourceIds = #{sourceIds} + and sourceNames = #{sourceNames} and pk_corp = #{pkCorp} and corp_type = #{corpType} and desdocid = #{desdocid} @@ -108,6 +123,11 @@ and account_book_id = #{accountBookId} and account_book_code = #{accountBookCode} and account_book_name = #{accountBookName} + and account_book_type_id = #{accountBookTypeId} + and account_book_type_code = #{accountBookTypeCode} + and account_book_type_name = #{accountBookTypeName} + and sourceIds = #{sourceIds} + and sourceNames = #{sourceNames} and pk_corp = #{pkCorp} and corp_type = #{corpType} and desdocid = #{desdocid} @@ -222,6 +242,11 @@ account_book_id , account_book_code , account_book_name , + account_book_type_id , + account_book_type_code , + account_book_type_name , + sourceIds , + sourceNames , pk_corp , corp_type , desdocid , @@ -253,6 +278,11 @@ #{accountBookId} , #{accountBookCode} , #{accountBookName} , + #{accountBookTypeId} , + #{accountBookTypeCode} , + #{accountBookTypeName} , + #{sourceIds} , + #{sourceNames} , #{pkCorp} , #{corpType} , #{desdocid} , @@ -370,7 +400,7 @@ - update ae_conf_subject_contrast set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + update ae_conf_subject_contrast set sts= 'N' ,modify_time = #{modify_time} and id = #{id} and code = #{code} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/MappingFileVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/MappingFileVO.java new file mode 100644 index 00000000..3a6bf78a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/MappingFileVO.java @@ -0,0 +1,14 @@ +package com.hzya.frame.voucher.ae.comf.subject.entity; + +import lombok.Data; + +/** + * Created by zydd on 2025-06-04 11:24 + * 科目对照来源档案使用 + */ +@Data +public class MappingFileVO { + private String id; + private String code; + private String name; +} 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 new file mode 100644 index 00000000..36777e28 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectContrastBService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.voucher.ae.comf.subject.service; + +import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表服务接口 + * + * @author zydd + * @since 2025-06-04 10:30:42 + */ +public interface IAeConfSubjectContrastBService extends IBaseService{ +} 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 14f641da..c20ffe12 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 @@ -14,7 +14,7 @@ import java.util.List; public interface IAeConfSubjectContrastService extends IBaseService{ List queryAll(AeConfSubjectContrastEntity entity); - List queryById(AeConfSubjectContrastEntity entity); + AeConfSubjectContrastEntity queryById(AeConfSubjectContrastEntity entity); AeConfSubjectContrastEntity saveEntity(AeConfSubjectContrastEntity entity); } 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 new file mode 100644 index 00000000..d420952c --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastBServiceImpl.java @@ -0,0 +1,26 @@ +package com.hzya.frame.voucher.ae.comf.subject.service.impl; + +import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; +import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao; +import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectContrastBService; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; +import com.hzya.frame.basedao.service.impl.BaseService; +/** + * 会计事项(accounting_event)-配置-科目对照_子表(AeConfSubjectContrastB)表服务实现类 + * + * @author zydd + * @since 2025-06-04 10:30:42 + */ +@Service +public class AeConfSubjectContrastBServiceImpl extends BaseService implements IAeConfSubjectContrastBService { + + private IAeConfSubjectContrastBDao aeConfSubjectContrastBDao; + + @Autowired + public void setAeConfSubjectContrastBDao(IAeConfSubjectContrastBDao dao) { + this.aeConfSubjectContrastBDao = dao; + this.dao = dao; + } +} 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 f5312519..c30ea7e4 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,14 +1,20 @@ package com.hzya.frame.voucher.ae.comf.subject.service.impl; import cn.hutool.core.lang.Assert; +import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao; +import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity; import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity; import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastDao; +import com.hzya.frame.voucher.ae.comf.subject.entity.MappingFileVO; import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectContrastService; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; + import javax.annotation.Resource; + import com.hzya.frame.basedao.service.impl.BaseService; +import java.util.ArrayList; import java.util.List; /** @@ -19,36 +25,88 @@ import java.util.List; */ @Service public class AeConfSubjectContrastServiceImpl extends BaseService implements IAeConfSubjectContrastService { - + private IAeConfSubjectContrastDao aeConfSubjectContrastDao; - + @Autowired - public void setAeConfSubjectContrastDao(IAeConfSubjectContrastDao dao) { - this.aeConfSubjectContrastDao = dao; - this.dao = dao; - } + public void setAeConfSubjectContrastDao(IAeConfSubjectContrastDao dao) { + this.aeConfSubjectContrastDao = dao; + this.dao = dao; + } + + @Autowired + private IAeConfSubjectContrastBDao aeConfSubjectContrastBDao; @Override public List queryAll(AeConfSubjectContrastEntity entity) { - - return null; + Assert.notNull(entity.getPkCorp(), "查询全部对照表时，公司id不能为空！"); + List aeConfSubjectContrastEntityList = aeConfSubjectContrastDao.query(entity); + //查询子表 + for (AeConfSubjectContrastEntity confSubjectContrastEntity : aeConfSubjectContrastEntityList) { + AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity(); + aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(confSubjectContrastEntity.getId())); + List aeConfSubjectContrastBEntityList = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity); + confSubjectContrastEntity.setContrastBEntityList(aeConfSubjectContrastBEntityList); + } + return aeConfSubjectContrastEntityList; } @Override - public List queryById(AeConfSubjectContrastEntity entity) { - Assert.notNull(entity.getId(),"根据id查询科目对照时，科目对照表id不能为空"); - return null; + public AeConfSubjectContrastEntity queryById(AeConfSubjectContrastEntity entity) { + Assert.notNull(entity.getPkCorp(), "根据id查询科目对照时，公司id不能为空！"); + Assert.notNull(entity.getId(), "根据id查询科目对照时，科目对照表id不能为空"); + List aeConfSubjectContrastEntityList = aeConfSubjectContrastDao.query(entity); + if (aeConfSubjectContrastEntityList.size() == 0) { + Assert.state(false, "根据科目对照表id：{}，未查询到科目对照！", entity.getId()); + } + if (aeConfSubjectContrastEntityList.size() > 1) { + Assert.state(false, "根据科目对照表id：{}，查询到科目对照不唯一！", entity.getId()); + } + AeConfSubjectContrastEntity contrastEntity = aeConfSubjectContrastEntityList.get(0); + //查询子表 + AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity(); + aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(contrastEntity.getId())); + List aeConfSubjectContrastBEntityList = aeConfSubjectContrastBDao.query(aeConfSubjectContrastBEntity); + contrastEntity.setContrastBEntityList(aeConfSubjectContrastBEntityList); + + return contrastEntity; } /** - * 新增科目对照表 - * TODO..账簿未同步 + * 新增科目对照表。现保存主表，再将来源档案分割为子表进行存储 */ @Override public AeConfSubjectContrastEntity saveEntity(AeConfSubjectContrastEntity entity) { - Assert.notNull(entity.getAccountBookId(),"科目对照表新增时，账簿id不能为空！"); - Assert.notNull(entity.getAccountBookCode(),"科目对照表新增时，账簿code不能为空！"); - Assert.notNull(entity.getAccountBookName(),"科目对照表新增时，账簿name不能为空！"); - return null; + Assert.notNull(entity.getPkCorp(), "科目对照表新增时，公司id不能为空！"); + Assert.notNull(entity.getCode(), "科目对照表新增时，code不能为空！"); + Assert.notNull(entity.getName(), "科目对照表新增时，name不能为空！"); + Assert.notNull(entity.getAccountBookTypeId(), "科目对照表新增时，账簿类型id不能为空！"); + Assert.notNull(entity.getAccountBookTypeCode(), "科目对照表新增时，账簿类型code不能为空！"); + Assert.notNull(entity.getAccountBookTypeName(), "科目对照表新增时，账簿类型name不能为空！"); + Assert.notNull(entity.getSourceIds(), "科目对照表新增时，来源档案ids不能为空！"); + Assert.notNull(entity.getSourceNames(), "科目对照表新增时，来源档案names不能为空！"); + + + List contrastBList = entity.getContrastBEntityList(); + Assert.notNull(contrastBList, "科目对照表新增时，来源档案不能为空！"); + if (contrastBList == null || contrastBList.size() == 0) { + Assert.state(false, "科目对照表新增时，来源档案VOS不能为空！"); + } + if (contrastBList.size() > 9) { + Assert.state(false, "科目对照表新增时，来源档案VOS最多为9个！"); + } + + //保存主表 + AeConfSubjectContrastEntity saveH = aeConfSubjectContrastDao.save(entity); + String Hid = saveH.getId(); + String HpkCorp = saveH.getPkCorp(); + + //保存子表 + for (AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity : contrastBList) { + aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(Hid)); + aeConfSubjectContrastBEntity.setPkCorp(HpkCorp); + AeConfSubjectContrastBEntity saveB = aeConfSubjectContrastBDao.save(aeConfSubjectContrastBEntity); + } + return saveH; } }