From 0f8ba6400ddd5a062820bc3156935c671781f7fb Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Fri, 21 Jun 2024 17:06:04 +0800
Subject: [PATCH 1/4] =?UTF-8?q?OA=E5=8D=95=E6=8D=AE=E3=80=81=E6=A1=A3?=
=?UTF-8?q?=E6=A1=88=20=E5=90=8C=E6=AD=A5BIP=E5=92=8C=E4=B8=BB=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../frame/plugin/a8bill/dao/IPayBillDao.java | 15 ++
.../a8bill/dao/impl/PayBillDaoImpl.java | 16 ++
.../plugin/a8bill/entity/PayBillEntity.java | 14 ++
.../plugin/a8bill/entity/PayBillEntity.xml | 16 ++
.../plugin/PayBillPluginInitializer.java | 64 ++++++++
.../a8bill/service/IPayBillService.java | 13 ++
.../service/impl/PayBillServiceImpl.java | 23 +++
.../plugin/MdmCustomerPluginInitializer.java | 13 +-
.../user/plugin/MdmUserPluginInitializer.java | 13 +-
.../src/main/resources/application-yc.yml | 4 +-
.../cfgHome/plugin/payBill/pluginCfg.xml | 6 +
.../spring/spring-buildpackage-plugin.xml | 5 +
.../spring/spring-buildpackage-service.xml | 5 +
.../hzya/frame/bip/v3/v2207/util/BipUtil.java | 53 +++++++
.../frame/seeyon/paybill/dao/IPayBillDao.java | 33 ++++
.../paybill/dao/impl/PayBillDaoImpl.java | 32 ++++
.../seeyon/paybill/entity/PayBillEntity.java | 80 ++++++++++
.../seeyon/paybill/entity/PayBillEntity.xml | 61 +++++++
.../paybill/service/IPayBillService.java | 29 ++++
.../service/impl/PayBillServiceImpl.java | 103 ++++++++++++
.../IMasterDataCustoMermanageService.java | 18 +++
.../service/IMasterDataMemberService.java | 19 +++
.../MasterDataCustoMermanageServiceImpl.java | 149 ++++++++++++++++++
.../impl/MasterDataMemberServiceImpl.java | 144 +++++++++++++++++
24 files changed, 924 insertions(+), 4 deletions(-)
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/IPayBillDao.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/impl/PayBillDaoImpl.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.xml
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayBillPluginInitializer.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/IPayBillService.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java
create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/payBill/pluginCfg.xml
create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-plugin.xml
create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-service.xml
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataCustoMermanageService.java
create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataMemberService.java
create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataCustoMermanageServiceImpl.java
create mode 100644 service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataMemberServiceImpl.java
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/IPayBillDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/IPayBillDao.java
new file mode 100644
index 00000000..4c8956ed
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/IPayBillDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.plugin.a8bill.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.plugin.a8bill.entity.PayBillEntity;
+
+/**
+ * 组织档案(mdm_org: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:04
+ */
+public interface IPayBillDao extends IBaseDao<PayBillEntity, String> {
+
+}
+
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/impl/PayBillDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/impl/PayBillDaoImpl.java
new file mode 100644
index 00000000..f4bc0c6e
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/dao/impl/PayBillDaoImpl.java
@@ -0,0 +1,16 @@
+package com.hzya.frame.plugin.a8bill.dao.impl;
+
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.plugin.a8bill.dao.IPayBillDao;
+import com.hzya.frame.plugin.a8bill.entity.PayBillEntity;
+
+/**
+ * 组织档案(MdmOrg)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:04
+ */
+public class PayBillDaoImpl extends MybatisGenericDao<PayBillEntity, String> implements IPayBillDao {
+
+}
+
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.java
new file mode 100644
index 00000000..ecca14fb
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.java
@@ -0,0 +1,14 @@
+package com.hzya.frame.plugin.a8bill.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * 付款单
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:04
+ */
+public class PayBillEntity extends BaseEntity {
+
+}
+
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.xml
new file mode 100644
index 00000000..a251e1cd
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/entity/PayBillEntity.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.plugin.a8bill.dao.impl.PayBillDaoImpl">
+
+ <resultMap id="get-PayBillEntity-result" type="com.hzya.frame.plugin.a8bill.entity.PayBillEntity" >
+ <result property="id" column="id" jdbcType="VARCHAR"/>
+
+ </resultMap>
+ <!-- 查询的字段-->
+ <sql id = "PayBillEntity_Base_Column_List">
+ id
+
+ </sql>
+
+</mapper>
+
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayBillPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayBillPluginInitializer.java
new file mode 100644
index 00000000..43ab218a
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayBillPluginInitializer.java
@@ -0,0 +1,64 @@
+package com.hzya.frame.plugin.a8bill.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+
+import com.hzya.frame.seeyon.paybill.service.IPayBillService;
+import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataOrgsServiceImpl;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 组织档案(PayBill)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:05
+ */
+public class PayBillPluginInitializer extends PluginBaseEntity{
+ Logger logger = LoggerFactory.getLogger(PayBillPluginInitializer.class);
+ @Autowired
+ private IPayBillService payBillService;
+
+ @Override
+ public void initialize() {
+ logger.info(getPluginLabel() + "執行初始化方法initialize()");
+ }
+
+ @Override
+ public void destroy() {
+ logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+ }
+
+ @Override
+ public String getPluginId() {
+ return "PayBillPlugin";
+ }
+
+ @Override
+ public String getPluginName() {
+ return "PayBillPlugin插件";
+ }
+
+ @Override
+ public String getPluginLabel() {
+ return "PayBillPlugin";
+ }
+
+ @Override
+ public String getPluginType() {
+ return "1";
+ }
+ @Override
+ public JsonResultEntity executeBusiness(JSONObject requestJson) {
+ try {
+ logger.info("======开始执行付款单据信息同步========");
+ return payBillService.sendEngineerPayBillToBip(requestJson);
+ }catch (Exception e){
+ logger.info("======执行付款单据同步失败:{}========",e.getMessage());
+ e.printStackTrace();
+ }
+ return null;
+ }
+}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/IPayBillService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/IPayBillService.java
new file mode 100644
index 00000000..8a8f041c
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/IPayBillService.java
@@ -0,0 +1,13 @@
+package com.hzya.frame.plugin.a8bill.service;
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.plugin.a8bill.entity.PayBillEntity;
+
+/**
+ * 付款单
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:05
+ */
+public interface IPayBillService extends IBaseService<PayBillEntity, String>{
+}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java
new file mode 100644
index 00000000..40b189b6
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java
@@ -0,0 +1,23 @@
+package com.hzya.frame.plugin.a8bill.service.impl;
+
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.plugin.a8bill.entity.PayBillEntity;
+import com.hzya.frame.plugin.a8bill.service.IPayBillService;
+import com.hzya.frame.plugin.masterData.org.service.IMdmOrgService;
+
+/**
+ * private IMdmOrgDao mdmOrgDao;
+ *
+ * @Autowired
+ * public void setMdmOrgDao(IMdmOrgDao dao) {
+ * this.mdmOrgDao = dao;
+ * this.dao = dao;
+ * }
+ *
+ * @author makejava
+ * @since 2024-06-07 18:30:05
+ */
+public class PayBillServiceImpl extends BaseService<PayBillEntity, String> implements IPayBillService {
+
+
+}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java
index a1eb009e..5b3a3d22 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java
@@ -1,9 +1,12 @@
package com.hzya.frame.plugin.masterData.customer.plugin;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataCustoMermanageService;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
/**
* 客户档案(MdmCustomer)表服务接口
*
@@ -12,6 +15,8 @@ import org.slf4j.LoggerFactory;
*/
public class MdmCustomerPluginInitializer extends PluginBaseEntity{
Logger logger = LoggerFactory.getLogger(MdmCustomerPluginInitializer.class);
+ @Autowired
+ private IMasterDataCustoMermanageService masterDataCustoMermanageService;
@Override
public void initialize() {
@@ -44,7 +49,13 @@ public class MdmCustomerPluginInitializer extends PluginBaseEntity{
}
@Override
public JsonResultEntity executeBusiness(JSONObject requestJson) {
- logger.info("执行业务代码逻辑");
+ try {
+ logger.info("======开始执行客户信息同步========");
+ return masterDataCustoMermanageService.queryCustoMermanageArchives(requestJson);
+ }catch (Exception e){
+ logger.info("======执行客户同步失败:{}========",e.getMessage());
+ e.printStackTrace();
+ }
return null;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java
index 0fbea074..4eaf8f41 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java
@@ -1,9 +1,12 @@
package com.hzya.frame.plugin.masterData.user.plugin;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataMemberService;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
/**
* 用户档案(MdmUser)表服务接口
*
@@ -12,6 +15,8 @@ import org.slf4j.LoggerFactory;
*/
public class MdmUserPluginInitializer extends PluginBaseEntity{
Logger logger = LoggerFactory.getLogger(MdmUserPluginInitializer.class);
+ @Autowired
+ private IMasterDataMemberService masterDataMemberService;
@Override
public void initialize() {
@@ -44,7 +49,13 @@ public class MdmUserPluginInitializer extends PluginBaseEntity{
}
@Override
public JsonResultEntity executeBusiness(JSONObject requestJson) {
- logger.info("执行业务代码逻辑");
+ try {
+ logger.info("======开始执行用户信息同步========");
+ return masterDataMemberService.queryMemberArchives(requestJson);
+ }catch (Exception e){
+ logger.info("======执行用户同步失败:{}========",e.getMessage());
+ e.printStackTrace();
+ }
return null;
}
}
diff --git a/buildpackage/src/main/resources/application-yc.yml b/buildpackage/src/main/resources/application-yc.yml
index 57d31813..acd952ff 100644
--- a/buildpackage/src/main/resources/application-yc.yml
+++ b/buildpackage/src/main/resources/application-yc.yml
@@ -26,9 +26,9 @@
#ax:
# url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
logging:
- #日志级别 指定目录级别
+ #日志级别 指定目录级别warn
level:
- root: warn
+ root: info
encodings: UTF-8
file:
# 日志保存路径
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/payBill/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/payBill/pluginCfg.xml
new file mode 100644
index 00000000..cedbfee4
--- /dev/null
+++ b/buildpackage/src/main/resources/cfgHome/plugin/payBill/pluginCfg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+<id>PayBillPlugin</id>
+<name>OA付款单插件</name>
+<category>202406210001</category>
+</plugin>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-plugin.xml
new file mode 100644
index 00000000..dc955eca
--- /dev/null
+++ b/buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-plugin.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+<bean name="PayBillPluginInitializer" class="com.hzya.frame.plugin.a8bill.plugin.PayBillPluginInitializer" />
+</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-service.xml
new file mode 100644
index 00000000..88a86bfb
--- /dev/null
+++ b/buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-service.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans default-autowire="byName">
+ <bean name="PayBillPluginService" class="com.hzya.frame.plugin.a8bill.service.impl.PayBillServiceImpl" />
+</beans>
diff --git a/service/src/main/java/com/hzya/frame/bip/v3/v2207/util/BipUtil.java b/service/src/main/java/com/hzya/frame/bip/v3/v2207/util/BipUtil.java
index c9ef8339..a7bfe324 100644
--- a/service/src/main/java/com/hzya/frame/bip/v3/v2207/util/BipUtil.java
+++ b/service/src/main/java/com/hzya/frame/bip/v3/v2207/util/BipUtil.java
@@ -1,5 +1,10 @@
package com.hzya.frame.bip.v3.v2207.util;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+
/**
* com.hzya.frame.bip.v3.v2207.util
*
@@ -8,5 +13,53 @@ package com.hzya.frame.bip.v3.v2207.util;
*/
public class BipUtil {
+ /**
+ *
+ * @content 发送单据到BIP系统
+ * @author laborer
+ * @date 2024/6/21 0021 10:51
+ *
+ */
+ public static String sendU9cTOBipEsb(String parm, String apiCode,String token){
+ String baseUrl = "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface";
+ System.out.println("推送参数"+parm);
+ String result = HttpRequest.post(baseUrl)
+ .header("appId", "800023")//头信息，多个头信息多次调用此方法即可
+ .header("access_token", token)//头信息，多个头信息多次调用此方法即可
+ .header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可
+ .header("publicKey", "ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj")//头信息，多个头信息多次调用此方法即可
+ .header("secretKey", "7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//头信息，多个头信息多次调用此方法即可
+ .body(parm)//表单内容
+ .timeout(20000)//超时，毫秒
+ .execute().body();
+ System.out.println("返回参数"+result);
+ if(StrUtil.isNotEmpty(result)){
+ return analytic(result);
+ }
+ return null;
+ }
+ public static String getBipToken(String userCode, String apiCode){
+ String baseUrl = "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface";
+ String result = HttpRequest.post(baseUrl)
+ .header("appId", "800023")//头信息，多个头信息多次调用此方法即可
+ .header("apiCode", apiCode)//头信息，多个头信息多次调用此方法即可
+ .header("usercode", userCode)//头信息，多个头信息多次调用此方法即可
+ .header("publicKey", "ZJYA1vBeY1ai53iNmbAEsw6DImjkXGBkdMailxcBdliFC85Ce7eDIk+3zDUT+v578prj")//头信息，多个头信息多次调用此方法即可
+ .header("secretKey", "7Gp6OjHrIaQ6R3tXGPrI4morjQyWL+qu4JJschQnkBRtv26VDgGFVYKOy5kMZfd/j3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=")//头信息，多个头信息多次调用此方法即可
+ .body("")//表单内容
+ .timeout(20000)//超时，毫秒
+ .execute().body();
+ System.out.println("返回参数"+result);
+ if(StrUtil.isNotEmpty(result)){
+ JSONObject obj = JSON.parseObject( analytic(result));
+ JSONObject data = obj.getJSONObject("data");
+ return data.getString("access_token");
+ }
+ return null;
+ }
+ public static String analytic(String parm){
+ JSONObject main = JSON.parseObject(parm);
+ return main.getString("attribute");
+ }
}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java
new file mode 100644
index 00000000..a0ec8db8
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/IPayBillDao.java
@@ -0,0 +1,33 @@
+package com.hzya.frame.seeyon.paybill.dao;
+
+import com.hzya.frame.seeyon.entity.SeeYonInterFaceEntity;
+import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 👻👻👻👻👻👻👻👻👻👻 gjh
+ * @version 1.0
+ * @content
+ * @date 2023-08-30 10:27
+ */
+public interface IPayBillDao {
+/**
+ *
+ * @content 获取OA工程付款单数据
+ * @author laborer
+ * @date 2024/6/20 0020 11:30
+ *
+ */
+ List<PayBillEntity> getOaEngineerPay(PayBillEntity entity);
+/**
+ *
+ * @content 修改推送状态
+ * @author laborer
+ * @date 2024/6/21 0021 11:15
+ *
+ */
+
+ int updateState(PayBillEntity pay);
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java
new file mode 100644
index 00000000..3a753554
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/dao/impl/PayBillDaoImpl.java
@@ -0,0 +1,32 @@
+package com.hzya.frame.seeyon.paybill.dao.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.seeyon.entity.SeeYonInterFaceEntity;
+import com.hzya.frame.seeyon.paybill.dao.IPayBillDao;
+import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 👻👻👻👻👻👻👻👻👻👻 gjh
+ * @version 1.0
+ * @content
+ * @date 2023-08-30 10:27
+ */
+@Repository(value = "PayBillDaoImpl")
+public class PayBillDaoImpl extends MybatisGenericDao implements IPayBillDao {
+
+ @DS("#entity.dataSourceCode")
+ @Override
+ public List<PayBillEntity> getOaEngineerPay(PayBillEntity entity) {
+ return super.selectList("com.hzya.frame.seeyon.paybill.dao.impl.PayBillDaoImpl.PayBillEntity_list_base",entity);
+ }
+ @DS("#pay.dataSourceCode")
+ @Override
+ public int updateState(PayBillEntity pay) {
+ return super.update("com.hzya.frame.seeyon.paybill.dao.impl.PayBillDaoImpl.PayBillEntity_update",pay);
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
new file mode 100644
index 00000000..9fa7a24b
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.java
@@ -0,0 +1,80 @@
+package com.hzya.frame.seeyon.paybill.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @content 付款結算單
+ * @author laborer
+ * @date 2024/6/20 0020 11:07
+ *
+ */
+
+public class PayBillEntity extends BaseEntity {
+ private String billDate;//付款日期
+ private String primalMoney;//付款金额信息
+ private String pkOppaccount;//付款银行信息
+ private String pkSupplier;//供应商信息
+ private String tableName;//表名称
+ private String fieldName;//字段名称
+ private String state;//推送状态
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public String getTableName() {
+ return tableName;
+ }
+
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
+ }
+
+ public String getFieldName() {
+ return fieldName;
+ }
+
+ public void setFieldName(String fieldName) {
+ this.fieldName = fieldName;
+ }
+
+ public String getBillDate() {
+ return billDate;
+ }
+
+ public void setBillDate(String billDate) {
+ this.billDate = billDate;
+ }
+
+ public String getPrimalMoney() {
+ return primalMoney;
+ }
+
+ public void setPrimalMoney(String primalMoney) {
+ this.primalMoney = primalMoney;
+ }
+
+ public String getPkOppaccount() {
+ return pkOppaccount;
+ }
+
+ public void setPkOppaccount(String pkOppaccount) {
+ this.pkOppaccount = pkOppaccount;
+ }
+
+ public String getPkSupplier() {
+ return pkSupplier;
+ }
+
+ public void setPkSupplier(String pkSupplier) {
+ this.pkSupplier = pkSupplier;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
new file mode 100644
index 00000000..8514cc4c
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/entity/PayBillEntity.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hzya.frame.seeyon.paybill.dao.impl.PayBillDaoImpl">
+ <resultMap id="get-PayBillEntity-result" type="com.hzya.frame.seeyon.paybill.entity.PayBillEntity" >
+ <result property="id" column="id" jdbcType="VARCHAR"/>
+ <result property="billDate" column="bill_date" jdbcType="VARCHAR"/>
+ <result property="primalMoney" column="primal_money" jdbcType="VARCHAR"/>
+ <result property="pkOppaccount" column="pk_oppaccount" jdbcType="VARCHAR"/>
+ <result property="pkSupplier" column="pk_supplier" jdbcType="VARCHAR"/>
+ <result property="tableName" column="table_name" jdbcType="VARCHAR"/>
+ <result property="fieldName" column="field_name" jdbcType="VARCHAR"/>
+
+ </resultMap>
+
+ <!--工程项目查询-->
+ <select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.seeyon.paybill.entity.PayBillEntity">
+ SELECT
+ body.id as id,
+ field0070 AS bill_date,
+ field0057 AS primal_money,
+ field0019 AS pk_oppaccount,
+ field0082 AS pk_supplier,
+ 'formson_0222' as table_name,
+ 'field0084' as field_name
+ FROM formmain_0093 main
+ LEFT JOIN formson_0222 body ON main.id = body.formmain_id
+ WHERE field0070 IS NOT null and field0084 is null
+ union all
+ SELECT
+ body.id as id,
+ field0073 AS bill_date,
+ field0031 AS primal_money,
+ field0042 AS pk_oppaccount,
+ field0077 AS pk_supplier,
+ 'formson_0210' as table_name,
+ 'field0078' as field_name
+ FROM formmain_0209 main
+ LEFT JOIN formson_0210 body ON main.id = body.formmain_id
+ WHERE field0073 IS NOT null and field0078 is null
+ union all
+ SELECT
+ body.id as id,
+ field0053 AS bill_date,
+ field0041 AS primal_money,
+ field0024 AS pk_oppaccount,
+ field0057 AS pk_supplier,
+ 'formson_0223' as table_name,
+ 'field0058' as field_name
+ FROM formmain_0094 main
+ LEFT JOIN formson_0223 body ON main.id = body.formmain_id
+ WHERE field0053 IS NOT NULL and field0058 is null
+ </select>
+
+ <!--通过主键修改方法-->
+ <update id="PayBillEntity_update" parameterType = "java.util.Map" >
+ update ${tableName} set ${fieldName} = #{state} where id = #{id}
+ </update>
+
+
+</mapper>
+
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java
new file mode 100644
index 00000000..caad27a7
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/service/IPayBillService.java
@@ -0,0 +1,29 @@
+package com.hzya.frame.seeyon.paybill.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+import java.util.List;
+
+/**
+ *
+ * @content huoqu
+ * @author laborer获取OA付款单数据并推送BIP生成付款结算单
+ * @date 2024/6/20 0020 11:19
+ *
+ */
+
+public interface IPayBillService extends IBaseService<PaymentEntity,String> {
+/**
+ *
+ * @content 工程付款单数据同步BIP
+ * @author laborer
+ * @date 2024/6/20 0020 11:24
+ *
+ */
+JsonResultEntity sendEngineerPayBillToBip(JSONObject requestJson);
+
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java b/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
new file mode 100644
index 00000000..9adbab1d
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/paybill/service/impl/PayBillServiceImpl.java
@@ -0,0 +1,103 @@
+package com.hzya.frame.seeyon.paybill.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.util.BipUtil;
+import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.seeyon.paybill.dao.IPayBillDao;
+import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import com.hzya.frame.seeyon.paybill.service.IPayBillService;
+import com.hzya.frame.seeyon.service.impl.SeeYonInterFaceImpl;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * @content 付款单同步BIP
+ * @author laborer
+ * @date 2024/6/20 0020 15:20
+ *
+ */
+
+@Service("PayBillServiceImpl")
+public class PayBillServiceImpl extends BaseService<PaymentEntity,String> implements IPayBillService {
+ private static final Logger logger = LoggerFactory.getLogger(PayBillServiceImpl.class);
+
+ @Autowired
+ private IPayBillDao payBillDao;
+ /**
+ *
+ * @content 工程付款单数据同步BIP
+ * @author laborer
+ * @date 2024/6/20 0020 11:24
+ *
+ */
+ @Override
+ public JsonResultEntity sendEngineerPayBillToBip(JSONObject requestJson) {
+ PayBillEntity entity = new PayBillEntity();
+ requestJson.put("db_code","OA");
+ entity.setDataSourceCode(requestJson.getString("db_code"));
+ List<PayBillEntity>payBillEntityList = payBillDao.getOaEngineerPay(entity);
+ if(CollectionUtils.isNotEmpty(payBillEntityList)){
+ for(PayBillEntity pay : payBillEntityList){
+ String token = BipUtil.getBipToken("yonyou","8000230000");
+ JSONObject main = bindingAdd(pay);
+ logger.info("工程付款单调用中台生成BIP付款结算单推送报文{}",main.toString());
+ String result = BipUtil.sendU9cTOBipEsb(main.toString(),"8000230014",token);
+ logger.info("工程付款单调用中台生成BIP付款结算单返回结果{}",result);
+ JSONObject resultObj = JSON.parseObject(result);
+ boolean flag = resultObj.getBoolean("success");
+ if(flag){
+ pay.setState("Y");
+ }else{
+ pay.setState("N");
+ }
+ pay.setDataSourceCode(requestJson.getString("db_code"));
+ payBillDao.updateState(pay);
+ // todo 后续在写吧（没字段等OA开了外网在创建），修改推送状态，避免再次查询
+ }
+ }
+ return null;
+ }
+
+ @NotNull
+ private JSONObject bindingAdd(PayBillEntity pay) {
+ JSONObject head = new JSONObject();
+ head.put("pk_org","");//所属组织
+ head.put("pk_group","");//集团
+ head.put("bill_type","F5");//单据类型 默认F5
+ head.put("trade_type","D5");//付款结算类型 默认D5
+ head.put("source_flag","2");//付款结算类型 默认2
+ head.put("bill_date",pay.getBillDate());//单据日期
+ head.put("primal_money",pay.getPrimalMoney());//付款原币金额
+ head.put("pk_currtype","CNY");//币种
+ head.put("billmaker","");//制单人
+ //处理明细数据，按照明细付款 多个明细生成多个付款结算单
+ JSONArray detailsArr = new JSONArray();
+ JSONObject body = new JSONObject();
+ body.put("pk_org","");//所属组织
+ body.put("pk_group","");//集团
+ body.put("bill_type","F5");//单据类型 默认F5
+ body.put("trade_type","D5");//付款结算类型 默认D5
+ body.put("pk_currtype","CNY");//币种
+ body.put("bill_date",pay.getBillDate());//单据日期
+ body.put("pay_primal",pay.getPrimalMoney());//付款原币金额
+ body.put("creationtime",pay.getBillDate());//创建时间
+ body.put("direction","-1");//方向 :1=收;-1=付;
+ body.put("objecttype","");//交易对象
+ detailsArr.add(body);
+ JSONObject main = new JSONObject();
+ main.put("head",head);//表头
+ main.put("body",detailsArr);//明细数据
+ return main;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataCustoMermanageService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataCustoMermanageService.java
new file mode 100644
index 00000000..b7b2301a
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataCustoMermanageService.java
@@ -0,0 +1,18 @@
+package com.hzya.frame.sysnew.comparison.masterData.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+public interface IMasterDataCustoMermanageService extends IBaseService<ComparisonEntity, String> {
+/**
+ *
+ * @content 查询客户档案同步中台主数据中心
+ * @author laborer
+ * @date 2024/6/20 0020 9:54
+ *
+ */
+
+JsonResultEntity queryCustoMermanageArchives(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataMemberService.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataMemberService.java
new file mode 100644
index 00000000..73926f3e
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/IMasterDataMemberService.java
@@ -0,0 +1,19 @@
+package com.hzya.frame.sysnew.comparison.masterData.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+public interface IMasterDataMemberService extends IBaseService<ComparisonEntity, String> {
+
+ /**
+ *
+ * @content 查询项目档案
+ * @Param
+ * @Return
+ * @Author hecan
+ * @Date 2024/6/6 16:10
+ * **/
+ JsonResultEntity queryMemberArchives(JSONObject jsonObject);
+}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataCustoMermanageServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataCustoMermanageServiceImpl.java
new file mode 100644
index 00000000..c9bfd60f
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataCustoMermanageServiceImpl.java
@@ -0,0 +1,149 @@
+package com.hzya.frame.sysnew.comparison.masterData.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.dateutil.DateUtil;
+import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl;
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
+import com.hzya.frame.sysnew.comparison.masterData.dao.impl.MasterDataDaoImpl;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataCustoMermanageService;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataProjectService;
+import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@Service("MasterDataCustoMermanageServiceImpl")
+public class MasterDataCustoMermanageServiceImpl extends BaseService<ComparisonEntity, String> implements IMasterDataCustoMermanageService {
+
+ @Autowired
+ private MasterDataDaoImpl masterDataDaoImpl;
+ @Autowired
+ private ComparisonServiceImpl comparisonServiceimpl;
+ @Autowired
+ private MdmModuleSourceDaoImpl mdmModuleSourceDaoImpl;
+
+ private String ts = "";
+
+ //同步客户档案到主数据
+ public JsonResultEntity queryCustoMermanageArchives(JSONObject json){
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ //查询主数据来源表，根据来源类型为插件得进行分类，获取来源名称和编码
+ List<MdmModuleSourceEntity> list = mdmModuleSourceDaoImpl.MdmModuleSourceentityGroupByType();
+ if (CollectionUtils.isEmpty(list)) {
+ logger.info("数据来源表中没有类型为插件得数据,无法获取来源名称和来源编码");
+ return BaseResult.getFailureMessageEntity("数据来源表无插件类型");
+ }
+ for (MdmModuleSourceEntity mdmModuleSourceEntity : list) {
+ //通过不同的应用类型用于拼接sql
+ String appTyp = mdmModuleSourceEntity.getAppType();
+ String dbCode = mdmModuleSourceEntity.getDbCode();
+ switch (appTyp) {
+ case "1":
+ StringBuffer sb = new StringBuffer();
+ if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
+ String code = jsonObject.getString("code");
+ sb.append(" and a.code = '"+code+"'");
+ }else{
+ ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+ sb.append(" and a.update_time >= '"+ts+"'");
+ }
+
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append("SELECT id as id,field0013 AS code,field0014 AS name,field0016 AS pk_custclass,field0015 AS shortname,field0012 AS pk_org FROM formmain_0226 WHERE 1=1 AND id = '1706533959075383844' " );
+
+ mdmModuleSourceEntity.setDataSourceCode(dbCode);
+ try {
+ List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
+ logger.info("查询出来的值为:{}",hashMaps);
+ if (null != hashMaps && hashMaps.size() > 0) {
+ ParametricAssembly(mdmModuleSourceEntity,hashMaps,"10004");
+ } else {
+ logger.info("U8C主数据档案客商档案没有需要同步中台的数据");
+ return null;
+ }
+ } catch (Exception e) {
+ logger.info("查询主数据档案客商档案错误:{}", e.getMessage());
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return BaseResult.getSuccessMessageEntity("客商档案同步成功");
+ }
+
+
+ //查询档案参数组装
+ public JsonResultEntity ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List<HashMap<String, Object>> hashMaps,String mdmCode){
+ for (HashMap<String, Object> hashMap : hashMaps) {
+ JSONObject jsonObjectUser = new JSONObject();
+ JSONObject jsonStr = new JSONObject();
+ jsonObjectUser.put("id", hashMap.get("id"));
+ jsonObjectUser.put("mdmCode", mdmCode);
+ jsonStr.put("jsonStr", jsonObjectUser);
+ //查询明细信息
+ Long formmainId = (Long) hashMap.get("id");
+ StringBuffer stringBufferDetails = new StringBuffer();
+ stringBufferDetails.append("SELECT field0023 AS pk_bankdoc,field0024 AS accnum,field0025 AS combinenum FROM formson_0229 WHERE formmain_id = '"+formmainId+"' " );
+ List<HashMap<String, Object>> hashMapsDetails = masterDataDaoImpl.queryArchivesByDataSource(stringBufferDetails.toString(),mdmModuleSourceEntity);
+ //先查询编码和名称查询是否存在
+ JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr);
+ Object attribute = jsonResultEntity.getAttribute();
+ logger.info("得到的attribute值为：{}", attribute);
+ JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute);
+ JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list");
+ //如果jsonArrayList为null，说明没有值，在表中不存在
+ if (jsonArrayList == null || jsonArrayList.size() == 0) {
+ //将查询出来得数据调用通用接口新增，保存到表中
+ JSONObject main = new JSONObject();
+ for(String key:hashMap.keySet()) {
+ main.put(key, hashMap.get(key));
+ }
+ jsonObjectUser.put("main", main);
+ jsonObjectUser.put("details", hashMapsDetails);
+ jsonObjectUser.put("appName","数智中台");
+ jsonObjectUser.put("appCode","800004");
+ jsonObjectUser.put("optionName", "数智中台");
+ jsonStr.put("jsonStr", jsonObjectUser);
+ try {
+ comparisonServiceimpl.saveEntity(jsonStr);
+ } catch (Exception e) {
+ logger.info("U8C主数据档案新增用户档案失败,失败原因:{}",e.getMessage());
+ }
+ } else {
+ for (Object o : jsonArrayList) {
+ JSONObject jsonObjectUpdate = JSON.parseObject(String.valueOf(o));
+ String id = jsonObjectUpdate.getString("id");
+ JSONObject main = new JSONObject();
+ for(String key:hashMap.keySet()) {
+ main.put(key, hashMap.get(key));
+ main.put("id",id);
+ }
+ jsonObjectUser.put("main", main);
+ jsonObjectUser.put("appName","数智中台");
+ jsonObjectUser.put("appCode","800004");
+ jsonObjectUser.put("optionName", "数智中台");
+ jsonStr.put("jsonStr", jsonObjectUser);
+ try {
+ comparisonServiceimpl.updateEntity(jsonStr);
+ } catch (Exception e) {
+ logger.info("U8C主数据档案更新用户档案失败,失败原因:{}", e.getMessage());
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataMemberServiceImpl.java b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataMemberServiceImpl.java
new file mode 100644
index 00000000..c889c24b
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/sysnew/comparison/masterData/service/impl/MasterDataMemberServiceImpl.java
@@ -0,0 +1,144 @@
+package com.hzya.frame.sysnew.comparison.masterData.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.dateutil.DateUtil;
+import com.hzya.frame.mdm.mdmModuleSource.dao.impl.MdmModuleSourceDaoImpl;
+import com.hzya.frame.mdm.mdmModuleSource.entity.MdmModuleSourceEntity;
+import com.hzya.frame.sysnew.comparison.entity.ComparisonEntity;
+import com.hzya.frame.sysnew.comparison.masterData.dao.impl.MasterDataDaoImpl;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataMemberService;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataProjectService;
+import com.hzya.frame.sysnew.comparison.service.impl.ComparisonServiceImpl;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@Service("MasterDataMemberServiceImpl")
+public class MasterDataMemberServiceImpl extends BaseService<ComparisonEntity, String> implements IMasterDataMemberService {
+
+ @Autowired
+ private MasterDataDaoImpl masterDataDaoImpl;
+ @Autowired
+ private ComparisonServiceImpl comparisonServiceimpl;
+ @Autowired
+ private MdmModuleSourceDaoImpl mdmModuleSourceDaoImpl;
+
+ private String ts = "";
+
+ //同步用户信息到主数据
+ public JsonResultEntity queryMemberArchives(JSONObject json){
+ JSONObject jsonObject = json.getJSONObject("jsonStr");
+ //查询主数据来源表，根据来源类型为插件得进行分类，获取来源名称和编码
+ List<MdmModuleSourceEntity> list = mdmModuleSourceDaoImpl.MdmModuleSourceentityGroupByType();
+ if (CollectionUtils.isEmpty(list)) {
+ logger.info("数据来源表中没有类型为插件得数据,无法获取来源名称和来源编码");
+ return BaseResult.getFailureMessageEntity("数据来源表无插件类型");
+ }
+
+ for (MdmModuleSourceEntity mdmModuleSourceEntity : list) {
+ //通过不同的应用类型用于拼接sql
+ String appTyp = mdmModuleSourceEntity.getAppType();
+ String dbCode = mdmModuleSourceEntity.getDbCode();
+ switch (appTyp) {
+ case "1":
+ StringBuffer sb = new StringBuffer();
+ if(null != jsonObject && StrUtil.isNotEmpty(jsonObject.getString("code"))){
+ String code = jsonObject.getString("code");
+ sb.append(" and a.code = '"+code+"'");
+ }else{
+ ts = DateUtil.dateToString(new Date(), "yyyy-MM-dd HH:mm:ss");
+ sb.append(" and a.update_time >= '"+ts+"'");
+ }
+
+ StringBuffer stringBuffer = new StringBuffer();
+ stringBuffer.append("select a.id as id, a.name as user_name, e.LOGIN_NAME as user_code FROM org_member a left join org_principal e on a.id = e.MEMBER_ID" +
+ " WHERE 1=1 " + sb.toString());
+ mdmModuleSourceEntity.setDataSourceCode(dbCode);
+ try {
+ List<HashMap<String, Object>> hashMaps = masterDataDaoImpl.queryArchivesByDataSource(stringBuffer.toString(),mdmModuleSourceEntity);
+ logger.info("查询出来的值为:{}",hashMaps);
+ if (null != hashMaps && hashMaps.size() > 0) {
+ ParametricAssembly(mdmModuleSourceEntity,hashMaps,"10003");
+ } else {
+ logger.info("U8C主数据用户档案没有需要同步中台的数据");
+ return null;
+ }
+ } catch (Exception e) {
+ logger.info("查询主数据档案用户档案错误:{}", e.getMessage());
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return BaseResult.getSuccessMessageEntity("用户档案同步成功");
+ }
+
+
+ //查询档案参数组装
+ public JsonResultEntity ParametricAssembly(MdmModuleSourceEntity mdmModuleSourceEntity,List<HashMap<String, Object>> hashMaps,String mdmCode){
+ for (HashMap<String, Object> hashMap : hashMaps) {
+ JSONObject jsonObjectUser = new JSONObject();
+ JSONObject jsonStr = new JSONObject();
+ jsonObjectUser.put("id", hashMap.get("id"));
+ jsonObjectUser.put("mdmCode", mdmCode);
+ jsonStr.put("jsonStr", jsonObjectUser);
+ //先查询编码和名称查询是否存在
+ JsonResultEntity jsonResultEntity = comparisonServiceimpl.queryEntityPage(jsonStr);
+ Object attribute = jsonResultEntity.getAttribute();
+ logger.info("得到的attribute值为：{}", attribute);
+ JSONObject jsonObjectAttribute = (JSONObject) JSON.toJSON(attribute);
+ JSONArray jsonArrayList = jsonObjectAttribute.getJSONArray("list");
+ //如果jsonArrayList为null，说明没有值，在表中不存在
+ if (jsonArrayList == null || jsonArrayList.size() == 0) {
+ //将查询出来得数据调用通用接口新增，保存到表中
+ JSONObject main = new JSONObject();
+ for(String key:hashMap.keySet()) {
+ main.put(key, hashMap.get(key));
+ }
+ jsonObjectUser.put("main", main);
+ jsonObjectUser.put("appName","数智中台");
+ jsonObjectUser.put("appCode","800004");
+ jsonObjectUser.put("optionName", "数智中台");
+ jsonStr.put("jsonStr", jsonObjectUser);
+ try {
+ comparisonServiceimpl.saveEntity(jsonStr);
+ } catch (Exception e) {
+ logger.info("U8C主数据档案新增用户档案失败,失败原因:{}",e.getMessage());
+ }
+ } else {
+ for (Object o : jsonArrayList) {
+ JSONObject jsonObjectUpdate = JSON.parseObject(String.valueOf(o));
+ String id = jsonObjectUpdate.getString("id");
+ JSONObject main = new JSONObject();
+ for(String key:hashMap.keySet()) {
+ main.put(key, hashMap.get(key));
+ main.put("id",id);
+ }
+ jsonObjectUser.put("main", main);
+ jsonObjectUser.put("appName","数智中台");
+ jsonObjectUser.put("appCode","800004");
+ jsonObjectUser.put("optionName", "数智中台");
+ jsonStr.put("jsonStr", jsonObjectUser);
+ try {
+ comparisonServiceimpl.updateEntity(jsonStr);
+ } catch (Exception e) {
+ logger.info("U8C主数据档案更新用户档案失败,失败原因:{}", e.getMessage());
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+}
From ddaacd38fd2cdfe34a399a29834dab6187305905 Mon Sep 17 00:00:00 2001
From: xiang2lin <251481237@qq.com>
Date: Fri, 21 Jun 2024 17:55:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?cap4=E6=97=A0=E6=B5=81=E7=A8=8B=E8=A1=A8?=
=?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../frame/seeyon/cap4/form/dto/FormDTO.java | 74 +++++++++++++++++++
.../seeyon/cap4/form/dto/FormDataDTO.java | 36 +++++++++
.../seeyon/cap4/form/dto/MasterTableDTO.java | 45 +++++++++++
.../frame/seeyon/cap4/form/dto/RecordDTO.java | 34 +++++++++
.../seeyon/cap4/form/dto/RecordFieldDTO.java | 52 +++++++++++++
.../seeyon/cap4/form/dto/SubTableDTO.java | 9 +++
6 files changed, 250 insertions(+)
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDTO.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDataDTO.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/MasterTableDTO.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordDTO.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordFieldDTO.java
create mode 100644 service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/SubTableDTO.java
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDTO.java b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDTO.java
new file mode 100644
index 00000000..e9fe54b8
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDTO.java
@@ -0,0 +1,74 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description 无流程表单批量保存请求参数
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:18
+ **/
+public class FormDTO {
+ @JSONField(ordinal = 4)
+ private String formCode;//模版编号
+ @JSONField(ordinal = 5)
+ private String loginName;//模版编号
+ @JSONField(ordinal = 2)
+ private String rightId;//权限id，找到无流程表单，点新增，弹出的窗口上会有这个参数
+ @JSONField(ordinal = 3)
+ private List<FormDataDTO> dataList;//导入的数据
+ @JSONField(ordinal = 1)
+ private String[] uniqueFiled;//更新用的唯一标识
+ @JSONField(ordinal = 6)
+ private Boolean doTrigger;//是否执行触发(Since V8.0sp2),测试中发现传了这个参数会报错
+
+ public String getFormCode() {
+ return formCode;
+ }
+
+ public void setFormCode(String formCode) {
+ this.formCode = formCode;
+ }
+
+ public String getLoginName() {
+ return loginName;
+ }
+
+ public void setLoginName(String loginName) {
+ this.loginName = loginName;
+ }
+
+ public String getRightId() {
+ return rightId;
+ }
+
+ public void setRightId(String rightId) {
+ this.rightId = rightId;
+ }
+
+ public List<FormDataDTO> getDataList() {
+ return dataList;
+ }
+
+ public void setDataList(List<FormDataDTO> dataList) {
+ this.dataList = dataList;
+ }
+
+ public String[] getUniqueFiled() {
+ return uniqueFiled;
+ }
+
+ public void setUniqueFiled(String[] uniqueFiled) {
+ this.uniqueFiled = uniqueFiled;
+ }
+
+ public Boolean getDoTrigger() {
+ return doTrigger;
+ }
+
+ public void setDoTrigger(Boolean doTrigger) {
+ this.doTrigger = doTrigger;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDataDTO.java b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDataDTO.java
new file mode 100644
index 00000000..b69031d6
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/FormDataDTO.java
@@ -0,0 +1,36 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description dataList节点
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:26
+ **/
+public class FormDataDTO {
+ @JSONField(ordinal = 1)
+ private MasterTableDTO masterTable;//主表数据
+ @JSONField(ordinal = 2)
+ private List<SubTableDTO> subTables;//子表数据
+
+ //private List<> attachmentInfos;//附件列表
+
+ public MasterTableDTO getMasterTable() {
+ return masterTable;
+ }
+
+ public void setMasterTable(MasterTableDTO masterTable) {
+ this.masterTable = masterTable;
+ }
+
+ public List<SubTableDTO> getSubTables() {
+ return subTables;
+ }
+
+ public void setSubTables(List<SubTableDTO> subTables) {
+ this.subTables = subTables;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/MasterTableDTO.java b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/MasterTableDTO.java
new file mode 100644
index 00000000..56f5f9fb
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/MasterTableDTO.java
@@ -0,0 +1,45 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description 主表数据
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:29
+ **/
+
+public class MasterTableDTO {
+ @JSONField(ordinal = 1)
+ private String name;//表名
+ @JSONField(ordinal = 2)
+ private RecordDTO record;//数据
+ @JSONField(ordinal = 3)
+ private List<String> changedFields;//需要计算的字段
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public RecordDTO getRecord() {
+ return record;
+ }
+
+ public void setRecord(RecordDTO record) {
+ this.record = record;
+ }
+
+ public List<String> getChangedFields() {
+ return changedFields;
+ }
+
+ public void setChangedFields(List<String> changedFields) {
+ this.changedFields = changedFields;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordDTO.java b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordDTO.java
new file mode 100644
index 00000000..cc3857e0
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordDTO.java
@@ -0,0 +1,34 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * @Description record节点
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:31
+ **/
+public class RecordDTO {
+ @JSONField(ordinal = 1)
+ private long id;//数据id，测试中发现新增时这个参数随便填写 不影响导入
+ @JSONField(ordinal = 2)
+ private List<RecordFieldDTO> fields;//字段列表
+
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public List<RecordFieldDTO> getFields() {
+ return fields;
+ }
+
+ public void setFields(List<RecordFieldDTO> fields) {
+ this.fields = fields;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordFieldDTO.java b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordFieldDTO.java
new file mode 100644
index 00000000..a2bfa15b
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/RecordFieldDTO.java
@@ -0,0 +1,52 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * @Description masterTable—record—fields的结构
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:32
+ **/
+public class RecordFieldDTO {
+ @JSONField(ordinal = 1)
+ private String name;//数据域名称 ,fieldxxxx
+ @JSONField(ordinal = 2)
+ private String value;//数据值（优先）
+ @JSONField(ordinal = 3)
+ private String showValue;//显示值
+
+ public RecordFieldDTO() {
+
+ }
+
+ public RecordFieldDTO(String name, String value, String showValue) {
+ this.name = name;
+ this.value = value;
+ this.showValue = showValue;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getShowValue() {
+ return showValue;
+ }
+
+ public void setShowValue(String showValue) {
+ this.showValue = showValue;
+ }
+}
diff --git a/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/SubTableDTO.java b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/SubTableDTO.java
new file mode 100644
index 00000000..8d5e5226
--- /dev/null
+++ b/service/src/main/java/com/hzya/frame/seeyon/cap4/form/dto/SubTableDTO.java
@@ -0,0 +1,9 @@
+package com.hzya.frame.seeyon.cap4.form.dto;
+
+/**
+ * @Description 子表数据
+ * @Author xiangerlin
+ * @Date 2024/1/8 11:29
+ **/
+public class SubTableDTO {
+}
From 7b40d8c0dc435e139cfce0d31d32e64a09f2d7cf Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Mon, 24 Jun 2024 10:30:23 +0800
Subject: [PATCH 3/4] =?UTF-8?q?MDM=E5=85=AC=E7=94=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/cfgHome/plugin/masterData/org/pluginCfg.xml | 6 ------
.../masterData/org/spring/spring-buildpackage-dao.xml | 5 -----
.../masterData/org/spring/spring-buildpackage-plugin.xml | 5 -----
.../masterData/org/spring/spring-buildpackage-service.xml | 5 -----
4 files changed, 21 deletions(-)
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml
deleted file mode 100644
index f2f50ef1..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmOrgPlugin</id>
-<name>MdmOrgPlugin插件</name>
-<category>90000001</category>
-</plugin>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml
deleted file mode 100644
index 134e2407..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmOrgDao" class="com.hzya.frame.plugin.masterData.org.dao.impl.MdmOrgDaoImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index a8e39d7b..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmOrgInitializer" class="com.hzya.frame.plugin.masterData.org.plugin.MdmOrgPluginInitializer" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml
deleted file mode 100644
index 9cea180a..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-service.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmOrgService" class="com.hzya.frame.plugin.masterData.org.service.impl.MdmOrgServiceImpl" />
-</beans>
From 7b8ce8e35a6ba09117c2ae1b4c22a10e67a9f34a Mon Sep 17 00:00:00 2001
From: yuqh <123456>
Date: Mon, 24 Jun 2024 10:30:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?MDM=E5=85=AC=E7=94=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/PayBillServiceImpl.java | 1 -
.../bank/dao/IMdmCustomerBankDao.java | 15 -
.../bank/dao/impl/MdmCustomerBankDaoImpl.java | 16 -
.../bank/entity/MdmCustomerBankEntity.java | 86 ----
.../bank/entity/MdmCustomerBankEntity.xml | 267 ----------
.../MdmCustomerBankPluginInitializer.java | 50 --
.../bank/service/IMdmCustomerBankService.java | 12 -
.../impl/MdmCustomerBankServiceImpl.java | 25 -
.../customer/dao/IMdmCustomerDao.java | 15 -
.../customer/dao/impl/MdmCustomerDaoImpl.java | 16 -
.../customer/service/IMdmCustomerService.java | 12 -
.../service/impl/MdmCustomerServiceImpl.java | 25 -
.../frame/plugin/masterData/dao/IMdmDao.java | 15 +
.../masterData/dao/impl/MdmDaoImpl.java | 15 +
.../MdmEntity.java} | 4 +-
.../MdmEntity.xml} | 20 +-
.../plugin/masterData/org/dao/IMdmOrgDao.java | 15 -
.../org/dao/impl/MdmOrgDaoImpl.java | 16 -
.../masterData/org/entity/MdmOrgEntity.java | 196 --------
.../masterData/org/entity/MdmOrgEntity.xml | 388 --------------
.../org/plugin/MdmOrgPluginInitializer.java | 62 ---
.../org/service/IMdmOrgService.java | 13 -
.../org/service/impl/MdmOrgServiceImpl.java | 26 -
.../MdmPluginInitializer.java} | 17 +-
.../project/dao/IMdmProjectDao.java | 16 -
.../project/dao/impl/MdmProjectDaoImpl.java | 17 -
.../project/entity/MdmProjectEntity.java | 186 -------
.../project/entity/MdmProjectEntity.xml | 377 --------------
.../plugin/MdmProjectPluginInitializer.java | 64 ---
.../project/service/IMdmProjectService.java | 13 -
.../service/impl/MdmProjectServiceImpl.java | 26 -
.../masterData/service/IMdmService.java | 12 +
.../service/impl/MdmServiceImpl.java | 24 +
.../masterData/user/dao/IMdmUserDao.java | 15 -
.../user/dao/impl/MdmUserDaoImpl.java | 15 -
.../masterData/user/entity/MdmUserEntity.java | 275 ----------
.../masterData/user/entity/MdmUserEntity.xml | 476 ------------------
.../user/plugin/MdmUserPluginInitializer.java | 61 ---
.../user/service/IMdmUserService.java | 13 -
.../user/service/impl/MdmUserServiceImpl.java | 23 -
.../masterData.customer.bank/pluginCfg.xml | 6 -
.../spring/spring-buildpackage-dao.xml | 5 -
.../spring/spring-buildpackage-plugin.xml | 5 -
.../spring/spring-buildpackage-service.xml | 5 -
.../plugin/masterData.customer/pluginCfg.xml | 6 -
.../plugin/masterData.project/pluginCfg.xml | 6 -
.../spring/spring-buildpackage-dao.xml | 5 -
.../spring/spring-buildpackage-plugin.xml | 5 -
.../spring/spring-buildpackage-service.xml | 5 -
.../spring/spring-buildpackage-dao.xml | 5 -
.../spring/spring-buildpackage-plugin.xml | 5 -
.../spring/spring-buildpackage-service.xml | 5 -
.../pluginCfg.xml | 4 +-
.../spring/spring-buildpackage-dao.xml | 2 +-
.../spring/spring-buildpackage-plugin.xml | 2 +-
.../spring/spring-buildpackage-service.xml | 2 +-
56 files changed, 92 insertions(+), 2921 deletions(-)
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java
rename buildpackage/src/main/java/com/hzya/frame/plugin/masterData/{customer/entity/MdmCustomerEntity.java => entity/MdmEntity.java} (97%)
rename buildpackage/src/main/java/com/hzya/frame/plugin/masterData/{customer/entity/MdmCustomerEntity.xml => entity/MdmEntity.xml} (97%)
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java
rename buildpackage/src/main/java/com/hzya/frame/plugin/masterData/{customer/plugin/MdmCustomerPluginInitializer.java => plugin/MdmPluginInitializer.java} (68%)
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java
create mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java
delete mode 100644 buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml
delete mode 100644 buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml
rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.user => masterData}/pluginCfg.xml (61%)
rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.customer => masterData}/spring/spring-buildpackage-dao.xml (84%)
rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.customer => masterData}/spring/spring-buildpackage-plugin.xml (80%)
rename buildpackage/src/main/resources/cfgHome/plugin/{masterData.customer => masterData}/spring/spring-buildpackage-service.xml (81%)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java
index 40b189b6..e6375473 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java
@@ -3,7 +3,6 @@ package com.hzya.frame.plugin.a8bill.service.impl;
import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.plugin.a8bill.entity.PayBillEntity;
import com.hzya.frame.plugin.a8bill.service.IPayBillService;
-import com.hzya.frame.plugin.masterData.org.service.IMdmOrgService;
/**
* private IMdmOrgDao mdmOrgDao;
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java
deleted file mode 100644
index d22d954a..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.bank.dao;
-
-import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
-
-/**
- * 客户银行(mdm_customer_bank: table)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-21 13:55:55
- */
-public interface IMdmCustomerBankDao extends IBaseDao<MdmCustomerBankEntity, String> {
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java
deleted file mode 100644
index 78161b29..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.bank.dao.impl;
-
-import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity;
-import com.hzya.frame.plugin.masterData.customer.bank.dao.IMdmCustomerBankDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-/**
- * 客户银行(MdmCustomerBank)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-21 13:55:55
- */
-public class MdmCustomerBankDaoImpl extends MybatisGenericDao<MdmCustomerBankEntity, String> implements IMdmCustomerBankDao{
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java
deleted file mode 100644
index 4c389315..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.bank.entity;
-
-import java.util.Date;
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 客户银行(MdmCustomerBank)实体类
- *
- * @author makejava
- * @since 2024-06-21 13:55:55
- */
-public class MdmCustomerBankEntity extends BaseEntity {
-
- /** formmain_id */
- private String formmainId;
- /** 数据状态 Y正常 N删除 F修改 */
- private String dataStatus;
- /** 公司id */
- private String companyId;
- /** 银行 */
- private String bank;
- /** 开户银行 */
- private String pkBankdoc;
- /** 账号 */
- private String accnum;
- /** 联行号 */
- private String combinenum;
-
-
- public String getFormmainId() {
- return formmainId;
- }
-
- public void setFormmainId(String formmainId) {
- this.formmainId = formmainId;
- }
-
- public String getDataStatus() {
- return dataStatus;
- }
-
- public void setDataStatus(String dataStatus) {
- this.dataStatus = dataStatus;
- }
-
- public String getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- }
-
- public String getBank() {
- return bank;
- }
-
- public void setBank(String bank) {
- this.bank = bank;
- }
-
- public String getPkBankdoc() {
- return pkBankdoc;
- }
-
- public void setPkBankdoc(String pkBankdoc) {
- this.pkBankdoc = pkBankdoc;
- }
-
- public String getAccnum() {
- return accnum;
- }
-
- public void setAccnum(String accnum) {
- this.accnum = accnum;
- }
-
- public String getCombinenum() {
- return combinenum;
- }
-
- public void setCombinenum(String combinenum) {
- this.combinenum = combinenum;
- }
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml
deleted file mode 100644
index 3689e8c9..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.plugin.masterData.customer.bank.dao.impl.MdmCustomerBankDaoImpl">
-
- <resultMap id="get-MdmCustomerBankEntity-result" type="com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity" >
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <result property="formmainId" column="formmain_id" jdbcType="VARCHAR"/>
- <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
- <result property="sorts" column="sorts" jdbcType="INTEGER"/>
- <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
- <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
- <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
- <result property="sts" column="sts" jdbcType="VARCHAR"/>
- <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
- <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
- <result property="bank" column="bank" jdbcType="VARCHAR"/>
- <result property="pkBankdoc" column="pk_bankdoc" jdbcType="VARCHAR"/>
- <result property="accnum" column="accnum" jdbcType="VARCHAR"/>
- <result property="combinenum" column="combinenum" jdbcType="VARCHAR"/>
- </resultMap>
- <!-- 查询的字段-->
- <sql id = "MdmCustomerBankEntity_Base_Column_List">
- id
- ,formmain_id
- ,data_status
- ,sorts
- ,create_user_id
- ,create_time
- ,modify_user_id
- ,modify_time
- ,sts
- ,org_id
- ,company_id
- ,bank
- ,pk_bankdoc
- ,accnum
- ,combinenum
- </sql>
- <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-MdmCustomerBankEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity">
- select
- <include refid="MdmCustomerBankEntity_Base_Column_List" />
- from mdm_customer_bank
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- <if test="bank != null and bank != ''"> and bank = #{bank} </if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> and pk_bankdoc = #{pkBankdoc} </if>
- <if test="accnum != null and accnum != ''"> and accnum = #{accnum} </if>
- <if test="combinenum != null and combinenum != ''"> and combinenum = #{combinenum} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity">
- select count(1) from mdm_customer_bank
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- <if test="bank != null and bank != ''"> and bank = #{bank} </if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> and pk_bankdoc = #{pkBankdoc} </if>
- <if test="accnum != null and accnum != ''"> and accnum = #{accnum} </if>
- <if test="combinenum != null and combinenum != ''"> and combinenum = #{combinenum} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
- </select>
-
- <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-MdmCustomerBankEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity">
- select
- <include refid="MdmCustomerBankEntity_Base_Column_List" />
- from mdm_customer_bank
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
- <if test="formmainId != null and formmainId != ''"> and formmain_id like concat('%',#{formmainId},'%') </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status like concat('%',#{dataStatus},'%') </if>
- <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
- <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
- <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
- <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
- <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
- <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
- <if test="bank != null and bank != ''"> and bank like concat('%',#{bank},'%') </if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> and pk_bankdoc like concat('%',#{pkBankdoc},'%') </if>
- <if test="accnum != null and accnum != ''"> and accnum like concat('%',#{accnum},'%') </if>
- <if test="combinenum != null and combinenum != ''"> and combinenum like concat('%',#{combinenum},'%') </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="MdmCustomerBankentity_list_or" resultMap="get-MdmCustomerBankEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity">
- select
- <include refid="MdmCustomerBankEntity_Base_Column_List" />
- from mdm_customer_bank
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> or id = #{id} </if>
- <if test="formmainId != null and formmainId != ''"> or formmain_id = #{formmainId} </if>
- <if test="dataStatus != null and dataStatus != ''"> or data_status = #{dataStatus} </if>
- <if test="sorts != null"> or sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> or create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> or modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> or sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
- <if test="bank != null and bank != ''"> or bank = #{bank} </if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> or pk_bankdoc = #{pkBankdoc} </if>
- <if test="accnum != null and accnum != ''"> or accnum = #{accnum} </if>
- <if test="combinenum != null and combinenum != ''"> or combinenum = #{combinenum} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity" keyProperty="id" useGeneratedKeys="true">
- insert into mdm_customer_bank(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> id , </if>
- <if test="formmainId != null and formmainId != ''"> formmain_id , </if>
- <if test="dataStatus != null and dataStatus != ''"> data_status , </if>
- <if test="sorts != null"> sorts , </if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
- <if test="create_time != null"> create_time , </if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
- <if test="modify_time != null"> modify_time , </if>
- <if test="sts != null and sts != ''"> sts , </if>
- <if test="org_id != null and org_id != ''"> org_id , </if>
- <if test="companyId != null and companyId != ''"> company_id , </if>
- <if test="bank != null and bank != ''"> bank , </if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> pk_bankdoc , </if>
- <if test="accnum != null and accnum != ''"> accnum , </if>
- <if test="combinenum != null and combinenum != ''"> combinenum , </if>
- <if test="sorts == null ">sorts,</if>
- <if test="sts == null ">sts,</if>
- </trim>
- )values(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> #{id} ,</if>
- <if test="formmainId != null and formmainId != ''"> #{formmainId} ,</if>
- <if test="dataStatus != null and dataStatus != ''"> #{dataStatus} ,</if>
- <if test="sorts != null"> #{sorts} ,</if>
- <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
- <if test="create_time != null"> #{create_time} ,</if>
- <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
- <if test="modify_time != null"> #{modify_time} ,</if>
- <if test="sts != null and sts != ''"> #{sts} ,</if>
- <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
- <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
- <if test="bank != null and bank != ''"> #{bank} ,</if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> #{pkBankdoc} ,</if>
- <if test="accnum != null and accnum != ''"> #{accnum} ,</if>
- <if test="combinenum != null and combinenum != ''"> #{combinenum} ,</if>
- <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_customer_bank a WHERE a.sts = 'Y' ),</if>
- <if test="sts == null ">'Y',</if>
- </trim>
- )
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" keyProperty="id" useGeneratedKeys="true">
- insert into mdm_customer_bank(formmain_id, data_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, bank, pk_bankdoc, accnum, combinenum, sts)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.formmainId},#{entity.dataStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.bank},#{entity.pkBankdoc},#{entity.accnum},#{entity.combinenum}, 'Y')
- </foreach>
-</insert>
-<!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
- insert into mdm_customer_bank(formmain_id, data_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, bank, pk_bankdoc, accnum, combinenum)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.formmainId},#{entity.dataStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.bank},#{entity.pkBankdoc},#{entity.accnum},#{entity.combinenum})
- </foreach>
- on duplicate key update
- formmain_id = values(formmain_id),
- data_status = values(data_status),
- create_user_id = values(create_user_id),
- create_time = values(create_time),
- modify_user_id = values(modify_user_id),
- modify_time = values(modify_time),
- sts = values(sts),
- org_id = values(org_id),
- company_id = values(company_id),
- bank = values(bank),
- pk_bankdoc = values(pk_bankdoc),
- accnum = values(accnum),
- combinenum = values(combinenum)</insert>
-<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity" >
-update mdm_customer_bank set
-<trim suffix="" suffixOverrides=",">
- <if test="formmainId != null and formmainId != ''"> formmain_id = #{formmainId},</if>
- <if test="dataStatus != null and dataStatus != ''"> data_status = #{dataStatus},</if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
- <if test="create_time != null"> create_time = #{create_time},</if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
- <if test="modify_time != null"> modify_time = #{modify_time},</if>
- <if test="sts != null and sts != ''"> sts = #{sts},</if>
- <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
- <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
- <if test="bank != null and bank != ''"> bank = #{bank},</if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> pk_bankdoc = #{pkBankdoc},</if>
- <if test="accnum != null and accnum != ''"> accnum = #{accnum},</if>
- <if test="combinenum != null and combinenum != ''"> combinenum = #{combinenum},</if>
-</trim>
-where id = #{id}
-</update>
-<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity" >
-update mdm_customer_bank set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity" >
-update mdm_customer_bank set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="formmainId != null and formmainId != ''"> and formmain_id = #{formmainId} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- <if test="bank != null and bank != ''"> and bank = #{bank} </if>
- <if test="pkBankdoc != null and pkBankdoc != ''"> and pk_bankdoc = #{pkBankdoc} </if>
- <if test="accnum != null and accnum != ''"> and accnum = #{accnum} </if>
- <if test="combinenum != null and combinenum != ''"> and combinenum = #{combinenum} </if>
- and sts='Y'
- </trim>
-</update>
-<!--通过主键删除-->
-<delete id="entity_delete">
- delete from mdm_customer_bank where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java
deleted file mode 100644
index e62824b8..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.bank.plugin;
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.base.PluginBaseEntity;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-/**
- * 客户银行(MdmCustomerBank)表服务接口
- *
- * @author makejava
- * @since 2024-06-21 13:55:55
- */
-public class MdmCustomerBankPluginInitializer extends PluginBaseEntity{
- Logger logger = LoggerFactory.getLogger(MdmCustomerBankPluginInitializer.class);
-
- @Override
- public void initialize() {
- logger.info(getPluginLabel() + "執行初始化方法initialize()");
- }
-
- @Override
- public void destroy() {
- logger.info(getPluginLabel() + "執行銷毀方法destroy()");
- }
-
- @Override
- public String getPluginId() {
- return "MdmCustomerBankPlugin";
- }
-
- @Override
- public String getPluginName() {
- return "MdmCustomerBankPlugin插件";
- }
-
- @Override
- public String getPluginLabel() {
- return "MdmCustomerBankPlugin";
- }
-
- @Override
- public String getPluginType() {
- return "1";
- }
- @Override
- public JsonResultEntity executeBusiness(JSONObject requestJson) {
- logger.info("执行业务代码逻辑");
- return null;
- }
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java
deleted file mode 100644
index b1be580d..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.bank.service;
-
-import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-/**
- * 客户银行(MdmCustomerBank)表服务接口
- *
- * @author makejava
- * @since 2024-06-21 13:55:55
- */
-public interface IMdmCustomerBankService extends IBaseService<MdmCustomerBankEntity, String>{
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java
deleted file mode 100644
index 11fe5130..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.bank.service.impl;
-
-import com.hzya.frame.plugin.masterData.customer.bank.entity.MdmCustomerBankEntity;
-import com.hzya.frame.plugin.masterData.customer.bank.dao.IMdmCustomerBankDao;
-import com.hzya.frame.plugin.masterData.customer.bank.service.IMdmCustomerBankService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-/**
- * 客户银行(MdmCustomerBank)表服务实现类
- *
- * @author makejava
- * @since 2024-06-21 13:55:55
- */
-public class MdmCustomerBankServiceImpl extends BaseService<MdmCustomerBankEntity, String> implements IMdmCustomerBankService {
-
- private IMdmCustomerBankDao mdmCustomerBankDao;
-
- @Autowired
- public void setMdmCustomerBankDao(IMdmCustomerBankDao dao) {
- this.mdmCustomerBankDao = dao;
- this.dao = dao;
- }
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java
deleted file mode 100644
index 8b8ae96e..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.dao;
-
-import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity;
-import com.hzya.frame.basedao.dao.IBaseDao;
-
-/**
- * 客户档案(mdm_customer: table)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-21 13:52:35
- */
-public interface IMdmCustomerDao extends IBaseDao<MdmCustomerEntity, String> {
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java
deleted file mode 100644
index 8899979b..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.dao.impl;
-
-import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity;
-import com.hzya.frame.plugin.masterData.customer.dao.IMdmCustomerDao;
-import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-/**
- * 客户档案(MdmCustomer)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-21 13:52:35
- */
-public class MdmCustomerDaoImpl extends MybatisGenericDao<MdmCustomerEntity, String> implements IMdmCustomerDao{
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java
deleted file mode 100644
index 83ea4dfe..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.service;
-
-import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity;
-import com.hzya.frame.basedao.service.IBaseService;
-/**
- * 客户档案(MdmCustomer)表服务接口
- *
- * @author makejava
- * @since 2024-06-21 13:52:35
- */
-public interface IMdmCustomerService extends IBaseService<MdmCustomerEntity, String>{
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java
deleted file mode 100644
index 6e48b6d1..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.hzya.frame.plugin.masterData.customer.service.impl;
-
-import com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity;
-import com.hzya.frame.plugin.masterData.customer.dao.IMdmCustomerDao;
-import com.hzya.frame.plugin.masterData.customer.service.IMdmCustomerService;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.annotation.Resource;
-import com.hzya.frame.basedao.service.impl.BaseService;
-/**
- * 客户档案(MdmCustomer)表服务实现类
- *
- * @author makejava
- * @since 2024-06-21 13:52:35
- */
-public class MdmCustomerServiceImpl extends BaseService<MdmCustomerEntity, String> implements IMdmCustomerService {
-
- private IMdmCustomerDao mdmCustomerDao;
-
- @Autowired
- public void setMdmCustomerDao(IMdmCustomerDao dao) {
- this.mdmCustomerDao = dao;
- this.dao = dao;
- }
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java
new file mode 100644
index 00000000..b69adb80
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/IMdmDao.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.plugin.masterData.dao;
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.plugin.masterData.entity.MdmEntity;
+
+/**
+ * 客户档案(mdm_customer: table)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public interface IMdmDao extends IBaseDao<MdmEntity, String> {
+
+}
+
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java
new file mode 100644
index 00000000..05e95b1e
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java
@@ -0,0 +1,15 @@
+package com.hzya.frame.plugin.masterData.dao.impl;
+
+import com.hzya.frame.plugin.masterData.entity.MdmEntity;
+import com.hzya.frame.plugin.masterData.dao.IMdmDao;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+/**
+ * 客户档案(MdmCustomer)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public class MdmDaoImpl extends MybatisGenericDao<MdmEntity, String> implements IMdmDao {
+
+}
+
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java
similarity index 97%
rename from buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java
rename to buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java
index 7e61cc1c..e8d7f6f9 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java
@@ -1,4 +1,4 @@
-package com.hzya.frame.plugin.masterData.customer.entity;
+package com.hzya.frame.plugin.masterData.entity;
import java.util.Date;
import com.hzya.frame.web.entity.BaseEntity;
@@ -8,7 +8,7 @@ import com.hzya.frame.web.entity.BaseEntity;
* @author makejava
* @since 2024-06-21 13:52:35
*/
-public class MdmCustomerEntity extends BaseEntity {
+public class MdmEntity extends BaseEntity {
/** 单据规则 */
private String documentRule;
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml
similarity index 97%
rename from buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml
rename to buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml
index 41c3a4ff..245f4a02 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/entity/MdmCustomerEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.plugin.masterData.customer.dao.impl.MdmCustomerDaoImpl">
+<mapper namespace="com.hzya.frame.plugin.masterData.dao.impl.MdmDaoImpl">
- <resultMap id="get-MdmCustomerEntity-result" type="com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity" >
+ <resultMap id="get-MdmCustomerEntity-result" type="com.hzya.frame.plugin.masterData.customer.entity.MdmEntity" >
<result property="id" column="id" jdbcType="VARCHAR"/>
<result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
<result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
@@ -58,7 +58,7 @@
,taxpayerid
</sql>
<!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-MdmCustomerEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity">
+ <select id="entity_list_base" resultMap="get-MdmCustomerEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity">
select
<include refid="MdmCustomerEntity_Base_Column_List" />
from mdm_customer
@@ -95,7 +95,7 @@
</select>
<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity">
+<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity">
select count(1) from mdm_customer
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
@@ -130,7 +130,7 @@
</select>
<!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-MdmCustomerEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity">
+<select id="entity_list_like" resultMap="get-MdmCustomerEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity">
select
<include refid="MdmCustomerEntity_Base_Column_List" />
from mdm_customer
@@ -167,7 +167,7 @@
</select>
<!-- 查询列表 字段采用or格式 -->
-<select id="MdmCustomerentity_list_or" resultMap="get-MdmCustomerEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity">
+<select id="MdmCustomerentity_list_or" resultMap="get-MdmCustomerEntity-result" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity">
select
<include refid="MdmCustomerEntity_Base_Column_List" />
from mdm_customer
@@ -204,7 +204,7 @@
</select>
<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity" keyProperty="id" useGeneratedKeys="true">
+<insert id="entity_insert" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity" keyProperty="id" useGeneratedKeys="true">
insert into mdm_customer(
<trim suffix="" suffixOverrides=",">
<if test="id != null and id != ''"> id , </if>
@@ -307,7 +307,7 @@
pk_org = values(pk_org),
taxpayerid = values(taxpayerid)</insert>
<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity" >
+<update id="entity_update" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity" >
update mdm_customer set
<trim suffix="" suffixOverrides=",">
<if test="documentRule != null and documentRule != ''"> document_rule = #{documentRule},</if>
@@ -337,12 +337,12 @@ update mdm_customer set
where id = #{id}
</update>
<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity" >
+<update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity" >
update mdm_customer set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
where id = #{id}
</update>
<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmCustomerEntity" >
+<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.masterData.customer.entity.MdmEntity" >
update mdm_customer set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="id != null and id != ''"> and id = #{id} </if>
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
deleted file mode 100644
index bfe0e1cd..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.plugin.masterData.org.dao;
-
-import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity;
-
-/**
- * 组织档案(mdm_org: table)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-07 18:30:04
- */
-public interface IMdmOrgDao extends IBaseDao<MdmOrgEntity, String> {
-
-}
-
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
deleted file mode 100644
index dc0271b5..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hzya.frame.plugin.masterData.org.dao.impl;
-
-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;
-/**
- * 组织档案(MdmOrg)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-07 18:30:04
- */
-public class MdmOrgDaoImpl extends MybatisGenericDao<MdmOrgEntity, String> 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
deleted file mode 100644
index 55aa6f31..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.hzya.frame.plugin.masterData.org.entity;
-
-import java.util.Date;
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 组织档案(MdmOrg)实体类
- *
- * @author makejava
- * @since 2024-06-07 18:30:04
- */
-public class MdmOrgEntity extends BaseEntity {
-
- /** 单据规则 */
- private String documentRule;
- /** 单据规则流水号 */
- private Long documentRuleNum;
- /** 组织编码 */
- private String orgCode;
- /** 组织名称 */
- private String orgName;
- /** 地址 */
- private String orgAddress;
- /** 国家地区 */
- private String orgCountryzone;
- /** 内部编码 */
- private String orgInnercode;
- /** 说明 */
- private String orgMemo;
- /** 助记码 */
- private String orgMnecode;
- /** 所属行业 */
- private String orgNcindustry;
- /** 上级业务单元 */
- private String orgFatherorg;
- /** 负责人 */
- private String orgPrincipal;
- /** 电话 */
- private String orgTel;
- /** 数据状态 Y正常 N删除 F修改 */
- private String dataStatus;
- /** 新增数据状态 0待下发 1已下发 */
- private String addStatus;
- /** 修改数据状态 0待下发 1已下发 */
- private String updateStatus;
- /** 删除数据状态 0待下发 1已下发 */
- private String deleteStatus;
- /** 公司id */
- private String companyId;
-
-
- public String getDocumentRule() {
- return documentRule;
- }
-
- public void setDocumentRule(String documentRule) {
- this.documentRule = documentRule;
- }
-
- public Long getDocumentRuleNum() {
- return documentRuleNum;
- }
-
- public void setDocumentRuleNum(Long documentRuleNum) {
- this.documentRuleNum = documentRuleNum;
- }
-
- public String getOrgCode() {
- return orgCode;
- }
-
- public void setOrgCode(String orgCode) {
- this.orgCode = orgCode;
- }
-
- public String getOrgName() {
- return orgName;
- }
-
- public void setOrgName(String orgName) {
- this.orgName = orgName;
- }
-
- public String getOrgAddress() {
- return orgAddress;
- }
-
- public void setOrgAddress(String orgAddress) {
- this.orgAddress = orgAddress;
- }
-
- public String getOrgCountryzone() {
- return orgCountryzone;
- }
-
- public void setOrgCountryzone(String orgCountryzone) {
- this.orgCountryzone = orgCountryzone;
- }
-
- public String getOrgInnercode() {
- return orgInnercode;
- }
-
- public void setOrgInnercode(String orgInnercode) {
- this.orgInnercode = orgInnercode;
- }
-
- public String getOrgMemo() {
- return orgMemo;
- }
-
- public void setOrgMemo(String orgMemo) {
- this.orgMemo = orgMemo;
- }
-
- public String getOrgMnecode() {
- return orgMnecode;
- }
-
- public void setOrgMnecode(String orgMnecode) {
- this.orgMnecode = orgMnecode;
- }
-
- public String getOrgNcindustry() {
- return orgNcindustry;
- }
-
- public void setOrgNcindustry(String orgNcindustry) {
- this.orgNcindustry = orgNcindustry;
- }
-
- public String getOrgFatherorg() {
- return orgFatherorg;
- }
-
- public void setOrgFatherorg(String orgFatherorg) {
- this.orgFatherorg = orgFatherorg;
- }
-
- public String getOrgPrincipal() {
- return orgPrincipal;
- }
-
- public void setOrgPrincipal(String orgPrincipal) {
- this.orgPrincipal = orgPrincipal;
- }
-
- public String getOrgTel() {
- return orgTel;
- }
-
- public void setOrgTel(String orgTel) {
- this.orgTel = orgTel;
- }
-
- public String getDataStatus() {
- return dataStatus;
- }
-
- public void setDataStatus(String dataStatus) {
- this.dataStatus = dataStatus;
- }
-
- public String getAddStatus() {
- return addStatus;
- }
-
- public void setAddStatus(String addStatus) {
- this.addStatus = addStatus;
- }
-
- public String getUpdateStatus() {
- return updateStatus;
- }
-
- public void setUpdateStatus(String updateStatus) {
- this.updateStatus = updateStatus;
- }
-
- public String getDeleteStatus() {
- return deleteStatus;
- }
-
- public void setDeleteStatus(String deleteStatus) {
- this.deleteStatus = deleteStatus;
- }
-
- public String getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- }
-
-}
-
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
deleted file mode 100644
index ed02fdf9..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.plugin.masterData.org.dao.impl.MdmOrgDaoImpl">
-
- <resultMap id="get-MdmOrgEntity-result" type="com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity" >
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
- <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
- <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
- <result property="orgName" column="org_name" jdbcType="VARCHAR"/>
- <result property="orgAddress" column="org_address" jdbcType="VARCHAR"/>
- <result property="orgCountryzone" column="org_countryzone" jdbcType="VARCHAR"/>
- <result property="orgInnercode" column="org_innercode" jdbcType="VARCHAR"/>
- <result property="orgMemo" column="org_memo" jdbcType="VARCHAR"/>
- <result property="orgMnecode" column="org_mnecode" jdbcType="VARCHAR"/>
- <result property="orgNcindustry" column="org_ncindustry" jdbcType="VARCHAR"/>
- <result property="orgFatherorg" column="org_fatherorg" jdbcType="VARCHAR"/>
- <result property="orgPrincipal" column="org_principal" jdbcType="VARCHAR"/>
- <result property="orgTel" column="org_tel" jdbcType="VARCHAR"/>
- <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
- <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
- <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
- <result property="deleteStatus" column="delete_status" jdbcType="VARCHAR"/>
- <result property="sorts" column="sorts" jdbcType="INTEGER"/>
- <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
- <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
- <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
- <result property="sts" column="sts" jdbcType="VARCHAR"/>
- <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
- <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
- </resultMap>
- <!-- 查询的字段-->
- <sql id = "MdmOrgEntity_Base_Column_List">
- id
- ,document_rule
- ,document_rule_num
- ,org_code
- ,org_name
- ,org_address
- ,org_countryzone
- ,org_innercode
- ,org_memo
- ,org_mnecode
- ,org_ncindustry
- ,org_fatherorg
- ,org_principal
- ,org_tel
- ,data_status
- ,add_status
- ,update_status
- ,delete_status
- ,sorts
- ,create_user_id
- ,create_time
- ,modify_user_id
- ,modify_time
- ,sts
- ,org_id
- ,company_id
- </sql>
- <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-MdmOrgEntity-result" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity">
- select
- <include refid="MdmOrgEntity_Base_Column_List" />
- from mdm_org
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode} </if>
- <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
- <if test="orgAddress != null and orgAddress != ''"> and org_address = #{orgAddress} </if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone = #{orgCountryzone} </if>
- <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode = #{orgInnercode} </if>
- <if test="orgMemo != null and orgMemo != ''"> and org_memo = #{orgMemo} </if>
- <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode = #{orgMnecode} </if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry = #{orgNcindustry} </if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg = #{orgFatherorg} </if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal = #{orgPrincipal} </if>
- <if test="orgTel != null and orgTel != ''"> and org_tel = #{orgTel} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity">
- select count(1) from mdm_org
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode} </if>
- <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
- <if test="orgAddress != null and orgAddress != ''"> and org_address = #{orgAddress} </if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone = #{orgCountryzone} </if>
- <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode = #{orgInnercode} </if>
- <if test="orgMemo != null and orgMemo != ''"> and org_memo = #{orgMemo} </if>
- <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode = #{orgMnecode} </if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry = #{orgNcindustry} </if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg = #{orgFatherorg} </if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal = #{orgPrincipal} </if>
- <if test="orgTel != null and orgTel != ''"> and org_tel = #{orgTel} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
- </select>
-
- <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-MdmOrgEntity-result" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity">
- select
- <include refid="MdmOrgEntity_Base_Column_List" />
- from mdm_org
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule like concat('%',#{documentRule},'%') </if>
- <if test="documentRuleNum != null"> and document_rule_num like concat('%',#{documentRuleNum},'%') </if>
- <if test="orgCode != null and orgCode != ''"> and org_code like concat('%',#{orgCode},'%') </if>
- <if test="orgName != null and orgName != ''"> and org_name like concat('%',#{orgName},'%') </if>
- <if test="orgAddress != null and orgAddress != ''"> and org_address like concat('%',#{orgAddress},'%') </if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone like concat('%',#{orgCountryzone},'%') </if>
- <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode like concat('%',#{orgInnercode},'%') </if>
- <if test="orgMemo != null and orgMemo != ''"> and org_memo like concat('%',#{orgMemo},'%') </if>
- <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode like concat('%',#{orgMnecode},'%') </if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry like concat('%',#{orgNcindustry},'%') </if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg like concat('%',#{orgFatherorg},'%') </if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal like concat('%',#{orgPrincipal},'%') </if>
- <if test="orgTel != null and orgTel != ''"> and org_tel like concat('%',#{orgTel},'%') </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status like concat('%',#{dataStatus},'%') </if>
- <if test="addStatus != null and addStatus != ''"> and add_status like concat('%',#{addStatus},'%') </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status like concat('%',#{updateStatus},'%') </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status like concat('%',#{deleteStatus},'%') </if>
- <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
- <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
- <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
- <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
- <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
- <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="MdmOrgentity_list_or" resultMap="get-MdmOrgEntity-result" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity">
- select
- <include refid="MdmOrgEntity_Base_Column_List" />
- from mdm_org
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> or id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> or document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> or document_rule_num = #{documentRuleNum} </if>
- <if test="orgCode != null and orgCode != ''"> or org_code = #{orgCode} </if>
- <if test="orgName != null and orgName != ''"> or org_name = #{orgName} </if>
- <if test="orgAddress != null and orgAddress != ''"> or org_address = #{orgAddress} </if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> or org_countryzone = #{orgCountryzone} </if>
- <if test="orgInnercode != null and orgInnercode != ''"> or org_innercode = #{orgInnercode} </if>
- <if test="orgMemo != null and orgMemo != ''"> or org_memo = #{orgMemo} </if>
- <if test="orgMnecode != null and orgMnecode != ''"> or org_mnecode = #{orgMnecode} </if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> or org_ncindustry = #{orgNcindustry} </if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> or org_fatherorg = #{orgFatherorg} </if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> or org_principal = #{orgPrincipal} </if>
- <if test="orgTel != null and orgTel != ''"> or org_tel = #{orgTel} </if>
- <if test="dataStatus != null and dataStatus != ''"> or data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> or add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> or update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> or delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> or sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> or create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> or modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> or sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity" >
- insert into mdm_org(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> id , </if>
- <if test="documentRule != null and documentRule != ''"> document_rule , </if>
- <if test="documentRuleNum != null"> document_rule_num , </if>
- <if test="orgCode != null and orgCode != ''"> org_code , </if>
- <if test="orgName != null and orgName != ''"> org_name , </if>
- <if test="orgAddress != null and orgAddress != ''"> org_address , </if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> org_countryzone , </if>
- <if test="orgInnercode != null and orgInnercode != ''"> org_innercode , </if>
- <if test="orgMemo != null and orgMemo != ''"> org_memo , </if>
- <if test="orgMnecode != null and orgMnecode != ''"> org_mnecode , </if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> org_ncindustry , </if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> org_fatherorg , </if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> org_principal , </if>
- <if test="orgTel != null and orgTel != ''"> org_tel , </if>
- <if test="dataStatus != null and dataStatus != ''"> data_status , </if>
- <if test="addStatus != null and addStatus != ''"> add_status , </if>
- <if test="updateStatus != null and updateStatus != ''"> update_status , </if>
- <if test="deleteStatus != null and deleteStatus != ''"> delete_status , </if>
- <if test="sorts != null"> sorts , </if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
- <if test="create_time != null"> create_time , </if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
- <if test="modify_time != null"> modify_time , </if>
- <if test="sts != null and sts != ''"> sts , </if>
- <if test="org_id != null and org_id != ''"> org_id , </if>
- <if test="companyId != null and companyId != ''"> company_id , </if>
- <if test="sorts == null ">sorts,</if>
- <if test="sts == null ">sts,</if>
- </trim>
- )values(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> #{id} ,</if>
- <if test="documentRule != null and documentRule != ''"> #{documentRule} ,</if>
- <if test="documentRuleNum != null"> #{documentRuleNum} ,</if>
- <if test="orgCode != null and orgCode != ''"> #{orgCode} ,</if>
- <if test="orgName != null and orgName != ''"> #{orgName} ,</if>
- <if test="orgAddress != null and orgAddress != ''"> #{orgAddress} ,</if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> #{orgCountryzone} ,</if>
- <if test="orgInnercode != null and orgInnercode != ''"> #{orgInnercode} ,</if>
- <if test="orgMemo != null and orgMemo != ''"> #{orgMemo} ,</if>
- <if test="orgMnecode != null and orgMnecode != ''"> #{orgMnecode} ,</if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> #{orgNcindustry} ,</if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> #{orgFatherorg} ,</if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> #{orgPrincipal} ,</if>
- <if test="orgTel != null and orgTel != ''"> #{orgTel} ,</if>
- <if test="dataStatus != null and dataStatus != ''"> #{dataStatus} ,</if>
- <if test="addStatus != null and addStatus != ''"> #{addStatus} ,</if>
- <if test="updateStatus != null and updateStatus != ''"> #{updateStatus} ,</if>
- <if test="deleteStatus != null and deleteStatus != ''"> #{deleteStatus} ,</if>
- <if test="sorts != null"> #{sorts} ,</if>
- <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
- <if test="create_time != null"> #{create_time} ,</if>
- <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
- <if test="modify_time != null"> #{modify_time} ,</if>
- <if test="sts != null and sts != ''"> #{sts} ,</if>
- <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
- <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
- <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_org a WHERE a.sts = 'Y' ),</if>
- <if test="sts == null ">'Y',</if>
- </trim>
- )
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" >
- insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
- </foreach>
-</insert>
-<!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch" >
- insert into mdm_org(document_rule, document_rule_num, org_code, org_name, org_address, org_countryzone, org_innercode, org_memo, org_mnecode, org_ncindustry, org_fatherorg, org_principal, org_tel, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.documentRule},#{entity.documentRuleNum},#{entity.orgCode},#{entity.orgName},#{entity.orgAddress},#{entity.orgCountryzone},#{entity.orgInnercode},#{entity.orgMemo},#{entity.orgMnecode},#{entity.orgNcindustry},#{entity.orgFatherorg},#{entity.orgPrincipal},#{entity.orgTel},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
- </foreach>
- on duplicate key update
- document_rule = values(document_rule),
- document_rule_num = values(document_rule_num),
- org_code = values(org_code),
- org_name = values(org_name),
- org_address = values(org_address),
- org_countryzone = values(org_countryzone),
- org_innercode = values(org_innercode),
- org_memo = values(org_memo),
- org_mnecode = values(org_mnecode),
- org_ncindustry = values(org_ncindustry),
- org_fatherorg = values(org_fatherorg),
- org_principal = values(org_principal),
- org_tel = values(org_tel),
- data_status = values(data_status),
- add_status = values(add_status),
- update_status = values(update_status),
- delete_status = values(delete_status),
- create_user_id = values(create_user_id),
- create_time = values(create_time),
- modify_user_id = values(modify_user_id),
- modify_time = values(modify_time),
- sts = values(sts),
- org_id = values(org_id),
- company_id = values(company_id)</insert>
-<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity" >
-update mdm_org set
-<trim suffix="" suffixOverrides=",">
- <if test="documentRule != null and documentRule != ''"> document_rule = #{documentRule},</if>
- <if test="documentRuleNum != null"> document_rule_num = #{documentRuleNum},</if>
- <if test="orgCode != null and orgCode != ''"> org_code = #{orgCode},</if>
- <if test="orgName != null and orgName != ''"> org_name = #{orgName},</if>
- <if test="orgAddress != null and orgAddress != ''"> org_address = #{orgAddress},</if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> org_countryzone = #{orgCountryzone},</if>
- <if test="orgInnercode != null and orgInnercode != ''"> org_innercode = #{orgInnercode},</if>
- <if test="orgMemo != null and orgMemo != ''"> org_memo = #{orgMemo},</if>
- <if test="orgMnecode != null and orgMnecode != ''"> org_mnecode = #{orgMnecode},</if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> org_ncindustry = #{orgNcindustry},</if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> org_fatherorg = #{orgFatherorg},</if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> org_principal = #{orgPrincipal},</if>
- <if test="orgTel != null and orgTel != ''"> org_tel = #{orgTel},</if>
- <if test="dataStatus != null and dataStatus != ''"> data_status = #{dataStatus},</if>
- <if test="addStatus != null and addStatus != ''"> add_status = #{addStatus},</if>
- <if test="updateStatus != null and updateStatus != ''"> update_status = #{updateStatus},</if>
- <if test="deleteStatus != null and deleteStatus != ''"> delete_status = #{deleteStatus},</if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
- <if test="create_time != null"> create_time = #{create_time},</if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
- <if test="modify_time != null"> modify_time = #{modify_time},</if>
- <if test="sts != null and sts != ''"> sts = #{sts},</if>
- <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
- <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
-</trim>
-where id = #{id}
-</update>
-<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity" >
-update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity" >
-update mdm_org set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="orgCode != null and orgCode != ''"> and org_code = #{orgCode} </if>
- <if test="orgName != null and orgName != ''"> and org_name = #{orgName} </if>
- <if test="orgAddress != null and orgAddress != ''"> and org_address = #{orgAddress} </if>
- <if test="orgCountryzone != null and orgCountryzone != ''"> and org_countryzone = #{orgCountryzone} </if>
- <if test="orgInnercode != null and orgInnercode != ''"> and org_innercode = #{orgInnercode} </if>
- <if test="orgMemo != null and orgMemo != ''"> and org_memo = #{orgMemo} </if>
- <if test="orgMnecode != null and orgMnecode != ''"> and org_mnecode = #{orgMnecode} </if>
- <if test="orgNcindustry != null and orgNcindustry != ''"> and org_ncindustry = #{orgNcindustry} </if>
- <if test="orgFatherorg != null and orgFatherorg != ''"> and org_fatherorg = #{orgFatherorg} </if>
- <if test="orgPrincipal != null and orgPrincipal != ''"> and org_principal = #{orgPrincipal} </if>
- <if test="orgTel != null and orgTel != ''"> and org_tel = #{orgTel} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- and sts='Y'
- </trim>
-</update>
-<!--通过主键删除-->
-<delete id="entity_delete">
- delete from mdm_org where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java
deleted file mode 100644
index f4e7c8f6..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/plugin/MdmOrgPluginInitializer.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.hzya.frame.plugin.masterData.org.plugin;
-
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.base.PluginBaseEntity;
-import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataOrgsServiceImpl;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 组织档案(MdmOrg)表服务接口
- *
- * @author makejava
- * @since 2024-06-07 18:30:05
- */
-public class MdmOrgPluginInitializer extends PluginBaseEntity{
- Logger logger = LoggerFactory.getLogger(MdmOrgPluginInitializer.class);
- @Autowired
- private MasterDataOrgsServiceImpl masterDataOrgsService;
-
- @Override
- public void initialize() {
- logger.info(getPluginLabel() + "執行初始化方法initialize()");
- }
-
- @Override
- public void destroy() {
- logger.info(getPluginLabel() + "執行銷毀方法destroy()");
- }
-
- @Override
- public String getPluginId() {
- return "MdmOrgPlugin";
- }
-
- @Override
- public String getPluginName() {
- return "MdmOrgPlugin插件";
- }
-
- @Override
- public String getPluginLabel() {
- return "MdmOrgPlugin";
- }
-
- @Override
- public String getPluginType() {
- return "1";
- }
- @Override
- public JsonResultEntity executeBusiness(JSONObject requestJson) {
- try {
- logger.info("======开始执行主数据档案组织档案同步========");
- return masterDataOrgsService.queryOrgsArchives(requestJson);
- }catch (Exception e){
- logger.info("======执行主数据档案组织档案同步失败:{}========",e.getMessage());
- e.printStackTrace();
- }
- return null;
- }
-}
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
deleted file mode 100644
index fa37d8cd..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hzya.frame.plugin.masterData.org.service;
-
-import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.plugin.masterData.org.entity.MdmOrgEntity;
-
-/**
- * 组织档案(MdmOrg)表服务接口
- *
- * @author makejava
- * @since 2024-06-07 18:30:05
- */
-public interface IMdmOrgService extends IBaseService<MdmOrgEntity, String>{
-}
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
deleted file mode 100644
index f4f543ee..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hzya.frame.plugin.masterData.org.service.impl;
-
-
-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;
-/**
- * 组织档案(MdmOrg)表服务实现类
- *
- * @author makejava
- * @since 2024-06-07 18:30:05
- */
-public class MdmOrgServiceImpl extends BaseService<MdmOrgEntity, String> implements IMdmOrgService {
-
- private IMdmOrgDao mdmOrgDao;
-
- @Autowired
- public void setMdmOrgDao(IMdmOrgDao dao) {
- this.mdmOrgDao = dao;
- this.dao = dao;
- }
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java
similarity index 68%
rename from buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java
rename to buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java
index 5b3a3d22..298019eb 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/plugin/MdmCustomerPluginInitializer.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java
@@ -1,22 +1,23 @@
-package com.hzya.frame.plugin.masterData.customer.plugin;
+package com.hzya.frame.plugin.masterData.plugin;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.base.PluginBaseEntity;
import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataCustoMermanageService;
+import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService;
import com.hzya.frame.web.entity.JsonResultEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
- * 客户档案(MdmCustomer)表服务接口
+ * 主数据同步
*
* @author makejava
* @since 2024-06-21 13:52:35
*/
-public class MdmCustomerPluginInitializer extends PluginBaseEntity{
- Logger logger = LoggerFactory.getLogger(MdmCustomerPluginInitializer.class);
+public class MdmPluginInitializer extends PluginBaseEntity{
+ Logger logger = LoggerFactory.getLogger(MdmPluginInitializer.class);
@Autowired
- private IMasterDataCustoMermanageService masterDataCustoMermanageService;
+ private IMasterDataService masterDataService;
@Override
public void initialize() {
@@ -50,10 +51,10 @@ public class MdmCustomerPluginInitializer extends PluginBaseEntity{
@Override
public JsonResultEntity executeBusiness(JSONObject requestJson) {
try {
- logger.info("======开始执行客户信息同步========");
- return masterDataCustoMermanageService.queryCustoMermanageArchives(requestJson);
+ logger.info("======开始执行主数据信息同步========");
+ return masterDataService.queryArchives(requestJson);
}catch (Exception e){
- logger.info("======执行客户同步失败:{}========",e.getMessage());
+ logger.info("======执行主数据同步失败:{}========",e.getMessage());
e.printStackTrace();
}
return null;
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
deleted file mode 100644
index 8b130a7f..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.hzya.frame.plugin.masterData.project.dao;
-
-
-import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity;
-
-/**
- * 项目档案(mdm_project: table)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-07 18:29:23
- */
-public interface IMdmProjectDao extends IBaseDao<MdmProjectEntity, String> {
-
-}
-
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
deleted file mode 100644
index ae270f7d..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.hzya.frame.plugin.masterData.project.dao.impl;
-
-
-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;
-/**
- * 项目档案(MdmProject)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-07 18:29:23
- */
-public class MdmProjectDaoImpl extends MybatisGenericDao<MdmProjectEntity, String> 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
deleted file mode 100644
index fba1cf1c..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.hzya.frame.plugin.masterData.project.entity;
-
-import java.util.Date;
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 项目档案(MdmProject)实体类
- *
- * @author makejava
- * @since 2024-06-07 18:29:23
- */
-public class MdmProjectEntity extends BaseEntity {
-
- /** 单据规则 */
- private String documentRule;
- /** 单据规则流水号 */
- private Long documentRuleNum;
- /** 项目编码 */
- private String projectCode;
- /** 项目名称 */
- private String projectName;
- /** 单据类型 */
- private String projectBillType;
- /** 备注 */
- private String projectMemo;
- /** 币种 */
- private String projectCurrtype;
- /** 责任人 */
- private String projectDutier;
- /** 责任部门 */
- private String projectDutyDept;
- /** 管理组织 */
- private String projectOrg;
- /** 父项目 */
- private String projectParentpro;
- /** 项目简称 */
- private String projectShName;
- /** 数据状态 Y正常 N删除 F修改 */
- private String dataStatus;
- /** 新增数据状态 0待下发 1已下发 */
- private String addStatus;
- /** 修改数据状态 0待下发 1已下发 */
- private String updateStatus;
- /** 删除数据状态 0待下发 1已下发 */
- private String deleteStatus;
- /** 公司id */
- private String companyId;
-
-
- public String getDocumentRule() {
- return documentRule;
- }
-
- public void setDocumentRule(String documentRule) {
- this.documentRule = documentRule;
- }
-
- public Long getDocumentRuleNum() {
- return documentRuleNum;
- }
-
- public void setDocumentRuleNum(Long documentRuleNum) {
- this.documentRuleNum = documentRuleNum;
- }
-
- public String getProjectCode() {
- return projectCode;
- }
-
- public void setProjectCode(String projectCode) {
- this.projectCode = projectCode;
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- public String getProjectBillType() {
- return projectBillType;
- }
-
- public void setProjectBillType(String projectBillType) {
- this.projectBillType = projectBillType;
- }
-
- public String getProjectMemo() {
- return projectMemo;
- }
-
- public void setProjectMemo(String projectMemo) {
- this.projectMemo = projectMemo;
- }
-
- public String getProjectCurrtype() {
- return projectCurrtype;
- }
-
- public void setProjectCurrtype(String projectCurrtype) {
- this.projectCurrtype = projectCurrtype;
- }
-
- public String getProjectDutier() {
- return projectDutier;
- }
-
- public void setProjectDutier(String projectDutier) {
- this.projectDutier = projectDutier;
- }
-
- public String getProjectDutyDept() {
- return projectDutyDept;
- }
-
- public void setProjectDutyDept(String projectDutyDept) {
- this.projectDutyDept = projectDutyDept;
- }
-
- public String getProjectOrg() {
- return projectOrg;
- }
-
- public void setProjectOrg(String projectOrg) {
- this.projectOrg = projectOrg;
- }
-
- public String getProjectParentpro() {
- return projectParentpro;
- }
-
- public void setProjectParentpro(String projectParentpro) {
- this.projectParentpro = projectParentpro;
- }
-
- public String getProjectShName() {
- return projectShName;
- }
-
- public void setProjectShName(String projectShName) {
- this.projectShName = projectShName;
- }
-
- public String getDataStatus() {
- return dataStatus;
- }
-
- public void setDataStatus(String dataStatus) {
- this.dataStatus = dataStatus;
- }
-
- public String getAddStatus() {
- return addStatus;
- }
-
- public void setAddStatus(String addStatus) {
- this.addStatus = addStatus;
- }
-
- public String getUpdateStatus() {
- return updateStatus;
- }
-
- public void setUpdateStatus(String updateStatus) {
- this.updateStatus = updateStatus;
- }
-
- public String getDeleteStatus() {
- return deleteStatus;
- }
-
- public void setDeleteStatus(String deleteStatus) {
- this.deleteStatus = deleteStatus;
- }
-
- public String getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- }
-
-}
-
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
deleted file mode 100644
index 467882e1..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.plugin.masterData.project.dao.impl.MdmProjectDaoImpl">
-
- <resultMap id="get-MdmProjectEntity-result" type="com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity" >
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
- <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
- <result property="projectCode" column="project_code" jdbcType="VARCHAR"/>
- <result property="projectName" column="project_name" jdbcType="VARCHAR"/>
- <result property="projectBillType" column="project_bill_type" jdbcType="VARCHAR"/>
- <result property="projectMemo" column="project_memo" jdbcType="VARCHAR"/>
- <result property="projectCurrtype" column="project_currtype" jdbcType="VARCHAR"/>
- <result property="projectDutier" column="project_dutier" jdbcType="VARCHAR"/>
- <result property="projectDutyDept" column="project_duty_dept" jdbcType="VARCHAR"/>
- <result property="projectOrg" column="project_org" jdbcType="VARCHAR"/>
- <result property="projectParentpro" column="project_parentpro" jdbcType="VARCHAR"/>
- <result property="projectShName" column="project_sh_name" jdbcType="VARCHAR"/>
- <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
- <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
- <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
- <result property="deleteStatus" column="delete_status" jdbcType="VARCHAR"/>
- <result property="sorts" column="sorts" jdbcType="INTEGER"/>
- <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
- <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
- <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
- <result property="sts" column="sts" jdbcType="VARCHAR"/>
- <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
- <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
- </resultMap>
- <!-- 查询的字段-->
- <sql id = "MdmProjectEntity_Base_Column_List">
- id
- ,document_rule
- ,document_rule_num
- ,project_code
- ,project_name
- ,project_bill_type
- ,project_memo
- ,project_currtype
- ,project_dutier
- ,project_duty_dept
- ,project_org
- ,project_parentpro
- ,project_sh_name
- ,data_status
- ,add_status
- ,update_status
- ,delete_status
- ,sorts
- ,create_user_id
- ,create_time
- ,modify_user_id
- ,modify_time
- ,sts
- ,org_id
- ,company_id
- </sql>
- <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-MdmProjectEntity-result" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity">
- select
- <include refid="MdmProjectEntity_Base_Column_List" />
- from mdm_project
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="projectCode != null and projectCode != ''"> and project_code = #{projectCode} </if>
- <if test="projectName != null and projectName != ''"> and project_name = #{projectName} </if>
- <if test="projectBillType != null and projectBillType != ''"> and project_bill_type = #{projectBillType} </if>
- <if test="projectMemo != null and projectMemo != ''"> and project_memo = #{projectMemo} </if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype = #{projectCurrtype} </if>
- <if test="projectDutier != null and projectDutier != ''"> and project_dutier = #{projectDutier} </if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept = #{projectDutyDept} </if>
- <if test="projectOrg != null and projectOrg != ''"> and project_org = #{projectOrg} </if>
- <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro = #{projectParentpro} </if>
- <if test="projectShName != null and projectShName != ''"> and project_sh_name = #{projectShName} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity">
- select count(1) from mdm_project
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="projectCode != null and projectCode != ''"> and project_code = #{projectCode} </if>
- <if test="projectName != null and projectName != ''"> and project_name = #{projectName} </if>
- <if test="projectBillType != null and projectBillType != ''"> and project_bill_type = #{projectBillType} </if>
- <if test="projectMemo != null and projectMemo != ''"> and project_memo = #{projectMemo} </if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype = #{projectCurrtype} </if>
- <if test="projectDutier != null and projectDutier != ''"> and project_dutier = #{projectDutier} </if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept = #{projectDutyDept} </if>
- <if test="projectOrg != null and projectOrg != ''"> and project_org = #{projectOrg} </if>
- <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro = #{projectParentpro} </if>
- <if test="projectShName != null and projectShName != ''"> and project_sh_name = #{projectShName} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
- </select>
-
- <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-MdmProjectEntity-result" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity">
- select
- <include refid="MdmProjectEntity_Base_Column_List" />
- from mdm_project
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule like concat('%',#{documentRule},'%') </if>
- <if test="documentRuleNum != null"> and document_rule_num like concat('%',#{documentRuleNum},'%') </if>
- <if test="projectCode != null and projectCode != ''"> and project_code like concat('%',#{projectCode},'%') </if>
- <if test="projectName != null and projectName != ''"> and project_name like concat('%',#{projectName},'%') </if>
- <if test="projectBillType != null and projectBillType != ''"> and project_bill_type like concat('%',#{projectBillType},'%') </if>
- <if test="projectMemo != null and projectMemo != ''"> and project_memo like concat('%',#{projectMemo},'%') </if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype like concat('%',#{projectCurrtype},'%') </if>
- <if test="projectDutier != null and projectDutier != ''"> and project_dutier like concat('%',#{projectDutier},'%') </if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept like concat('%',#{projectDutyDept},'%') </if>
- <if test="projectOrg != null and projectOrg != ''"> and project_org like concat('%',#{projectOrg},'%') </if>
- <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro like concat('%',#{projectParentpro},'%') </if>
- <if test="projectShName != null and projectShName != ''"> and project_sh_name like concat('%',#{projectShName},'%') </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status like concat('%',#{dataStatus},'%') </if>
- <if test="addStatus != null and addStatus != ''"> and add_status like concat('%',#{addStatus},'%') </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status like concat('%',#{updateStatus},'%') </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status like concat('%',#{deleteStatus},'%') </if>
- <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
- <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
- <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
- <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
- <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
- <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="MdmProjectentity_list_or" resultMap="get-MdmProjectEntity-result" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity">
- select
- <include refid="MdmProjectEntity_Base_Column_List" />
- from mdm_project
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> or id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> or document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> or document_rule_num = #{documentRuleNum} </if>
- <if test="projectCode != null and projectCode != ''"> or project_code = #{projectCode} </if>
- <if test="projectName != null and projectName != ''"> or project_name = #{projectName} </if>
- <if test="projectBillType != null and projectBillType != ''"> or project_bill_type = #{projectBillType} </if>
- <if test="projectMemo != null and projectMemo != ''"> or project_memo = #{projectMemo} </if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> or project_currtype = #{projectCurrtype} </if>
- <if test="projectDutier != null and projectDutier != ''"> or project_dutier = #{projectDutier} </if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> or project_duty_dept = #{projectDutyDept} </if>
- <if test="projectOrg != null and projectOrg != ''"> or project_org = #{projectOrg} </if>
- <if test="projectParentpro != null and projectParentpro != ''"> or project_parentpro = #{projectParentpro} </if>
- <if test="projectShName != null and projectShName != ''"> or project_sh_name = #{projectShName} </if>
- <if test="dataStatus != null and dataStatus != ''"> or data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> or add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> or update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> or delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> or sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> or create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> or modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> or sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity" >
- insert into mdm_project(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> id , </if>
- <if test="documentRule != null and documentRule != ''"> document_rule , </if>
- <if test="documentRuleNum != null"> document_rule_num , </if>
- <if test="projectCode != null and projectCode != ''"> project_code , </if>
- <if test="projectName != null and projectName != ''"> project_name , </if>
- <if test="projectBillType != null and projectBillType != ''"> project_bill_type , </if>
- <if test="projectMemo != null and projectMemo != ''"> project_memo , </if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> project_currtype , </if>
- <if test="projectDutier != null and projectDutier != ''"> project_dutier , </if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> project_duty_dept , </if>
- <if test="projectOrg != null and projectOrg != ''"> project_org , </if>
- <if test="projectParentpro != null and projectParentpro != ''"> project_parentpro , </if>
- <if test="projectShName != null and projectShName != ''"> project_sh_name , </if>
- <if test="dataStatus != null and dataStatus != ''"> data_status , </if>
- <if test="addStatus != null and addStatus != ''"> add_status , </if>
- <if test="updateStatus != null and updateStatus != ''"> update_status , </if>
- <if test="deleteStatus != null and deleteStatus != ''"> delete_status , </if>
- <if test="sorts != null"> sorts , </if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
- <if test="create_time != null"> create_time , </if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
- <if test="modify_time != null"> modify_time , </if>
- <if test="sts != null and sts != ''"> sts , </if>
- <if test="org_id != null and org_id != ''"> org_id , </if>
- <if test="companyId != null and companyId != ''"> company_id , </if>
- <if test="sorts == null ">sorts,</if>
- <if test="sts == null ">sts,</if>
- </trim>
- )values(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> #{id} ,</if>
- <if test="documentRule != null and documentRule != ''"> #{documentRule} ,</if>
- <if test="documentRuleNum != null"> #{documentRuleNum} ,</if>
- <if test="projectCode != null and projectCode != ''"> #{projectCode} ,</if>
- <if test="projectName != null and projectName != ''"> #{projectName} ,</if>
- <if test="projectBillType != null and projectBillType != ''"> #{projectBillType} ,</if>
- <if test="projectMemo != null and projectMemo != ''"> #{projectMemo} ,</if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> #{projectCurrtype} ,</if>
- <if test="projectDutier != null and projectDutier != ''"> #{projectDutier} ,</if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> #{projectDutyDept} ,</if>
- <if test="projectOrg != null and projectOrg != ''"> #{projectOrg} ,</if>
- <if test="projectParentpro != null and projectParentpro != ''"> #{projectParentpro} ,</if>
- <if test="projectShName != null and projectShName != ''"> #{projectShName} ,</if>
- <if test="dataStatus != null and dataStatus != ''"> #{dataStatus} ,</if>
- <if test="addStatus != null and addStatus != ''"> #{addStatus} ,</if>
- <if test="updateStatus != null and updateStatus != ''"> #{updateStatus} ,</if>
- <if test="deleteStatus != null and deleteStatus != ''"> #{deleteStatus} ,</if>
- <if test="sorts != null"> #{sorts} ,</if>
- <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
- <if test="create_time != null"> #{create_time} ,</if>
- <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
- <if test="modify_time != null"> #{modify_time} ,</if>
- <if test="sts != null and sts != ''"> #{sts} ,</if>
- <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
- <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
- <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_project a WHERE a.sts = 'Y' ),</if>
- <if test="sts == null ">'Y',</if>
- </trim>
- )
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" >
- insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, sts)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId}, 'Y')
- </foreach>
-</insert>
-<!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch" >
- insert into mdm_project(document_rule, document_rule_num, project_code, project_name, project_bill_type, project_memo, project_currtype, project_dutier, project_duty_dept, project_org, project_parentpro, project_sh_name, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.documentRule},#{entity.documentRuleNum},#{entity.projectCode},#{entity.projectName},#{entity.projectBillType},#{entity.projectMemo},#{entity.projectCurrtype},#{entity.projectDutier},#{entity.projectDutyDept},#{entity.projectOrg},#{entity.projectParentpro},#{entity.projectShName},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
- </foreach>
- on duplicate key update
- document_rule = values(document_rule),
- document_rule_num = values(document_rule_num),
- project_code = values(project_code),
- project_name = values(project_name),
- project_bill_type = values(project_bill_type),
- project_memo = values(project_memo),
- project_currtype = values(project_currtype),
- project_dutier = values(project_dutier),
- project_duty_dept = values(project_duty_dept),
- project_org = values(project_org),
- project_parentpro = values(project_parentpro),
- project_sh_name = values(project_sh_name),
- data_status = values(data_status),
- add_status = values(add_status),
- update_status = values(update_status),
- delete_status = values(delete_status),
- create_user_id = values(create_user_id),
- create_time = values(create_time),
- modify_user_id = values(modify_user_id),
- modify_time = values(modify_time),
- sts = values(sts),
- org_id = values(org_id),
- company_id = values(company_id)</insert>
-<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity" >
-update mdm_project set
-<trim suffix="" suffixOverrides=",">
- <if test="documentRule != null and documentRule != ''"> document_rule = #{documentRule},</if>
- <if test="documentRuleNum != null"> document_rule_num = #{documentRuleNum},</if>
- <if test="projectCode != null and projectCode != ''"> project_code = #{projectCode},</if>
- <if test="projectName != null and projectName != ''"> project_name = #{projectName},</if>
- <if test="projectBillType != null and projectBillType != ''"> project_bill_type = #{projectBillType},</if>
- <if test="projectMemo != null and projectMemo != ''"> project_memo = #{projectMemo},</if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> project_currtype = #{projectCurrtype},</if>
- <if test="projectDutier != null and projectDutier != ''"> project_dutier = #{projectDutier},</if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> project_duty_dept = #{projectDutyDept},</if>
- <if test="projectOrg != null and projectOrg != ''"> project_org = #{projectOrg},</if>
- <if test="projectParentpro != null and projectParentpro != ''"> project_parentpro = #{projectParentpro},</if>
- <if test="projectShName != null and projectShName != ''"> project_sh_name = #{projectShName},</if>
- <if test="dataStatus != null and dataStatus != ''"> data_status = #{dataStatus},</if>
- <if test="addStatus != null and addStatus != ''"> add_status = #{addStatus},</if>
- <if test="updateStatus != null and updateStatus != ''"> update_status = #{updateStatus},</if>
- <if test="deleteStatus != null and deleteStatus != ''"> delete_status = #{deleteStatus},</if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
- <if test="create_time != null"> create_time = #{create_time},</if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
- <if test="modify_time != null"> modify_time = #{modify_time},</if>
- <if test="sts != null and sts != ''"> sts = #{sts},</if>
- <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
- <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
-</trim>
-where id = #{id}
-</update>
-<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity" >
-update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity" >
-update mdm_project set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="projectCode != null and projectCode != ''"> and project_code = #{projectCode} </if>
- <if test="projectName != null and projectName != ''"> and project_name = #{projectName} </if>
- <if test="projectBillType != null and projectBillType != ''"> and project_bill_type = #{projectBillType} </if>
- <if test="projectMemo != null and projectMemo != ''"> and project_memo = #{projectMemo} </if>
- <if test="projectCurrtype != null and projectCurrtype != ''"> and project_currtype = #{projectCurrtype} </if>
- <if test="projectDutier != null and projectDutier != ''"> and project_dutier = #{projectDutier} </if>
- <if test="projectDutyDept != null and projectDutyDept != ''"> and project_duty_dept = #{projectDutyDept} </if>
- <if test="projectOrg != null and projectOrg != ''"> and project_org = #{projectOrg} </if>
- <if test="projectParentpro != null and projectParentpro != ''"> and project_parentpro = #{projectParentpro} </if>
- <if test="projectShName != null and projectShName != ''"> and project_sh_name = #{projectShName} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- and sts='Y'
- </trim>
-</update>
-<!--通过主键删除-->
-<delete id="entity_delete">
- delete from mdm_project where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java
deleted file mode 100644
index 0a554a69..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/plugin/MdmProjectPluginInitializer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.hzya.frame.plugin.masterData.project.plugin;
-
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.base.PluginBaseEntity;
-import com.hzya.frame.sysnew.comparison.masterData.service.impl.MasterDataProjectServiceImpl;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 项目档案(MdmProject)表服务接口
- *
- * @author makejava
- * @since 2024-06-07 18:29:23
- */
-public class MdmProjectPluginInitializer extends PluginBaseEntity{
- Logger logger = LoggerFactory.getLogger(MdmProjectPluginInitializer.class);
-
- @Autowired
- private MasterDataProjectServiceImpl masterDataProjectService;
-
- @Override
- public void initialize() {
- logger.info(getPluginLabel() + "執行初始化方法initialize()");
- }
-
- @Override
- public void destroy() {
- logger.info(getPluginLabel() + "執行銷毀方法destroy()");
- }
-
- @Override
- public String getPluginId() {
- return "MdmProjectPlugin";
- }
-
- @Override
- public String getPluginName() {
- return "MdmProjectPlugin插件";
- }
-
- @Override
- public String getPluginLabel() {
- return "MdmProjectPlugin";
- }
-
- @Override
- public String getPluginType() {
- return "1";
- }
- @Override
- public JsonResultEntity executeBusiness(JSONObject requestJson) {
- try {
- logger.info("=====开始执行主数据档案项目档案同步=======");
- JsonResultEntity jsonResultEntity = masterDataProjectService.queryProjectArchives(requestJson);
- return jsonResultEntity;
- }catch (Exception e){
- logger.info("======执行主数据档案项目档案同步失败:{}",e.getMessage());
- e.printStackTrace();
- }
- return null;
- }
-}
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
deleted file mode 100644
index f35a9209..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hzya.frame.plugin.masterData.project.service;
-
-import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.plugin.masterData.project.entity.MdmProjectEntity;
-
-/**
- * 项目档案(MdmProject)表服务接口
- *
- * @author makejava
- * @since 2024-06-07 18:29:23
- */
-public interface IMdmProjectService extends IBaseService<MdmProjectEntity, String>{
-}
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
deleted file mode 100644
index 0284f229..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hzya.frame.plugin.masterData.project.service.impl;
-
-
-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;
-/**
- * 项目档案(MdmProject)表服务实现类
- *
- * @author makejava
- * @since 2024-06-07 18:29:23
- */
-public class MdmProjectServiceImpl extends BaseService<MdmProjectEntity, String> implements IMdmProjectService {
-
- private IMdmProjectDao mdmProjectDao;
-
- @Autowired
- public void setMdmProjectDao(IMdmProjectDao dao) {
- this.mdmProjectDao = dao;
- this.dao = dao;
- }
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java
new file mode 100644
index 00000000..175d0616
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java
@@ -0,0 +1,12 @@
+package com.hzya.frame.plugin.masterData.service;
+
+import com.hzya.frame.plugin.masterData.entity.MdmEntity;
+import com.hzya.frame.basedao.service.IBaseService;
+/**
+ * 客户档案(MdmCustomer)表服务接口
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public interface IMdmService extends IBaseService<MdmEntity, String>{
+}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java
new file mode 100644
index 00000000..e1016019
--- /dev/null
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java
@@ -0,0 +1,24 @@
+package com.hzya.frame.plugin.masterData.service.impl;
+
+import com.hzya.frame.plugin.masterData.entity.MdmEntity;
+import com.hzya.frame.plugin.masterData.dao.IMdmDao;
+import com.hzya.frame.plugin.masterData.service.IMdmService;
+import com.hzya.frame.plugin.masterData.service.IMdmService;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.hzya.frame.basedao.service.impl.BaseService;
+/**
+ * 客户档案(MdmCustomer)表服务实现类
+ *
+ * @author makejava
+ * @since 2024-06-21 13:52:35
+ */
+public class MdmServiceImpl extends BaseService<MdmEntity, String> implements IMdmService {
+
+ private IMdmDao mdmCustomerDao;
+
+ @Autowired
+ public void setMdmCustomerDao(IMdmDao dao) {
+ this.mdmCustomerDao = dao;
+ this.dao = dao;
+ }
+}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java
deleted file mode 100644
index 1556e191..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.plugin.masterData.user.dao;
-
-import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity;
-
-/**
- * 用户档案(mdm_user: table)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public interface IMdmUserDao extends IBaseDao<MdmUserEntity, String> {
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java
deleted file mode 100644
index e8d048ea..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.hzya.frame.plugin.masterData.user.dao.impl;
-
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.plugin.masterData.user.dao.IMdmUserDao;
-import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity;
-/**
- * 用户档案(MdmUser)表数据库访问层
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public class MdmUserDaoImpl extends MybatisGenericDao<MdmUserEntity, String> implements IMdmUserDao {
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java
deleted file mode 100644
index 5a89edcf..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package com.hzya.frame.plugin.masterData.user.entity;
-
-import com.hzya.frame.web.entity.BaseEntity;
-/**
- * 用户档案(MdmUser)实体类
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public class MdmUserEntity extends BaseEntity {
-
- /** 单据规则 */
- private String documentRule;
- /** 单据规则流水号 */
- private Long documentRuleNum;
- /** 数据状态 Y正常 N删除 F修改 */
- private String dataStatus;
- /** 新增数据状态 0待下发 1已下发 */
- private String addStatus;
- /** 修改数据状态 0待下发 1已下发 */
- private String updateStatus;
- /** 删除数据状态 0待下发 1已下发 */
- private String deleteStatus;
- /** 公司id */
- private String companyId;
- /** 用户名称 */
- private String userName;
- /** 用户编码 */
- private String userCode;
- /** 用户密码 */
- private String userPassword;
- /** 密码安全级别 */
- private String pwdlevelcode;
- /** 密码参数 */
- private String pwdparam;
- /** 备注 */
- private String userNote;
- /** 生效日期 */
- private String abledate;
- /** 失效日期 */
- private String disabledate;
- /** 锁定 */
- private String islocked;
- /** 用户类型 */
- private String userType;
- /** 身份类型 */
- private String baseDocType;
- /** 身份 */
- private String pkBaseDoc;
- /** 认证类型 */
- private String identityverifycode;
- /** 所属组织 */
- private String pkOrg;
- /** 数据格式 */
- private String format;
- /** CA用户 */
- private String isca;
- /** 启用状态 */
- private String enablestate;
- /** 内容语种 */
- private String contentlang;
- /** 用户编码 */
- private String userCodeQ;
-
-
- public String getDocumentRule() {
- return documentRule;
- }
-
- public void setDocumentRule(String documentRule) {
- this.documentRule = documentRule;
- }
-
- public Long getDocumentRuleNum() {
- return documentRuleNum;
- }
-
- public void setDocumentRuleNum(Long documentRuleNum) {
- this.documentRuleNum = documentRuleNum;
- }
-
- public String getDataStatus() {
- return dataStatus;
- }
-
- public void setDataStatus(String dataStatus) {
- this.dataStatus = dataStatus;
- }
-
- public String getAddStatus() {
- return addStatus;
- }
-
- public void setAddStatus(String addStatus) {
- this.addStatus = addStatus;
- }
-
- public String getUpdateStatus() {
- return updateStatus;
- }
-
- public void setUpdateStatus(String updateStatus) {
- this.updateStatus = updateStatus;
- }
-
- public String getDeleteStatus() {
- return deleteStatus;
- }
-
- public void setDeleteStatus(String deleteStatus) {
- this.deleteStatus = deleteStatus;
- }
-
- public String getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(String companyId) {
- this.companyId = companyId;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getUserPassword() {
- return userPassword;
- }
-
- public void setUserPassword(String userPassword) {
- this.userPassword = userPassword;
- }
-
- public String getPwdlevelcode() {
- return pwdlevelcode;
- }
-
- public void setPwdlevelcode(String pwdlevelcode) {
- this.pwdlevelcode = pwdlevelcode;
- }
-
- public String getPwdparam() {
- return pwdparam;
- }
-
- public void setPwdparam(String pwdparam) {
- this.pwdparam = pwdparam;
- }
-
- public String getUserNote() {
- return userNote;
- }
-
- public void setUserNote(String userNote) {
- this.userNote = userNote;
- }
-
- public String getAbledate() {
- return abledate;
- }
-
- public void setAbledate(String abledate) {
- this.abledate = abledate;
- }
-
- public String getDisabledate() {
- return disabledate;
- }
-
- public void setDisabledate(String disabledate) {
- this.disabledate = disabledate;
- }
-
- public String getIslocked() {
- return islocked;
- }
-
- public void setIslocked(String islocked) {
- this.islocked = islocked;
- }
-
- public String getUserType() {
- return userType;
- }
-
- public void setUserType(String userType) {
- this.userType = userType;
- }
-
- public String getBaseDocType() {
- return baseDocType;
- }
-
- public void setBaseDocType(String baseDocType) {
- this.baseDocType = baseDocType;
- }
-
- public String getPkBaseDoc() {
- return pkBaseDoc;
- }
-
- public void setPkBaseDoc(String pkBaseDoc) {
- this.pkBaseDoc = pkBaseDoc;
- }
-
- public String getIdentityverifycode() {
- return identityverifycode;
- }
-
- public void setIdentityverifycode(String identityverifycode) {
- this.identityverifycode = identityverifycode;
- }
-
- public String getPkOrg() {
- return pkOrg;
- }
-
- public void setPkOrg(String pkOrg) {
- this.pkOrg = pkOrg;
- }
-
- public String getFormat() {
- return format;
- }
-
- public void setFormat(String format) {
- this.format = format;
- }
-
- public String getIsca() {
- return isca;
- }
-
- public void setIsca(String isca) {
- this.isca = isca;
- }
-
- public String getEnablestate() {
- return enablestate;
- }
-
- public void setEnablestate(String enablestate) {
- this.enablestate = enablestate;
- }
-
- public String getContentlang() {
- return contentlang;
- }
-
- public void setContentlang(String contentlang) {
- this.contentlang = contentlang;
- }
-
- public String getUserCodeQ() {
- return userCodeQ;
- }
-
- public void setUserCodeQ(String userCodeQ) {
- this.userCodeQ = userCodeQ;
- }
-
-}
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml
deleted file mode 100644
index b594d94b..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.hzya.frame.plugin.masterData.user.dao.impl.MdmUserDaoImpl">
-
- <resultMap id="get-MdmUserEntity-result" type="com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity" >
- <result property="id" column="id" jdbcType="VARCHAR"/>
- <result property="documentRule" column="document_rule" jdbcType="VARCHAR"/>
- <result property="documentRuleNum" column="document_rule_num" jdbcType="INTEGER"/>
- <result property="dataStatus" column="data_status" jdbcType="VARCHAR"/>
- <result property="addStatus" column="add_status" jdbcType="VARCHAR"/>
- <result property="updateStatus" column="update_status" jdbcType="VARCHAR"/>
- <result property="deleteStatus" column="delete_status" jdbcType="VARCHAR"/>
- <result property="sorts" column="sorts" jdbcType="INTEGER"/>
- <result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
- <result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
- <result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
- <result property="sts" column="sts" jdbcType="VARCHAR"/>
- <result property="org_id" column="org_id" jdbcType="VARCHAR"/>
- <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
- <result property="userName" column="user_name" jdbcType="VARCHAR"/>
- <result property="userCode" column="user_code" jdbcType="VARCHAR"/>
- <result property="userPassword" column="user_password" jdbcType="VARCHAR"/>
- <result property="pwdlevelcode" column="pwdlevelcode" jdbcType="VARCHAR"/>
- <result property="pwdparam" column="pwdparam" jdbcType="VARCHAR"/>
- <result property="userNote" column="user_note" jdbcType="VARCHAR"/>
- <result property="abledate" column="abledate" jdbcType="VARCHAR"/>
- <result property="disabledate" column="disabledate" jdbcType="VARCHAR"/>
- <result property="islocked" column="islocked" jdbcType="VARCHAR"/>
- <result property="userType" column="user_type" jdbcType="VARCHAR"/>
- <result property="baseDocType" column="base_doc_type" jdbcType="VARCHAR"/>
- <result property="pkBaseDoc" column="pk_base_doc" jdbcType="VARCHAR"/>
- <result property="identityverifycode" column="identityverifycode" jdbcType="VARCHAR"/>
- <result property="pkOrg" column="pk_org" jdbcType="VARCHAR"/>
- <result property="format" column="format" jdbcType="VARCHAR"/>
- <result property="isca" column="isca" jdbcType="VARCHAR"/>
- <result property="enablestate" column="enablestate" jdbcType="VARCHAR"/>
- <result property="contentlang" column="contentlang" jdbcType="VARCHAR"/>
- <result property="userCodeQ" column="user_code_q" jdbcType="VARCHAR"/>
- </resultMap>
- <!-- 查询的字段-->
- <sql id = "MdmUserEntity_Base_Column_List">
- id
- ,document_rule
- ,document_rule_num
- ,data_status
- ,add_status
- ,update_status
- ,delete_status
- ,sorts
- ,create_user_id
- ,create_time
- ,modify_user_id
- ,modify_time
- ,sts
- ,org_id
- ,company_id
- ,user_name
- ,user_code
- ,user_password
- ,pwdlevelcode
- ,pwdparam
- ,user_note
- ,abledate
- ,disabledate
- ,islocked
- ,user_type
- ,base_doc_type
- ,pk_base_doc
- ,identityverifycode
- ,pk_org
- ,format
- ,isca
- ,enablestate
- ,contentlang
- ,user_code_q
- </sql>
- <!-- 查询 采用==查询 -->
- <select id="entity_list_base" resultMap="get-MdmUserEntity-result" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity">
- select
- <include refid="MdmUserEntity_Base_Column_List" />
- from mdm_user
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- <if test="userName != null and userName != ''"> and user_name = #{userName} </if>
- <if test="userCode != null and userCode != ''"> and user_code = #{userCode} </if>
- <if test="userPassword != null and userPassword != ''"> and user_password = #{userPassword} </if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> and pwdlevelcode = #{pwdlevelcode} </if>
- <if test="pwdparam != null and pwdparam != ''"> and pwdparam = #{pwdparam} </if>
- <if test="userNote != null and userNote != ''"> and user_note = #{userNote} </if>
- <if test="abledate != null and abledate != ''"> and abledate = #{abledate} </if>
- <if test="disabledate != null and disabledate != ''"> and disabledate = #{disabledate} </if>
- <if test="islocked != null and islocked != ''"> and islocked = #{islocked} </if>
- <if test="userType != null and userType != ''"> and user_type = #{userType} </if>
- <if test="baseDocType != null and baseDocType != ''"> and base_doc_type = #{baseDocType} </if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> and pk_base_doc = #{pkBaseDoc} </if>
- <if test="identityverifycode != null and identityverifycode != ''"> and identityverifycode = #{identityverifycode} </if>
- <if test="pkOrg != null and pkOrg != ''"> and pk_org = #{pkOrg} </if>
- <if test="format != null and format != ''"> and format = #{format} </if>
- <if test="isca != null and isca != ''"> and isca = #{isca} </if>
- <if test="enablestate != null and enablestate != ''"> and enablestate = #{enablestate} </if>
- <if test="contentlang != null and contentlang != ''"> and contentlang = #{contentlang} </if>
- <if test="userCodeQ != null and userCodeQ != ''"> and user_code_q = #{userCodeQ} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询符合条件的数量 -->
-<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity">
- select count(1) from mdm_user
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> and create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> and modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- <if test="userName != null and userName != ''"> and user_name = #{userName} </if>
- <if test="userCode != null and userCode != ''"> and user_code = #{userCode} </if>
- <if test="userPassword != null and userPassword != ''"> and user_password = #{userPassword} </if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> and pwdlevelcode = #{pwdlevelcode} </if>
- <if test="pwdparam != null and pwdparam != ''"> and pwdparam = #{pwdparam} </if>
- <if test="userNote != null and userNote != ''"> and user_note = #{userNote} </if>
- <if test="abledate != null and abledate != ''"> and abledate = #{abledate} </if>
- <if test="disabledate != null and disabledate != ''"> and disabledate = #{disabledate} </if>
- <if test="islocked != null and islocked != ''"> and islocked = #{islocked} </if>
- <if test="userType != null and userType != ''"> and user_type = #{userType} </if>
- <if test="baseDocType != null and baseDocType != ''"> and base_doc_type = #{baseDocType} </if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> and pk_base_doc = #{pkBaseDoc} </if>
- <if test="identityverifycode != null and identityverifycode != ''"> and identityverifycode = #{identityverifycode} </if>
- <if test="pkOrg != null and pkOrg != ''"> and pk_org = #{pkOrg} </if>
- <if test="format != null and format != ''"> and format = #{format} </if>
- <if test="isca != null and isca != ''"> and isca = #{isca} </if>
- <if test="enablestate != null and enablestate != ''"> and enablestate = #{enablestate} </if>
- <if test="contentlang != null and contentlang != ''"> and contentlang = #{contentlang} </if>
- <if test="userCodeQ != null and userCodeQ != ''"> and user_code_q = #{userCodeQ} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
- </select>
-
- <!-- 分页查询列表 采用like格式 -->
-<select id="entity_list_like" resultMap="get-MdmUserEntity-result" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity">
- select
- <include refid="MdmUserEntity_Base_Column_List" />
- from mdm_user
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule like concat('%',#{documentRule},'%') </if>
- <if test="documentRuleNum != null"> and document_rule_num like concat('%',#{documentRuleNum},'%') </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status like concat('%',#{dataStatus},'%') </if>
- <if test="addStatus != null and addStatus != ''"> and add_status like concat('%',#{addStatus},'%') </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status like concat('%',#{updateStatus},'%') </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status like concat('%',#{deleteStatus},'%') </if>
- <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
- <if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
- <if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
- <if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
- <if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
- <if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
- <if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
- <if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
- <if test="userName != null and userName != ''"> and user_name like concat('%',#{userName},'%') </if>
- <if test="userCode != null and userCode != ''"> and user_code like concat('%',#{userCode},'%') </if>
- <if test="userPassword != null and userPassword != ''"> and user_password like concat('%',#{userPassword},'%') </if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> and pwdlevelcode like concat('%',#{pwdlevelcode},'%') </if>
- <if test="pwdparam != null and pwdparam != ''"> and pwdparam like concat('%',#{pwdparam},'%') </if>
- <if test="userNote != null and userNote != ''"> and user_note like concat('%',#{userNote},'%') </if>
- <if test="abledate != null and abledate != ''"> and abledate like concat('%',#{abledate},'%') </if>
- <if test="disabledate != null and disabledate != ''"> and disabledate like concat('%',#{disabledate},'%') </if>
- <if test="islocked != null and islocked != ''"> and islocked like concat('%',#{islocked},'%') </if>
- <if test="userType != null and userType != ''"> and user_type like concat('%',#{userType},'%') </if>
- <if test="baseDocType != null and baseDocType != ''"> and base_doc_type like concat('%',#{baseDocType},'%') </if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> and pk_base_doc like concat('%',#{pkBaseDoc},'%') </if>
- <if test="identityverifycode != null and identityverifycode != ''"> and identityverifycode like concat('%',#{identityverifycode},'%') </if>
- <if test="pkOrg != null and pkOrg != ''"> and pk_org like concat('%',#{pkOrg},'%') </if>
- <if test="format != null and format != ''"> and format like concat('%',#{format},'%') </if>
- <if test="isca != null and isca != ''"> and isca like concat('%',#{isca},'%') </if>
- <if test="enablestate != null and enablestate != ''"> and enablestate like concat('%',#{enablestate},'%') </if>
- <if test="contentlang != null and contentlang != ''"> and contentlang like concat('%',#{contentlang},'%') </if>
- <if test="userCodeQ != null and userCodeQ != ''"> and user_code_q like concat('%',#{userCodeQ},'%') </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!-- 查询列表 字段采用or格式 -->
-<select id="MdmUserentity_list_or" resultMap="get-MdmUserEntity-result" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity">
- select
- <include refid="MdmUserEntity_Base_Column_List" />
- from mdm_user
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> or id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> or document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> or document_rule_num = #{documentRuleNum} </if>
- <if test="dataStatus != null and dataStatus != ''"> or data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> or add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> or update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> or delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> or sorts = #{sorts} </if>
- <if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
- <if test="create_time != null"> or create_time = #{create_time} </if>
- <if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
- <if test="modify_time != null"> or modify_time = #{modify_time} </if>
- <if test="sts != null and sts != ''"> or sts = #{sts} </if>
- <if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
- <if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
- <if test="userName != null and userName != ''"> or user_name = #{userName} </if>
- <if test="userCode != null and userCode != ''"> or user_code = #{userCode} </if>
- <if test="userPassword != null and userPassword != ''"> or user_password = #{userPassword} </if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> or pwdlevelcode = #{pwdlevelcode} </if>
- <if test="pwdparam != null and pwdparam != ''"> or pwdparam = #{pwdparam} </if>
- <if test="userNote != null and userNote != ''"> or user_note = #{userNote} </if>
- <if test="abledate != null and abledate != ''"> or abledate = #{abledate} </if>
- <if test="disabledate != null and disabledate != ''"> or disabledate = #{disabledate} </if>
- <if test="islocked != null and islocked != ''"> or islocked = #{islocked} </if>
- <if test="userType != null and userType != ''"> or user_type = #{userType} </if>
- <if test="baseDocType != null and baseDocType != ''"> or base_doc_type = #{baseDocType} </if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> or pk_base_doc = #{pkBaseDoc} </if>
- <if test="identityverifycode != null and identityverifycode != ''"> or identityverifycode = #{identityverifycode} </if>
- <if test="pkOrg != null and pkOrg != ''"> or pk_org = #{pkOrg} </if>
- <if test="format != null and format != ''"> or format = #{format} </if>
- <if test="isca != null and isca != ''"> or isca = #{isca} </if>
- <if test="enablestate != null and enablestate != ''"> or enablestate = #{enablestate} </if>
- <if test="contentlang != null and contentlang != ''"> or contentlang = #{contentlang} </if>
- <if test="userCodeQ != null and userCodeQ != ''"> or user_code_q = #{userCodeQ} </if>
- and sts='Y'
- </trim>
- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
-</select>
-
-<!--新增所有列-->
-<insert id="entity_insert" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity" >
- insert into mdm_user(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> id , </if>
- <if test="documentRule != null and documentRule != ''"> document_rule , </if>
- <if test="documentRuleNum != null"> document_rule_num , </if>
- <if test="dataStatus != null and dataStatus != ''"> data_status , </if>
- <if test="addStatus != null and addStatus != ''"> add_status , </if>
- <if test="updateStatus != null and updateStatus != ''"> update_status , </if>
- <if test="deleteStatus != null and deleteStatus != ''"> delete_status , </if>
- <if test="sorts != null"> sorts , </if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
- <if test="create_time != null"> create_time , </if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
- <if test="modify_time != null"> modify_time , </if>
- <if test="sts != null and sts != ''"> sts , </if>
- <if test="org_id != null and org_id != ''"> org_id , </if>
- <if test="companyId != null and companyId != ''"> company_id , </if>
- <if test="userName != null and userName != ''"> user_name , </if>
- <if test="userCode != null and userCode != ''"> user_code , </if>
- <if test="userPassword != null and userPassword != ''"> user_password , </if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> pwdlevelcode , </if>
- <if test="pwdparam != null and pwdparam != ''"> pwdparam , </if>
- <if test="userNote != null and userNote != ''"> user_note , </if>
- <if test="abledate != null and abledate != ''"> abledate , </if>
- <if test="disabledate != null and disabledate != ''"> disabledate , </if>
- <if test="islocked != null and islocked != ''"> islocked , </if>
- <if test="userType != null and userType != ''"> user_type , </if>
- <if test="baseDocType != null and baseDocType != ''"> base_doc_type , </if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> pk_base_doc , </if>
- <if test="identityverifycode != null and identityverifycode != ''"> identityverifycode , </if>
- <if test="pkOrg != null and pkOrg != ''"> pk_org , </if>
- <if test="format != null and format != ''"> format , </if>
- <if test="isca != null and isca != ''"> isca , </if>
- <if test="enablestate != null and enablestate != ''"> enablestate , </if>
- <if test="contentlang != null and contentlang != ''"> contentlang , </if>
- <if test="userCodeQ != null and userCodeQ != ''"> user_code_q , </if>
- <if test="sorts == null ">sorts,</if>
- <if test="sts == null ">sts,</if>
- </trim>
- )values(
- <trim suffix="" suffixOverrides=",">
- <if test="id != null and id != ''"> #{id} ,</if>
- <if test="documentRule != null and documentRule != ''"> #{documentRule} ,</if>
- <if test="documentRuleNum != null"> #{documentRuleNum} ,</if>
- <if test="dataStatus != null and dataStatus != ''"> #{dataStatus} ,</if>
- <if test="addStatus != null and addStatus != ''"> #{addStatus} ,</if>
- <if test="updateStatus != null and updateStatus != ''"> #{updateStatus} ,</if>
- <if test="deleteStatus != null and deleteStatus != ''"> #{deleteStatus} ,</if>
- <if test="sorts != null"> #{sorts} ,</if>
- <if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
- <if test="create_time != null"> #{create_time} ,</if>
- <if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
- <if test="modify_time != null"> #{modify_time} ,</if>
- <if test="sts != null and sts != ''"> #{sts} ,</if>
- <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
- <if test="companyId != null and companyId != ''"> #{companyId} ,</if>
- <if test="userName != null and userName != ''"> #{userName} ,</if>
- <if test="userCode != null and userCode != ''"> #{userCode} ,</if>
- <if test="userPassword != null and userPassword != ''"> #{userPassword} ,</if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> #{pwdlevelcode} ,</if>
- <if test="pwdparam != null and pwdparam != ''"> #{pwdparam} ,</if>
- <if test="userNote != null and userNote != ''"> #{userNote} ,</if>
- <if test="abledate != null and abledate != ''"> #{abledate} ,</if>
- <if test="disabledate != null and disabledate != ''"> #{disabledate} ,</if>
- <if test="islocked != null and islocked != ''"> #{islocked} ,</if>
- <if test="userType != null and userType != ''"> #{userType} ,</if>
- <if test="baseDocType != null and baseDocType != ''"> #{baseDocType} ,</if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> #{pkBaseDoc} ,</if>
- <if test="identityverifycode != null and identityverifycode != ''"> #{identityverifycode} ,</if>
- <if test="pkOrg != null and pkOrg != ''"> #{pkOrg} ,</if>
- <if test="format != null and format != ''"> #{format} ,</if>
- <if test="isca != null and isca != ''"> #{isca} ,</if>
- <if test="enablestate != null and enablestate != ''"> #{enablestate} ,</if>
- <if test="contentlang != null and contentlang != ''"> #{contentlang} ,</if>
- <if test="userCodeQ != null and userCodeQ != ''"> #{userCodeQ} ,</if>
- <if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_user a WHERE a.sts = 'Y' ),</if>
- <if test="sts == null ">'Y',</if>
- </trim>
- )
-</insert>
-<!-- 批量新增 -->
-<insert id="entityInsertBatch" >
- insert into mdm_user(document_rule, document_rule_num, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, user_name, user_code, user_password, pwdlevelcode, pwdparam, user_note, abledate, disabledate, islocked, user_type, base_doc_type, pk_base_doc, identityverifycode, pk_org, format, isca, enablestate, contentlang, user_code_q, sts)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.userName},#{entity.userCode},#{entity.userPassword},#{entity.pwdlevelcode},#{entity.pwdparam},#{entity.userNote},#{entity.abledate},#{entity.disabledate},#{entity.islocked},#{entity.userType},#{entity.baseDocType},#{entity.pkBaseDoc},#{entity.identityverifycode},#{entity.pkOrg},#{entity.format},#{entity.isca},#{entity.enablestate},#{entity.contentlang},#{entity.userCodeQ}, 'Y')
- </foreach>
-</insert>
-<!-- 批量新增或者修改-->
-<insert id="entityInsertOrUpdateBatch" >
- insert into mdm_user(document_rule, document_rule_num, data_status, add_status, update_status, delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, user_name, user_code, user_password, pwdlevelcode, pwdparam, user_note, abledate, disabledate, islocked, user_type, base_doc_type, pk_base_doc, identityverifycode, pk_org, format, isca, enablestate, contentlang, user_code_q)
- values
- <foreach collection="entities" item="entity" separator=",">
- (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.userName},#{entity.userCode},#{entity.userPassword},#{entity.pwdlevelcode},#{entity.pwdparam},#{entity.userNote},#{entity.abledate},#{entity.disabledate},#{entity.islocked},#{entity.userType},#{entity.baseDocType},#{entity.pkBaseDoc},#{entity.identityverifycode},#{entity.pkOrg},#{entity.format},#{entity.isca},#{entity.enablestate},#{entity.contentlang},#{entity.userCodeQ})
- </foreach>
- on duplicate key update
- document_rule = values(document_rule),
- document_rule_num = values(document_rule_num),
- data_status = values(data_status),
- add_status = values(add_status),
- update_status = values(update_status),
- delete_status = values(delete_status),
- create_user_id = values(create_user_id),
- create_time = values(create_time),
- modify_user_id = values(modify_user_id),
- modify_time = values(modify_time),
- sts = values(sts),
- org_id = values(org_id),
- company_id = values(company_id),
- user_name = values(user_name),
- user_code = values(user_code),
- user_password = values(user_password),
- pwdlevelcode = values(pwdlevelcode),
- pwdparam = values(pwdparam),
- user_note = values(user_note),
- abledate = values(abledate),
- disabledate = values(disabledate),
- islocked = values(islocked),
- user_type = values(user_type),
- base_doc_type = values(base_doc_type),
- pk_base_doc = values(pk_base_doc),
- identityverifycode = values(identityverifycode),
- pk_org = values(pk_org),
- format = values(format),
- isca = values(isca),
- enablestate = values(enablestate),
- contentlang = values(contentlang),
- user_code_q = values(user_code_q)</insert>
-<!--通过主键修改方法-->
-<update id="entity_update" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity" >
-update mdm_user set
-<trim suffix="" suffixOverrides=",">
- <if test="documentRule != null and documentRule != ''"> document_rule = #{documentRule},</if>
- <if test="documentRuleNum != null"> document_rule_num = #{documentRuleNum},</if>
- <if test="dataStatus != null and dataStatus != ''"> data_status = #{dataStatus},</if>
- <if test="addStatus != null and addStatus != ''"> add_status = #{addStatus},</if>
- <if test="updateStatus != null and updateStatus != ''"> update_status = #{updateStatus},</if>
- <if test="deleteStatus != null and deleteStatus != ''"> delete_status = #{deleteStatus},</if>
- <if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
- <if test="create_time != null"> create_time = #{create_time},</if>
- <if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
- <if test="modify_time != null"> modify_time = #{modify_time},</if>
- <if test="sts != null and sts != ''"> sts = #{sts},</if>
- <if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
- <if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
- <if test="userName != null and userName != ''"> user_name = #{userName},</if>
- <if test="userCode != null and userCode != ''"> user_code = #{userCode},</if>
- <if test="userPassword != null and userPassword != ''"> user_password = #{userPassword},</if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> pwdlevelcode = #{pwdlevelcode},</if>
- <if test="pwdparam != null and pwdparam != ''"> pwdparam = #{pwdparam},</if>
- <if test="userNote != null and userNote != ''"> user_note = #{userNote},</if>
- <if test="abledate != null and abledate != ''"> abledate = #{abledate},</if>
- <if test="disabledate != null and disabledate != ''"> disabledate = #{disabledate},</if>
- <if test="islocked != null and islocked != ''"> islocked = #{islocked},</if>
- <if test="userType != null and userType != ''"> user_type = #{userType},</if>
- <if test="baseDocType != null and baseDocType != ''"> base_doc_type = #{baseDocType},</if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> pk_base_doc = #{pkBaseDoc},</if>
- <if test="identityverifycode != null and identityverifycode != ''"> identityverifycode = #{identityverifycode},</if>
- <if test="pkOrg != null and pkOrg != ''"> pk_org = #{pkOrg},</if>
- <if test="format != null and format != ''"> format = #{format},</if>
- <if test="isca != null and isca != ''"> isca = #{isca},</if>
- <if test="enablestate != null and enablestate != ''"> enablestate = #{enablestate},</if>
- <if test="contentlang != null and contentlang != ''"> contentlang = #{contentlang},</if>
- <if test="userCodeQ != null and userCodeQ != ''"> user_code_q = #{userCodeQ},</if>
-</trim>
-where id = #{id}
-</update>
-<!-- 逻辑删除 -->
-<update id="entity_logicDelete" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity" >
-update mdm_user set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
-where id = #{id}
-</update>
-<!-- 多条件逻辑删除 -->
-<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity" >
-update mdm_user set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and">
- <if test="id != null and id != ''"> and id = #{id} </if>
- <if test="documentRule != null and documentRule != ''"> and document_rule = #{documentRule} </if>
- <if test="documentRuleNum != null"> and document_rule_num = #{documentRuleNum} </if>
- <if test="dataStatus != null and dataStatus != ''"> and data_status = #{dataStatus} </if>
- <if test="addStatus != null and addStatus != ''"> and add_status = #{addStatus} </if>
- <if test="updateStatus != null and updateStatus != ''"> and update_status = #{updateStatus} </if>
- <if test="deleteStatus != null and deleteStatus != ''"> and delete_status = #{deleteStatus} </if>
- <if test="sorts != null"> and sorts = #{sorts} </if>
- <if test="sts != null and sts != ''"> and sts = #{sts} </if>
- <if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
- <if test="userName != null and userName != ''"> and user_name = #{userName} </if>
- <if test="userCode != null and userCode != ''"> and user_code = #{userCode} </if>
- <if test="userPassword != null and userPassword != ''"> and user_password = #{userPassword} </if>
- <if test="pwdlevelcode != null and pwdlevelcode != ''"> and pwdlevelcode = #{pwdlevelcode} </if>
- <if test="pwdparam != null and pwdparam != ''"> and pwdparam = #{pwdparam} </if>
- <if test="userNote != null and userNote != ''"> and user_note = #{userNote} </if>
- <if test="abledate != null and abledate != ''"> and abledate = #{abledate} </if>
- <if test="disabledate != null and disabledate != ''"> and disabledate = #{disabledate} </if>
- <if test="islocked != null and islocked != ''"> and islocked = #{islocked} </if>
- <if test="userType != null and userType != ''"> and user_type = #{userType} </if>
- <if test="baseDocType != null and baseDocType != ''"> and base_doc_type = #{baseDocType} </if>
- <if test="pkBaseDoc != null and pkBaseDoc != ''"> and pk_base_doc = #{pkBaseDoc} </if>
- <if test="identityverifycode != null and identityverifycode != ''"> and identityverifycode = #{identityverifycode} </if>
- <if test="pkOrg != null and pkOrg != ''"> and pk_org = #{pkOrg} </if>
- <if test="format != null and format != ''"> and format = #{format} </if>
- <if test="isca != null and isca != ''"> and isca = #{isca} </if>
- <if test="enablestate != null and enablestate != ''"> and enablestate = #{enablestate} </if>
- <if test="contentlang != null and contentlang != ''"> and contentlang = #{contentlang} </if>
- <if test="userCodeQ != null and userCodeQ != ''"> and user_code_q = #{userCodeQ} </if>
- and sts='Y'
- </trim>
-</update>
-<!--通过主键删除-->
-<delete id="entity_delete">
- delete from mdm_user where id = #{id}
-</delete>
-
-</mapper>
-
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java
deleted file mode 100644
index 4eaf8f41..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.hzya.frame.plugin.masterData.user.plugin;
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.base.PluginBaseEntity;
-import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataMemberService;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * 用户档案(MdmUser)表服务接口
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public class MdmUserPluginInitializer extends PluginBaseEntity{
- Logger logger = LoggerFactory.getLogger(MdmUserPluginInitializer.class);
- @Autowired
- private IMasterDataMemberService masterDataMemberService;
-
- @Override
- public void initialize() {
- logger.info(getPluginLabel() + "執行初始化方法initialize()");
- }
-
- @Override
- public void destroy() {
- logger.info(getPluginLabel() + "執行銷毀方法destroy()");
- }
-
- @Override
- public String getPluginId() {
- return "MdmUserPlugin";
- }
-
- @Override
- public String getPluginName() {
- return "MdmUserPlugin插件";
- }
-
- @Override
- public String getPluginLabel() {
- return "MdmUserPlugin";
- }
-
- @Override
- public String getPluginType() {
- return "1";
- }
- @Override
- public JsonResultEntity executeBusiness(JSONObject requestJson) {
- try {
- logger.info("======开始执行用户信息同步========");
- return masterDataMemberService.queryMemberArchives(requestJson);
- }catch (Exception e){
- logger.info("======执行用户同步失败:{}========",e.getMessage());
- e.printStackTrace();
- }
- return null;
- }
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java
deleted file mode 100644
index e7f984eb..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.hzya.frame.plugin.masterData.user.service;
-
-import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity;
-
-/**
- * 用户档案(MdmUser)表服务接口
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public interface IMdmUserService extends IBaseService<MdmUserEntity, String>{
-}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java
deleted file mode 100644
index 3f88a2d2..00000000
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.hzya.frame.plugin.masterData.user.service.impl;
-
-import com.hzya.frame.basedao.service.impl.BaseService;
-import com.hzya.frame.plugin.masterData.user.dao.IMdmUserDao;
-import com.hzya.frame.plugin.masterData.user.entity.MdmUserEntity;
-import com.hzya.frame.plugin.masterData.user.service.IMdmUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-/**
- * 用户档案(MdmUser)表服务实现类
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public class MdmUserServiceImpl extends BaseService<MdmUserEntity, String> implements IMdmUserService {
-
- private IMdmUserDao mdmUserDao;
-
- @Autowired
- public void setMdmUserDao(IMdmUserDao dao) {
- this.mdmUserDao = dao;
- this.dao = dao;
- }
-}
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml
deleted file mode 100644
index 5543d57a..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmCustomerBankPlugin</id>
-<name>MdmCustomerBankPlugin插件</name>
-<category>90000001</category>
-</plugin>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml
deleted file mode 100644
index d3358861..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmCustomerBankDao" class="com.hzya.frame.plugin.masterData.customer.bank.dao.impl.MdmCustomerBankDaoImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index d99236a7..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmCustomerBankInitializer" class="com.hzya.frame.plugin.masterData.customer.bank.plugin.MdmCustomerBankPluginInitializer" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml
deleted file mode 100644
index 5fe75f54..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmCustomerBankService" class="com.hzya.frame.plugin.masterData.customer.bank.service.impl.MdmCustomerBankServiceImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml
deleted file mode 100644
index df03dbcd..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmCustomerPlugin</id>
-<name>MdmCustomerPlugin插件</name>
-<category>90000001</category>
-</plugin>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml
deleted file mode 100644
index e6a21caa..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmProjectPlugin</id>
-<name>MdmProjectPlugin插件</name>
-<category>90000001</category>
-</plugin>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml
deleted file mode 100644
index 4b2b24ab..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmProjectDao" class="com.hzya.frame.plugin.masterData.project.dao.impl.MdmProjectDaoImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index 272d01ca..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmProjectInitializer" class="com.hzya.frame.plugin.masterData.project.plugin.MdmProjectPluginInitializer" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml
deleted file mode 100644
index 5b26e6ed..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmProjectService" class="com.hzya.frame.plugin.masterData.project.service.impl.MdmProjectServiceImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml
deleted file mode 100644
index 08c20d5f..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmUserDao" class="com.hzya.frame.plugin.masterData.user.dao.impl.MdmUserDaoImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml
deleted file mode 100644
index a9e42b61..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmUserInitializer" class="com.hzya.frame.plugin.masterData.user.plugin.MdmUserPluginInitializer" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml
deleted file mode 100644
index 0b5dc5ca..00000000
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-service.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans default-autowire="byName">
-<bean name="mdmUserService" class="com.hzya.frame.plugin.masterData.user.service.impl.MdmUserServiceImpl" />
-</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml
similarity index 61%
rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml
rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml
index b7b315a4..e9adf11a 100644
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml
+++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin>
-<id>MdmUserPlugin</id>
-<name>MdmUserPlugin插件</name>
+<id>MdmPlugin</id>
+<name>MdmPlugin插件</name>
<category>90000001</category>
</plugin>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml
similarity index 84%
rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml
rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml
index 62161706..471dd4a6 100644
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-dao.xml
+++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-dao.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans default-autowire="byName">
-<bean name="mdmCustomerDao" class="com.hzya.frame.plugin.masterData.customer.dao.impl.MdmCustomerDaoImpl" />
+<bean name="mdmCustomerDao" class="com.hzya.frame.plugin.masterData.dao.impl.MdmDaoImpl" />
</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml
similarity index 80%
rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml
rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml
index 41c79445..6943ad23 100644
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-plugin.xml
+++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-plugin.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans default-autowire="byName">
-<bean name="mdmCustomerInitializer" class="com.hzya.frame.plugin.masterData.customer.plugin.MdmCustomerPluginInitializer" />
+<bean name="mdmCustomerInitializer" class="com.hzya.frame.plugin.masterData.plugin.MdmPluginInitializer" />
</beans>
diff --git a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml
similarity index 81%
rename from buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml
rename to buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml
index cdbf695b..c642948f 100644
--- a/buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/spring/spring-buildpackage-service.xml
+++ b/buildpackage/src/main/resources/cfgHome/plugin/masterData/spring/spring-buildpackage-service.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans default-autowire="byName">
-<bean name="mdmCustomerService" class="com.hzya.frame.plugin.masterData.customer.service.impl.MdmCustomerServiceImpl" />
+<bean name="mdmCustomerService" class="com.hzya.frame.plugin.masterData.service.impl.MdmServiceImpl" />
</beans>