diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java index f4e33f9a..465c68bb 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/controller/BdController.java @@ -97,6 +97,7 @@ public class BdController extends DefaultController { MdmDbFiledVO mdmDbFiledVO = new MdmDbFiledVO(); mdmDbFiledVO.setMdmType("1");//1、档案 2、单据 mdmDbFiledVO.setMdmId(entity.getPkBdinfo()); + mdmDbFiledVO.setDbName(entity.getDbName()); List all = new ArrayList<>(); List mdmDbFiledVOList = mdmDbFiledVODAO.queryMdmDbFiledVO(mdmDbFiledVO); diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateTypeController.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateTypeController.java new file mode 100644 index 00000000..ea8b69a7 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/controller/TemplateTypeController.java @@ -0,0 +1,95 @@ +package com.hzya.frame.voucher.ae.comf.template.controller; + +import com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateTypeEntity; +import com.hzya.frame.voucher.ae.comf.template.service.IAeConfVoucherTemplateTypeService; +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-06-25 16:51 + */ +@RestController +@RequestMapping("/ae/conf/temp/type") +public class TemplateTypeController extends DefaultController { + + @Autowired + private IAeConfVoucherTemplateTypeService templateTypeService; + + + /** + * 查询全部 + */ + @RequestMapping(value = "/queryAll", method = RequestMethod.POST) + public JsonResultEntity queryAll(@RequestBody AeConfVoucherTemplateTypeEntity entity) { + try { + List list = templateTypeService.queryAll(entity); + return getSuccessMessageEntity("请求成功", list); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + @RequestMapping(value = "/queryByMdmId", method = RequestMethod.POST) + public JsonResultEntity queryByMdmId(@RequestBody AeConfVoucherTemplateTypeEntity entity) { + try { + List list = templateTypeService.queryByMdmId(entity); + return getSuccessMessageEntity("请求成功", list); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + @RequestMapping(value = "/save", method = RequestMethod.POST) + public JsonResultEntity saveEntity(@RequestBody AeConfVoucherTemplateTypeEntity entity) { + try { + AeConfVoucherTemplateTypeEntity save = templateTypeService.saveEntity(entity); + return getSuccessMessageEntity("请求成功", save); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + @RequestMapping(value = "/update", method = RequestMethod.POST) + public JsonResultEntity updateEntity(@RequestBody AeConfVoucherTemplateTypeEntity entity) { + try { + AeConfVoucherTemplateTypeEntity update = templateTypeService.updateEntity(entity); + return getSuccessMessageEntity("请求成功", update); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + @RequestMapping(value = "/delete", method = RequestMethod.POST) + public JsonResultEntity deleteEntity(@RequestBody AeConfVoucherTemplateTypeEntity entity) { + try { + AeConfVoucherTemplateTypeEntity update = templateTypeService.deleteEntity(entity); + return getSuccessMessageEntity("请求成功"); + } catch (Exception e) { + e.printStackTrace(); + return getFailureMessageEntity(e.getMessage()); + } + } + + +// /** +// * +// */ +// @RequestMapping(value = "/", method = RequestMethod.POST) +// public JsonResultEntity (@RequestBody entity) { +// try { +// List<> list = mdmDBQueryVODAO.(entity); +// return getSuccessMessageEntity("请求成功", list); +// } catch (Exception e) { +// e.printStackTrace(); +// return getFailureMessageEntity(e.getMessage()); +// } +// } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/dao/IAeConfVoucherTemplateTypeDao.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/dao/IAeConfVoucherTemplateTypeDao.java new file mode 100644 index 00000000..c73a230b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/dao/IAeConfVoucherTemplateTypeDao.java @@ -0,0 +1,15 @@ +package com.hzya.frame.voucher.ae.comf.template.dao; + +import com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateTypeEntity; +import com.hzya.frame.basedao.dao.IBaseDao; + +/** + * (ae_conf_voucher_template_type: table)表数据库访问层 + * + * @author zydd + * @since 2025-07-03 15:27:25 + */ +public interface IAeConfVoucherTemplateTypeDao extends IBaseDao { + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/dao/impl/AeConfVoucherTemplateTypeDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/dao/impl/AeConfVoucherTemplateTypeDaoImpl.java new file mode 100644 index 00000000..7ad723b3 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/dao/impl/AeConfVoucherTemplateTypeDaoImpl.java @@ -0,0 +1,17 @@ +package com.hzya.frame.voucher.ae.comf.template.dao.impl; + +import com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateTypeEntity; +import com.hzya.frame.voucher.ae.comf.template.dao.IAeConfVoucherTemplateTypeDao; +import org.springframework.stereotype.Repository; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +/** + * (AeConfVoucherTemplateType)表数据库访问层 + * + * @author zydd + * @since 2025-07-03 15:27:25 + */ +@Repository +public class AeConfVoucherTemplateTypeDaoImpl extends MybatisGenericDao implements IAeConfVoucherTemplateTypeDao{ + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateTypeEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateTypeEntity.java new file mode 100644 index 00000000..b6213e7b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateTypeEntity.java @@ -0,0 +1,173 @@ +package com.hzya.frame.voucher.ae.comf.template.entity; + +import java.util.Date; + +import com.hzya.frame.web.entity.BaseEntity; + +/** + * (AeConfVoucherTemplateType)实体类 + * + * @author zydd + * @since 2025-07-03 15:27:25 + */ +public class AeConfVoucherTemplateTypeEntity extends BaseEntity { + + private String code; + private String name; + /** + * 主数据id + */ + private String mdmId; + /** + * 备注 + */ + 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; + + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + 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; + } + + public String getMdmId() { + return mdmId; + } + + public void setMdmId(String mdmId) { + this.mdmId = mdmId; + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateTypeEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateTypeEntity.xml new file mode 100644 index 00000000..8301888e --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/entity/AeConfVoucherTemplateTypeEntity.xml @@ -0,0 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,code + ,name + ,remark + ,mdm_id + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,create_time + ,create_user + ,modify_time + ,modify_user + ,sts + + + + + + + + + + + + + + + + insert into ae_conf_voucher_template_type( + + id , + code , + name , + remark , + mdm_id , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + create_time , + create_time , + create_user , + modify_time , + modify_time , + modify_user , + sts , + sts, + + )values( + + #{id} , + #{code} , + #{name} , + #{remark} , + #{mdmId} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + #{create_time} , + now() , + #{createUser} , + #{modify_time} , + now() , + #{modifyUser} , + #{sts} , + 'Y', + + ) + + + + insert into ae_conf_voucher_template_type(code, name, remark, def1, def2, def3, def4, def5, def6, def7, def8, + def9, def10, create_time, create_user, modify_time, modify_user, sts, sts) + values + + (#{entity.code},#{entity.name},#{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') + + + + + insert into ae_conf_voucher_template_type(code, name, remark, def1, def2, def3, def4, def5, def6, def7, def8, + def9, def10, create_time, create_user, modify_time, modify_user, sts) + values + + (#{entity.code},#{entity.name},#{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}) + + on duplicate key update + code = values(code), + name = values(name), + remark = values(remark), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6), + def7 = values(def7), + def8 = values(def8), + def9 = values(def9), + def10 = values(def10), + create_time = values(create_time), + create_user = values(create_user), + modify_time = values(modify_time), + modify_user = values(modify_user), + sts = values(sts) + + + + update ae_conf_voucher_template_type set + + code = #{code}, + name = #{name}, + remark = #{remark}, + mdm_id = #{mdmId}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + create_time = #{create_time}, + create_user = #{createUser}, + modify_time = #{modify_time}, + modify_time = now(), + modify_user = #{modifyUser}, + sts = #{sts}, + + where id = #{id} + + + + update ae_conf_voucher_template_type + set sts= 'N', + modify_time = now() + where id = #{id} + + + + update ae_conf_voucher_template_type set sts= 'N' ,modify_time = #{modify_time},modify_user_id = + #{modify_user_id} + + and id = #{id} + and code = #{code} + and name = #{name} + and remark = #{remark} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and create_user = #{createUser} + and modify_user = #{modifyUser} + and sts = #{sts} + and sts='Y' + + + + + delete + from ae_conf_voucher_template_type + where id = #{id} + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateTypeService.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateTypeService.java new file mode 100644 index 00000000..0537fd09 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/IAeConfVoucherTemplateTypeService.java @@ -0,0 +1,20 @@ +package com.hzya.frame.voucher.ae.comf.template.service; + +import com.hzya.frame.voucher.ae.comf.template.entity.AeConfVoucherTemplateTypeEntity; +import com.hzya.frame.basedao.service.IBaseService; + +import java.util.List; + +/** + * (AeConfVoucherTemplateType)表服务接口 + * + * @author zydd + * @since 2025-07-03 15:27:25 + */ +public interface IAeConfVoucherTemplateTypeService extends IBaseService{ + List queryAll(AeConfVoucherTemplateTypeEntity entity); + List queryByMdmId(AeConfVoucherTemplateTypeEntity entity); + AeConfVoucherTemplateTypeEntity saveEntity(AeConfVoucherTemplateTypeEntity entity); + AeConfVoucherTemplateTypeEntity updateEntity(AeConfVoucherTemplateTypeEntity entity); + AeConfVoucherTemplateTypeEntity deleteEntity(AeConfVoucherTemplateTypeEntity entity); +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java index 717fd7e9..184e6d4c 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/template/service/impl/AeConfVoucherTemplateServiceImpl.java @@ -213,10 +213,6 @@ public class AeConfVoucherTemplateServiceImpl extends BaseService implements IAeConfVoucherTemplateTypeService { + + private IAeConfVoucherTemplateTypeDao aeConfVoucherTemplateTypeDao; + + @Autowired + public void setAeConfVoucherTemplateTypeDao(IAeConfVoucherTemplateTypeDao dao) { + this.aeConfVoucherTemplateTypeDao = dao; + this.dao = dao; + } + + @Override + public List queryAll(AeConfVoucherTemplateTypeEntity entity) { + checkTempTypeNull("queryAll", entity); + List query = aeConfVoucherTemplateTypeDao.query(entity); + return query; + } + + @Override + public List queryByMdmId(AeConfVoucherTemplateTypeEntity entity) { + checkTempTypeNull("queryByMdmId", entity); + List query = aeConfVoucherTemplateTypeDao.query(entity); + return query; + } + + @Override + public AeConfVoucherTemplateTypeEntity saveEntity(AeConfVoucherTemplateTypeEntity entity) { + checkTempTypeNull("saveEntity", entity); + AeConfVoucherTemplateTypeEntity save = aeConfVoucherTemplateTypeDao.save(entity); + return save; + } + @Override + public AeConfVoucherTemplateTypeEntity updateEntity(AeConfVoucherTemplateTypeEntity entity) { + checkTempTypeNull("updateEntity", entity); + AeConfVoucherTemplateTypeEntity update = aeConfVoucherTemplateTypeDao.update(entity); + return entity; + } + @Override + public AeConfVoucherTemplateTypeEntity deleteEntity(AeConfVoucherTemplateTypeEntity entity) { + checkTempTypeNull("deleteEntity", entity); + int i = aeConfVoucherTemplateTypeDao.logicRemove(entity); + return null; + } + + public void checkTempTypeNull(String type, AeConfVoucherTemplateTypeEntity entity) { + switch (type){ + case "queryAll": + Assert.notNull(entity.getMdmId(), "查询全部时,主数据id不能为空"); + break; + case "queryByMdmId": + Assert.notNull(entity.getMdmId(), "根据主数据id查询全部时,主数据id不能为空"); + break; + case "saveEntity": + Assert.notNull(entity.getMdmId(), "新增模板类型时,主数据id不能为空"); + Assert.notNull(entity.getName(), "新增模板类型时,模板名称不能为空"); + break; + case "updateEntity": + Assert.notNull(entity.getId(), "修改模板类型时,id不能为空"); + Assert.notNull(entity.getName(), "修改模板类型时,模板名称不能为空"); + break; + case "deleteEntity": + Assert.notNull(entity.getId(), "删除模板类型时,id不能为空"); + break; + } + } +}