From 2f3480d256baa5827a3c45332576421c2cd6727b Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 13 Jun 2024 10:08:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/masterData/org/dao/IMdmOrgDao.java | 6 +++--- .../org/dao/impl/MdmOrgDaoImpl.java | 8 ++++---- .../masterData/org/entity/MdmOrgEntity.java | 2 +- .../masterData/org/entity/MdmOrgEntity.xml | 20 +++++++++---------- .../org/service/IMdmOrgService.java | 5 +++-- .../org/service/impl/MdmOrgServiceImpl.java | 11 +++++----- .../project/dao/IMdmProjectDao.java | 7 ++++--- .../project/dao/impl/MdmProjectDaoImpl.java | 9 +++++---- .../project/entity/MdmProjectEntity.java | 2 +- .../project/entity/MdmProjectEntity.xml | 20 +++++++++---------- .../project/service/IMdmProjectService.java | 5 +++-- .../service/impl/MdmProjectServiceImpl.java | 11 +++++----- .../dao/impl/MdmModuleSourceDaoImpl.java | 2 +- 13 files changed, 57 insertions(+), 51 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java index 7f9d06c5..bfe0e1cd 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java @@ -1,7 +1,7 @@ -package masterData.dao; +package com.hzya.frame.plugin.masterData.org.dao; -import masterData.entity.MdmOrgEntity; -import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; /** * 组织档案(mdm_org: table)表数据库访问层 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java index 3648d6b9..dc0271b5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java @@ -1,7 +1,7 @@ -package masterData.dao.impl; +package com.hzya.frame.plugin.masterData.org.dao.impl; -import masterData.entity.MdmOrgEntity; -import masterData.dao.IMdmOrgDao; +import com.hzya.frame.plugin.masterData.org.dao.IMdmOrgDao; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** @@ -10,7 +10,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * @author makejava * @since 2024-06-07 18:30:04 */ -public class MdmOrgDaoImpl extends MybatisGenericDao implements IMdmOrgDao{ +public class MdmOrgDaoImpl extends MybatisGenericDao implements IMdmOrgDao { } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java index 8d502635..55aa6f31 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java @@ -1,4 +1,4 @@ -package masterData.entity; +package com.hzya.frame.plugin.masterData.org.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml index c14c6a01..9c5e813e 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -60,7 +60,7 @@ ,company_id - select from mdm_org @@ -98,7 +98,7 @@ - select count(1) from mdm_org and id = #{id} @@ -134,7 +134,7 @@ - select from mdm_org @@ -172,7 +172,7 @@ - select from mdm_org @@ -210,7 +210,7 @@ - + insert into mdm_org( id , @@ -316,7 +316,7 @@ org_id = values(org_id), company_id = values(company_id) - + update mdm_org set document_rule = #{documentRule}, @@ -347,12 +347,12 @@ update mdm_org set where id = #{id} - + update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java index fe82b199..fa37d8cd 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java @@ -1,7 +1,8 @@ -package masterData.service; +package com.hzya.frame.plugin.masterData.org.service; -import masterData.entity.MdmOrgEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; + /** * 组织档案(MdmOrg)表服务接口 * diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java index 700a73ce..f4f543ee 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java @@ -1,9 +1,10 @@ -package masterData.service.impl; +package com.hzya.frame.plugin.masterData.org.service.impl; -import masterData.entity.MdmOrgEntity; -import masterData.dao.IMdmOrgDao; -import masterData.service.IMdmOrgService; -import org.springframework.stereotype.Service; + +import com.hzya.frame.plugin.masterData.org.dao.IMdmOrgDao; +import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity; +import com.hzya.frame.plugin.masterData.org.service.IMdmOrgService; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java index 7389b3cc..8b130a7f 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java @@ -1,7 +1,8 @@ -package masterData.dao; +package com.hzya.frame.plugin.masterData.project.dao; -import masterData.entity.MdmProjectEntity; -import com.hzya.frame.basedao.dao.IBaseDao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; /** * 项目档案(mdm_project: table)表数据库访问层 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java index 3da10ccc..ae270f7d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java @@ -1,7 +1,8 @@ -package masterData.dao.impl; +package com.hzya.frame.plugin.masterData.project.dao.impl; -import masterData.entity.MdmProjectEntity; -import masterData.dao.IMdmProjectDao; + +import com.hzya.frame.plugin.masterData.project.dao.IMdmProjectDao; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; import org.springframework.stereotype.Repository; import com.hzya.frame.basedao.dao.MybatisGenericDao; /** @@ -10,7 +11,7 @@ import com.hzya.frame.basedao.dao.MybatisGenericDao; * @author makejava * @since 2024-06-07 18:29:23 */ -public class MdmProjectDaoImpl extends MybatisGenericDao implements IMdmProjectDao{ +public class MdmProjectDaoImpl extends MybatisGenericDao implements IMdmProjectDao { } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java index 958d6fc5..fba1cf1c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java @@ -1,4 +1,4 @@ -package masterData.entity; +package com.hzya.frame.plugin.masterData.project.entity; import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml index 6003878f..93ec1958 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml @@ -1,8 +1,8 @@ - + - + @@ -58,7 +58,7 @@ ,company_id - select from mdm_project @@ -95,7 +95,7 @@ - select count(1) from mdm_project and id = #{id} @@ -130,7 +130,7 @@ - select from mdm_project @@ -167,7 +167,7 @@ - select from mdm_project @@ -204,7 +204,7 @@ - + insert into mdm_project( id , @@ -307,7 +307,7 @@ org_id = values(org_id), company_id = values(company_id) - + update mdm_project set document_rule = #{documentRule}, @@ -337,12 +337,12 @@ update mdm_project set where id = #{id} - + update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} where id = #{id} - + update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} and id = #{id} diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java index 58e801b2..f35a9209 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java @@ -1,7 +1,8 @@ -package masterData.service; +package com.hzya.frame.plugin.masterData.project.service; -import masterData.entity.MdmProjectEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; + /** * 项目档案(MdmProject)表服务接口 * diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java index 4dc5e249..0284f229 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java @@ -1,9 +1,10 @@ -package masterData.service.impl; +package com.hzya.frame.plugin.masterData.project.service.impl; -import masterData.entity.MdmProjectEntity; -import masterData.dao.IMdmProjectDao; -import masterData.service.IMdmProjectService; -import org.springframework.stereotype.Service; + +import com.hzya.frame.plugin.masterData.project.dao.IMdmProjectDao; +import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity; +import com.hzya.frame.plugin.masterData.project.service.IMdmProjectService; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java index b7cc9034..4e025854 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModuleSource/dao/impl/MdmModuleSourceDaoImpl.java @@ -18,7 +18,7 @@ public class MdmModuleSourceDaoImpl extends MybatisGenericDao MdmModuleSourceentityGroupByType() { - List list =(List) super.selectList(getSqlIdPrifx() + "MdmModuleSourceentityGroupByType", ""); + List list =(List) super.selectList(getSqlIdPrifx() + "queryMdmModuleSourceentityGroupByType", ""); return list; }