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

1、新增公司查询接口。 

2、优化分类定义接口，方法等。
This commit is contained in:
zhengyf 2025-06-16 10:14:56 +08:00
parent 082a6a1e6e
commit 202db9a448
9 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java
View File

@ -45,6 +45,21 @@ public class BdController extends DefaultController {
@Autowired
private IMdmDbFiledVODAO mdmDbFiledVODAO;
/**
* 查询所有公司
*/
@RequestMapping(value = "/queryOrgVO", method = RequestMethod.POST)
public JsonResultEntity queryOrgVO(@RequestBody OrgBookVO vo) {
try {
List<OrgBookVO> all = aeConfBdOrgBookVODao.queryOrgVO(vo);
return getSuccessMessageEntity("请求成功", all);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity(e.getMessage());
}
}
/**
* 查询所有公司账簿信息
*/
@ -81,6 +96,7 @@ public class BdController extends DefaultController {
try {
MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO();
mdmDbFiledVO.setMdmType("1");//1、档案 2、单据
mdmDbFiledVO.setMdmId(entity.getPkBdinfo());
List<MdmDbFiledVO> all = new ArrayList<>();
List<MdmDbFiledVO> mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVO(mdmDbFiledVO);
@ -88,6 +104,7 @@ public class BdController extends DefaultController {
dbFiledVO.setPkBdinfo(dbFiledVO.getMdmId());
dbFiledVO.setBdcode(dbFiledVO.getMdmCode());
dbFiledVO.setBdname(dbFiledVO.getMdmName());
dbFiledVO.setTablepkname("id");
}
if (entity.getMdmName() != null) {

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

@ -14,6 +14,7 @@ import java.util.List;
public interface IAeConfBdOrgBookVODao extends IBaseDao<OrgBookVO, String> {
public List<OrgBookVO> queryOrgBookVO(OrgBookVO vo);
public List<OrgBookVO> queryOrgVO(OrgBookVO vo);
}

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

@ -17,4 +17,10 @@ public class AeConfBdOrgBookVODaoImpl extends MybatisGenericDao<OrgBookVO, Strin
List<OrgBookVO> orgBookVOList = (List<OrgBookVO>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgBookVO", vo);
return orgBookVOList;
}
@Override
public List<OrgBookVO> queryOrgVO(OrgBookVO vo) {
List<OrgBookVO> orgBookVOList = (List<OrgBookVO>) selectList("com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdOrgBookVODaoImpl.queryOrgVO", vo);
return orgBookVOList;
}
}

4
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/AeConfBdAccsubjEntity.xml
View File

@ -3,6 +3,7 @@
<mapper namespace="com.hzya.frame.voucher.ae.comf.bd.dao.impl.AeConfBdAccsubjDaoImpl">
<resultMap id="get-AeConfBdAccsubjEntity-result" type="com.hzya.frame.voucher.ae.comf.bd.entity.AeConfBdAccsubjEntity">
<result property="id" column="id"/>
<result property="dispname" column="dispname" jdbcType="VARCHAR"/>
<result property="dr" column="dr" jdbcType="VARCHAR"/>
<result property="endflag" column="endflag" jdbcType="VARCHAR"/>
@ -17,7 +18,8 @@
</resultMap>
<!-- 查询的字段-->
<sql id="AeConfBdAccsubjEntity_Base_Column_List">
dispname
id
,dispname
,dr
,endflag
,pk_accsubj

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

@ -36,8 +36,8 @@
db.db_name as tablename,
db.remark as dbName,
fileds.sys_pk as tablepkname,
fileds.sys_code as namefieldname,
fileds.sys_name as codefieldname
fileds.sys_code AS codefieldname,
fileds.sys_name AS namefieldname
FROM
mdm_module mdm
LEFT JOIN mdm_module_db db ON db.mdm_id = mdm.id
@ -49,6 +49,7 @@
GROUP BY db_id) fileds ON fileds.db_id = db.id
WHERE
1=1
<if test="mdmId != null and mdmId != ''">and mdm.id = #{mdmId}</if>
AND mdm.sts = 'Y'
AND db.db_type = '1'
</select>

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

@ -46,13 +46,35 @@
LEFT JOIN mdm_bd_glorg glorg ON glorg.pk_glorg=glorgbook.pk_glorg
LEFT JOIN mdm_bd_glbook glbook ON glbook.pk_glbook=glorgbook.pk_glbook
<trim prefix="where" prefixOverrides="and">
<if test="pkentityorg != null and pkentityorg != ''">and glorg.pk_entityorg = #{pkentityorg}</if>
<if test="glorgcode != null and glorgcode != ''">and glorg.glorgcode = #{glorgcode}</if>
<if test="glorgname != null and glorgname != ''">and glorg.glorgname = #{glorgname}</if>
<if test="pkentityorg != null and pkentityorg != ''">and glorg.pk_entityorg like concat('%',#{pkentityorg},'%')</if>
<if test="glorgcode != null and glorgcode != ''">and glorg.gl_orgcode like concat('%',#{glorgcode},'%')</if>
<if test="glorgname != null and glorgname != ''">and glorg.gl_orgname like concat('%',#{glorgname},'%')</if>
and glorgbook.dr=0
</trim>
order by glorgbook.pk_glorg asc
</select>
<!-- 查询 采用==查询 -->
<select id="queryOrgVO" resultMap="get-OrgBookVO-result"
parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.OrgBookVO">
SELECT
DISTINCT
glorg.pk_entityorg AS pkentityorg,
glorg.gl_orgcode AS glorgcode,
glorg.gl_orgname AS glorgname
FROM
mdm_bd_glorgbook glorgbook
LEFT JOIN mdm_bd_glorg glorg ON glorg.pk_glorg = glorgbook.pk_glorg
LEFT JOIN mdm_bd_glbook glbook ON glbook.pk_glbook = glorgbook.pk_glbook
<trim prefix="where" prefixOverrides="and">
<if test="glorgcode != null and glorgcode != ''">and glorg.gl_orgcode like concat('%',#{glorgcode},'%')</if>
<if test="glorgname != null and glorgname != ''">and glorg.gl_orgname like concat('%',#{glorgname},'%')</if>
and glorgbook.dr=0
</trim>
order by glorgbook.pk_glorg asc
</select>
</mapper>

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

@ -18,227 +18,177 @@ public class AeConfSubjectContrastBEntity extends BaseEntity {
/**
* 对照表id
*/
@JsonIgnore
private Long contrastId;
/**
* 公司pk
*/
@JsonIgnore
private String pkCorp;
private String glorgname;
/**
* 目标档案id
*/
@JsonIgnore
private String pkAccsubj;
/**
* 目标档案值（会计科目)
*/
@JsonIgnore
private String desdocvalue;
/**
* 来源档案表1
*/
@JsonIgnore
private String factortable1;
/**
* 来源档案表2
*/
@JsonIgnore
private String factortable2;
/**
* 来源档案表3
*/
@JsonIgnore
private String factortable3;
/**
* 来源档案表4
*/
@JsonIgnore
private String factortable4;
/**
* 来源档案表5
*/
@JsonIgnore
private String factortable5;
/**
* 来源档案表6
*/
@JsonIgnore
private String factortable6;
/**
* 来源档案表7
*/
@JsonIgnore
private String factortable7;
/**
* 来源档案表8
*/
@JsonIgnore
private String factortable8;
/**
* 来源档案表9
*/
@JsonIgnore
private String factortable9;
/**
* 来源档案主键1
*/
@JsonIgnore
private String factorpk1;
/**
* 来源档案主键2
*/
@JsonIgnore
private String factorpk2;
/**
* 来源档案主键3
*/
@JsonIgnore
private String factorpk3;
/**
* 来源档案主键4
*/
@JsonIgnore
private String factorpk4;
/**
* 来源档案主键5
*/
@JsonIgnore
private String factorpk5;
/**
* 来源档案主键6
*/
@JsonIgnore
private String factorpk6;
/**
* 来源档案主键7
*/
@JsonIgnore
private String factorpk7;
/**
* 来源档案主键8
*/
@JsonIgnore
private String factorpk8;
/**
* 来源档案主键9
*/
@JsonIgnore
private String factorpk9;
/**
* 来源档案值1
*/
@JsonIgnore
private String factorid1;
/**
* 来源档案值2
*/
@JsonIgnore
private String factorid2;
/**
* 来源档案值3
*/
@JsonIgnore
private String factorid3;
/**
* 来源档案值4
*/
@JsonIgnore
private String factorid4;
/**
* 来源档案值5
*/
@JsonIgnore
private String factorid5;
/**
* 来源档案值6
*/
@JsonIgnore
private String factorid6;
/**
* 来源档案值7
*/
@JsonIgnore
private String factorid7;
/**
* 来源档案值8
*/
@JsonIgnore
private String factorid8;
/**
* 来源档案值9
*/
@JsonIgnore
private String factorid9;
/**
* 来源档案名称1
*/
@JsonIgnore
private String factorname1;
/**
* 来源档案名称2
*/
@JsonIgnore
private String factorname2;
/**
* 来源档案名称3
*/
@JsonIgnore
private String factorname3;
/**
* 来源档案名称4
*/
@JsonIgnore
private String factorname4;
/**
* 来源档案名称5
*/
@JsonIgnore
private String factorname5;
/**
* 来源档案名称6
*/
@JsonIgnore
private String factorname6;
/**
* 来源档案名称7
*/
@JsonIgnore
private String factorname7;
/**
* 来源档案名称8
*/
@JsonIgnore
private String factorname8;
/**
* 来源档案名称9
*/
@JsonIgnore
private String factorname9;
/**
* 备注
*/
private String remark;
@JsonIgnore
private String def1;
@JsonIgnore
private String def2;
@JsonIgnore
private String def3;
@JsonIgnore
private String def4;
@JsonIgnore
private String def5;
@JsonIgnore
private String def6;
@JsonIgnore
private String def7;
@JsonIgnore
private String def8;
@JsonIgnore
private String def9;
@JsonIgnore
private String def10;
/**
* 创建人

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

@ -110,7 +110,7 @@ public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSu
public void queryaeConfSubjectContrastBList(AeConfSubjectClassificationEntity entity) {
if (entity.getContrastId() != null || !"".equals(entity.getContrastId())) {
if (entity.getContrastId() != null && !"".equals(entity.getContrastId())) {
//查询科目对照子表
AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity();
aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(entity.getContrastId()));

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

@ -184,7 +184,7 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
aeConfInfluenceFactorEntity.setId(sourceId);
List<AeConfInfluenceFactorEntity> query = iAeConfInfluenceFactorService.query(aeConfInfluenceFactorEntity);
if (query.size() == 0 || query.size() > 1) {
Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查");
Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查", moduleId, sourceId);
}
sourceIdList.add(query.get(0).getMappingFileId());
}