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

1、模板配置，优化修改方法。 

2、优化基础查询接口
This commit is contained in:
zhengyf 2025-07-10 11:16:32 +08:00
parent 50bdaf9e32
commit bc62a800ca
6 changed files with 98 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,8 @@ import com.github.pagehelper.PageInfo;
import com.hzya.frame.mdm.mdmModule.dao.IMdmModuleDao;
import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
import com.hzya.frame.mdm.mdmModule.service.IMdmModuleService;
import com.hzya.frame.mdm.mdmModuleDb.dao.IMdmModuleDbDao;
import com.hzya.frame.mdm.mdmModuleDb.entity.MdmModuleDbEntity;
import com.hzya.frame.voucher.ae.comf.bd.dao.*;
import com.hzya.frame.voucher.ae.comf.bd.entity.*;
import com.hzya.frame.voucher.ae.comf.bd.entity.vo.*;
@ -41,6 +43,8 @@ public class BdController extends DefaultController {
private IMdmModuleService mdmModuleService;
@Autowired
private IMdmModuleDao mdmModuleDao;
@Autowired
private IMdmModuleDbDao mdmModuleDbDao;
@Autowired
private IMdmDbFiledVODAO mdmDbFiledVODAO;
@ -205,6 +209,21 @@ public class BdController extends DefaultController {
if (mdmDBQueryVO.getTablename() == null || "".equals(mdmDBQueryVO.getTablename())) {
return getSuccessMessageEntity("请求成功", null);
}
//查询表remark，是否包含管理
MdmModuleDbEntity mdmModuleDbEntity = new MdmModuleDbEntity();
mdmModuleDbEntity.setDbName(mdmDBQueryVO.getTablename());
List<MdmModuleDbEntity> dbEntityList = mdmModuleDbDao.query(mdmModuleDbEntity);
if (dbEntityList.size() == 0) {
return getFailureMessageEntity("该表不存在");
}
String remark = dbEntityList.get(0).getRemark();
if (remark != null && !"".equals(remark)) {
if (!remark.contains("管理")) {
mdmDBQueryVO.setPkentityorg(null);
}
}
PageHelper.startPage(mdmDBQueryVO.getPageNum(), mdmDBQueryVO.getPageSize());
List<Map<String, Object>> objectList = mdmDBQueryVODAO.queryMdmDb(mdmDBQueryVO);
PageInfo pageInfo = new PageInfo(objectList);

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

@ -30,4 +30,6 @@ public class MdmDBQueryVO extends BaseEntity {
private String propValue8;
private String propValue9;
private String propValue10;
private String pkentityorg;
}

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

@ -24,6 +24,7 @@
<if test="prop8 !=null and propValue8 != null">${prop8}like concat('%', #{propValue8},'%')</if>
<if test="prop9 !=null and propValue9 != null">${prop9}like concat('%', #{propValue9},'%')</if>
<if test="prop10 !=null and propValue10 != null">${prop10}like concat('%', #{propValue10},'%')</if>
<if test="pkentityorg !=null and pkentityorg != null">pk_corp= #{pkentityorg}</if>
</trim>
</select>

3
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/module/service/impl/MdmServiceImpl.java
View File

@ -51,7 +51,8 @@ public class MdmServiceImpl implements IMdmService {
MdmModuleDbFiledsEntity mdmModuleDbFiledsEntity = new MdmModuleDbFiledsEntity();
mdmModuleDbFiledsEntity.setDbId(mdmModuleDbEntity.getId());
List<MdmModuleDbFiledsEntity> filedList = mdmModuleDbFiledsDao.query(mdmModuleDbFiledsEntity);
mdmModuleDbEntity.setSublistMdmModuleDbFileds(filedList);
List<MdmModuleDbFiledsEntity> collect = filedList.stream().filter(filed -> "1".equals(filed.getViewType())).collect(Collectors.toList());
mdmModuleDbEntity.setSublistMdmModuleDbFileds(collect);
res.add(mdmModuleDbEntity);
}

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

@ -366,45 +366,85 @@
modify_user = values(modify_user),
sts = values(sts)
</insert>
<!--通过主键修改方法-->
<!-- <update id="entity_update"-->
<!-- parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">-->
<!-- update ae_conf_subject_classification set-->
<!-- <trim suffix="" suffixOverrides=",">-->
<!-- <if test="code != null and code != ''">code = #{code},</if>-->
<!-- <if test="name != null and name != ''">name = #{name},</if>-->
<!-- <if test="aeConfModuleId != null and aeConfModuleId != ''">aeConfModuleId = #{aeConfModuleId},</if>-->
<!-- <if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>-->
<!-- <if test="pkglorgbook != null and pkglorgbook != ''">pkglorgbook = #{pkglorgbook},</if>-->
<!-- <if test="glorgbookcode != null and glorgbookcode != ''">glorgbookcode = #{glorgbookcode},</if>-->
<!-- <if test="glorgbookname != null and glorgbookname != ''">glorgbookname = #{glorgbookname},</if>-->
<!-- <if test="factorids != null and factorids != ''">factorIds = #{factorids},</if>-->
<!-- <if test="factornames != null and factornames != ''">factorNames = #{factornames},</if>-->
<!-- <if test="contrastId != null and contrastId != ''">contrast_id = #{contrastId},</if>-->
<!-- <if test="contrastCode != null and contrastCode != ''">contrast_code = #{contrastCode},</if>-->
<!-- <if test="contrastName != null and contrastName != ''">contrast_name = #{contrastName},</if>-->
<!-- <if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">desdocvalue_default_id = #{desdocvalueDefaultId}, </if>-->
<!-- <if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">desdocvalue_default_name = #{desdocvalueDefaultName}, </if>-->
<!-- <if test="remark != null and remark != ''">remark = #{remark},</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_update"
parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">
update ae_conf_subject_classification set
<trim suffix="" suffixOverrides=",">
<if test="code != null and code != ''">code = #{code},</if>
<if test="name != null and name != ''">name = #{name},</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">aeConfModuleId = #{aeConfModuleId},</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp = #{pkCorp},</if>
<if test="pkglorgbook != null and pkglorgbook != ''">pkglorgbook = #{pkglorgbook},</if>
<if test="glorgbookcode != null and glorgbookcode != ''">glorgbookcode = #{glorgbookcode},</if>
<if test="glorgbookname != null and glorgbookname != ''">glorgbookname = #{glorgbookname},</if>
<if test="factorids != null and factorids != ''">factorIds = #{factorids},</if>
<if test="factornames != null and factornames != ''">factorNames = #{factornames},</if>
<if test="contrastId != null and contrastId != ''">contrast_id = #{contrastId},</if>
<if test="contrastCode != null and contrastCode != ''">contrast_code = #{contrastCode},</if>
<if test="contrastName != null and contrastName != ''">contrast_name = #{contrastName},</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">desdocvalue_default_id = #{desdocvalueDefaultId}, </if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">desdocvalue_default_name = #{desdocvalueDefaultName}, </if>
<if test="remark != null and remark != ''">remark = #{remark},</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>
code = #{code},
name = #{name},
aeConfModuleId = #{aeConfModuleId},
pk_corp = #{pkCorp},
pkglorgbook = #{pkglorgbook},
glorgbookcode = #{glorgbookcode},
glorgbookname = #{glorgbookname},
factorIds = #{factorids},
factorNames = #{factornames},
contrast_id = #{contrastId},
contrast_code = #{contrastCode},
contrast_name = #{contrastName},
desdocvalue_default_id = #{desdocvalueDefaultId},
desdocvalue_default_name = #{desdocvalueDefaultName},
remark = #{remark},
def1 = #{def1},
def2 = #{def2},
def3 = #{def3},
def4 = #{def4},
def5 = #{def5},
def6 = #{def6},
def7 = #{def7},
def8 = #{def8},
def9 = #{def9},
def10 = #{def10},
create_time = #{create_time},
create_user = #{createUser},
modify_time = #{modify_time},
modify_time = now(),
modify_user = #{modifyUser},
sts = #{sts}
where id = #{id}
</update>
<!-- 逻辑删除 -->
<update id="entity_logicDelete"
parameterType="com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity">

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

@ -559,7 +559,7 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService<AeConfVoucherT
// Assert.notNull(entity.getDNumField(), "事项分录模板配置新增时，贷方数量字段不能为空");
// Assert.notNull(entity.getDYbSumField(), "事项分录模板配置新增时，贷方原币金额字段不能为空");
// Assert.notNull(entity.getDBbSumField(), "事项分录模板配置新增时，贷方本币金额字段不能为空");
Assert.notNull(entity.getPkCashflow(), "事项分录模板配置新增时，现金流量项目不能为空");
// Assert.notNull(entity.getPkCashflow(), "事项分录模板配置新增时，现金流量项目不能为空");
break;
case "updateEntity":
Assert.notNull(entity.getId(), "根据id更新时，id不能为空");