From bb1d1f2c49688548b8539ccf8111127aae2af191 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 20 Aug 2025 23:44:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=B9=E7=85=A7?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=AE=A4=E9=A2=86=E6=96=B9=E6=A1=88=E7=AD=89?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=80=82=202=E3=80=81=E6=96=B0=E5=A2=9E=E5=BE=85?= =?UTF-8?q?=E8=AE=A4=E9=A2=86=E6=B8=85=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../claim/controller/ClaimSKController.java | 75 +++++ .../claim/service/IClaimSKService.java | 21 ++ .../service/impl/IClaimSKServiceImpl.java | 102 ++++++ .../controller/FileEigenController.java | 43 +++ .../controller/ModuleController.java | 119 +++++++ .../conf/fileeigen/dao/IFeConfModuleDao.java | 15 + .../dao/impl/FeConfModuleDaoImpl.java | 17 + .../entity/FeConfFileEigenEntity.java | 148 +-------- .../fileeigen/entity/FeConfModuleEntity.java | 44 +++ .../fileeigen/entity/FeConfModuleEntity.xml | 306 ++++++++++++++++++ .../service/IFeConfFileEigenService.java | 7 + .../service/IFeConfModuleService.java | 12 + .../impl/FeConfFileEigenServiceImpl.java | 81 +++++ .../service/impl/FeConfModuleServiceImpl.java | 26 ++ .../ae/comf/bd/dao/IMdmDBQueryVODAO.java | 2 + .../comf/bd/dao/impl/MdmDBQueryVODAOImpl.java | 6 + .../ae/comf/bd/entity/vo/MdmDBQueryVO.java | 3 + .../ae/comf/bd/entity/vo/MdmDBQueryVO.xml | 23 ++ .../controller/ContrastController.java | 4 + .../entity/AeConfSubjectContrastBEntity.java | 6 +- .../entity/AeConfSubjectContrastBEntity.xml | 49 ++- ...eConfSubjectClassificationServiceImpl.java | 50 +-- .../AeConfSubjectContrastServiceImpl.java | 19 +- 23 files changed, 997 insertions(+), 181 deletions(-) create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimSKController.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimSKService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/ModuleController.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/IFeConfModuleDao.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/impl/FeConfModuleDaoImpl.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.xml create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfModuleService.java create mode 100644 base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfModuleServiceImpl.java diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimSKController.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimSKController.java new file mode 100644 index 00000000..1b022db1 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimSKController.java @@ -0,0 +1,75 @@ +package com.hzya.frame.finance.claim.controller; + +import com.github.pagehelper.PageInfo; +import com.hzya.frame.finance.claim.service.IClaimSKService; +import com.hzya.frame.finance.conf.fileeigen.entity.FeConfFileEigenEntity; +import com.hzya.frame.mdm.entity.MdmViewVo; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; +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; +import java.util.Map; + +/** + * Created by zydd on 2025-08-20 17:07 + */ +@RestController +@RequestMapping("/fe/sk/claim") +public class ClaimSKController extends DefaultController { + + @Autowired + private IClaimSKService claimSKService; + + + /** + * 流水查询字段 + */ + @RequestMapping(value = "/queryFlowFileds", method = RequestMethod.POST) + public JsonResultEntity queryFlowFileds(@RequestBody MdmDBQueryVO entity) { + try { + MdmViewVo mdmViewVo = claimSKService.queryFlowFileds(entity); + return getSuccessMessageEntity("请求成功", mdmViewVo); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + /** + * 流水查询数据 + */ + @RequestMapping(value = "/queryFlowDatePaged", method = RequestMethod.POST) + public JsonResultEntity queryFlowDatePaged(@RequestBody MdmDBQueryVO entity) { + try { + PageInfo pageInfo = claimSKService.queryFlowDatePaged(entity); + return getSuccessMessageEntity("请求成功", pageInfo); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + + /** + * 流水查询数据 + */ + @RequestMapping(value = "/queryFlowDateIds", method = RequestMethod.POST) + public JsonResultEntity queryFlowDateIds(@RequestBody MdmDBQueryVO entity) { + try { + List> mps = claimSKService.queryFlowDateIds(entity); + return getSuccessMessageEntity("请求成功", mps); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimSKService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimSKService.java new file mode 100644 index 00000000..98f16698 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimSKService.java @@ -0,0 +1,21 @@ +package com.hzya.frame.finance.claim.service; + +import com.github.pagehelper.PageInfo; +import com.hzya.frame.mdm.entity.MdmViewVo; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; + +import java.util.List; +import java.util.Map; + +/** + * Created by zydd on 2025-08-20 17:20 + */ +public interface IClaimSKService { + PageInfo queryDataMapPagedByMdmId(MdmDBQueryVO entity); + + MdmViewVo queryFlowFileds(MdmDBQueryVO entity); + + PageInfo queryFlowDatePaged(MdmDBQueryVO entity); + + List> queryFlowDateIds(MdmDBQueryVO entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java new file mode 100644 index 00000000..d8401bd0 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java @@ -0,0 +1,102 @@ +package com.hzya.frame.finance.claim.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hzya.frame.finance.claim.service.IClaimSKService; +import com.hzya.frame.mdm.entity.MdmViewVo; +import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; +import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao; +import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDBQueryVODAO; +import com.hzya.frame.voucher.ae.comf.bd.dao.IMdmDbFiledVODAO; +import com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO; +import com.hzya.frame.voucher.ae.generate.core.vo.CreateVoucherVO; +import com.hzya.frame.voucher.ae.push.service.IAePushVoucherLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * Created by zydd on 2025-08-20 17:20 + */ +@Service +public class IClaimSKServiceImpl implements IClaimSKService { + + @Autowired + private IMdmModuleDao mdmModuleDao; + @Autowired + private IMdmModuleDbDao mdmModuleDbDao; + @Autowired + private IMdmDBQueryVODAO mdmDBQueryVODAO; + @Autowired + private IMdmDbFiledVODAO mdmDbFiledVODAO; + + + @Autowired + private IAePushVoucherLogService aePushVoucherLogService; + + + /** + * 目前写死 银行流水表 db_name:mdm_kk_bankflow_ccb + * 目前写死 银行流水表 mdm_id:60d0374c9fa743019b0c1488a4eac1fe + * @param entity + * @return + */ + @Override + public PageInfo queryDataMapPagedByMdmId(MdmDBQueryVO entity) { + + List> maps= mdmDBQueryVODAO.queryMdmDateBySK(entity); + + + return null; + } + + @Override + public MdmViewVo queryFlowFileds(MdmDBQueryVO entity) { + + CreateVoucherVO createVoucherVO = new CreateVoucherVO(); + createVoucherVO.setMdmId("60d0374c9fa743019b0c1488a4eac1fe"); + MdmViewVo mdmViewVo = aePushVoucherLogService.queryBillFileds(createVoucherVO); + return mdmViewVo; + } + + @Override + public PageInfo queryFlowDatePaged(MdmDBQueryVO entity) { + entity.setTablename("mdm_kk_bankflow_ccb"); + + if(entity.getBillstatus()!=null){ + entity.setClaimstatus(entity.getBillstatus()); + } + + + + //prop1 对方账号 + if(entity.getPropValue1()!=null&& !"".equals(entity.getPropValue1())){ + entity.setProp1(""); + entity.setPropValue1(""); + } + //prop2 对方单位 + //prop3 交易时间 + //prop4 交易金额 + //prop5 用途 + //prop6 附言 + //prop7 对方账号 + //prop8 对方行名 + + PageHelper.startPage(entity.getPageNum(), entity.getPageSize()); + List> maps= mdmDBQueryVODAO.queryMdmDateBySK(entity); + PageInfo pageInfo = new PageInfo(maps); + return pageInfo; + } + + @Override + public List> queryFlowDateIds(MdmDBQueryVO entity) { + entity.setTablename("mdm_kk_bankflow_ccb"); + + + List> maps= mdmDBQueryVODAO.queryMdmDateBySK(entity); + + return maps; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/FileEigenController.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/FileEigenController.java index cf07a9aa..eb41b04d 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/FileEigenController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/FileEigenController.java @@ -1,5 +1,6 @@ package com.hzya.frame.finance.conf.fileeigen.controller; +import com.github.pagehelper.PageInfo; import com.hzya.frame.finance.conf.fileeigen.entity.FeConfFileEigenEntity; import com.hzya.frame.finance.conf.fileeigen.service.IFeConfFileEigenService; import com.hzya.frame.web.action.DefaultController; @@ -104,6 +105,19 @@ public class FileEigenController extends DefaultController { } } + /** + * 根据mdmID查询数据 + */ + @RequestMapping(value = "/queryDataMapPagedByMdmId", method = RequestMethod.POST) + public JsonResultEntity queryDataMapPagedByMdmId(@RequestBody FeConfFileEigenEntity entity) { + try { + PageInfo pageInfo = fileEigenService.queryDataMapPagedByMdmId(entity); + return getSuccessMessageEntity("请求成功", pageInfo); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } /** * 自动生成特征 @@ -120,4 +134,33 @@ public class FileEigenController extends DefaultController { } + /** + * 档案搜索 + */ + @RequestMapping(value = "/searchFile", method = RequestMethod.POST) + public JsonResultEntity searchFile(@RequestBody FeConfFileEigenEntity entity) { + try { + List> autoExecute = fileEigenService.searchFile(entity); + return getSuccessMessageEntity("请求成功", autoExecute); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + /** + * 特征值搜索 + */ + @RequestMapping(value = "/searchName", method = RequestMethod.POST) + public JsonResultEntity searchName(@RequestBody FeConfFileEigenEntity entity) { + try { + List autoExecute = fileEigenService.searchName(entity); + return getSuccessMessageEntity("请求成功", autoExecute); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/ModuleController.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/ModuleController.java new file mode 100644 index 00000000..8a6d4646 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/ModuleController.java @@ -0,0 +1,119 @@ +package com.hzya.frame.finance.conf.fileeigen.controller; + +import cn.hutool.core.lang.Assert; +import com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity; +import com.hzya.frame.finance.conf.fileeigen.service.IFeConfModuleService; +import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao; +import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity; +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-08-20 10:05 + * 档案特征-业务模块 + */ +@RestController("fileeigenMdmModuleController") +@RequestMapping("/fe/conf/fileeigenmodule") +public class ModuleController extends DefaultController { + + @Autowired + private IFeConfModuleService feConfModuleService; + @Autowired + private IMdmModuleDao mdmModuleDao; + + @RequestMapping(value = "/queryMdm1", method = RequestMethod.POST) + public JsonResultEntity queryMdm1(@RequestBody FeConfModuleEntity entity) { + try { + MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); + mdmModuleEntity.setMdmType("1"); + List query = mdmModuleDao.query(mdmModuleEntity); + return getSuccessMessageEntity("请求成功", query); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + @RequestMapping(value = "/queryAll", method = RequestMethod.POST) + public JsonResultEntity queryAll(@RequestBody FeConfModuleEntity entity) { + try { + List all = feConfModuleService.query(entity); + for (FeConfModuleEntity feConfModuleEntity : all) { + String id = feConfModuleEntity.getMdmId(); + MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); + mdmModuleEntity.setId(id); + List query = mdmModuleDao.query(mdmModuleEntity); + if (query.size() == 0) { + return getSuccessMessageEntity("请求成功", all); + } + MdmModuleEntity mdmModuleEntity1 = query.get(0); + feConfModuleEntity.setMdmCode(String.valueOf(mdmModuleEntity1.getMdmCode())); + feConfModuleEntity.setMdmName(mdmModuleEntity1.getMdmName()); + } + return getSuccessMessageEntity("请求成功", all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + @RequestMapping(value = "/save", method = RequestMethod.POST) + public JsonResultEntity save(@RequestBody FeConfModuleEntity entity) { + try { + Assert.notNull(entity.getMdmId()); + + + List query1 = feConfModuleService.query(entity); + if (query1.size() > 0) { + Assert.state(false, "该模块已存在，请勿重复添加"); + } + + FeConfModuleEntity all = feConfModuleService.save(entity); + String mdmId = entity.getMdmId(); + MdmModuleEntity mdmModuleEntity = new MdmModuleEntity(); + mdmModuleEntity.setId(mdmId); + List query = mdmModuleDao.query(mdmModuleEntity); + MdmModuleEntity mdmModuleEntity1 = query.get(0); + all.setMdmCode(String.valueOf(mdmModuleEntity1.getMdmCode())); + all.setMdmName(mdmModuleEntity1.getMdmName()); + + return getSuccessMessageEntity("请求成功", all); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + @RequestMapping(value = "/update", method = RequestMethod.POST) + public JsonResultEntity update(@RequestBody FeConfModuleEntity entity) { + try { + Assert.notNull(entity.getMdmId()); + Assert.notNull(entity.getId()); + feConfModuleService.update(entity); + return getSuccessMessageEntity("请求成功", entity); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public JsonResultEntity delete(@RequestBody FeConfModuleEntity entity) { + try { + Assert.notNull(entity.getId()); + feConfModuleService.logicRemove(entity); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/IFeConfModuleDao.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/IFeConfModuleDao.java new file mode 100644 index 00000000..b87e561a --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/IFeConfModuleDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.finance.conf.fileeigen.dao; + +import com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * 财资事项(finance_event)-配置-档案特征-模块(fe_conf_module: table)表数据库访问层 + * + * @author zydd + * @since 2025-08-20 10:00:30 + */ +public interface IFeConfModuleDao extends IBaseDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/impl/FeConfModuleDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/impl/FeConfModuleDaoImpl.java new file mode 100644 index 00000000..95a65202 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/impl/FeConfModuleDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.finance.conf.fileeigen.dao.impl; + +import com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity; +import com.hzya.frame.finance.conf.fileeigen.dao.IFeConfModuleDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * 财资事项(finance_event)-配置-档案特征-模块(FeConfModule)表数据库访问层 + * + * @author zydd + * @since 2025-08-20 10:00:30 + */ +@Repository +public class FeConfModuleDaoImpl extends MybatisGenericDao implements IFeConfModuleDao{ + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfFileEigenEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfFileEigenEntity.java index 42c821a6..0ba075a5 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfFileEigenEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfFileEigenEntity.java @@ -3,6 +3,7 @@ package com.hzya.frame.finance.conf.fileeigen.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; /** * 财资事项(finance_event)-配置-档案特征(FeConfFileEigen)实体类 @@ -10,17 +11,11 @@ import com.hzya.frame.web.entity.BaseEntity; * @author zydd * @since 2025-08-19 15:12:04 */ +@Data public class FeConfFileEigenEntity extends BaseEntity { private String splitName; - public String getSplitName() { - return splitName; - } - - public void setSplitName(String splitName) { - this.splitName = splitName; - } /** * 主数据ID @@ -32,6 +27,8 @@ public class FeConfFileEigenEntity extends BaseEntity { * 数据ID */ private String mdmDataId; + private String mdmDataCode; + private String mdmDataName; /** * 特征值 */ @@ -55,142 +52,5 @@ public class FeConfFileEigenEntity extends BaseEntity { */ private String modifyUser; - - public String getMdmId() { - return mdmId; - } - - public void setMdmId(String mdmId) { - this.mdmId = mdmId; - } - - public String getMdmCode() { - return mdmCode; - } - - public void setMdmCode(String mdmCode) { - this.mdmCode = mdmCode; - } - - public String getMdmName() { - return mdmName; - } - - public void setMdmName(String mdmName) { - this.mdmName = mdmName; - } - - public String getMdmDataId() { - return mdmDataId; - } - - public void setMdmDataId(String mdmDataId) { - this.mdmDataId = mdmDataId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - 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/finance/conf/fileeigen/entity/FeConfModuleEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.java new file mode 100644 index 00000000..f676b1e7 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.java @@ -0,0 +1,44 @@ +package com.hzya.frame.finance.conf.fileeigen.entity; + +import java.util.Date; + +import com.hzya.frame.web.entity.BaseEntity; +import lombok.Data; + +/** + * 财资事项(finance_event)-配置-档案特征-模块(FeConfModule)实体类 + * + * @author zydd + * @since 2025-08-20 10:00:30 + */ +@Data +public class FeConfModuleEntity extends BaseEntity { + + /** + * 模块id + */ + private String mdmId; + private String mdmCode; + private String mdmName; + 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/finance/conf/fileeigen/entity/FeConfModuleEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.xml new file mode 100644 index 00000000..b658f158 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,mdm_id + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,create_time + ,create_user + ,modify_time + ,modify_user + ,sts + + + + + + + + + + + + + + + + insert into fe_conf_module( + + id , + mdm_id , + 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} , + #{mdmId} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + #{create_time} , + now() , + #{createUser} , + #{modify_time} , + now() , + #{modifyUser} , + #{sts} , + 'Y', + + ) + + + + insert into fe_conf_module(mdm_id, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, create_time, + create_user, modify_time, modify_user, sts, sts) + values + + (#{entity.mdmId},#{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 fe_conf_module(mdm_id, def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, create_time, + create_user, modify_time, modify_user, sts) + values + + (#{entity.mdmId},#{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 + mdm_id = values(mdm_id), + 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 fe_conf_module set + + mdm_id = #{mdmId}, + 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 fe_conf_module + set sts= 'N', + modify_time = now() + where id = #{id} + + + + update fe_conf_module set sts= 'N' ,modify_time = now() + + and id = #{id} + and mdm_id = #{mdmId} + 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 fe_conf_module + where id = #{id} + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfFileEigenService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfFileEigenService.java index b71e7796..86508f5d 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfFileEigenService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfFileEigenService.java @@ -1,5 +1,6 @@ package com.hzya.frame.finance.conf.fileeigen.service; +import com.github.pagehelper.PageInfo; import com.hzya.frame.finance.conf.fileeigen.entity.FeConfFileEigenEntity; import com.hzya.frame.basedao.service.IBaseService; @@ -26,4 +27,10 @@ public interface IFeConfFileEigenService extends IBaseService queryMdmAll(FeConfFileEigenEntity entity); List autoExecute(FeConfFileEigenEntity entity); + + List> searchFile(FeConfFileEigenEntity entity); + List searchName(FeConfFileEigenEntity entity); + + PageInfo queryDataMapPagedByMdmId(FeConfFileEigenEntity entity); + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfModuleService.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfModuleService.java new file mode 100644 index 00000000..24eeab02 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfModuleService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.finance.conf.fileeigen.service; + +import com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity; +import com.hzya.frame.basedao.service.IBaseService; +/** + * 财资事项(finance_event)-配置-档案特征-模块(FeConfModule)表服务接口 + * + * @author zydd + * @since 2025-08-20 10:00:30 + */ +public interface IFeConfModuleService extends IBaseService{ +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfFileEigenServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfFileEigenServiceImpl.java index 4427e335..c0e377b7 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfFileEigenServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfFileEigenServiceImpl.java @@ -1,6 +1,8 @@ package com.hzya.frame.finance.conf.fileeigen.service.impl; import cn.hutool.core.lang.Assert; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.hzya.frame.finance.conf.fileeigen.entity.FeConfFileEigenEntity; import com.hzya.frame.finance.conf.fileeigen.dao.IFeConfFileEigenDao; import com.hzya.frame.finance.conf.fileeigen.service.IFeConfFileEigenService; @@ -235,6 +237,77 @@ public class FeConfFileEigenServiceImpl extends BaseService> searchFile(FeConfFileEigenEntity entity) { + checkAssistNull("searchFile", entity); + String mdmId = entity.getMdmId(); + String mdmDataName = entity.getMdmDataName(); + + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmId); + mdmModuleDbEntity.setDbType("1"); + List query = mdmModuleDbDao.query(mdmModuleDbEntity); + if(query.size()==0){ + Assert.state(false,"根据mdmId：{}，查询数据表细失败",mdmId); + } + String dbName = query.get(0).getDbName(); + + + MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO(); + mdmDbFiledVO.setMdmId(mdmId); + List mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVOByMdmID(mdmDbFiledVO); + if(mdmDbFiledVOList==null||mdmDbFiledVOList.size()==0){ + Assert.state(false,"根据mdmId：{}，查询字段名细失败",mdmId); + } + MdmDbFiledVO mdmDbFiled = mdmDbFiledVOList.get(0); + String fieldName = mdmDbFiled.getNamefieldname(); + if(fieldName==null){ + Assert.state(false,"根据mdmId：{}，查询名称字段名细失败。",mdmId); + } + System.out.println(fieldName); + MdmDBQueryVO queryueryVO=new MdmDBQueryVO(); + queryueryVO.setTablename(dbName); + queryueryVO.setProp1(fieldName); + queryueryVO.setPropValue1(mdmDataName); + List> maps = mdmDBQueryVODAO.queryMdmDb(queryueryVO); + return maps; + } + + @Override + public List searchName(FeConfFileEigenEntity entity) { + checkAssistNull("searchName", entity); + List query = feConfFileEigenDao.queryByLike(entity); + return query; + } + + @Override + public PageInfo queryDataMapPagedByMdmId(FeConfFileEigenEntity entity) { + checkAssistNull("queryDataMapByMdmId", entity); + String mdmId = entity.getMdmId(); + + MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity(); + mdmModuleDbEntity.setMdmId(mdmId); + mdmModuleDbEntity.setDbType("1"); + List mdmModuleEntityDbList = mdmModuleDbDao.query(mdmModuleDbEntity); + if (mdmModuleEntityDbList.size() == 0 || mdmModuleEntityDbList.size() > 1) { + Assert.state(false, "根据mdmId：{}，未查询到数据表或数据表不唯一。"); + } + MdmModuleDbEntity mdmModuleDb = mdmModuleEntityDbList.get(0); + String dbName = mdmModuleDb.getDbName(); + + MdmDBQueryVO mdmDBQueryVO = new MdmDBQueryVO(); + mdmDBQueryVO.setTablename(dbName); + mdmDBQueryVO.setPageNum(entity.getPageNum()); + mdmDBQueryVO.setPageSize(entity.getPageSize()); + + + + PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize()); + List> dataMapList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO); + PageInfo pageInfo = new PageInfo(dataMapList); + return pageInfo; + } + public void checkAssistNull(String type, FeConfFileEigenEntity entity) { switch (type) { case "queryAll": @@ -256,6 +329,14 @@ public class FeConfFileEigenServiceImpl extends BaseService implements IFeConfModuleService { + + private IFeConfModuleDao feConfModuleDao; + + @Autowired + public void setFeConfModuleDao(IFeConfModuleDao dao) { + this.feConfModuleDao = dao; + this.dao = dao; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java index ee8ebf03..3d32f5e1 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java @@ -25,4 +25,6 @@ public interface IMdmDBQueryVODAO extends IBaseDao { List queryVoucherType(BdVoucherTypeVO entity); List queryBdCurrtype(BdCurrtypeVO entity); + + List> queryMdmDateBySK(MdmDBQueryVO entity); } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java index 288bf777..294a7242 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java @@ -76,4 +76,10 @@ public class MdmDBQueryVODAOImpl extends MybatisGenericDao List list =(List) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryBdCurrtype", entity); return list; } + + @Override + public List> queryMdmDateBySK(MdmDBQueryVO entity) { + List> maps = (List>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryMdmDateBySK", entity); + return maps; + } } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java index 9944e98c..a8c14109 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java @@ -35,4 +35,7 @@ public class MdmDBQueryVO extends BaseEntity { private String pkentityorg; private String billstatus; + private String claimstatus; + private String ids; + } diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml index 3526e078..86d43025 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml @@ -245,5 +245,28 @@ SELECT id,pk_currtype as pkCurrtype,code,name,currtypesign,dr,ts from mdm_bd_currtype + + 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 15aa818f..d0cf2244 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 @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; /** @@ -84,6 +85,9 @@ public class ContrastController extends DefaultController { public JsonResultEntity queryByInfluenceIds(@RequestBody AeConfSubjectContrastEntity entity) { try { List list = aeConfSubjectContrastService.queryByInfluenceIds(entity); + if(list==null){ + return getSuccessMessageEntity("请求成功", new ArrayList<>()); + } return getSuccessMessageEntity("请求成功", list); } catch (Exception e) { e.printStackTrace(); 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 f56931c7..842197ea 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 @@ -29,8 +29,12 @@ public class AeConfSubjectContrastBEntity extends BaseEntity { */ public String pkAccsubj; /** - * 目标档案值（会计科目) + * 目标档案 */ + public String desdoctable; + public String desdocpk; + public String desdocid; + public String desdocname; public String desdocvalue; /** * 来源档案表1 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 86e4652f..b413286f 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 @@ -8,6 +8,13 @@ + + + + + + + @@ -70,6 +77,10 @@ ,pk_corp ,glorgname ,pk_accsubj + ,desdoctable + ,desdocpk + ,desdocid + ,desdocname ,desdocvalue ,factortable1 ,factortable2 @@ -134,6 +145,12 @@ and id = #{id} and contrast_id = #{contrastId} and pk_corp = #{pkCorp} + + and desdoctable=#{desdoctable} + and desdocpk=#{desdocpk} + and desdocid=#{desdocid} + and desdocname=#{desdocname} + and desdocvalue = #{desdocvalue} and factortable1 = #{factortable1} and factortable2 = #{factortable2} @@ -190,6 +207,12 @@ and id = #{id} and contrast_id = #{contrastId} and pk_corp = #{pkCorp} + + and desdoctable=#{desdoctable} + and desdocpk=#{desdocpk} + and desdocid=#{desdocid} + and desdocname=#{desdocname} + and desdocvalue = #{desdocvalue} and factortable1 = #{factortable1} and factortable2 = #{factortable2} @@ -240,7 +263,7 @@