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

广脉：1、科目对照新增补充字段

This commit is contained in:
zhengyf 2025-06-09 08:46:09 +08:00
parent 89a76ef43e
commit 4d8905f445
11 changed files with 368 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ public class AeConfBusinessModuleMdmServiceImpl extends BaseService<AeConfBusine
//校验是否存在重复
for (AeConfBusinessModuleMdmEntity aeConfBusinessModuleMdmEntity : list) {
AeConfBusinessModuleMdmEntity ae1 = new AeConfBusinessModuleMdmEntity();
ae1.setAeConfModuleId(aeConfBusinessModuleMdmEntity.getAeConfModuleId());
// ae1.setAeConfModuleId(aeConfBusinessModuleMdmEntity.getAeConfModuleId());
ae1.setMdmId(aeConfBusinessModuleMdmEntity.getMdmId());
List<AeConfBusinessModuleMdmEntity> query1 = aeConfBusinessModuleMdmDao.query(ae1);
if (query1.size() > 0) {

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

@ -24,22 +24,53 @@ public class ClassificationController extends DefaultController {
@Autowired
private IAeConfSubjectClassificationService aeConfSubjectClassificationService;
// @RequestMapping(value = "/queryAll", method = RequestMethod.POST)
// public JsonResultEntity queryAll(@RequestBody AeConfSubjectContrastEntity entity){
// try {
// List<AeConfSubjectContrastEntity> all = aeConfSubjectClassificationService.queryAll(entity);
// return getSuccessMessageEntity("请求成功",all);
// } catch (Exception e) {
// e.printStackTrace();
// return getFailureMessageEntity("请求失败",e.getMessage());
// }
// }
@RequestMapping(value = "/queryAll", method = RequestMethod.POST)
public JsonResultEntity queryAll(@RequestBody AeConfSubjectClassificationEntity entity){
try {
List<AeConfSubjectClassificationEntity> all = aeConfSubjectClassificationService.queryAll(entity);
return getSuccessMessageEntity("请求成功",all);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败",e.getMessage());
}
}
@RequestMapping(value = "/queryById", method = RequestMethod.POST)
public JsonResultEntity queryById(@RequestBody AeConfSubjectClassificationEntity entity){
try {
AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity = aeConfSubjectClassificationService.queryById(entity);
return getSuccessMessageEntity("请求成功",aeConfSubjectClassificationEntity);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败",e.getMessage());
}
}
@RequestMapping(value = "/save", method = RequestMethod.POST)
public JsonResultEntity save(@RequestBody AeConfSubjectClassificationEntity entity) {
try {
List<AeConfSubjectContrastEntity> all = aeConfSubjectClassificationService.saveEntity(entity);
return getSuccessMessageEntity("请求成功", all);
AeConfSubjectClassificationEntity save = aeConfSubjectClassificationService.saveEntity(entity);
return getSuccessMessageEntity("请求成功", save);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败", e.getMessage());
}
}
@RequestMapping(value = "/update", method = RequestMethod.POST)
public JsonResultEntity update(@RequestBody AeConfSubjectClassificationEntity entity) {
try {
AeConfSubjectClassificationEntity update = aeConfSubjectClassificationService.updateEntity(entity);
return getSuccessMessageEntity("请求成功", update);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败", e.getMessage());
}
}
@RequestMapping(value = "/delete", method = RequestMethod.POST)
public JsonResultEntity delete(@RequestBody AeConfSubjectClassificationEntity entity) {
try {
aeConfSubjectClassificationService.deleteEntity(entity);
return getSuccessMessageEntity("请求成功", null);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败", e.getMessage());

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

@ -80,8 +80,8 @@ public class ContrastController extends DefaultController {
@RequestMapping(value = "/queryByInfluenceIds", method = RequestMethod.POST)
public JsonResultEntity queryByInfluenceIds(@RequestBody AeConfSubjectContrastEntity entity){
try {
AeConfSubjectContrastEntity aeConfSubjectContrastEntity = aeConfSubjectContrastService.queryByInfluenceIds(entity);
return getSuccessMessageEntity("请求成功",aeConfSubjectContrastEntity);
List<AeConfSubjectContrastEntity> list = aeConfSubjectContrastService.queryByInfluenceIds(entity);
return getSuccessMessageEntity("请求成功",list);
} catch (Exception e) {
e.printStackTrace();
return getFailureMessageEntity("请求失败",e.getMessage());

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

@ -1,236 +1,106 @@
package com.hzya.frame.voucher.ae.comf.subject.entity;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hzya.frame.web.entity.BaseEntity;
import lombok.Data;
/**
* 会计事项(accounting_event)-配置-科目分类定义(AeConfSubjectClassification)实体类
*
* @author zydd
* @since 2025-06-06 17:00:57
*/
@Data
public class AeConfSubjectClassificationEntity extends BaseEntity {
/** 科目分类编码 */
private String code;
/** 科目分类名称 */
private String name;
/** 公司pk */
private String pkCorp;
/** 账簿主键 */
private String pkglorgbook;
/** 账簿编码 */
private String glorgbookcode;
/** 账簿名称 */
private String glorgbookname;
/** 影响因素定义ids */
private String factorids;
/** 影响因素定义names */
private String factornames;
/** 对照表id */
private String contrastId;
/** 目标档案值（会计科目)-默认值，没有对照表时使用 */
private String desdocvalueDefault;
/** 备注 */
private String remark;
private String def1;
private String def2;
private String def3;
private String def4;
private String def5;
private String def6;
private String def7;
private String def8;
private String def9;
private String def10;
/** 创建人 */
private String createUser;
/** 修改人 */
private String modifyUser;
/**
* 科目分类编码
*/
private String code;
/**
* 科目分类名称
*/
private String name;
/**
* 模块id
*/
private String aeConfModuleId;
/**
* 公司pk
*/
private String pkCorp;
/**
* 账簿主键
*/
private String pkglorgbook;
/**
* 账簿编码
*/
private String glorgbookcode;
/**
* 账簿名称
*/
private String glorgbookname;
/**
* 影响因素定义ids
*/
private String factorids;
/**
* 影响因素定义names
*/
private String factornames;
/**
* 对照表id
*/
private String contrastId;
private String contrastCode;
private String contrastName;
/**
* 目标档案值（会计科目)-默认值，没有对照表时使用
*/
private String desdocvalueDefaultId;
private String desdocvalueDefaultName;
/**
* 备注
*/
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;
/**
* 创建人
*/
private String createUser;
/**
* 修改人
*/
private String modifyUser;
public String getCode() {
return code;
}
/**
* 科目对照子表
*/
private List<AeConfSubjectContrastBEntity> contrastBEntityList;
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPkCorp() {
return pkCorp;
}
public void setPkCorp(String pkCorp) {
this.pkCorp = pkCorp;
}
public String getPkglorgbook() {
return pkglorgbook;
}
public void setPkglorgbook(String pkglorgbook) {
this.pkglorgbook = pkglorgbook;
}
public String getGlorgbookcode() {
return glorgbookcode;
}
public void setGlorgbookcode(String glorgbookcode) {
this.glorgbookcode = glorgbookcode;
}
public String getGlorgbookname() {
return glorgbookname;
}
public void setGlorgbookname(String glorgbookname) {
this.glorgbookname = glorgbookname;
}
public String getFactorids() {
return factorids;
}
public void setFactorids(String factorids) {
this.factorids = factorids;
}
public String getFactornames() {
return factornames;
}
public void setFactornames(String factornames) {
this.factornames = factornames;
}
public String getContrastId() {
return contrastId;
}
public void setContrastId(String contrastId) {
this.contrastId = contrastId;
}
public String getDesdocvalueDefault() {
return desdocvalueDefault;
}
public void setDesdocvalueDefault(String desdocvalueDefault) {
this.desdocvalueDefault = desdocvalueDefault;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getDef1() {
return def1;
}
public void setDef1(String def1) {
this.def1 = def1;
}
public String getDef2() {
return def2;
}
public void setDef2(String def2) {
this.def2 = def2;
}
public String getDef3() {
return def3;
}
public void setDef3(String def3) {
this.def3 = def3;
}
public String getDef4() {
return def4;
}
public void setDef4(String def4) {
this.def4 = def4;
}
public String getDef5() {
return def5;
}
public void setDef5(String def5) {
this.def5 = def5;
}
public String getDef6() {
return def6;
}
public void setDef6(String def6) {
this.def6 = def6;
}
public String getDef7() {
return def7;
}
public void setDef7(String def7) {
this.def7 = def7;
}
public String getDef8() {
return def8;
}
public void setDef8(String def8) {
this.def8 = def8;
}
public String getDef9() {
return def9;
}
public void setDef9(String def9) {
this.def9 = def9;
}
public String getDef10() {
return def10;
}
public void setDef10(String def10) {
this.def10 = def10;
}
public String getCreateUser() {
return createUser;
}
public void setCreateUser(String createUser) {
this.createUser = createUser;
}
public String getModifyUser() {
return modifyUser;
}
public void setModifyUser(String modifyUser) {
this.modifyUser = modifyUser;
}
}

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

@ -7,6 +7,7 @@
<result property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="aeConfModuleId" column="aeConfModuleId" jdbcType="VARCHAR"/>
<result property="pkCorp" column="pk_corp" jdbcType="VARCHAR"/>
<result property="pkglorgbook" column="pkglorgbook" jdbcType="VARCHAR"/>
<result property="glorgbookcode" column="glorgbookcode" jdbcType="VARCHAR"/>
@ -14,7 +15,10 @@
<result property="factorids" column="factorIds" jdbcType="VARCHAR"/>
<result property="factornames" column="factorNames" jdbcType="VARCHAR"/>
<result property="contrastId" column="contrast_id" jdbcType="VARCHAR"/>
<result property="desdocvalueDefault" column="desdocvalue_default" jdbcType="VARCHAR"/>
<result property="contrastCode" column="contrast_code" jdbcType="VARCHAR"/>
<result property="contrastName" column="contrast_name" jdbcType="VARCHAR"/>
<result property="desdocvalueDefaultId" column="desdocvalue_default_id" jdbcType="VARCHAR"/>
<result property="desdocvalueDefaultName" column="desdocvalue_default_name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="def1" column="def1" jdbcType="VARCHAR"/>
<result property="def2" column="def2" jdbcType="VARCHAR"/>
@ -37,15 +41,19 @@
id
,code
,name
,pk_corp
,aeConfModuleId
,pk_corp
,pkglorgbook
,glorgbookcode
,glorgbookname
,factorIds
,factorNames
,contrast_id
,desdocvalue_default
,remark
,contrast_code
,contrast_name
,desdocvalue_default_id
,desdocvalue_default_name
,remark
,def1
,def2
,def3
@ -72,6 +80,7 @@
<if test="id != null">and id = #{id}</if>
<if test="code != null and code != ''">and code = #{code}</if>
<if test="name != null and name != ''">and name = #{name}</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">and aeConfModuleId = #{aeConfModuleId}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook = #{pkglorgbook}</if>
<if test="glorgbookcode != null and glorgbookcode != ''">and glorgbookcode = #{glorgbookcode}</if>
@ -79,9 +88,10 @@
<if test="factorids != null and factorids != ''">and factorIds = #{factorids}</if>
<if test="factornames != null and factornames != ''">and factorNames = #{factornames}</if>
<if test="contrastId != null and contrastId != ''">and contrast_id = #{contrastId}</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default =
#{desdocvalueDefault}
</if>
<if test="contrastCode != null and contrastCode != ''">and contrast_code = #{contrastCode}</if>
<if test="contrastName != null and contrastName != ''">and contrast_name = #{contrastName}</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">and desdocvalue_default_id = #{desdocvalueDefaultId} </if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">and desdocvalue_default_name = #{desdocvalueDefaultName} </if>
<if test="remark != null and remark != ''">and remark = #{remark}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
@ -110,6 +120,7 @@
<if test="id != null">and id = #{id}</if>
<if test="code != null and code != ''">and code = #{code}</if>
<if test="name != null and name != ''">and name = #{name}</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">and aeConfModuleId = #{aeConfModuleId}</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp = #{pkCorp}</if>
<if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook = #{pkglorgbook}</if>
<if test="glorgbookcode != null and glorgbookcode != ''">and glorgbookcode = #{glorgbookcode}</if>
@ -117,9 +128,10 @@
<if test="factorids != null and factorids != ''">and factorIds = #{factorids}</if>
<if test="factornames != null and factornames != ''">and factorNames = #{factornames}</if>
<if test="contrastId != null and contrastId != ''">and contrast_id = #{contrastId}</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default =
#{desdocvalueDefault}
</if>
<if test="contrastCode != null and contrastCode != ''">and contrast_code = #{contrastCode}</if>
<if test="contrastName != null and contrastName != ''">and contrast_name = #{contrastName}</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">and desdocvalue_default_id = #{desdocvalueDefaultId} </if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">and desdocvalue_default_name = #{desdocvalueDefaultName} </if>
<if test="remark != null and remark != ''">and remark = #{remark}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>
@ -150,6 +162,7 @@
<if test="id != null">and id like concat('%',#{id},'%')</if>
<if test="code != null and code != ''">and code like concat('%',#{code},'%')</if>
<if test="name != null and name != ''">and name like concat('%',#{name},'%')</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">and aeConfModuleId like concat('%',#{aeConfModuleId},'%')</if>
<if test="pkCorp != null and pkCorp != ''">and pk_corp like concat('%',#{pkCorp},'%')</if>
<if test="pkglorgbook != null and pkglorgbook != ''">and pkglorgbook like concat('%',#{pkglorgbook},'%')
</if>
@ -163,9 +176,10 @@
<if test="factornames != null and factornames != ''">and factorNames like concat('%',#{factornames},'%')
</if>
<if test="contrastId != null and contrastId != ''">and contrast_id like concat('%',#{contrastId},'%')</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default like
concat('%',#{desdocvalueDefault},'%')
</if>
<if test="contrastCode != null and contrastCode != ''">and contrast_code like concat('%',#{contrastCode},'%')</if>
<if test="contrastName != null and contrastName != ''">and contrast_name like concat('%',#{contrastName},'%')</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">and desdocvalue_default_id like concat('%',#{desdocvalueDefaultId},'%') </if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">and desdocvalue_default_name like concat('%',#{desdocvalueDefaultName},'%') </if>
<if test="remark != null and remark != ''">and remark like concat('%',#{remark},'%')</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>
@ -196,6 +210,7 @@
<if test="id != null">or id = #{id}</if>
<if test="code != null and code != ''">or code = #{code}</if>
<if test="name != null and name != ''">or name = #{name}</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">or aeConfModuleId = #{aeConfModuleId}</if>
<if test="pkCorp != null and pkCorp != ''">or pk_corp = #{pkCorp}</if>
<if test="pkglorgbook != null and pkglorgbook != ''">or pkglorgbook = #{pkglorgbook}</if>
<if test="glorgbookcode != null and glorgbookcode != ''">or glorgbookcode = #{glorgbookcode}</if>
@ -203,9 +218,8 @@
<if test="factorids != null and factorids != ''">or factorIds = #{factorids}</if>
<if test="factornames != null and factornames != ''">or factorNames = #{factornames}</if>
<if test="contrastId != null and contrastId != ''">or contrast_id = #{contrastId}</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">or desdocvalue_default =
#{desdocvalueDefault}
</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">or desdocvalue_default_id = #{desdocvalueDefaultId} </if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">or desdocvalue_default_name = #{desdocvalueDefaultName} </if>
<if test="remark != null and remark != ''">or remark = #{remark}</if>
<if test="def1 != null and def1 != ''">or def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">or def2 = #{def2}</if>
@ -234,6 +248,7 @@
<trim suffix="" suffixOverrides=",">
<if test="code != null and code != ''">code ,</if>
<if test="name != null and name != ''">name ,</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">aeConfModuleId ,</if>
<if test="pkCorp != null and pkCorp != ''">pk_corp ,</if>
<if test="pkglorgbook != null and pkglorgbook != ''">pkglorgbook ,</if>
<if test="glorgbookcode != null and glorgbookcode != ''">glorgbookcode ,</if>
@ -241,7 +256,10 @@
<if test="factorids != null and factorids != ''">factorIds ,</if>
<if test="factornames != null and factornames != ''">factorNames ,</if>
<if test="contrastId != null and contrastId != ''">contrast_id ,</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">desdocvalue_default ,</if>
<if test="contrastCode != null and contrastCode != ''">contrast_code ,</if>
<if test="contrastName != null and contrastName != ''">contrast_name ,</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">desdocvalue_default_id ,</if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">desdocvalue_default_name ,</if>
<if test="remark != null and remark != ''">remark ,</if>
<if test="def1 != null and def1 != ''">def1 ,</if>
<if test="def2 != null and def2 != ''">def2 ,</if>
@ -266,6 +284,7 @@
<trim suffix="" suffixOverrides=",">
<if test="code != null and code != ''">#{code} ,</if>
<if test="name != null and name != ''">#{name} ,</if>
<if test="aeConfModuleId != null and aeConfModuleId != ''">#{aeConfModuleId} ,</if>
<if test="pkCorp != null and pkCorp != ''">#{pkCorp} ,</if>
<if test="pkglorgbook != null and pkglorgbook != ''">#{pkglorgbook} ,</if>
<if test="glorgbookcode != null and glorgbookcode != ''">#{glorgbookcode} ,</if>
@ -273,7 +292,10 @@
<if test="factorids != null and factorids != ''">#{factorids} ,</if>
<if test="factornames != null and factornames != ''">#{factornames} ,</if>
<if test="contrastId != null and contrastId != ''">#{contrastId} ,</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">#{desdocvalueDefault} ,</if>
<if test="contrastCode != null and contrastCode != ''">#{contrastCode} ,</if>
<if test="contrastName != null and contrastName != ''">#{contrastName} ,</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">#{desdocvalueDefaultId} ,</if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">#{desdocvalueDefaultName} ,</if>
<if test="remark != null and remark != ''">#{remark} ,</if>
<if test="def1 != null and def1 != ''">#{def1} ,</if>
<if test="def2 != null and def2 != ''">#{def2} ,</if>
@ -299,22 +321,22 @@
<!-- 批量新增 -->
<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
insert into ae_conf_subject_classification(code, name, pk_corp, pkglorgbook, glorgbookcode, glorgbookname,
factorIds, factorNames, contrast_id, desdocvalue_default, remark, def1, def2, def3, def4, def5, def6, def7,
factorIds, factorNames, contrast_id, desdocvalue_default_id, remark, 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.code},#{entity.name},#{entity.pkCorp},#{entity.pkglorgbook},#{entity.glorgbookcode},#{entity.glorgbookname},#{entity.factorids},#{entity.factornames},#{entity.contrastId},#{entity.desdocvalueDefault},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts},
(#{entity.code},#{entity.name},#{entity.pkCorp},#{entity.pkglorgbook},#{entity.glorgbookcode},#{entity.glorgbookname},#{entity.factorids},#{entity.factornames},#{entity.contrastId},#{entity.desdocvalueDefaultId},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts},
'Y')
</foreach>
</insert>
<!-- 批量新增或者修改-->
<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into ae_conf_subject_classification(code, name, pk_corp, pkglorgbook, glorgbookcode, glorgbookname,
factorIds, factorNames, contrast_id, desdocvalue_default, remark, def1, def2, def3, def4, def5, def6, def7,
factorIds, factorNames, contrast_id, desdocvalue_default_id, remark, 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.code},#{entity.name},#{entity.pkCorp},#{entity.pkglorgbook},#{entity.glorgbookcode},#{entity.glorgbookname},#{entity.factorids},#{entity.factornames},#{entity.contrastId},#{entity.desdocvalueDefault},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts})
(#{entity.code},#{entity.name},#{entity.pkCorp},#{entity.pkglorgbook},#{entity.glorgbookcode},#{entity.glorgbookname},#{entity.factorids},#{entity.factornames},#{entity.contrastId},#{entity.desdocvalueDefaultId},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.create_time},#{entity.createUser},#{entity.modify_time},#{entity.modifyUser},#{entity.sts})
</foreach>
on duplicate key update
code = values(code),
@ -326,7 +348,7 @@
factorIds = values(factorIds),
factorNames = values(factorNames),
contrast_id = values(contrast_id),
desdocvalue_default = values(desdocvalue_default),
desdocvalue_default_id = values(desdocvalue_default_id),
remark = values(remark),
def1 = values(def1),
def2 = values(def2),
@ -351,6 +373,7 @@
<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>
@ -358,9 +381,10 @@
<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="desdocvalueDefault != null and desdocvalueDefault != ''">desdocvalue_default =
#{desdocvalueDefault},
</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>
@ -405,9 +429,8 @@
<if test="factorids != null and factorids != ''">and factorIds = #{factorids}</if>
<if test="factornames != null and factornames != ''">and factorNames = #{factornames}</if>
<if test="contrastId != null and contrastId != ''">and contrast_id = #{contrastId}</if>
<if test="desdocvalueDefault != null and desdocvalueDefault != ''">and desdocvalue_default =
#{desdocvalueDefault}
</if>
<if test="desdocvalueDefaultId != null and desdocvalueDefaultId != ''">and desdocvalue_default_id = #{desdocvalueDefaultId} </if>
<if test="desdocvalueDefaultName != null and desdocvalueDefaultName != ''">and desdocvalue_default_name = #{desdocvalueDefaultName} </if>
<if test="remark != null and remark != ''">and remark = #{remark}</if>
<if test="def1 != null and def1 != ''">and def1 = #{def1}</if>
<if test="def2 != null and def2 != ''">and def2 = #{def2}</if>

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

@ -2,6 +2,7 @@ package com.hzya.frame.voucher.ae.comf.subject.entity;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hzya.frame.web.entity.BaseEntity;
import lombok.Data;
@ -17,177 +18,227 @@ 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;
/**
* 创建人

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

@ -93,10 +93,10 @@ public class AeConfSubjectContrastEntity extends BaseEntity {
private List<AeConfSubjectContrastBEntity> contrastBEntityList;
/** 多选来源档案时接收参数使用，在逐一保存自白哦 */
/** */
private List<MappingFileVO> mappingFileVOS;
private String aeConfModuleId;
}

9
base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/subject/service/IAeConfSubjectClassificationService.java
View File

@ -13,5 +13,12 @@ import java.util.List;
* @since 2025-06-06 17:00:57
*/
public interface IAeConfSubjectClassificationService extends IBaseService<AeConfSubjectClassificationEntity, String>{
List<AeConfSubjectContrastEntity> saveEntity(AeConfSubjectClassificationEntity entity);
List<AeConfSubjectClassificationEntity> queryAll(AeConfSubjectClassificationEntity entity);
AeConfSubjectClassificationEntity queryById(AeConfSubjectClassificationEntity entity);
AeConfSubjectClassificationEntity saveEntity(AeConfSubjectClassificationEntity entity);
AeConfSubjectClassificationEntity updateEntity(AeConfSubjectClassificationEntity entity);
void deleteEntity(AeConfSubjectClassificationEntity entity);
}

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

@ -20,5 +20,5 @@ public interface IAeConfSubjectContrastService extends IBaseService<AeConfSubjec
AeConfSubjectContrastEntity updateEntity(AeConfSubjectContrastEntity entity) throws Exception;
AeConfSubjectContrastEntity deleteEntity(AeConfSubjectContrastEntity entity) throws Exception;
AeConfSubjectContrastEntity queryByInfluenceIds(AeConfSubjectContrastEntity entity);
List<AeConfSubjectContrastEntity> queryByInfluenceIds(AeConfSubjectContrastEntity entity);
}

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

@ -1,12 +1,18 @@
package com.hzya.frame.voucher.ae.comf.subject.service.impl;
import cn.hutool.core.lang.Assert;
import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectClassificationEntity;
import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectClassificationDao;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastEntity;
import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectClassificationService;
import org.springframework.stereotype.Service;
import com.hzya.frame.voucher.ae.comf.subject.service.IAeConfSubjectContrastBService;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import com.hzya.frame.basedao.service.impl.BaseService;
import java.util.List;
@ -19,18 +25,97 @@ import java.util.List;
*/
@Service
public class AeConfSubjectClassificationServiceImpl extends BaseService<AeConfSubjectClassificationEntity, String> implements IAeConfSubjectClassificationService {
private IAeConfSubjectClassificationDao aeConfSubjectClassificationDao;
@Autowired
public void setAeConfSubjectClassificationDao(IAeConfSubjectClassificationDao dao) {
this.aeConfSubjectClassificationDao = dao;
this.dao = dao;
}
public void setAeConfSubjectClassificationDao(IAeConfSubjectClassificationDao dao) {
this.aeConfSubjectClassificationDao = dao;
this.dao = dao;
}
@Autowired
private IAeConfSubjectContrastBService contrastBService;
@Override
public List<AeConfSubjectContrastEntity> saveEntity(AeConfSubjectClassificationEntity entity) {
public List<AeConfSubjectClassificationEntity> queryAll(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getPkCorp(), "查询科目分类定义时，公司主键不允许为空。");
Assert.notNull(entity.getPkglorgbook(), "查询科目分类定义时，账簿主键不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "查询科目分类定义时，业务模块id不允许为空。");
List<AeConfSubjectClassificationEntity> query = aeConfSubjectClassificationDao.query(entity);
for (AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity : query) {
//查询科目对照子表
queryaeConfSubjectContrastBList(aeConfSubjectClassificationEntity);
}
return query;
}
return null;
@Override
public AeConfSubjectClassificationEntity queryById(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getId(), "查询科目分类定义时，id不允许为空。");
Assert.notNull(entity.getPkCorp(), "查询科目分类定义时，公司主键不允许为空。");
Assert.notNull(entity.getPkglorgbook(), "查询科目分类定义时，账簿主键不允许为空。");
Assert.notNull(entity.getAeConfModuleId(), "查询科目分类定义时，业务模块id不允许为空。");
List<AeConfSubjectClassificationEntity> query = aeConfSubjectClassificationDao.query(entity);
if (query.size() == 0 || query.size() > 1) {
return null;
}
AeConfSubjectClassificationEntity aeConfSubjectClassificationEntity = query.get(0);
//查询科目对照子表
queryaeConfSubjectContrastBList(aeConfSubjectClassificationEntity);
return aeConfSubjectClassificationEntity;
}
/**
* 科目分类定义
*/
@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(), "科目分类定义新增时，名称不允许为空。");
AeConfSubjectClassificationEntity save = aeConfSubjectClassificationDao.save(entity);
//查询科目对照子表
queryaeConfSubjectContrastBList(save);
return save;
}
@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(), "科目分类定义更新时，名称不允许为空。");
AeConfSubjectClassificationEntity update = aeConfSubjectClassificationDao.update(entity);
//查询科目对照子表
queryaeConfSubjectContrastBList(update);
return update;
}
@Override
public void deleteEntity(AeConfSubjectClassificationEntity entity) {
Assert.notNull(entity.getId(), "科目分类定义删除时，id不允许为空。");
aeConfSubjectClassificationDao.logicRemove(entity);
}
public void queryaeConfSubjectContrastBList(AeConfSubjectClassificationEntity entity) {
if (entity.getContrastId() != null || !"".equals(entity.getContrastId())) {
//查询科目对照子表
AeConfSubjectContrastBEntity aeConfSubjectContrastBEntity = new AeConfSubjectContrastBEntity();
aeConfSubjectContrastBEntity.setContrastId(Long.valueOf(entity.getContrastId()));
List<AeConfSubjectContrastBEntity> bEntities = contrastBService.queryAllByContrastId(aeConfSubjectContrastBEntity);
entity.setContrastBEntityList(bEntities);
}
}
}

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

@ -1,6 +1,7 @@
package com.hzya.frame.voucher.ae.comf.subject.service.impl;
import cn.hutool.core.lang.Assert;
import com.hzya.frame.voucher.ae.comf.factor.entity.AeConfInfluenceFactorEntity;
import com.hzya.frame.voucher.ae.comf.factor.service.IAeConfInfluenceFactorService;
import com.hzya.frame.voucher.ae.comf.subject.dao.IAeConfSubjectContrastBDao;
import com.hzya.frame.voucher.ae.comf.subject.entity.AeConfSubjectContrastBEntity;
@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import com.hzya.frame.basedao.service.impl.BaseService;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
/**
@ -169,16 +171,32 @@ public class AeConfSubjectContrastServiceImpl extends BaseService<AeConfSubjectC
* 3、返回对照表对象
*/
@Override
public AeConfSubjectContrastEntity queryByInfluenceIds(AeConfSubjectContrastEntity entity) {
public List<AeConfSubjectContrastEntity> queryByInfluenceIds(AeConfSubjectContrastEntity entity) {
Assert.notNull(entity.getSourceIds(), "根据影响因素ids查询时对照表时，来源档案ids不能为空！");
String sourceIds = entity.getSourceIds();
String moduleId = entity.getAeConfModuleId();
String[] sourceIdSplit = sourceIds.split(",");
iAeConfInfluenceFactorService.query(null);
return null;
List<String> sourceIdList = new ArrayList<>();
for (String sourceId : sourceIdSplit) {
AeConfInfluenceFactorEntity aeConfInfluenceFactorEntity = new AeConfInfluenceFactorEntity();
aeConfInfluenceFactorEntity.setAeConfModuleId(Long.valueOf(moduleId));
aeConfInfluenceFactorEntity.setId(sourceId);
List<AeConfInfluenceFactorEntity> query = iAeConfInfluenceFactorService.query(aeConfInfluenceFactorEntity);
if (query.size() == 0 || query.size() > 1) {
Assert.state(false, "根据模块id：{}，影响因素id：{}，未查询到或查到多个影响因素配置，请检查");
}
sourceIdList.add(query.get(0).getMappingFileId());
}
//将sourceIdList，用,拼接起来
String result = String.join(",", sourceIdList);
System.out.println(result);
AeConfSubjectContrastEntity aeConfSubjectContrastEntity = new AeConfSubjectContrastEntity();
aeConfSubjectContrastEntity.setSourceIds(result);
List<AeConfSubjectContrastEntity> query = aeConfSubjectContrastDao.query(aeConfSubjectContrastEntity);
if (query.size() == 0) {
return null;
}
return query;
}
}