hzya
/
kangarooDataCenterV3
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改对照表，认领方案等模块以及相关方法。 

2、新增待认领清单模块
This commit is contained in:
zhengyf 2025-08-20 23:44:33 +08:00
parent 0d657561df
commit bb1d1f2c49
23 changed files with 997 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
base-buildpackage/src/main/java/com/hzya/frame/finance/claim/controller/ClaimSKController.java Normal file
View File

@ -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<Map<String, Object>> mps = claimSKService.queryFlowDateIds(entity);
return getSuccessMessageEntity("请求成功", mps);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
}

21
base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/IClaimSKService.java Normal file
View File

@ -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<Map<String, Object>> queryFlowDateIds(MdmDBQueryVO entity);
}

102
base-buildpackage/src/main/java/com/hzya/frame/finance/claim/service/impl/IClaimSKServiceImpl.java Normal file
View File

@ -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<Map<String, Object>> 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<Map<String, Object>> maps= mdmDBQueryVODAO.queryMdmDateBySK(entity);
PageInfo pageInfo = new PageInfo(maps);
return pageInfo;
}
@Override
public List<Map<String, Object>> queryFlowDateIds(MdmDBQueryVO entity) {
entity.setTablename("mdm_kk_bankflow_ccb");
List<Map<String, Object>> maps= mdmDBQueryVODAO.queryMdmDateBySK(entity);
return maps;
}
}

43
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/FileEigenController.java
View File

@ -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<Map<String, Object>> 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<FeConfFileEigenEntity> autoExecute = fileEigenService.searchName(entity);
return getSuccessMessageEntity("请求成功", autoExecute);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
}

119
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/controller/ModuleController.java Normal file
View File

@ -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<MdmModuleEntity> 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<FeConfModuleEntity> all = feConfModuleService.query(entity);
for (FeConfModuleEntity feConfModuleEntity : all) {
String id = feConfModuleEntity.getMdmId();
MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
mdmModuleEntity.setId(id);
List<MdmModuleEntity> 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<FeConfModuleEntity> 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<MdmModuleEntity> 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());
}
}
}

15
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/IFeConfModuleDao.java Normal file
View File

@ -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<FeConfModuleEntity, String> {
}

17
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/dao/impl/FeConfModuleDaoImpl.java Normal file
View File

@ -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<FeConfModuleEntity, String> implements IFeConfModuleDao{
}

148
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfFileEigenEntity.java
View File

@ -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;
}
}

44
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.java Normal file
View File

@ -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;
}

306
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/entity/FeConfModuleEntity.xml Normal file
View File

@ -0,0 +1,306 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.finance.conf.fileeigen.dao.impl.FeConfModuleDaoImpl">
<resultMap id="get-FeConfModuleEntity-result"
type="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="mdmId" column="mdm_id" jdbcType="VARCHAR"/>
<result property="mdmCode" column="mdm_coe" jdbcType="VARCHAR"/>
<result property="mdmName" column="mdm_name" jdbcType="VARCHAR"/>
<result property="def1" column="def1" jdbcType="VARCHAR"/>
<result property="def2" column="def2" jdbcType="VARCHAR"/>
<result property="def3" column="def3" jdbcType="VARCHAR"/>
<result property="def4" column="def4" jdbcType="VARCHAR"/>
<result property="def5" column="def5" jdbcType="VARCHAR"/>
<result property="def6" column="def6" jdbcType="VARCHAR"/>
<result property="def7" column="def7" jdbcType="VARCHAR"/>
<result property="def8" column="def8" jdbcType="VARCHAR"/>
<result property="def9" column="def9" jdbcType="VARCHAR"/>
<result property="def10" column="def10" jdbcType="VARCHAR"/>
<result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
<result property="createUser" column="create_user" jdbcType="VARCHAR"/>
<result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
<result property="modifyUser" column="modify_user" jdbcType="VARCHAR"/>
<result property="sts" column="sts" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id="FeConfModuleEntity_Base_Column_List">
id
,mdm_id
,def1
,def2
,def3
,def4
,def5
,def6
,def7
,def8
,def9
,def10
,create_time
,create_user
,modify_time
,modify_user
,sts
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-FeConfModuleEntity-result"
parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
select
<include refid="FeConfModuleEntity_Base_Column_List"/>
from fe_conf_module
<trim prefix="where" prefixOverrides="and">
<if test="id != null">and id = #{id}</if>
<if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
<if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
<if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
<if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
<if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
<if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
<if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
<if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
<if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
<if test="create_time != null">and create_time = #{create_time}</if>
<if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
<if test="modify_time != null">and modify_time = #{modify_time}</if>
<if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
and sts='Y'
</trim>
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer"
parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
select count(1) from fe_conf_module
<trim prefix="where" prefixOverrides="and">
<if test="id != null">and id = #{id}</if>
<if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
<if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
<if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
<if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
<if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
<if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
<if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
<if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
<if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
<if test="create_time != null">and create_time = #{create_time}</if>
<if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
<if test="modify_time != null">and modify_time = #{modify_time}</if>
<if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
and sts='Y'
</trim>
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-FeConfModuleEntity-result"
parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
select
<include refid="FeConfModuleEntity_Base_Column_List"/>
from fe_conf_module
<trim prefix="where" prefixOverrides="and">
<if test="id != null">and id like concat('%',#{id},'%')</if>
<if test="mdmId != null and mdmId != ''">and mdm_id like concat('%',#{mdmId},'%')</if>
<if test="def1 != null and def1 != ''">and def1 like concat('%',#{def1},'%')</if>
<if test="def2 != null and def2 != ''">and def2 like concat('%',#{def2},'%')</if>
<if test="def3 != null and def3 != ''">and def3 like concat('%',#{def3},'%')</if>
<if test="def4 != null and def4 != ''">and def4 like concat('%',#{def4},'%')</if>
<if test="def5 != null and def5 != ''">and def5 like concat('%',#{def5},'%')</if>
<if test="def6 != null and def6 != ''">and def6 like concat('%',#{def6},'%')</if>
<if test="def7 != null and def7 != ''">and def7 like concat('%',#{def7},'%')</if>
<if test="def8 != null and def8 != ''">and def8 like concat('%',#{def8},'%')</if>
<if test="def9 != null and def9 != ''">and def9 like concat('%',#{def9},'%')</if>
<if test="def10 != null and def10 != ''">and def10 like concat('%',#{def10},'%')</if>
<if test="create_time != null">and create_time like concat('%',#{create_time},'%')</if>
<if test="createUser != null and createUser != ''">and create_user like concat('%',#{createUser},'%')</if>
<if test="modify_time != null">and modify_time like concat('%',#{modify_time},'%')</if>
<if test="modifyUser != null and modifyUser != ''">and modify_user like concat('%',#{modifyUser},'%')</if>
<if test="sts != null and sts != ''">and sts like concat('%',#{sts},'%')</if>
and sts='Y'
</trim>
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="FeConfModuleentity_list_or" resultMap="get-FeConfModuleEntity-result"
parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
select
<include refid="FeConfModuleEntity_Base_Column_List"/>
from fe_conf_module
<trim prefix="where" prefixOverrides="and">
<if test="id != null">or id = #{id}</if>
<if test="mdmId != null and mdmId != ''">or mdm_id = #{mdmId}</if>
<if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
<if test="def3 != null and def3 != ''">or def3 = #{def3}</if>
<if test="def4 != null and def4 != ''">or def4 = #{def4}</if>
<if test="def5 != null and def5 != ''">or def5 = #{def5}</if>
<if test="def6 != null and def6 != ''">or def6 = #{def6}</if>
<if test="def7 != null and def7 != ''">or def7 = #{def7}</if>
<if test="def8 != null and def8 != ''">or def8 = #{def8}</if>
<if test="def9 != null and def9 != ''">or def9 = #{def9}</if>
<if test="def10 != null and def10 != ''">or def10 = #{def10}</if>
<if test="create_time != null">or create_time = #{create_time}</if>
<if test="createUser != null and createUser != ''">or create_user = #{createUser}</if>
<if test="modify_time != null">or modify_time = #{modify_time}</if>
<if test="modifyUser != null and modifyUser != ''">or modify_user = #{modifyUser}</if>
<if test="sts != null and sts != ''">or sts = #{sts}</if>
and sts='Y'
</trim>
</select>
<!--新增所有列-->
<insert id="entity_insert" parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity"
keyProperty="id" useGeneratedKeys="true">
insert into fe_conf_module(
<trim suffix="" suffixOverrides=",">
<if test="id != null">id ,</if>
<if test="mdmId != null and mdmId != ''">mdm_id ,</if>
<if test="def1 != null and def1 != ''">def1 ,</if>
<if test="def2 != null and def2 != ''">def2 ,</if>
<if test="def3 != null and def3 != ''">def3 ,</if>
<if test="def4 != null and def4 != ''">def4 ,</if>
<if test="def5 != null and def5 != ''">def5 ,</if>
<if test="def6 != null and def6 != ''">def6 ,</if>
<if test="def7 != null and def7 != ''">def7 ,</if>
<if test="def8 != null and def8 != ''">def8 ,</if>
<if test="def9 != null and def9 != ''">def9 ,</if>
<if test="def10 != null and def10 != ''">def10 ,</if>
<if test="create_time != null">create_time ,</if>
<if test="create_time == null">create_time ,</if>
<if test="createUser != null and createUser != ''">create_user ,</if>
<if test="modify_time != null">modify_time ,</if>
<if test="modify_time == null">modify_time ,</if>
<if test="modifyUser != null and modifyUser != ''">modify_user ,</if>
<if test="sts != null and sts != ''">sts ,</if>
<if test="sts == null ">sts,</if>
</trim>
)values(
<trim suffix="" suffixOverrides=",">
<if test="id != null">#{id} ,</if>
<if test="mdmId != null and mdmId != ''">#{mdmId} ,</if>
<if test="def1 != null and def1 != ''">#{def1} ,</if>
<if test="def2 != null and def2 != ''">#{def2} ,</if>
<if test="def3 != null and def3 != ''">#{def3} ,</if>
<if test="def4 != null and def4 != ''">#{def4} ,</if>
<if test="def5 != null and def5 != ''">#{def5} ,</if>
<if test="def6 != null and def6 != ''">#{def6} ,</if>
<if test="def7 != null and def7 != ''">#{def7} ,</if>
<if test="def8 != null and def8 != ''">#{def8} ,</if>
<if test="def9 != null and def9 != ''">#{def9} ,</if>
<if test="def10 != null and def10 != ''">#{def10} ,</if>
<if test="create_time != null">#{create_time} ,</if>
<if test="create_time == null">now() ,</if>
<if test="createUser != null and createUser != ''">#{createUser} ,</if>
<if test="modify_time != null">#{modify_time} ,</if>
<if test="modify_time == null">now() ,</if>
<if test="modifyUser != null and modifyUser != ''">#{modifyUser} ,</if>
<if test="sts != null and sts != ''">#{sts} ,</if>
<if test="sts == null ">'Y',</if>
</trim>
)
</insert>
<!-- 批量新增 -->
<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
insert into 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
<foreach collection="entities" item="entity" separator=",">
(#{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')
</foreach>
</insert>
<!-- 批量新增或者修改-->
<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
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
<foreach collection="entities" item="entity" separator=",">
(#{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})
</foreach>
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)
</insert>
<!--通过主键修改方法-->
<update id="entity_update" parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
update fe_conf_module set
<trim suffix="" suffixOverrides=",">
<if test="mdmId != null and mdmId != ''">mdm_id = #{mdmId},</if>
<if test="def1 != null and def1 != ''">def1 = #{def1},</if>
<if test="def2 != null and def2 != ''">def2 = #{def2},</if>
<if test="def3 != null and def3 != ''">def3 = #{def3},</if>
<if test="def4 != null and def4 != ''">def4 = #{def4},</if>
<if test="def5 != null and def5 != ''">def5 = #{def5},</if>
<if test="def6 != null and def6 != ''">def6 = #{def6},</if>
<if test="def7 != null and def7 != ''">def7 = #{def7},</if>
<if test="def8 != null and def8 != ''">def8 = #{def8},</if>
<if test="def9 != null and def9 != ''">def9 = #{def9},</if>
<if test="def10 != null and def10 != ''">def10 = #{def10},</if>
<if test="create_time != null">create_time = #{create_time},</if>
<if test="createUser != null and createUser != ''">create_user = #{createUser},</if>
<if test="modify_time != null">modify_time = #{modify_time},</if>
<if test="modify_time == null">modify_time = now(),</if>
<if test="modifyUser != null and modifyUser != ''">modify_user = #{modifyUser},</if>
<if test="sts != null and sts != ''">sts = #{sts},</if>
</trim>
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete" parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
update fe_conf_module
set sts= 'N',
modify_time = now()
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
<update id="entity_logicDelete_Multi_Condition"
parameterType="com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity">
update fe_conf_module set sts= 'N' ,modify_time = now()
<trim prefix="where" prefixOverrides="and">
<if test="id != null">and id = #{id}</if>
<if test="mdmId != null and mdmId != ''">and mdm_id = #{mdmId}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
<if test="def3 != null and def3 != ''">and def3 = #{def3}</if>
<if test="def4 != null and def4 != ''">and def4 = #{def4}</if>
<if test="def5 != null and def5 != ''">and def5 = #{def5}</if>
<if test="def6 != null and def6 != ''">and def6 = #{def6}</if>
<if test="def7 != null and def7 != ''">and def7 = #{def7}</if>
<if test="def8 != null and def8 != ''">and def8 = #{def8}</if>
<if test="def9 != null and def9 != ''">and def9 = #{def9}</if>
<if test="def10 != null and def10 != ''">and def10 = #{def10}</if>
<if test="createUser != null and createUser != ''">and create_user = #{createUser}</if>
<if test="modifyUser != null and modifyUser != ''">and modify_user = #{modifyUser}</if>
<if test="sts != null and sts != ''">and sts = #{sts}</if>
and sts='Y'
</trim>
</update>
<!--通过主键删除-->
<delete id="entity_delete">
delete
from fe_conf_module
where id = #{id}
</delete>
</mapper>

7
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfFileEigenService.java
View File

@ -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<FeConfFileEigenEnt
List<FeConfFileEigenEntity> queryMdmAll(FeConfFileEigenEntity entity);
List<FeConfFileEigenEntity> autoExecute(FeConfFileEigenEntity entity);
List<Map<String, Object>> searchFile(FeConfFileEigenEntity entity);
List<FeConfFileEigenEntity> searchName(FeConfFileEigenEntity entity);
PageInfo queryDataMapPagedByMdmId(FeConfFileEigenEntity entity);
}

12
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/IFeConfModuleService.java Normal file
View File

@ -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<FeConfModuleEntity, String>{
}

81
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfFileEigenServiceImpl.java
View File

@ -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<FeConfFileEigenEntit
}
@Override
public List<Map<String, Object>> 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<MdmModuleDbEntity> 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<MdmDbFiledVO> 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<Map<String, Object>> maps = mdmDBQueryVODAO.queryMdmDb(queryueryVO);
return maps;
}
@Override
public List<FeConfFileEigenEntity> searchName(FeConfFileEigenEntity entity) {
checkAssistNull("searchName", entity);
List<FeConfFileEigenEntity> 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<MdmModuleDbEntity> 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<Map<String, Object>> 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<FeConfFileEigenEntit
Assert.notNull(entity.getMdmId(), "自动生成时，mdmId不能为空");
Assert.notNull(entity.getSplitName(), "自动生成时，splitName不能为空");
break;
case "searchFile":
Assert.notNull(entity.getMdmId(), "搜索档案内容时，mdmId不能为空");
Assert.notNull(entity.getMdmDataName(), "搜索档案内容时，mdmDataName不能为空");
break;
case "searchName":
Assert.notNull(entity.getMdmId(), "搜错特征值时，mdmId不能为空");
Assert.notNull(entity.getName(), "搜错特征值时，name不能为空");
break;
}
}

26
base-buildpackage/src/main/java/com/hzya/frame/finance/conf/fileeigen/service/impl/FeConfModuleServiceImpl.java Normal file
View File

@ -0,0 +1,26 @@
package com.hzya.frame.finance.conf.fileeigen.service.impl;
import com.hzya.frame.finance.conf.fileeigen.entity.FeConfModuleEntity;
import com.hzya.frame.finance.conf.fileeigen.dao.IFeConfModuleDao;
import com.hzya.frame.finance.conf.fileeigen.service.IFeConfModuleService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService;
/**
* 财资事项(finance_event)-配置-档案特征-模块(FeConfModule)表服务实现类
*
* @author zydd
* @since 2025-08-20 10:00:30
*/
@Service
public class FeConfModuleServiceImpl extends BaseService<FeConfModuleEntity, String> implements IFeConfModuleService {
private IFeConfModuleDao feConfModuleDao;
@Autowired
public void setFeConfModuleDao(IFeConfModuleDao dao) {
this.feConfModuleDao = dao;
this.dao = dao;
}
}

2
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/IMdmDBQueryVODAO.java
View File

@ -25,4 +25,6 @@ public interface IMdmDBQueryVODAO extends IBaseDao<MdmDBQueryVO, String> {
List<BdVoucherTypeVO> queryVoucherType(BdVoucherTypeVO entity);
List<BdCurrtypeVO> queryBdCurrtype(BdCurrtypeVO entity);
List<Map<String, Object>> queryMdmDateBySK(MdmDBQueryVO entity);
}

6
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/dao/impl/MdmDBQueryVODAOImpl.java
View File

@ -76,4 +76,10 @@ public class MdmDBQueryVODAOImpl extends MybatisGenericDao<MdmDBQueryVO, String>
List<BdCurrtypeVO> list =(List<BdCurrtypeVO>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryBdCurrtype", entity);
return list;
}
@Override
public List<Map<String, Object>> queryMdmDateBySK(MdmDBQueryVO entity) {
List<Map<String, Object>> maps = (List<Map<String, Object>>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.MdmDBQueryVODAOImpl.queryMdmDateBySK", entity);
return maps;
}
}

3
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.java
View File

@ -35,4 +35,7 @@ public class MdmDBQueryVO extends BaseEntity {
private String pkentityorg;
private String billstatus;
private String claimstatus;
private String ids;
}

23
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
View File

@ -245,5 +245,28 @@
SELECT id,pk_currtype as pkCurrtype,code,name,currtypesign,dr,ts from mdm_bd_currtype
</select>
<select id="queryMdmDateBySK" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map">
select
*
from
${tablename}
<trim prefix="where" prefixOverrides="and">
1=1
<if test="prop1 !=null and propValue1 != null">and ${prop1} like concat('%', #{propValue1},'%')</if>
<if test="prop2 !=null and propValue2 != null">and ${prop2} like concat('%', #{propValue2},'%')</if>
<if test="prop3 !=null and propValue3 != null">and ${prop3} like concat('%', #{propValue3},'%')</if>
<if test="prop4 !=null and propValue4 != null">and ${prop4} like concat('%', #{propValue4},'%')</if>
<if test="prop5 !=null and propValue5 != null">and ${prop5} like concat('%', #{propValue5},'%')</if>
<if test="prop6 !=null and propValue6 != null">and ${prop6} like concat('%', #{propValue6},'%')</if>
<if test="prop7 !=null and propValue7 != null">and ${prop7} like concat('%', #{propValue7},'%')</if>
<if test="prop8 !=null and propValue8 != null">and ${prop8} like concat('%', #{propValue8},'%')</if>
<if test="prop9 !=null and propValue9 != null">and ${prop9} like concat('%', #{propValue9},'%')</if>
<if test="prop10 !=null and propValue10 != null">and ${prop10} like concat('%', #{propValue10},'%')</if>
<if test="claimstatus !=null and claimstatus != ''">and claimstatus = #{claimstatus}</if>
<if test="ids !=null and ids != ''">and id in (${ids})</if>
</trim>
</select>
</mapper>

4
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/controller/ContrastController.java
View File

@ -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<AeConfSubjectContrastEntity> list = aeConfSubjectContrastService.queryByInfluenceIds(entity);
if(list==null){
return getSuccessMessageEntity("请求成功", new ArrayList<>());
}
return getSuccessMessageEntity("请求成功", list);
} catch (Exception e) {
e.printStackTrace();

6
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.java
View File

@ -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

49
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/entity/AeConfSubjectContrastBEntity.xml
View File

@ -8,6 +8,13 @@
<result property="contrastId" column="contrast_id" jdbcType="INTEGER"/>
<result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
<result property="glorgname" column="glorgname" jdbcType="VARCHAR"/>
<result property="desdoctable" column="desdoctable" jdbcType="VARCHAR"/>
<result property="desdocpk" column="desdocpk" jdbcType="VARCHAR"/>
<result property="desdocid" column="desdocid" jdbcType="VARCHAR"/>
<result property="desdocname" column="desdocname" jdbcType="VARCHAR"/>
<result property="desdocvalue" column="desdocvalue" jdbcType="VARCHAR"/>
<result property="pkAccsubj" column="pk_accsubj" jdbcType="VARCHAR"/>
<result property="factortable1" column="factortable1" jdbcType="VARCHAR"/>
@ -70,6 +77,10 @@
,pk_corp
,glorgname
,pk_accsubj
,desdoctable
,desdocpk
,desdocid
,desdocname
,desdocvalue
,factortable1
,factortable2
@ -134,6 +145,12 @@
<if test="id != null">and id = #{id}</if>
<if test="contrastId != null">and contrast_id = #{contrastId}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="desdoctable !=null and desdoctable != ''">and desdoctable=#{desdoctable}</if>
<if test="desdocpk !=null and desdocpk != ''">and desdocpk=#{desdocpk}</if>
<if test="desdocid !=null and desdocid != ''">and desdocid=#{desdocid}</if>
<if test="desdocname !=null and desdocname != ''">and desdocname=#{desdocname}</if>
<if test="desdocvalue != null and desdocvalue != ''">and desdocvalue = #{desdocvalue}</if>
<if test="factortable1 != null and factortable1 != ''">and factortable1 = #{factortable1}</if>
<if test="factortable2 != null and factortable2 != ''">and factortable2 = #{factortable2}</if>
@ -190,6 +207,12 @@
<if test="id != null">and id = #{id}</if>
<if test="contrastId != null">and contrast_id = #{contrastId}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="desdoctable !=null and desdoctable !=''">and desdoctable=#{desdoctable}</if>
<if test="desdocpk !=null and desdocpk !=''">and desdocpk=#{desdocpk}</if>
<if test="desdocid !=null and desdocid !=''">and desdocid=#{desdocid}</if>
<if test="desdocname !=null and desdocname !=''">and desdocname=#{desdocname}</if>
<if test="desdocvalue != null and desdocvalue != ''">and desdocvalue = #{desdocvalue}</if>
<if test="factortable1 != null and factortable1 != ''">and factortable1 = #{factortable1}</if>
<if test="factortable2 != null and factortable2 != ''">and factortable2 = #{factortable2}</if>
@ -240,7 +263,7 @@
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-AeConfSubjectContrastBEntity-result"
parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity">
parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity">
select
<include refid="AeConfSubjectContrastBEntity_Base_Column_List"/>
from ae_conf_subject_contrast_b
@ -248,6 +271,12 @@
<if test="id != null">and id like concat('%',#{id},'%')</if>
<if test="contrastId != null">and contrast_id like concat('%',#{contrastId},'%')</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp like concat('%',#{pkCorp},'%')</if>
<if test="desdoctable !=null and desdoctable !=''">and desdoctable like concat('%',#{desdoctable},'%')</if>
<if test="desdocpk !=null and desdocpk !=''">and desdocpk like concat('%',#{desdocpk},'%')</if>
<if test="desdocid !=null and desdocid !=''">and desdocid like concat('%',#{desdocid},'%')</if>
<if test="desdocname !=null and desdocname !=''">and desdocname like concat('%',#{desdocname},'%')</if>
<if test="desdocvalue != null and desdocvalue != ''">and desdocvalue like concat('%',#{desdocvalue},'%')
</if>
<if test="factortable1 != null and factortable1 != ''">and factortable1 like
@ -382,6 +411,12 @@
<if test="contrastId != null">contrast_id ,</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
<if test="glorgname != null and glorgname != ''">glorgname ,</if>
<if test="desdoctable !=null and desdoctable !=''" >desdoctable,</if>
<if test="desdocpk !=null and desdocpk !=''" >desdocpk,</if>
<if test="desdocid !=null and desdocid !=''" >desdocid,</if>
<if test="desdocname !=null and desdocname !=''" >desdocname,</if>
<if test="desdocvalue != null and desdocvalue != ''">desdocvalue ,</if>
<if test="pkAccsubj != null and pkAccsubj != ''">pk_accsubj ,</if>
<if test="factortable1 != null and factortable1 != ''">factortable1 ,</if>
@ -445,6 +480,12 @@
<if test="contrastId != null">#{contrastId} ,</if>
<if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
<if test="glorgname != null and glorgname != ''">#{glorgname} ,</if>
<if test="desdoctable !=null and desdoctable !=''">#{desdoctable},</if>
<if test="desdocpk !=null and desdocpk !=''">#{desdocpk},</if>
<if test="desdocid !=null and desdocid !=''">#{desdocid},</if>
<if test="desdocname !=null and desdocname !=''">#{desdocname},</if>
<if test="desdocvalue != null and desdocvalue != ''">#{desdocvalue} ,</if>
<if test="pkAccsubj != null and pkAccsubj != ''">#{pkAccsubj} ,</if>
<if test="factortable1 != null and factortable1 != ''">#{factortable1} ,</if>
@ -584,6 +625,12 @@
<trim suffix="" suffixOverrides=",">
<if test="contrastId != null">contrast_id = #{contrastId},</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>
<if test="desdoctable !=null and desdoctable !='">desdoctable = #{desdoctable}</if>
<if test="desdocpk !=null and desdocpk !='">desdocpk = #{desdocpk}</if>
<if test="desdocid !=null and desdocid !='">desdocid = #{desdocid}</if>
<if test="desdocname !=null and desdocname !='">desdocname = #{desdocname}</if>
<if test="desdocvalue != null and desdocvalue != ''">desdocvalue = #{desdocvalue},</if>
<if test="factortable1 != null and factortable1 != ''">factortable1 = #{factortable1},</if>
<if test="factortable2 != null and factortable2 != ''">factortable2 = #{factortable2},</if>

50
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectClassificationServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.hzya.frame.voucher.ae.comf.subject.service.impl;
import cn.hutool.core.lang.Assert;
import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectClassificationDao;
@ -36,26 +38,34 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSu
@Autowired
private IAeConfSubjectContrastBService contrastBService;
@Autowired
private IMdmModuleDao mdmModuleDao;
@Override
public List<AeConfSubjectClassificationEntity> queryAll(AeConfSubjectClassificationEntity entity) {
// Assert.notNull(entity.getPkCorp(), "查询科目分类定义时，公司主键不允许为空。");
Assert.notNull(entity.getPkglorgbook(), "查询科目分类定义时，账簿主键不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "查询科目分类定义时，业务模块id不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "查询科目认领方案时，业务模块id不允许为空。");
List<AeConfSubjectClassificationEntity> query = aeConfSubjectClassificationDao.query(entity);
for (AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity : query) {
//查询科目对照子表
queryaeConfSubjectContrastBList(aeConfSubjectClassificationEntity);
String desdocvalueDefaultId = aeConfSubjectClassificationEntity.getDesdocvalueDefaultId();
if(desdocvalueDefaultId!=null){
MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
mdmModuleEntity.setId(desdocvalueDefaultId);
List<MdmModuleEntity> mdmModuleEntityList = mdmModuleDao.query(mdmModuleEntity);
if(mdmModuleEntityList.size()!=0){
String mdmName = mdmModuleEntityList.get(0).getMdmName();
aeConfSubjectClassificationEntity.setDesdocvalueDefaultName(mdmName);
}
}
}
return query;
}
@Override
public AeConfSubjectClassificationEntity queryById(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getId(), "查询科目分类定义时，id不允许为空。");
Assert.notNull(entity.getPkCorp(), "查询科目分类定义时，公司主键不允许为空。");
Assert.notNull(entity.getPkglorgbook(), "查询科目分类定义时，账簿主键不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "查询科目分类定义时，业务模块id不允许为空。");
Assert.notNull(entity.getId(), "查询科目认领方案时，id不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "查询科目认领方案时，业务模块id不允许为空。");
List<AeConfSubjectClassificationEntity> query = aeConfSubjectClassificationDao.query(entity);
if (query.size() == 0 || query.size() > 1) {
return null;
@ -67,17 +77,13 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSu
}
/**
* 科目分类定义
* 科目认领方案
*/
@Override
public AeConfSubjectClassificationEntity saveEntity(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getPkCorp(), "科目分类定义新增时，公司主键不允许为空。");
Assert.notNull(entity.getPkglorgbook(), "科目分类定义新增时，核算账簿id不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "科目分类定义新增时，业务模块id不允许为空。");
Assert.notNull(entity.getGlorgbookcode(), "科目分类定义新增时，核算账簿编码不允许为空。");
Assert.notNull(entity.getGlorgbookname(), "科目分类定义新增时，核算账簿名称不允许为空。");
Assert.notNull(entity.getCode(), "科目分类定义新增时，编码不允许为空。");
Assert.notNull(entity.getName(), "科目分类定义新增时，名称不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "科目认领方案新增时，业务模块id不允许为空。");
Assert.notNull(entity.getCode(), "科目认领方案新增时，编码不允许为空。");
Assert.notNull(entity.getName(), "科目认领方案新增时，名称不允许为空。");
AeConfSubjectClassificationEntity save = aeConfSubjectClassificationDao.save(entity);
//查询科目对照子表
queryaeConfSubjectContrastBList(save);
@ -88,14 +94,10 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSu
@Override
public AeConfSubjectClassificationEntity updateEntity(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getId(), "科目分类定义更新时，id不允许为空。");
Assert.notNull(entity.getPkCorp(), "科目分类定义更新时，公司主键不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "科目分类定义更新时，业务模块id不允许为空。");
Assert.notNull(entity.getPkglorgbook(), "科目分类定义更新时，核算账簿id不允许为空。");
Assert.notNull(entity.getGlorgbookcode(), "科目分类定义更新时，核算账簿编码不允许为空。");
Assert.notNull(entity.getGlorgbookname(), "科目分类定义更新时，核算账簿名称不允许为空。");
Assert.notNull(entity.getCode(), "科目分类定义更新时，编码不允许为空。");
Assert.notNull(entity.getName(), "科目分类定义更新时，名称不允许为空。");
Assert.notNull(entity.getId(), "科目认领方案更新时，id不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "科目认领方案更新时，业务模块id不允许为空。");
Assert.notNull(entity.getCode(), "科目认领方案更新时，编码不允许为空。");
Assert.notNull(entity.getName(), "科目认领方案更新时，名称不允许为空。");
AeConfSubjectClassificationEntity update = aeConfSubjectClassificationDao.update(entity);
//查询科目对照子表
queryaeConfSubjectContrastBList(update);
@ -104,7 +106,7 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSu
@Override
public void deleteEntity(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getId(), "科目分类定义删除时，id不允许为空。");
Assert.notNull(entity.getId(), "科目认领方案删除时，id不允许为空。");
aeConfSubjectClassificationDao.logicRemove(entity);
}

19
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/impl/AeConfSubjectContrastServiceImpl.java
View File

@ -88,9 +88,6 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
//校验主表
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不能为空！");
@ -141,13 +138,13 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
@Override
public AeConfSubjectContrastEntity updateEntity(AeConfSubjectContrastEntity entity) throws Exception {
String id = entity.getId();
Assert.notNull(entity.getId(), "科目对照表修改时，科目对照表id不能为空！");
AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity();
aeConfSubjectContrastEntity.setId(entity.getId());
List<AeConfSubjectContrastEntity> query = aeConfSubjectContrastDao.query(aeConfSubjectContrastEntity);
if (query == null || query.size() == 0) {
Assert.state(false, "科目对照表修改时，科目对照表id：{}，未查询到科目对照！", entity.getId());
}
Assert.notNull(entity.getId(), "业务对照表修改时，业务对照表id不能为空！");
// AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity();
// aeConfSubjectContrastEntity.setId(entity.getId());
// List<AeConfSubjectContrastEntity> query = aeConfSubjectContrastDao.query(aeConfSubjectContrastEntity);
// if (query == null || query.size() == 0) {
// Assert.state(false, "科目对照表修改时，科目对照表id：{}，未查询到科目对照！", entity.getId());
// }
deleteEntity(entity);
AeConfSubjectContrastEntity aeConfSubjectContrastEntity1 = saveEntity(entity);
@ -170,7 +167,7 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
*/
@Override
public AeConfSubjectContrastEntity deleteEntity(AeConfSubjectContrastEntity entity) throws Exception {
Assert.notNull(entity.getId(), "科目对照表删除时，科目对照表id不能为空！");
Assert.notNull(entity.getId(), "业务对照表删除时，业务对照表id不能为空！");
aeConfSubjectContrastDao.logicRemove(entity);
//查询子表
AeConfSubjectContrastBEntity ContrastBEntity = new AeConfSubjectContrastBEntity();