Merge branches 'dev' and 'yuecheng-project' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into yuecheng-project

buildpackage/pom.xml

@@ -87,6 +87,12 @@
                 <profile.active>ydc</profile.active>
             </properties>
         </profile>
+        <profile>
+            <id>yc</id> <!--越城区-->
+            <properties>
+                <profile.active>yc</profile.active>
+            </properties>
+        </profile>
     </profiles>
     <build>
         <finalName>kangarooDataCenterV3</finalName>

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> {
+
+}
+

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 {
+ 
+}
+

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 {
+
+}
+

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>
+

buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/PayBillPluginInitializer.java

@@ -1,23 +1,24 @@
-package com.hzya.frame.plugin.masterData.org.plugin;
+package com.hzya.frame.plugin.a8bill.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.seeyon.paybill.service.IPayBillService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * 组织档案(MdmOrg)表服务接口
+ * 付款单(PayBill)表服务接口
  *
  * @author makejava
  * @since 2024-06-07 18:30:05
  */
-public class MdmOrgPluginInitializer extends PluginBaseEntity{
-    Logger logger = LoggerFactory.getLogger(MdmOrgPluginInitializer.class);
+public class PayBillPluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(PayBillPluginInitializer.class);
    @Autowired
-    private MasterDataOrgsServiceImpl masterDataOrgsService;
+   private IPayBillService payBillService;
 
       @Override
     public void initialize() {
@@ -31,17 +32,17 @@ public class MdmOrgPluginInitializer extends PluginBaseEntity{
 
     @Override
     public String getPluginId() {
-        return "MdmOrgPlugin";
+        return "PayBillPlugin";
     }
 
     @Override
     public String getPluginName() {
-        return "MdmOrgPlugin插件";
+        return "PayBillPlugin插件";
     }
 
     @Override
     public String getPluginLabel() {
-        return "MdmOrgPlugin";
+        return "PayBillPlugin";
     }
 
     @Override
@@ -51,10 +52,10 @@ public class MdmOrgPluginInitializer extends PluginBaseEntity{
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) {
           try {
-              logger.info("======开始执行主数据档案组织档案同步========");
-             return masterDataOrgsService.queryOrgsArchives(requestJson);
+              logger.info("======开始执行付款单据信息同步========");
+             return payBillService.sendEngineerPayBillToBip(requestJson);
           }catch (Exception e){
-              logger.info("======执行主数据档案组织档案同步失败:{}========",e.getMessage());
+              logger.info("======执行付款单据同步失败:{}========",e.getMessage());
               e.printStackTrace();
           }
           return null;

buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/plugin/RecBillPluginInitializer.java

@@ -1,24 +1,24 @@
-package com.hzya.frame.plugin.masterData.project.plugin;
+package com.hzya.frame.plugin.a8bill.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.seeyon.paybill.service.IPayBillService;
+import com.hzya.frame.seeyon.recbill.service.IRecBillService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * 项目档案(MdmProject)表服务接口
+ * 收款单(RecBill)表服务接口
  *
  * @author makejava
- * @since 2024-06-07 18:29:23
+ * @since 2024-06-07 18:30:05
  */
-public class MdmProjectPluginInitializer extends PluginBaseEntity{
-    Logger logger = LoggerFactory.getLogger(MdmProjectPluginInitializer.class);
-
+public class RecBillPluginInitializer extends PluginBaseEntity{
+    Logger logger = LoggerFactory.getLogger(RecBillPluginInitializer.class);
    @Autowired
-    private MasterDataProjectServiceImpl masterDataProjectService;
+   private IRecBillService recBillService;
 
       @Override
     public void initialize() {
@@ -32,17 +32,17 @@ public class MdmProjectPluginInitializer extends PluginBaseEntity{
 
     @Override
     public String getPluginId() {
-        return "MdmProjectPlugin";
+        return "RecBillPluginInitializer";
     }
 
     @Override
     public String getPluginName() {
-        return "MdmProjectPlugin插件";
+        return "RecBillPluginInitializer插件";
     }
 
     @Override
     public String getPluginLabel() {
-        return "MdmProjectPlugin";
+        return "RecBillPluginInitializer";
     }
 
     @Override
@@ -52,11 +52,10 @@ public class MdmProjectPluginInitializer extends PluginBaseEntity{
     @Override
     public JsonResultEntity executeBusiness(JSONObject requestJson) {
           try {
-              logger.info("=====开始执行主数据档案项目档案同步=======");
-              JsonResultEntity jsonResultEntity = masterDataProjectService.queryProjectArchives(requestJson);
-              return jsonResultEntity;
+              logger.info("======开始执行收款单据信息同步========");
+             return recBillService.sendRecBillToBip(requestJson);
           }catch (Exception e){
-              logger.info("======执行主数据档案项目档案同步失败:{}",e.getMessage());
+              logger.info("======执行收款单据同步失败:{}========",e.getMessage());
               e.printStackTrace();
           }
           return null;

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>{
+}

buildpackage/src/main/java/com/hzya/frame/plugin/a8bill/service/impl/PayBillServiceImpl.java

@@ -0,0 +1,22 @@
+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;
+
+/**
+ *  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 {
+     
+
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/AgentPayResultPluginInitializer.java

@@ -0,0 +1,111 @@
+package com.hzya.frame.plugin.cbs8.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.cbs8.dto.req.AgentPayResultRequestDTO;
+import com.hzya.frame.cbs8.dto.res.AgentPayResultResDTO;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/18 17:22
+ **/
+public class AgentPayResultPluginInitializer extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(AgentPayResultPluginInitializer.class);
+
+    @Autowired
+    private ICbsPluginService cbsPluginService;
+
+    /***
+     * 插件初始化方法
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 10:48
+     * @Param []
+     * @return void
+     **/
+    @Override
+    public void initialize() {
+
+    }
+
+    /****
+     * 插件销毁方法
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    /****
+     * 插件的ID
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginId() {
+        return "CBS8AgentPayResultPlugin";
+    }
+
+    /****
+     * 插件的名称
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginName() {
+        return "cbs8代发代扣详情查询插件";
+    }
+
+    /****
+     * 插件的显示值
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginLabel() {
+        return "cbs8代发代扣详情查询插件";
+    }
+
+    /***
+     * 插件类型 1、场景插件
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 14:01
+     * @Param []
+     * @return java.lang.String
+     **/
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    /***
+     * 执行业务代码
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-07 11:20
+     * @param requestJson  执行业务代码的参数
+     * @return void
+     **/
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        //1、查询代发代扣交易未完成代
+        //2、调用cbs接口
+        AgentPayResultRequestDTO agentPayResultRequestDTO = new AgentPayResultRequestDTO();
+        agentPayResultRequestDTO.setBusNum("");
+        AgentPayResultResDTO agentPayResultResDTO = cbsPluginService.agentPayResult(agentPayResultRequestDTO);
+        //更新OA表单
+        //记录日志
+        return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/ElecBillPluginInitializer.java

@@ -0,0 +1,101 @@
+package com.hzya.frame.plugin.cbs8.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description 电子回单定时任务
+ * @Author xiangerlin
+ * @Date 2024/6/17 14:03
+ **/
+public class ElecBillPluginInitializer extends PluginBaseEntity {
+
+    Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private ICbsPluginService cbsPluginService;
+    /***
+     * 插件初始化方法
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 10:48
+     * @Param []
+     * @return void
+     **/
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    /****
+     * 插件销毁方法
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    /****
+     * 插件的ID
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginId() {
+        return "CBS8ElecBillPlugin";
+    }
+
+    /****
+     * 插件的名称
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginName() {
+        return "cbs8电子回单插件";
+    }
+
+    /****
+     * 插件的显示值
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginLabel() {
+        return "cbs8电子回单插件";
+    }
+
+    /***
+     * 插件类型 1、场景插件
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 14:01
+     * @Param []
+     * @return java.lang.String
+     **/
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    /***
+     * 执行业务代码
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-07 11:20
+     * @param requestJson  执行业务代码的参数
+     * @return void
+     **/
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        cbsPluginService.elecBillUpload(requestJson);
+        return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyAgentPluginInitializer.java

@@ -0,0 +1,128 @@
+package com.hzya.frame.plugin.cbs8.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.cbs8.dto.res.PayResponseDTO;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/18 14:03
+ **/
+public class PayApplyAgentPluginInitializer extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(PayApplyAgentPluginInitializer.class);
+    @Autowired
+    private ICbsPluginService cbsPluginService;
+
+
+    @Autowired
+    private IAgentPaymentService agentPaymentService;
+
+
+    /***
+     * 插件初始化方法
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 10:48
+     * @Param []
+     * @return void
+     **/
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    /****
+     * 插件销毁方法
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    /****
+     * 插件的ID
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginId() {
+        return "CBS8PayApplyAgentPlugin";
+    }
+
+    /****
+     * 插件的名称
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginName() {
+        return "cbs8代发代扣插件";
+    }
+
+    /****
+     * 插件的显示值
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginLabel() {
+        return "cbs8代发代扣插件";
+    }
+
+    /***
+     * 插件类型 1、场景插件
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 14:01
+     * @Param []
+     * @return java.lang.String
+     **/
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    /***
+     * 执行业务代码
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-07 11:20
+     * @param requestJson  执行业务代码的参数
+     * @return void
+     **/
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        //1、查询代支付的
+        AgentPaymentEntity agentPaymentEntity = new AgentPaymentEntity();
+        List<AgentPaymentEntity> agentPaymentList = agentPaymentService.queryUnpaid(agentPaymentEntity);
+        if (CollectionUtils.isNotEmpty(agentPaymentList)){
+            for (AgentPaymentEntity paymentEntity : agentPaymentList) {
+                AgentPaymentDetailEntity detailEntity = new AgentPaymentDetailEntity();
+                detailEntity.setFormmainId(paymentEntity.getId());
+                List<AgentPaymentDetailEntity> agentPaymentDetailList = agentPaymentService.queryDetails(detailEntity);
+                if (CollectionUtils.isNotEmpty(agentPaymentDetailList)){
+                    //调用代发代扣接口
+                    PayResponseDTO payResponseDTO = cbsPluginService.applyAgentPay(paymentEntity, agentPaymentDetailList);
+                    //更新OA表单
+                    //记录日志
+                }
+            }
+        }
+        return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayApplyPluginInitializer.java

@@ -0,0 +1,112 @@
+package com.hzya.frame.plugin.cbs8.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description 经办支付申请
+ * @Author xiangerlin
+ * @Date 2024/6/7 13:42
+ **/
+public class PayApplyPluginInitializer extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(PayApplyPluginInitializer.class);
+
+    @Autowired
+    private ICbsPluginService cbsPluginService;
+
+    /***
+     * 插件初始化方法
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 10:48
+     * @Param []
+     * @return void
+     **/
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    /****
+     * 插件销毁方法
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    /****
+     * 插件的ID
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginId() {
+        return "CBS8PayApplyPlugin";
+    }
+
+    /****
+     * 插件的名称
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginName() {
+        return "cbs8支付申请插件";
+    }
+
+    /****
+     * 插件的显示值
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginLabel() {
+        return "cbs8支付申请插件";
+    }
+
+    /***
+     * 插件类型 1、场景插件
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 14:01
+     * @Param []
+     * @return java.lang.String
+     **/
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    /***
+     * 执行业务代码
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-07 11:20
+     * @param requestJson  执行业务代码的参数
+     * @return void
+     **/
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        PaymentEntity paymentEntity = null;
+        if (null != requestJson){
+            requestJson.remove("jsonStr");
+            paymentEntity = JSONObject.parseObject(requestJson.toString(),PaymentEntity.class);
+        }
+        if (null == paymentEntity)
+            paymentEntity = new PaymentEntity();
+        //支付申请
+        paymentEntity.setOaId("5490849762671477371");
+        cbsPluginService.applyPay(paymentEntity);
+        return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/PayResultPluginInitializer.java

@@ -0,0 +1,110 @@
+package com.hzya.frame.plugin.cbs8.plugin;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description 查询支付结果
+ * @Author xiangerlin
+ * @Date 2024/6/14 16:24
+ **/
+public class PayResultPluginInitializer extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(PayResultPluginInitializer.class);
+
+    @Autowired
+    private ICbsPluginService cbsPluginService;
+    /***
+     * 插件初始化方法
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 10:48
+     * @Param []
+     * @return void
+     **/
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    /****
+     * 插件销毁方法
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    /****
+     * 插件的ID
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginId() {
+        return "CBS8PayResultPlugin";
+    }
+
+    /****
+     * 插件的名称
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginName() {
+        return "cbs8支付结果查询插件";
+    }
+
+    /****
+     * 插件的显示值
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginLabel() {
+        return "cbs8支付结果查询插件";
+    }
+
+    /***
+     * 插件类型 1、场景插件
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 14:01
+     * @Param []
+     * @return java.lang.String
+     **/
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    /***
+     * 执行业务代码
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-07 11:20
+     * @param requestJson  执行业务代码的参数
+     * @return void
+     **/
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        CbsLogEntity cbsLogEntity = null;
+        if (null != requestJson){
+            requestJson.remove("jsonStr");
+            cbsLogEntity = JSONObject.parseObject(requestJson.toString(),CbsLogEntity.class);
+        }
+        if (null == cbsLogEntity){
+            cbsLogEntity = new CbsLogEntity();
+        }
+        cbsPluginService.queryResult(cbsLogEntity);
+        return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/plugin/TransactionDetailPluginInitializer.java

@@ -0,0 +1,126 @@
+package com.hzya.frame.plugin.cbs8.plugin;
+
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO;
+import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO;
+import com.hzya.frame.cbs8.util.CBSUtil;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * @Description 交易明细查询
+ * @Author xiangerlin
+ * @Date 2024/6/17 16:03
+ **/
+public class TransactionDetailPluginInitializer extends PluginBaseEntity {
+    Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ICbsPluginService cbsPluginService;
+
+    /***
+     * 插件初始化方法
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 10:48
+     * @Param []
+     * @return void
+     **/
+    @Override
+    public void initialize() {
+        logger.info(getPluginLabel() + "執行初始化方法initialize()");
+    }
+
+    /****
+     * 插件销毁方法
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public void destroy() {
+        logger.info(getPluginLabel() + "執行銷毀方法destroy()");
+    }
+
+    /****
+     * 插件的ID
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginId() {
+        return "CBS8TransactionDetailQueryPlugin";
+    }
+
+    /****
+     * 插件的名称
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginName() {
+        return "cbs8交易明细查询插件";
+    }
+
+    /****
+     * 插件的显示值
+     * @author 👻👻👻👻👻👻👻👻 gjh
+     * @date 2023-08-02 10:48
+     * @return void
+     **/
+    @Override
+    public String getPluginLabel() {
+        return "cbs8交易明细查询插件";
+    }
+
+    /***
+     * 插件类型 1、场景插件
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-02 14:01
+     * @Param []
+     * @return java.lang.String
+     **/
+    @Override
+    public String getPluginType() {
+        return "1";
+    }
+
+    /***
+     * 执行业务代码
+     * @Author 👻👻👻👻👻👻👻👻 gjh
+     * @Date 2023-08-07 11:20
+     * @param requestJson  执行业务代码的参数
+     * @return void
+     **/
+    @Override
+    public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
+        TransactionDetailReqDTO transactionDetailReqDTO = null;
+        if (null != requestJson){
+            requestJson.remove("jsonStr");
+            transactionDetailReqDTO = JSONObject.parseObject(requestJson.toString(),TransactionDetailReqDTO.class);
+        }
+        if (null == transactionDetailReqDTO){
+            transactionDetailReqDTO = new TransactionDetailReqDTO();
+        }
+        transactionDetailReqDTO.setCurrentPage(CBSUtil.DEFAULT_CURRENT_PAGE);
+        transactionDetailReqDTO.setPageSize(CBSUtil.DEFAULT_PAGE_SIZE);
+        transactionDetailReqDTO.setStartDate(DateUtil.today());
+        transactionDetailReqDTO.setEndDate(DateUtil.today());
+        transactionDetailReqDTO.setDateType("0");
+        transactionDetailReqDTO.setLoanType("2");
+        //1查询交易明细
+        List<TransactionDetailDTO> transactionDetailList = cbsPluginService.queryTransactionDetail(transactionDetailReqDTO);
+        //保存交易明细到OA底表
+        cbsPluginService.saveTransactionDetail(transactionDetailList);
+        return new JsonResultEntity("成功",true,transactionDetailList);
+        //return null;
+    }
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/ICbsPluginService.java

@@ -0,0 +1,77 @@
+package com.hzya.frame.plugin.cbs8.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.cbs8.dto.req.AgentPayResultRequestDTO;
+import com.hzya.frame.cbs8.dto.req.TransactionDetailReqDTO;
+import com.hzya.frame.cbs8.dto.res.AgentPayResultResDTO;
+import com.hzya.frame.cbs8.dto.res.PayResponseDTO;
+import com.hzya.frame.cbs8.dto.res.TransactionDetailDTO;
+import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/17 08:46
+ **/
+public interface ICbsPluginService {
+
+    /**
+     * 支付申请
+     * @param entity
+     */
+     void applyPay(PaymentEntity entity)throws Exception;
+
+    /**
+     * 保存支付申请日志
+     * @param entity
+     * @throws Exception
+     */
+     void savePayLog(PaymentEntity entity,PayResponseDTO payResponseDTO)throws Exception;
+
+    /**
+     * 查询支付申请的交易结果
+     * @param cbsLogEntity
+     * @throws Exception
+     */
+     void queryResult(CbsLogEntity cbsLogEntity)throws Exception;
+
+    /**
+     * 电子回单查询 并上传OA
+     * @param requestJson
+     * @throws Exception
+     */
+    void elecBillUpload(JSONObject requestJson)throws Exception;
+
+    /**
+     * 查询交易明细
+     * transactionDetailReqDTO.currentPage 、 transactionDetailReqDTO.pageSize 必填
+     * @param transactionDetailReqDTO
+     */
+    List<TransactionDetailDTO> queryTransactionDetail(TransactionDetailReqDTO transactionDetailReqDTO);
+
+    /**
+     * 代发代扣 支付申请
+     * @param paymentEntity
+     * @param agentPaymentDetailList
+     */
+    PayResponseDTO applyAgentPay(AgentPaymentEntity paymentEntity, List<AgentPaymentDetailEntity> agentPaymentDetailList);
+
+    /**
+     * 代发代扣 结果详情查询
+     * @param agentPayResultRequestDTO
+     * @return
+     */
+    AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO);
+
+    /**
+     * 保存交易明细到OA底表
+     * @param transactionDetailList
+     */
+    void saveTransactionDetail(List<TransactionDetailDTO> transactionDetailList);
+
+}

buildpackage/src/main/java/com/hzya/frame/plugin/cbs8/service/impl/CbsPluginServiceImpl.java

@@ -0,0 +1,411 @@
+package com.hzya.frame.plugin.cbs8.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.map.MapBuilder;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.cbs8.dto.req.*;
+import com.hzya.frame.cbs8.dto.res.*;
+import com.hzya.frame.cbs8.service.ICbs8Service;
+import com.hzya.frame.cbs8.util.CBSUtil;
+import com.hzya.frame.cbs8.util.PayState;
+import com.hzya.frame.plugin.cbs8.service.ICbsPluginService;
+import com.hzya.frame.seeyon.cap4.form.dto.*;
+import com.hzya.frame.seeyon.cbs8.entity.*;
+import com.hzya.frame.seeyon.cbs8.service.ICbsLogService;
+import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+import com.hzya.frame.seeyon.cbs8.service.ITransactionDetailService;
+import com.hzya.frame.seeyon.entity.CtpAttachmentEntity;
+import com.hzya.frame.seeyon.entity.CtpFileEntity;
+import com.hzya.frame.seeyon.service.ICtpAttachmentService;
+import com.hzya.frame.seeyon.util.RestUtil;
+import com.hzya.frame.uuid.UUIDLong;
+import com.hzya.frame.web.exception.BaseSystemException;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author xiangerlin
+ * @Date 2024/6/17 08:46
+ **/
+public class CbsPluginServiceImpl implements ICbsPluginService {
+
+    Logger logger = LoggerFactory.getLogger(CbsPluginServiceImpl.class);
+    @Autowired
+    private ICbs8Service cbs8Service;
+    @Autowired
+    private IPaymentService paymentService;
+    @Autowired
+    private ICbsLogService cbsLogService;
+    @Autowired
+    private ICtpAttachmentService ctpAttachmentService;
+    @Autowired
+    private ITransactionDetailService transactionDetailService;
+
+    @Autowired
+    private RestUtil restUtil;
+    @Value("${cbs8.elec_path}")
+    private String elec_path;
+    @Value("${OA.data_source_code}")
+    private String oa_data_source_code;
+    /**
+     * 支付申请
+     *
+     * @param paymentEntity
+     */
+    @Override
+    public void applyPay(PaymentEntity paymentEntity) throws Exception{
+        //查询待支付的列表
+        if (null == paymentEntity){
+            paymentEntity = new PaymentEntity();
+        }
+        paymentEntity.setDataSourceCode(oa_data_source_code);
+        List<PaymentEntity> paymentList = paymentService.queryUnpaid(paymentEntity);
+       /* List<PaymentEntity> paymentList = new ArrayList<>();
+        paymentEntity.setReferenceNum("CL202406140001");
+        paymentEntity.setPayAccount("655905707410000");
+        paymentEntity.setPayBankName("");
+        paymentEntity.setAmount("99");
+        paymentEntity.setRevAccount("123456778");
+        paymentEntity.setRevBankName("中国工商银行总行清算中心");
+        paymentEntity.setRevBankType("ICB");
+        paymentEntity.setRevAccountName("测试账户");
+        paymentEntity.setCnapsCode("102100099996");
+        paymentEntity.setPurpose("测试用途");
+        paymentEntity.setBusType("202");
+        paymentEntity.setCurrency("10");
+        paymentEntity.setPurpose("测试用途");
+        paymentList.add(paymentEntity);*/
+        if (CollectionUtils.isNotEmpty(paymentList)){
+            for (PaymentEntity pay : paymentList) {
+                //调用支付申请接口
+                PayResponseDTO payResponseDTO = cbs8Service.payApply(pay);
+                boolean successed = payResponseDTO.getSuccessed();
+                if (successed){
+                    pay.setPayResult(PayState.p.getValue());
+                }else {
+                    pay.setPayResult("推送失败");
+                }
+                //4、更新OA表单
+                pay.setDataSourceCode(oa_data_source_code);
+                paymentService.updatePayState(pay);
+                //5、记录操作日志
+                savePayLog(pay,payResponseDTO);
+            }
+        }
+    }
+
+    /**
+     * 保存支付申请日志
+     *
+     * @param entity
+     * @throws Exception
+     */
+    @Override
+    public void savePayLog(PaymentEntity entity,PayResponseDTO payResponseDTO) throws Exception {
+        //4. 保存日志
+        CbsLogEntity cbsLogEntity = new CbsLogEntity();
+        cbsLogEntity.setTitle(entity.getTitle());
+        cbsLogEntity.setPay_company(entity.getPayCompany());
+        cbsLogEntity.setPayee(entity.getRevAccountName());
+        cbsLogEntity.setAmount(entity.getAmount());
+        cbsLogEntity.setOa_id(entity.getOaId());
+        cbsLogEntity.setBill_code(Convert.toStr(entity.getReferenceNumNew(),entity.getReferenceNum()));
+        cbsLogEntity.setTab_name_ch(entity.getBillName());
+        cbsLogEntity.setTab_name_en(entity.getTableName());
+        Boolean successed = payResponseDTO.getSuccessed();
+        if (successed){
+            cbsLogEntity.setPay_state(PayState.p.getValue());
+            cbsLogEntity.setApply_state(PayState.two.getValue());
+            cbsLogEntity.setCbs_apply_code(payResponseDTO.getBusNum());
+            cbsLogEntity.setSuccessed("true");
+            entity.setPayResult(PayState.p.getValue());
+        }else {
+            cbsLogEntity.setPay_state("推送失败");
+            cbsLogEntity.setMessage(payResponseDTO.getErrorMsg());
+            cbsLogEntity.setSuccessed("false");
+            entity.setPayResult("推送失败");
+        }
+        cbsLogService.saveLog(cbsLogEntity);
+    }
+
+    /**
+     * 查询支付申请的交易结果
+     *
+     * @param cbsLogEntity
+     * @throws Exception
+     */
+    @Override
+    public void queryResult(CbsLogEntity cbsLogEntity) throws Exception {
+        if (null == cbsLogEntity){
+            cbsLogEntity = new CbsLogEntity();
+        }
+        cbsLogEntity.setDataSourceCode(oa_data_source_code);
+        // 1、查询支付中的日志
+        List<CbsLogEntity> inPayList = cbsLogService.queryInPayment(cbsLogEntity);
+        if (CollectionUtils.isNotEmpty(inPayList)){
+            for (CbsLogEntity entity : inPayList) {
+                try {
+                    List<PayResultResDTO> payResultResList = cbs8Service.queryPayResult(new PayResultRequestDTO(entity.getBill_code()));
+                    if (CollectionUtils.isNotEmpty(payResultResList)){
+                        PayResultResDTO payResultResDTO = payResultResList.get(0);
+                        //支付申请状态
+                        String status = payResultResDTO.getStatus();
+                        //支付状态
+                        String pay_status = payResultResDTO.getPayStatus();
+                        //不等于支付中的时候 更新支付状态
+                        if (!PayState.p.getType().equals(pay_status)){
+                            //如果支付状态为空，保存支付申请状态，如果支付状态不为空，则保存支付状态
+                            PaymentEntity paymentEntity = new PaymentEntity();
+                            paymentEntity.setOaId(entity.getOa_id());
+                            paymentEntity.setDataSourceCode(oa_data_source_code);
+                            List<PaymentEntity> paymentList = paymentService.query(paymentEntity);
+                            if (CollectionUtils.isNotEmpty(paymentList)){
+                                paymentEntity = paymentList.get(0);
+                                if (StrUtil.isEmpty(pay_status)) {
+                                    //支付申请状态 支付状态和支付申请状态用一个
+                                    paymentEntity.setPayResult(PayState.payStateGetValue(status));
+                                } else {
+                                    //支付状态 支付状态和支付申请状态用一个
+                                    paymentEntity.setPayResult(PayState.payStateGetValue(pay_status));
+                                }
+                                if (StrUtil.isNotEmpty(pay_status) && pay_status.equals(PayState.g.getType())) {
+                                    //支付时间
+                                    paymentEntity.setPayDate(CBSUtil.convertTimestampToString(payResultResDTO.getPayDate()));
+                                }
+                                //更新视图单据状态
+                                paymentEntity.setDataSourceCode(oa_data_source_code);
+                                paymentService.updatePayState(paymentEntity);
+                                //更新日志表状态
+                                entity.setPay_state(paymentEntity.getPayResult());
+                                entity.setApply_state(PayState.payStateGetValue(status));
+                                entity.setDataSourceCode(oa_data_source_code);
+                                cbsLogService.updateLog(entity);
+                            }
+                        }
+                    }
+                }catch (Exception e){
+                 e.printStackTrace();
+                 logger.error("查询交易结果出错",e);
+                }
+            }
+        }
+    }
+
+    /**
+     * 电子回单查询 并上传OA
+     *
+     * @param requestJson
+     * @throws Exception
+     */
+    @Override
+    public void elecBillUpload(JSONObject requestJson) throws Exception {
+        //查询支付成功 没有电子回单的数据
+        PaymentEntity paymentEntity = new PaymentEntity();
+       // List<PaymentEntity> paymentList = paymentService.queryElecIsNull(paymentEntity);
+        paymentEntity.setPayDate("2024-06-20");
+        paymentEntity.setReferenceNum("41");
+        List<PaymentEntity> paymentList = Arrays.asList(paymentEntity);
+        if (CollectionUtils.isNotEmpty(paymentList)) {
+            for (PaymentEntity pay : paymentList) {
+                try {
+                    String payDate = DateUtil.format(DateUtil.parse(pay.getPayDate()), "yyyy-MM-dd");
+                    //查询cbs电子回单
+                    List<ElecResponseDTO> elecResList = cbs8Service.queryElecBill(new ElecRequestDTO(payDate,DateUtil.today(),pay.getReferenceNum()));
+                    if (CollectionUtils.isNotEmpty(elecResList)){
+                        ElecResponseDTO elecResponseDTO = elecResList.get(0);
+                        String bucketFileUrl = elecResponseDTO.getBucketFileUrl();
+                        String bucketFileName = elecResponseDTO.getBucketFileName();
+                        //上传电子回单到OA
+                        HttpUtil.downloadFile(bucketFileUrl, FileUtil.file(elec_path));//附件下载
+                        String pdfUrl = elec_path + bucketFileName;
+                        File file = new File(pdfUrl);
+                        if (file.exists()) {
+                            CtpFileEntity cpFileEntity =  new CtpFileEntity();
+                            cpFileEntity.setFile(file);
+                            cpFileEntity.setDataSourceCode(oa_data_source_code);
+                            JSONObject jsonObjectUpload = restUtil.fileUpload(file,"8000240005");
+                            String file_url = jsonObjectUpload.getString("fileUrl");
+                            if (null != jsonObjectUpload && StrUtil.isNotEmpty(file_url)) {
+                                String sub_reference = String.valueOf(UUIDLong.longUUID());
+                                pay.setReceipt(sub_reference);
+                                //更新表单的电子回单值
+                                paymentService.updateElec(pay);
+                                //保存附件关系
+                                CtpAttachmentEntity ctpAttachmentEntity = new CtpAttachmentEntity();
+                                ctpAttachmentEntity.setFile_url(file_url);
+                                ctpAttachmentService.saveAttachment(file_url, pay.getSummaryId(), sub_reference);
+                            }
+                            //删除本地临时文件
+                            file.delete();
+                        }
+                    }
+                }catch (Exception e){
+                    logger.error("电子回单查询出错",e);
+                }
+            }
+        }
+    }
+
+    /**
+     * 查询交易明细
+     * transactionDetailReqDTO.currentPage 、 transactionDetailReqDTO.pageSize 必填
+     * @param transactionDetailReqDTO
+     */
+    @Override
+    public List<TransactionDetailDTO> queryTransactionDetail(TransactionDetailReqDTO transactionDetailReqDTO) {
+        boolean hasNextPage = true;//是否有下一页
+        int currentPage = transactionDetailReqDTO.getCurrentPage();
+        int pageSize = transactionDetailReqDTO.getPageSize();
+        if (currentPage == 0){
+            currentPage = CBSUtil.DEFAULT_CURRENT_PAGE;//页码
+        }
+        if (pageSize == 0){
+            pageSize = CBSUtil.DEFAULT_PAGE_SIZE;//每页条数
+            transactionDetailReqDTO.setPageSize(pageSize);
+        }
+        List<TransactionDetailDTO> resultList = new ArrayList<>();
+        do{
+            transactionDetailReqDTO.setCurrentPage(currentPage);//页码
+            currentPage++;//页码自增
+            hasNextPage = false;//保护功能，防止出现死循环
+            CbsResDataDTO dataDTO = cbs8Service.queryTransactionDetail(transactionDetailReqDTO);
+            if (null != dataDTO){
+                hasNextPage = dataDTO.getHasNextPage();
+                List<TransactionDetailDTO> transactionDetailDTOList = CBSUtil.convertJsonArrayToList(dataDTO.getList(), TransactionDetailDTO.class);
+                resultList.addAll(transactionDetailDTOList);
+            }
+        }while (hasNextPage);
+
+        return resultList;
+    }
+
+    /**
+     * 代发代扣 支付申请
+     *
+     * @param paymentEntity
+     * @param agentPaymentDetailList
+     */
+    @Override
+    public PayResponseDTO applyAgentPay(AgentPaymentEntity paymentEntity, List<AgentPaymentDetailEntity> agentPaymentDetailList) {
+        if (null != paymentEntity && CollectionUtils.isNotEmpty(agentPaymentDetailList)){
+            PaymentApplySubmitReqDTO paymentApplySubmitReqDTO = BeanUtil.copyProperties(paymentEntity,PaymentApplySubmitReqDTO.class);
+            List<PaymentApplyAgentDTO> paymentApplyAgentList = new ArrayList<>();
+            for (AgentPaymentDetailEntity detailEntity : agentPaymentDetailList) {
+                PaymentApplyAgentDTO detailDTO = BeanUtil.copyProperties(detailEntity,PaymentApplyAgentDTO.class);
+                paymentApplyAgentList.add(detailDTO);
+            }
+            PayResponseDTO payResponseDTO = cbs8Service.agentPayApply(paymentApplySubmitReqDTO,paymentApplyAgentList);
+            return payResponseDTO;
+        }else {
+            throw new BaseSystemException("参数不能为空");
+        }
+    }
+
+    /**
+     * 代发代扣 结果详情查询
+     *
+     * @param agentPayResultRequestDTO
+     * @return
+     */
+    @Override
+    public AgentPayResultResDTO agentPayResult(AgentPayResultRequestDTO agentPayResultRequestDTO) {
+        if (null != agentPayResultRequestDTO && StrUtil.isNotEmpty(agentPayResultRequestDTO.getBusNum())){
+            AgentPayResultResDTO agentPayResultResDTO = cbs8Service.agentPayResult(agentPayResultRequestDTO);
+            return agentPayResultResDTO;
+        }
+        return null;
+    }
+
+    /**
+     * 保存交易明细到OA底表
+     *
+     * @param transactionDetailList
+     */
+    @Override
+    public void saveTransactionDetail(List<TransactionDetailDTO> transactionDetailList) {
+        if (CollectionUtils.isNotEmpty(transactionDetailList)){
+            //过滤已经保存过的数据
+            for (TransactionDetailDTO dto : transactionDetailList) {
+                TransactionDetailEntity transactionDetail = new TransactionDetailEntity();
+                BeanUtil.copyProperties(dto,transactionDetail);
+                transactionDetailService.restSave(transactionDetail);
+            }
+        }
+    }
+
+    //这个方法没用，用的是8.0批量保存方式，我没有测试
+    private void saveTransactionDetailTemp(List<TransactionDetailDTO> transactionDetailList) {
+        if (CollectionUtils.isNotEmpty(transactionDetailList)){
+            //过滤已经保存过的数据
+            for (TransactionDetailDTO dto : transactionDetailList) {
+                List<FormDataDTO> dataList = new ArrayList<>();
+                FormDTO formDTO = new FormDTO();
+                formDTO.setFormCode("formmain_0233");
+                formDTO.setLoginName("yonyou");
+                formDTO.setRightId("6603635988997229999.-8611088937958683581");
+                String field0001=dto.getAccountNo();//我方银行账号
+                String field0002=dto.getAccountName();//我方户名
+                String field0003=dto.getOpenBank();//我方开户行
+                String field0004=dto.getBankType();//我方银行类型
+                String field0005=dto.getTransactionSerialNumber();//交易流水号
+                String field0006=dto.getBankTransactionDate();//交易日期
+                String field0007=dto.getBankSerialNumber();//银行流水号
+                String field0008=dto.getCurrency();//币种
+                String field0009=dto.getIncurredAmount();//收款金额
+                String field0010=dto.getPurpose();//用途
+                String field0011=dto.getDigest();//摘要
+                String field0012=dto.getOppositeAccount();//对方账号
+                String field0013=dto.getOppositeName();//对方户名
+                String field0014=dto.getOppositeOpeningBank();//对方开户行
+                String field0015=dto.getRemark();//备注
+                //fields
+                List<RecordFieldDTO> fields = new ArrayList<>();
+                fields.add(new RecordFieldDTO("field0001",field0001,field0001));
+                fields.add(new RecordFieldDTO("field0002",field0002,field0002));
+                fields.add(new RecordFieldDTO("field0003",field0003,field0003));
+                fields.add(new RecordFieldDTO("field0004",field0004,field0004));
+                fields.add(new RecordFieldDTO("field0005",field0005,field0005));
+                fields.add(new RecordFieldDTO("field0006",field0006,field0006));
+                fields.add(new RecordFieldDTO("field0007",field0007,field0007));
+                fields.add(new RecordFieldDTO("field0008",field0008,field0008));
+                fields.add(new RecordFieldDTO("field0009",field0009,field0009));
+                fields.add(new RecordFieldDTO("field0010",field0010,field0010));
+                fields.add(new RecordFieldDTO("field0011",field0011,field0011));
+                fields.add(new RecordFieldDTO("field0012",field0012,field0012));
+                fields.add(new RecordFieldDTO("field0013",field0013,field0013));
+                fields.add(new RecordFieldDTO("field0014",field0014,field0014));
+                fields.add(new RecordFieldDTO("field0015",field0015,field0015));
+                //masterTable
+                MasterTableDTO masterTableDTO = new MasterTableDTO();
+                masterTableDTO.setName("formmain_1284");
+                RecordDTO recordDTO = new RecordDTO();
+                recordDTO.setId(UUIDLong.longUUID());
+                recordDTO.setFields(fields);
+                masterTableDTO.setRecord(recordDTO);
+                //dataList
+                FormDataDTO formDataDTO = new FormDataDTO();
+                formDataDTO.setMasterTable(masterTableDTO);
+                dataList.add(formDataDTO);
+                formDTO.setDataList(dataList);
+            }
+        }
+    }
+
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/IMdmCustomerBankDao.java

@@ -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> {
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/dao/impl/MdmCustomerBankDaoImpl.java

@@ -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{
- 
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.java

@@ -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;
-    }
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/entity/MdmCustomerBankEntity.xml

@@ -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>
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/plugin/MdmCustomerBankPluginInitializer.java

@@ -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;
-    }
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/IMdmCustomerBankService.java

@@ -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>{
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/bank/service/impl/MdmCustomerBankServiceImpl.java

@@ -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;
-	}
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/IMdmCustomerDao.java

@@ -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> {
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/dao/impl/MdmCustomerDaoImpl.java

@@ -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{
- 
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/IMdmCustomerService.java

@@ -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>{
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/customer/service/impl/MdmCustomerServiceImpl.java

@@ -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;
-	}
-}

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> {
+
+}
+

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 {
+ 
+}
+

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;

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.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.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.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.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.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.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.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.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.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>

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/IMdmOrgDao.java

@@ -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> {
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/dao/impl/MdmOrgDaoImpl.java

@@ -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 {
- 
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.java

@@ -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;
-    }
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/entity/MdmOrgEntity.xml

@@ -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>
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/IMdmOrgService.java

@@ -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>{
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/org/service/impl/MdmOrgServiceImpl.java

@@ -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;
-	}
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/plugin/MdmPluginInitializer.java

@@ -1,17 +1,22 @@
-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.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 IMasterDataService masterDataService;
 
       @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 masterDataService.queryArchives(requestJson);
+        }catch (Exception e){
+            logger.info("======执行主数据同步失败:{}========",e.getMessage());
+            e.printStackTrace();
+        }
         return null;
     }
 }

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/IMdmProjectDao.java

@@ -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> {
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/dao/impl/MdmProjectDaoImpl.java

@@ -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 {
- 
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.java

@@ -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;
-    }
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/entity/MdmProjectEntity.xml

@@ -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>
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/IMdmProjectService.java

@@ -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>{
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/project/service/impl/MdmProjectServiceImpl.java

@@ -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;
-	}
-}

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>{
+}

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;
+	}
+}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/IMdmUserDao.java

@@ -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> {
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/dao/impl/MdmUserDaoImpl.java

@@ -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 {
- 
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.java

@@ -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;
-    }
-
-}
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/entity/MdmUserEntity.xml

@@ -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>
-

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/plugin/MdmUserPluginInitializer.java

@@ -1,50 +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.web.entity.JsonResultEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-/**
- * 用户档案(MdmUser)表服务接口
- *
- * @author makejava
- * @since 2024-06-17 14:52:30
- */
-public class MdmUserPluginInitializer extends PluginBaseEntity{
-    Logger logger = LoggerFactory.getLogger(MdmUserPluginInitializer.class);
-
-      @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) {
-        logger.info("执行业务代码逻辑");
-        return null;
-    }
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/IMdmUserService.java

@@ -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>{
-}

buildpackage/src/main/java/com/hzya/frame/plugin/masterData/user/service/impl/MdmUserServiceImpl.java

@@ -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;
-	}
-}

buildpackage/src/main/resources/application-llg.yml

@@ -8,21 +8,42 @@ logging:
     #    日志保存路径
     path: /Users/apple/Desktop/log/local
 spring:
+  flyway:
+    # 启动flyway migration, 默认为true
+    enabled: false
   datasource:
     dynamic:
+      druid:
+        filters: stat,log4j2
       datasource:
         master:
-#          url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
-#          url: jdbc:mysql://hzya.ufyct.com:9096/businesscenterauto?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
-#          username: root
-#          password: bd993088e8a7c3dc5f44441617f9b4bf
-#          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+#          url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
+#          username: hzyazt
+#          password: 62e4295b615a30dbf3b8ee96f41c820b
+#          driver-class-name: dm.jdbc.driver.DmDriver
+#          type: com.alibaba.druid.pool.DruidDataSource
           url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
           password: 62e4295b615a30dbf3b8ee96f41c820b
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+#          url: jdbc:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+
 savefile:
   #    文件保存路径
   path: /Users/apple/Desktop/log/local
 zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826
+  #电子回单下载临时存放位置
+  elec_path: /Users/xiangerlin/Downloads/
+OA:
+  data_source_code: yc_oa

buildpackage/src/main/resources/application-xel.yml

@@ -12,10 +12,24 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
           username: root
-          password: bd993088e8a7c3dc5f44441617f9b4bf
+          password: 62e4295b615a30dbf3b8ee96f41c820b
           driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
 savefile:
     #    文件保存路径
   path: /Users/xiangerlin/work/app/logs/ydc
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+    # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185
+  #电子回单下载临时存放位置
+  elec_path: /Users/xiangerlin/Downloads/
+OA:
+  data_source_code: yc-test

buildpackage/src/main/resources/application-yc.yml

@@ -0,0 +1,61 @@
+#logging:
+#  #日志级别 指定目录级别
+#  level:
+#    root: info
+#  encodings: UTF-8
+#  file:
+#    #    日志保存路径
+#    path: /zt/log
+#spring:
+#  flyway:
+#    # 启动flyway migration, 默认为true
+#    enabled: false
+#  datasource:
+#    dynamic:
+#      druid:
+#        filters: stat,log4j2
+#      datasource:
+#        master:
+#          url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle
+#          username: businesscenter
+#          password: 6842568689469adad597d144ee104063
+#          driver-class-name: dm.jdbc.driver.DmDriver
+#savefile:
+#  #    文件保存路径
+#  path: /zt/file
+#ax:
+#  url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
+logging:
+  #日志级别 指定目录级别warn
+  level:
+    root: info
+  encodings: UTF-8
+  file:
+    #    日志保存路径
+    path: /home/webservice/zt/log
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: 62e4295b615a30dbf3b8ee96f41c820b
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+  #    文件保存路径
+  path: /home/webservice/zt/file
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826
+  #电子回单下载临时存放位置
+  elec_path: /zt/elecfile
+OA:
+  data_source_code: yc_oa

buildpackage/src/main/resources/application-yuecheng.yml

@@ -0,0 +1,31 @@
+#######################本地环境#######################
+logging:
+  #日志级别 指定目录级别
+  level:
+    root: info
+  encodings: UTF-8
+  file:
+#    日志保存路径
+    path: /Users/xiangerlin/work/app/logs/yuecheng
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          url: jdbc:mysql://hzya.ufyct.com:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
+          username: root
+          password: 62e4295b615a30dbf3b8ee96f41c820b
+          driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+savefile:
+    #    文件保存路径
+  path: /Users/xiangerlin/work/app/logs/yuecheng
+cbs8:
+  appId: 1P4AGrpz
+  appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a
+  url: https://cbs8-openapi-reprd.csuat.cmburl.cn
+  # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥
+  ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44
+  # 这个私钥到时候上传到cbs，和下面到是同一对
+  #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46
+  ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde
+  cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185

buildpackage/src/main/resources/cfgHome/plugin/cbs8/pluginCfg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin>
+<id>CBS8PayApplyPlugin</id>
+<name>cbs8插件</name>
+<category>202406070001</category>
+</plugin>

buildpackage/src/main/resources/cfgHome/plugin/cbs8/spring/spring-buildpackage-plugin.xml

@@ -0,0 +1,10 @@
+<?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="payApplyPluginInitializer" class="com.hzya.frame.plugin.cbs8.plugin.PayApplyPluginInitializer" />
+<bean name="payResultPluginInitializer" class="com.hzya.frame.plugin.cbs8.plugin.PayResultPluginInitializer" />
+<bean name="elecBillPluginInitializer" class="com.hzya.frame.plugin.cbs8.plugin.ElecBillPluginInitializer" />
+<bean name="transactionDetailPluginInitializer" class="com.hzya.frame.plugin.cbs8.plugin.TransactionDetailPluginInitializer" />
+<bean name="payApplyAgentPluginInitializer" class="com.hzya.frame.plugin.cbs8.plugin.PayApplyAgentPluginInitializer" />
+<bean name="agentPayResultPluginInitializer" class="com.hzya.frame.plugin.cbs8.plugin.AgentPayResultPluginInitializer" />
+</beans>

buildpackage/src/main/resources/cfgHome/plugin/cbs8/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="mdmOrgService" class="com.hzya.frame.plugin.masterData.org.service.impl.MdmOrgServiceImpl" />
+    <bean name="cbsPluginService" class="com.hzya.frame.plugin.cbs8.service.impl.CbsPluginServiceImpl" />
 </beans>

buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/pluginCfg.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmCustomerBankPlugin</id>
-<name>MdmCustomerBankPlugin插件</name>
-<category>90000001</category>
-</plugin>

buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-dao.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-plugin.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.customer.bank/spring/spring-buildpackage-service.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.customer/pluginCfg.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmCustomerPlugin</id>
-<name>MdmCustomerPlugin插件</name>
-<category>90000001</category>
-</plugin>

buildpackage/src/main/resources/cfgHome/plugin/masterData.project/pluginCfg.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmProjectPlugin</id>
-<name>MdmProjectPlugin插件</name>
-<category>90000001</category>
-</plugin>

buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-dao.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-plugin.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.project/spring/spring-buildpackage-service.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.user/pluginCfg.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-<id>MdmUserPlugin</id>
-<name>MdmUserPlugin插件</name>
-<category>90000001</category>
-</plugin>

buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-dao.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData.user/spring/spring-buildpackage-plugin.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-dao.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData/org/spring/spring-buildpackage-plugin.xml

@@ -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>

buildpackage/src/main/resources/cfgHome/plugin/masterData/pluginCfg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
-<id>MdmOrgPlugin</id>
-<name>MdmOrgPlugin插件</name>
+<id>MdmPlugin</id>
+<name>MdmPlugin插件</name>
 <category>90000001</category>
 </plugin>

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>

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>

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>

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>

buildpackage/src/main/resources/cfgHome/plugin/payBill/spring/spring-buildpackage-plugin.xml

@@ -0,0 +1,6 @@
+<?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" />
+<bean name="RecBillPluginInitializer" class="com.hzya.frame.plugin.a8bill.plugin.RecBillPluginInitializer" />
+</beans>

buildpackage/src/main/resources/cfgHome/plugin/payBill/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="mdmUserService" class="com.hzya.frame.plugin.masterData.user.service.impl.MdmUserServiceImpl" />
+    <bean name="PayBillPluginService" class="com.hzya.frame.plugin.a8bill.service.impl.PayBillServiceImpl" />
 </beans>

buildpackage/src/main/resources/flyway/V3.0.2__dataSourceAddStatus.sql

@@ -1,3 +0,0 @@
-ALTER TABLE sys_data_source ADD COLUMN data_state char(1) DEFAULT NULL COMMENT '数据源状态 0校验失败 1校验成功';
-UPDATE sys_data_source SET data_state = '1';
-COMMIT;

buildpackage/src/test/java/com/hzya/frame/temButtom.java

@@ -1,16 +1,35 @@
 package com.hzya.frame;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.plugin.mdmDistribute.plugin.MdmModulePluginInitializer;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.cbs8.dto.req.PayRequestDTO;
+import com.hzya.frame.cbs8.dto.req.PayResultRequestDTO;
+import com.hzya.frame.cbs8.dto.res.PayResultResDTO;
+import com.hzya.frame.cbs8.service.ICbs8ExtService;
+import com.hzya.frame.cbs8.service.ICbs8Service;
+import com.hzya.frame.cbs8.util.CBSUtil;
+import com.hzya.frame.cbs8.util.CbsAccessToken;
+import com.hzya.frame.plugin.cbs8.plugin.PayApplyPluginInitializer;
+import com.hzya.frame.plugin.cbs8.plugin.PayResultPluginInitializer;
+import com.hzya.frame.plugin.cbs8.plugin.TransactionDetailPluginInitializer;
 import com.hzya.frame.plugin.seeyonExt.plugin.SeeyonExtPluginInitializer;
+import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+import com.hzya.frame.stringutil.StringUtil;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 import com.hzya.frame.util.AESUtil;
+import org.apache.http.protocol.HTTP;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * @ClassName dsasas
@@ -25,7 +44,114 @@ public class temButtom {
     @Resource
     SeeyonExtPluginInitializer seeyonExtPluginInitializer;
     @Resource
-    MdmModulePluginInitializer mdmModulePluginInitializer;
+    ICbs8Service cs8Service;
+    @Resource
+    ICbs8ExtService cbs8ExtService;
+    @Autowired
+    private IPaymentService paymentService;
+    @Autowired
+    private PayApplyPluginInitializer payApplyPluginInitializer;
+
+    @Autowired
+    private TransactionDetailPluginInitializer transactionDetailPluginInitializer;
+    @Autowired
+    private PayResultPluginInitializer payResultPluginInitializer;
+
+    @Test
+    public void cbs8PluginTest(){
+        try {
+            //支付申请 测试通过
+            //payApplyPluginInitializer.executeBusiness(new JSONObject());
+            //查询交易明细 测试通过
+            //transactionDetailPluginInitializer.executeBusiness(new JSONObject());
+            //交易结果查询 未测试 （OA没有日志底表，无法测试）
+            payResultPluginInitializer.executeBusiness(new JSONObject());
+            //电子回单测试 通过apipost测试过了，可以取到cbs电子回单，只是没法上传到OA
+            //
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+    @Test
+    public void queryUnpaid(){
+        //查询待支付的列表
+        PaymentEntity paymentEntity = new PaymentEntity();
+        paymentEntity.setDataSourceCode("yc-test");
+        try {
+            List<PaymentEntity> paymentList = paymentService.queryUnpaid(paymentEntity);
+            System.out.println(paymentList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+        System.out.println("1111");
+    }
+    @Test
+    public void queryResultTest(){
+       // SysExtensionApiEntity sysExt = new SysExtensionApiEntity();
+       // sysExt.setBodys("{\"referenceNum\":\"CL202406140002\"}");
+      //  cbs8ExtService.payResult(sysExt);
+       // System.out.println("11111");
+        List<PayResultResDTO> cl202406140002 = cs8Service.queryPayResult(new PayResultRequestDTO("CL202406140002"));
+        System.out.println("111");
+    }
+
+    @Test
+    public void cbs8ExtTest(){
+        PaymentEntity paymentEntity = new PaymentEntity();
+        paymentEntity.setReferenceNum("CL202406140003");
+        paymentEntity.setPayAccount("655905707410000");
+        paymentEntity.setPayBankName("");
+        paymentEntity.setAmount("99.02");
+        paymentEntity.setRevAccount("123456778");
+        paymentEntity.setRevBankName("中国工商银行总行清算中心");
+        paymentEntity.setRevBankType("ICB");
+        paymentEntity.setRevAccountName("测试账户");
+        paymentEntity.setCnapsCode("102100099996");
+        paymentEntity.setPurpose("测试用途");
+        paymentEntity.setBusType("202");
+        paymentEntity.setCurrency("10");
+        if (null != paymentEntity){
+            PayRequestDTO payRequestDTO = new PayRequestDTO();
+            String ferenceNum = Convert.toStr(paymentEntity.getReferenceNumNew(),paymentEntity.getReferenceNum());
+            payRequestDTO.setReferenceNum(ferenceNum);
+            payRequestDTO.setBusType(paymentEntity.getBusType());
+            payRequestDTO.setAmount(paymentEntity.getAmount());
+            payRequestDTO.setCurrency(paymentEntity.getCurrency());
+            payRequestDTO.setPayAccount(StringUtil.replaceBlank(paymentEntity.getPayAccount()));
+            payRequestDTO.setRevAccount(StringUtil.replaceBlank(paymentEntity.getRevAccount()));
+            payRequestDTO.setRevAccountName(StringUtil.replaceBlank(paymentEntity.getRevAccountName()));
+            payRequestDTO.setRevBankType(StringUtil.replaceBlank((paymentEntity.getRevBankType())));
+            payRequestDTO.setRevBankName(StringUtil.replaceBlank(paymentEntity.getRevBankName()));
+            payRequestDTO.setCnapsCode(StringUtil.replaceBlank((paymentEntity.getCnapsCode())));
+            payRequestDTO.setPurpose(paymentEntity.getPurpose());
+            payRequestDTO.setErpExtend1(paymentEntity.getPayType());
+            //集中支付模式
+            if (CBSUtil.CENTRALIZED_PAYMENT_TYPE.equals(payRequestDTO.getBusType())){
+                payRequestDTO.setBusiStep("1");
+                payRequestDTO.setApplyUnitCode(paymentEntity.getPayCompanyCode());
+                payRequestDTO.setPayAccount(null);
+            }
+            List<PayRequestDTO> list = new ArrayList<>();
+            list.add(payRequestDTO);
+            String requestData = JSONObject.toJSONString(list);
+            System.out.println("明文参数："+requestData);
+            //签名
+            long timestamp = System.currentTimeMillis();
+            String sign = CBSUtil.sign(requestData,timestamp);
+            //加密
+            byte[] encryptedData = CBSUtil.encrypt(requestData);
+            Map<String,String> header = new HashMap();
+            header.put(CBSUtil.SIGN_HEADER_NAME,sign);
+            header.put(CBSUtil.TIMESTAMP_HEADER,Long.toString(timestamp));
+            header.put(HTTP.CONTENT_TYPE,CBSUtil.TARGET_CONTENT_TYPE);
+            header.put(CBSUtil.AUTHORIZATION,CBSUtil.BEARER+CbsAccessToken.getToken());
+            byte[] bodyByte = HttpRequest.post("https://cbs8-openapi-reprd.csuat.cmburl.cn/openapi/payment/openapi/v1/payment-apply-common").addHeaders(header).body(encryptedData).execute().bodyBytes();
+            String decrypt = CBSUtil.decrypt(bodyByte);
+            System.out.println(decrypt);
+        }
+    }
     @Test
     public void seeyonExtTest(){
         JSONObject jsonStr = new JSONObject();
@@ -39,17 +165,6 @@ public class temButtom {
         }
     }
 
-    @Test
-    public void mdm(){
-        JSONObject jsonStr = new JSONObject();
-        jsonStr.put("integration_task_living_details_id","123123123123");
-        try {
-            mdmModulePluginInitializer.executeBusiness(jsonStr);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     @Test
     public void test01() {
         String a = AESUtil.encrypt("hzya@1314");

common/src/main/java/com/hzya/frame/datasource/DataSourceUtil.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.stereotype.Component;
@@ -26,103 +27,10 @@ import java.util.Properties;
  * @Date: 2020/3/31 10:25
  * 数据源工具类
  */
-//@Component
-//@Lazy(value = false)
+@Component
 public class DataSourceUtil {
-    //DATASOURCECODE
-    public static final ThreadLocal<BaseEntity> myContextThreadLocal = new ThreadLocal<>();
-    private static final Logger logger = LoggerFactory.getLogger(DataSourceUtil.class);
-    //SqlSessionFactory容器
-    private static final Map<String, SqlSessionFactory> SQLSESSIONFACTORYMAP = new HashMap<>();
-    //dataSource容器
-    private final Map<String, DruidDataSource> DATASOURCEMAP = new HashMap<>();
-    // 通过依赖注入获取 DynamicRoutingDataSource 对象
-    @Resource
-    private  DynamicRoutingDataSource ds;
-    /****
-     * 根据dataSourceKey 打开 SqlSession ,如果获取不到SqlSessionFactory 会抛出异常
-     * @content:
-     * @author 👻👻👻👻👻👻👻👻 gjh
-     * @date 2024-02-22 14:50
-     * @param
-     * @return org.apache.ibatis.session.SqlSession
-     **/
-
-    public synchronized static SqlSession getSqlSession() {
-        String dsKey = "master"; // 根据业务逻辑确定要使用的数据源名称
-        BaseEntity entity = DataSourceUtil.myContextThreadLocal.get();
-        if(null != entity ){
-            dsKey = entity.getDataSourceCode();
-        }
-        // 通过 DynamicRoutingDataSource 获取当前数据源
-//       ds.getDataSource(dsKey);
-
-        SqlSessionFactory factory = getSqlSessionFactoryByCache(dsKey);
-        if (null == factory) {
-            throw new BaseSystemException("根据dataSourceKey获取SqlSessionFactory 失败!请联系管理员");
-        } else {
-            return factory.openSession();
-        }
-    }
-
-
-    /****
-     * 根据dataSourceKey获取缓存内的SqlSessionFactory,如果获取不到会抛出异常信息
-     * @content:
-     * @author 👻👻👻👻👻👻👻👻 gjh
-     * @date 2024-02-22 14:44
-     * @param
-     * @return org.apache.ibatis.session.SqlSessionFactory
-     **/
-    public static SqlSessionFactory getSqlSessionFactoryByCache(String dataSourceKey) {
-        SqlSessionFactory sqlSessionFactory = SQLSESSIONFACTORYMAP.get(dataSourceKey);
-        if (null == sqlSessionFactory) {
-            throw new BaseSystemException("根据当前dataSourceKey获取SqlSessionFactory失败,请联系系统管理员！dataSourceKey:" + dataSourceKey);
-        }
-        return sqlSessionFactory;
-    }
-
-    /****
-     * 根据 dataSource 创建SqlSessionFactory,并放入map缓存 dataSourceKey
-     * @content:
-     * @author 👻👻👻👻👻👻👻👻 gjh
-     * @date 2024-02-22 14:38
-     * @param
-     * @return org.apache.ibatis.session.SqlSessionFactory
-     **/
-    public static SqlSessionFactory createSqlSessionFactoryToCache(String dataSourceKey, DataSource dataSource) {
-        SqlSessionFactory sqlSessionFactory = createSqlSessionFactory(dataSource);
-        SQLSESSIONFACTORYMAP.put(dataSourceKey, sqlSessionFactory);
-        return sqlSessionFactory;
-    }
-
-    //创建sqlSessionFactory
-    public static SqlSessionFactory createSqlSessionFactory(DataSource dataSource) throws BaseSystemException {
-        try {
-            if (null != dataSource) {
-                SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
-                //数据源
-                sqlSessionFactoryBean.setDataSource(dataSource);
-                //mybatis的config文件
-                PathMatchingResourcePatternResolver configLocationResolver = new PathMatchingResourcePatternResolver();
-                sqlSessionFactoryBean.setConfigLocation(configLocationResolver.getResource("classpath:mybatis/mybatis-config.xml"));
-                //xml
-                PathMatchingResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-                sqlSessionFactoryBean.setMapperLocations(resourcePatternResolver.getResources("classpath*:com/hzya/**/*.xml"));
-                sqlSessionFactoryBean.setDatabaseIdProvider(getDatabaseIdProvider());
-
-                return sqlSessionFactoryBean.getObject();
-            } else {
-                logger.info("======================创建sqlSessionFactory失败===========================");
-                throw new BaseSystemException("创建sqlSessionFactory失败");
-            }
-        } catch (Exception e) {
-            logger.info("======================创建sqlSessionFactory失败===========================");
-            throw new BaseSystemException("创建sqlSessionFactory失败" + e.getMessage());
-        }
-    }
-
-    public static DatabaseIdProvider getDatabaseIdProvider() {
+    @Bean
+    public  DatabaseIdProvider getDatabaseIdProvider() {
         //DBMS 后缀
         //Oracle oracle
         //DB2 db2
@@ -144,9 +52,4 @@ public class DataSourceUtil {
         dbProvider.setProperties(setPro);
         return dbProvider;
     }
-
-    public Map<String, DruidDataSource> getDataSourceMap() {
-        return DATASOURCEMAP;
-    }
-
 }

service/pom.xml

@@ -21,6 +21,36 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>${mysql-connector-java}</version>
         </dependency>
+       <dependency>
+            <groupId>com.hzya.bip</groupId>
+            <artifactId>pubbaseapp_nccloud_rtLevel</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/pubbaseapp_nccloud_rtLevel-1.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.hzya.bipyonyoulog</groupId>
+            <artifactId>yonyoulog</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/yonyoulog.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hzya.bcprov</groupId>
+            <artifactId>bcprov</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/bcprov-jdk15on-1.70.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hzya.DataApiSdk</groupId>
+            <artifactId>DataApiSdk</artifactId>
+            <version>1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/DataApiSdk-jar-with-dependencies.jar</systemPath>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

service/src/main/java/com/hzya/frame/bip/v3/v2207/entity/BipTokenVo.java

@@ -0,0 +1,13 @@
+package com.hzya.frame.bip.v3.v2207.entity;
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+/**
+ * com.hzya.frame.bip.v3.v2207.entity
+ *
+ * @author makejava
+ * @date 2024-05 -27 11:24
+ */
+
+public class BipTokenVo  extends BaseEntity {
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipSsoService.java

@@ -0,0 +1,31 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+public interface IBipSsoService extends  IBaseService<BipTokenVo,String>{
+/**
+ *
+ * @content Bip单点统一认证接口
+ * @author laborer
+ * @date 2024/5/30 0030 13:45
+ *
+ */
+
+    String erpSso( HttpServletRequest request,String ticket)throws Exception;
+    /**
+     *
+     * @content 此方法获取sso动态加密，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+    SysExtensionApiEntity ssoEncrypt(SysExtensionApiEntity entity);
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipV32207BillService.java

@@ -0,0 +1,18 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+
+public interface IBipV32207BillService extends  IBaseService<BipTokenVo,String>{
+/**
+ *
+ * @content 此方法获取BIPtoken，heade参数动态传入
+ * @author laborer
+ * @date 2024/5/27 0027 11:38
+ *
+ */
+
+    SysExtensionApiEntity getBipBill(SysExtensionApiEntity entity);
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/service/IBipV32207TokenService.java

@@ -0,0 +1,22 @@
+package com.hzya.frame.bip.v3.v2207.service;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipSupplierEntity;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.web.entity.JsonResultEntity;
+
+public interface IBipV32207TokenService extends  IBaseService<BipTokenVo,String>{
+/**
+ *
+ * @content 此方法获取BIPtoken，heade参数动态传入
+ * @author laborer
+ * @date 2024/5/27 0027 11:38
+ *
+ */
+
+    SysExtensionApiEntity getBipToken(SysExtensionApiEntity entity);
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipSsoServiceImpl.java

@@ -0,0 +1,119 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpException;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.bip.v3.v2207.service.IBipSsoService;
+import com.hzya.frame.iputil.IPUtil;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import nccloud.security.impl.SignatureTookKit;
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.*;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+
+@Service(value = "BipSsoServiceImpl")
+public class BipSsoServiceImpl extends BaseService<BipTokenVo, String> implements IBipSsoService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private final  String BASEURL = "http://192.168.2.237:8099/seeyon/thirdpartyController.do?ticket=";
+    private final  String ESBURL = "http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface";
+    /**
+     *
+     * @content Bip单点统一认证接口
+     * @author laborer
+     * @date 2024/5/30 0030 13:45
+     *
+     */
+
+    @Override
+    public String erpSso(HttpServletRequest request,String userCode)throws Exception {
+        logger.info("当前IP地址为"+ JSON.toJSONString(IPUtil.getIpAddress(request)));
+        String result = "";
+        boolean flag = true;
+//        logger.info("接收到致远OA认证参数的ticket：{}",ticket);
+        //通过ticket获取OA用户信息
+//        String userCode  = HttpUtil.get(BASEURL+ticket);
+        logger.info("获取到的OA用户信息：{}",userCode);
+        String dsname = "ycjf";
+        String client_id = "OAREST";//第三方系统id
+        StringBuffer sb = new StringBuffer();
+        if(StrUtil.isNotEmpty(userCode)){
+            try {
+                logger.info("开始加密");
+                String security = genKey(userCode,userCode  + (System.currentTimeMillis() + "").substring(0, 6));
+                logger.info("加密结束：{}",security);
+                sb.append("type=type_security&dsname="+dsname+"&usercode="+userCode+"&client_id="+client_id+"&security="+security);
+                String baseUrl = "http://10.75.51.78:8899/service/genThirdPartyAccessToken?"+sb.toString();
+                logger.info("请求BIPtokenbaseUrl：{}",baseUrl);
+                 result = HttpRequest.post(baseUrl)
+                        .header("Content-Type", "application/x-www-form-urlencoded")//头信息，多个头信息多次调用此方法即可
+                        .header("Content-Length", "10000")//头信息，多个头信息多次调用此方法即可
+                        .header("userid", "admin")//头信息，多个头信息多次调用此方法即可
+                        .body("{}")//表单内容
+                        .timeout(20000)//超时，毫秒
+                        .execute().body();
+                logger.info("获取到的BIPtoken信息：{}",result);
+            } catch (HttpException e) {
+                flag=false;
+                e.printStackTrace();
+            }
+        }
+        if(flag){
+            String indexUR = "http://10.75.51.78:8899/nccloud/resources/uap/rbac/thirdpartylogin/main/index.html?accesstoken="+result+"&redirect_uri=http://10.75.51.78:8899/nccloud/resources/workbench/public/common/main/index.html#";
+            logger.info(indexUR);
+            return  indexUR;
+        }else{
+            return "http://10.75.51.78:8899/nccloud/resources/uap/rbac/login/main/index.html";
+        }
+    }
+    /**
+     *
+     * @content 此方法获取sso动态加密，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+
+    @Override
+    public SysExtensionApiEntity ssoEncrypt(SysExtensionApiEntity entity) {
+        try {
+            Map<String, String> headers = entity.getHeaders();
+            String userCode = headers.get("usercode");//用户编码
+            String dsname = headers.get("dsname");//数据源
+            String client_id = headers.get("client_id");//第三方系统id
+            StringBuffer sb = new StringBuffer();
+            String security = genKey(userCode,userCode  + (System.currentTimeMillis() + "").substring(0, 6));
+            StringBuffer querys = new StringBuffer();
+            querys.append("type=type_security");
+            querys.append("&dsname="+dsname);
+            querys.append("&usercode="+userCode);
+            querys.append("&client_id="+client_id);
+            querys.append("&security="+security);
+            entity.setQuerys(querys.toString());
+            headers.put("Content-Type", "application/x-www-form-urlencoded");
+            headers.put("userid", "admin");
+            entity.setHeaders(headers);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+    /**获取NCC的key*/
+    private static String genKey(String userid, String key) throws Exception {
+        return new Base64().encodeToString(SignatureTookKit.digestSign(userid.getBytes(), key.getBytes()));
+    }
+
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207BillServiceImpl.java

@@ -0,0 +1,62 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.entity.BipTokenVo;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207BillService;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207TokenService;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.util.bipV3.Encryption;
+import com.hzya.frame.util.bipV3.SHA256Util;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Service(value = "BipV32207BillServiceImpl")
+public class BipV32207BillServiceImpl extends BaseService<BipTokenVo, String> implements IBipV32207BillService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    /**
+     *
+     * @content 此方法获取拼接单据动态加密，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+
+    @Override
+    public SysExtensionApiEntity getBipBill(SysExtensionApiEntity entity) {
+        try {
+            Map<String, String> headers = entity.getHeaders();
+            String client_id = headers.get("client_id");
+            //token信息
+            String access_token =  headers.get("access_token");
+            //公钥
+            String pubKey =  headers.get("pubKey");
+            StringBuffer sb = new StringBuffer();
+            sb.append(client_id);
+            String parm = entity.getBodys();
+            if (StringUtils.isNotBlank(parm)) {
+                sb.append(parm);
+            }
+            sb.append(pubKey);
+            // 签名
+            String sign = SHA256Util.getSHA256(sb.toString(), pubKey);
+            StringBuffer querys = new StringBuffer();
+            querys.append("access_token="+access_token);
+            querys.append("&signature="+sign);
+            querys.append("&client_id="+client_id);
+            entity.setQuerys(querys.toString());
+            headers.put("signature",sign);
+//            headers.put("content-type","application/x-www-form-urlencoded");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/service/impl/BipV32207TokenServiceImpl.java

@@ -0,0 +1,92 @@
+package com.hzya.frame.bip.v3.v2207.service.impl;
+
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.base.PluginBaseEntity;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipOrgsDetailsDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDao;
+import com.hzya.frame.bip.v3.v2207.dao.IBipSupplierDetailsDao;
+import com.hzya.frame.bip.v3.v2207.entity.*;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207Service;
+import com.hzya.frame.bip.v3.v2207.service.IBipV32207TokenService;
+import com.hzya.frame.dateutil.DateUtil;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
+import com.hzya.frame.util.PluginUtils;
+import com.hzya.frame.util.bipV3.Encryption;
+import com.hzya.frame.util.bipV3.SHA256Util;
+import com.hzya.frame.util.oldNcc.CompressUtil;
+import com.hzya.frame.util.oldNcc.Decryption;
+import com.hzya.frame.web.entity.BaseResult;
+import com.hzya.frame.web.entity.JsonResultEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.net.URLEncoder;
+import java.util.*;
+
+
+@Service(value = "bipV32207TokenService")
+public class BipV32207TokenServiceImpl extends BaseService<BipTokenVo, String> implements IBipV32207TokenService {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    /**
+     *
+     * @content 此方法获取BIPtoken，heade参数动态传入
+     * @author laborer
+     * @date 2024/5/27 0027 11:38
+     *
+     */
+
+    @Override
+    public SysExtensionApiEntity getBipToken(SysExtensionApiEntity entity) {
+        try {
+            Map<String, String> headers = entity.getHeaders();
+            String client_id = headers.get("client_id");
+            Map<String, String> paramMap = new HashMap<String, String>();
+            // 密码模式认证
+            paramMap.put("grant_type", "client_credentials");
+            // 第三方应用id
+            paramMap.put("client_id", client_id);
+            // 第三方应用secret]
+            String client_secret =  headers.get("client_secret");
+            // 账套编码
+            String busi_center =  headers.get("busi_center");
+            //用户编码
+            String usercode =  headers.get("usercode");
+            //数据库编码
+            String dsname =  headers.get("dsname");
+            String pubKey =  headers.get("pubKey");
+            // 第三方应用secret 公钥加密]
+            paramMap.put("client_secret", URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+            // 账套编码
+            paramMap.put("biz_center", busi_center);
+            // // TODO 传递数据源和ncc登录用户
+            paramMap.put("dsname", dsname);
+            paramMap.put("usercode", usercode);
+            // 签名
+            String sign = SHA256Util.getSHA256(client_id + client_secret + pubKey,pubKey);
+            paramMap.put("signature", sign);
+            StringBuffer querys = new StringBuffer();
+            querys.append("biz_center="+busi_center);
+            querys.append("&grant_type="+"client_credentials");
+            querys.append("&signature="+sign);
+            querys.append("&dsname="+dsname);
+            querys.append("&client_secret="+URLEncoder.encode(Encryption.pubEncrypt(pubKey, client_secret), "utf-8"));
+            querys.append("&usercode="+usercode);
+            querys.append("&client_id="+client_id);
+            entity.setQuerys(querys.toString());
+            headers.put("content-type","application/x-www-form-urlencoded");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return entity;
+    }
+}

service/src/main/java/com/hzya/frame/bip/v3/v2207/util/BipUtil.java

@@ -0,0 +1,65 @@
+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
+ *
+ * @author makejava
+ * @date 2024-05 -30 14:20
+ */
+
+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");
+    }
+}

service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayRequestDTO.java

@@ -0,0 +1,32 @@
+package com.hzya.frame.cbs8.dto.req;
+
+import java.util.List;
+
+/**
+ * @Description 代发代扣请求参数
+ * @Author xiangerlin
+ * @Date 2024/6/18 16:20
+ **/
+public class AgentPayRequestDTO {
+
+    //代发表头
+    private PaymentApplySubmitReqDTO paymentApplySubmitReqDTO;
+    //代发明细
+    private List<PaymentApplyAgentDTO> paymentApplyAgentDTO;
+
+    public PaymentApplySubmitReqDTO getPaymentApplySubmitReqDTO() {
+        return paymentApplySubmitReqDTO;
+    }
+
+    public void setPaymentApplySubmitReqDTO(PaymentApplySubmitReqDTO paymentApplySubmitReqDTO) {
+        this.paymentApplySubmitReqDTO = paymentApplySubmitReqDTO;
+    }
+
+    public List<PaymentApplyAgentDTO> getPaymentApplyAgentDTO() {
+        return paymentApplyAgentDTO;
+    }
+
+    public void setPaymentApplyAgentDTO(List<PaymentApplyAgentDTO> paymentApplyAgentDTO) {
+        this.paymentApplyAgentDTO = paymentApplyAgentDTO;
+    }
+}

service/src/main/java/com/hzya/frame/cbs8/dto/req/AgentPayResultRequestDTO.java

@@ -0,0 +1,20 @@
+package com.hzya.frame.cbs8.dto.req;
+
+/**
+ * @Description 代发代扣详情查询请求参数
+ * @Author xiangerlin
+ * @Date 2024/6/18 17:40
+ **/
+public class AgentPayResultRequestDTO {
+
+    //申请单编号。 代发代扣支付接口会返回这个单号的
+    private String busNum;
+
+    public String getBusNum() {
+        return busNum;
+    }
+
+    public void setBusNum(String busNum) {
+        this.busNum = busNum;
+    }
+}

service/src/main/java/com/hzya/frame/cbs8/dto/req/ElecRequestDTO.java

@@ -0,0 +1,134 @@
+package com.hzya.frame.cbs8.dto.req;
+
+import java.util.List;
+
+/**
+ * @Description 电子回单查询请求参数
+ * @Author xiangerlin
+ * @Date 2024/1/4 17:08
+ **/
+public class ElecRequestDTO {
+    // 开始日期
+    private String startDate;
+
+    // 结束日期
+    private String endDate;
+
+    // 账号
+    private String accountNo;
+
+    // 币种列表
+    private List<String> currencyList;
+
+    // 银行类型列表
+    private List<String> bankTypeList;
+
+    // 回单文件状态 1-已取回 0-未取回
+    private String billStatus;
+
+    // 借贷 1-借 2-贷
+    private String loanType;
+
+    // 单位编码列表
+    private List<String> unitCodeList;
+
+    // 对账码列表
+    private List<String> checkCodeList;
+
+    // ERP业务参考号
+    private String settleBusinessReferenceCode;
+
+    public ElecRequestDTO(String settleBusinessReferenceCode) {
+        this.settleBusinessReferenceCode = settleBusinessReferenceCode;
+    }
+
+    public ElecRequestDTO(String startDate, String endDate, String settleBusinessReferenceCode) {
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.settleBusinessReferenceCode = settleBusinessReferenceCode;
+    }
+
+    public ElecRequestDTO() {
+
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
+    }
+
+    public List<String> getCurrencyList() {
+        return currencyList;
+    }
+
+    public void setCurrencyList(List<String> currencyList) {
+        this.currencyList = currencyList;
+    }
+
+    public List<String> getBankTypeList() {
+        return bankTypeList;
+    }
+
+    public void setBankTypeList(List<String> bankTypeList) {
+        this.bankTypeList = bankTypeList;
+    }
+
+    public String getBillStatus() {
+        return billStatus;
+    }
+
+    public void setBillStatus(String billStatus) {
+        this.billStatus = billStatus;
+    }
+
+    public String getLoanType() {
+        return loanType;
+    }
+
+    public void setLoanType(String loanType) {
+        this.loanType = loanType;
+    }
+
+    public List<String> getUnitCodeList() {
+        return unitCodeList;
+    }
+
+    public void setUnitCodeList(List<String> unitCodeList) {
+        this.unitCodeList = unitCodeList;
+    }
+
+    public List<String> getCheckCodeList() {
+        return checkCodeList;
+    }
+
+    public void setCheckCodeList(List<String> checkCodeList) {
+        this.checkCodeList = checkCodeList;
+    }
+
+    public String getSettleBusinessReferenceCode() {
+        return settleBusinessReferenceCode;
+    }
+
+    public void setSettleBusinessReferenceCode(String settleBusinessReferenceCode) {
+        this.settleBusinessReferenceCode = settleBusinessReferenceCode;
+    }
+}

service/src/main/java/com/hzya/frame/cbs8/dto/req/PayRequestDTO.java

@@ -0,0 +1,272 @@
+package com.hzya.frame.cbs8.dto.req;
+
+/**
+ * @Description 经办支付请求DTO
+ * @Author xiangerlin
+ * @Date 2024/1/3 09:02
+ **/
+public class PayRequestDTO {
+    private String referenceNum;//业务参考号，必填
+    private String busType;//业务类型 必填
+    private String amount;//金额 必填
+    private String currency;//币种编码，必填
+    private String payAccount;//付款账号，非集中支付模式必填
+    private String revAccount;//收款账号 必填
+    private String revAccountName;//收款方户名 必填
+    private String revBankType;//收款银行类型编码，必填
+    private String revBankName;//收款开户行名称
+    private String cnapsCode;//联行号 必填
+    private String purpose;//支付用途 必填
+
+    private String innerAccount;//内部账号
+    private String revBankArea;//收款银行地区名称
+    private String revProvince;//收款人省
+    private String revCity;//收款人市
+    private String bankNum;//收款地区码｜银行号
+    private String summary;//该笔支付备注
+    private String expectTime;//期望支付时间
+    private String personalFlag;//公私标记 1对私 0对公
+    private String urgentTag;//加急，1加急0不加2特急
+    private String realTimeTag;//是否实时 1实时0落地
+    private String cityFlag;//同城标志 0同城1异地
+    private String payChannel;//支付渠道
+    private String busiStep;//业务步数 集中支付需要传1，其他不用传
+    private String applyUnitCode;//申请人单位号，集中支付必传
+    private String displayApplyUnitCode;//申请人单位号（前端显示），集中支付如果传了，会将其转化为applyUnitCode
+
+    private String erpExtend1;//客户备用字段1
+    private String erpExtend2;//客户备用字段2
+    private String erpExtend3;//客户备用字段3
+
+    public String getReferenceNum() {
+        return referenceNum;
+    }
+
+    public void setReferenceNum(String referenceNum) {
+        this.referenceNum = referenceNum;
+    }
+
+    public String getBusType() {
+        return busType;
+    }
+
+    public void setBusType(String busType) {
+        this.busType = busType;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getPayAccount() {
+        return payAccount;
+    }
+
+    public void setPayAccount(String payAccount) {
+        this.payAccount = payAccount;
+    }
+
+    public String getRevAccount() {
+        return revAccount;
+    }
+
+    public void setRevAccount(String revAccount) {
+        this.revAccount = revAccount;
+    }
+
+    public String getRevAccountName() {
+        return revAccountName;
+    }
+
+    public void setRevAccountName(String revAccountName) {
+        this.revAccountName = revAccountName;
+    }
+
+    public String getRevBankType() {
+        return revBankType;
+    }
+
+    public void setRevBankType(String revBankType) {
+        this.revBankType = revBankType;
+    }
+
+    public String getRevBankName() {
+        return revBankName;
+    }
+
+    public void setRevBankName(String revBankName) {
+        this.revBankName = revBankName;
+    }
+
+    public String getCnapsCode() {
+        return cnapsCode;
+    }
+
+    public void setCnapsCode(String cnapsCode) {
+        this.cnapsCode = cnapsCode;
+    }
+
+    public String getPurpose() {
+        return purpose;
+    }
+
+    public void setPurpose(String purpose) {
+        this.purpose = purpose;
+    }
+
+    public String getInnerAccount() {
+        return innerAccount;
+    }
+
+    public void setInnerAccount(String innerAccount) {
+        this.innerAccount = innerAccount;
+    }
+
+    public String getRevBankArea() {
+        return revBankArea;
+    }
+
+    public void setRevBankArea(String revBankArea) {
+        this.revBankArea = revBankArea;
+    }
+
+    public String getRevProvince() {
+        return revProvince;
+    }
+
+    public void setRevProvince(String revProvince) {
+        this.revProvince = revProvince;
+    }
+
+    public String getRevCity() {
+        return revCity;
+    }
+
+    public void setRevCity(String revCity) {
+        this.revCity = revCity;
+    }
+
+    public String getBankNum() {
+        return bankNum;
+    }
+
+    public void setBankNum(String bankNum) {
+        this.bankNum = bankNum;
+    }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public void setSummary(String summary) {
+        this.summary = summary;
+    }
+
+    public String getExpectTime() {
+        return expectTime;
+    }
+
+    public void setExpectTime(String expectTime) {
+        this.expectTime = expectTime;
+    }
+
+    public String getPersonalFlag() {
+        return personalFlag;
+    }
+
+    public void setPersonalFlag(String personalFlag) {
+        this.personalFlag = personalFlag;
+    }
+
+    public String getUrgentTag() {
+        return urgentTag;
+    }
+
+    public void setUrgentTag(String urgentTag) {
+        this.urgentTag = urgentTag;
+    }
+
+    public String getRealTimeTag() {
+        return realTimeTag;
+    }
+
+    public void setRealTimeTag(String realTimeTag) {
+        this.realTimeTag = realTimeTag;
+    }
+
+    public String getCityFlag() {
+        return cityFlag;
+    }
+
+    public void setCityFlag(String cityFlag) {
+        this.cityFlag = cityFlag;
+    }
+
+    public String getPayChannel() {
+        return payChannel;
+    }
+
+    public void setPayChannel(String payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    public String getBusiStep() {
+        return busiStep;
+    }
+
+    public void setBusiStep(String busiStep) {
+        this.busiStep = busiStep;
+    }
+
+    public String getApplyUnitCode() {
+        return applyUnitCode;
+    }
+
+    public void setApplyUnitCode(String applyUnitCode) {
+        this.applyUnitCode = applyUnitCode;
+    }
+
+    public String getDisplayApplyUnitCode() {
+        return displayApplyUnitCode;
+    }
+
+    public void setDisplayApplyUnitCode(String displayApplyUnitCode) {
+        this.displayApplyUnitCode = displayApplyUnitCode;
+    }
+
+    public String getErpExtend1() {
+        return erpExtend1;
+    }
+
+    public void setErpExtend1(String erpExtend1) {
+        this.erpExtend1 = erpExtend1;
+    }
+
+    public String getErpExtend2() {
+        return erpExtend2;
+    }
+
+    public void setErpExtend2(String erpExtend2) {
+        this.erpExtend2 = erpExtend2;
+    }
+
+    public String getErpExtend3() {
+        return erpExtend3;
+    }
+
+    public void setErpExtend3(String erpExtend3) {
+        this.erpExtend3 = erpExtend3;
+    }
+}

service/src/main/java/com/hzya/frame/cbs8/dto/req/PayResultRequestDTO.java

@@ -0,0 +1,44 @@
+package com.hzya.frame.cbs8.dto.req;
+
+import java.util.List;
+
+/**
+ * @Description 查询交易结果请求参数
+ * @Author xiangerlin
+ * @Date 2024/1/3 09:46
+ **/
+public class PayResultRequestDTO {
+    public PayResultRequestDTO() {
+    }
+    public PayResultRequestDTO(String referenceNum) {
+        this.referenceNum = referenceNum;
+    }
+
+    private String referenceNum;//业务参考号，必填
+    private List<String> statusList;//状态
+    private List<String> payStatusList;//支付状态
+
+    public String getReferenceNum() {
+        return referenceNum;
+    }
+
+    public void setReferenceNum(String referenceNum) {
+        this.referenceNum = referenceNum;
+    }
+
+    public List<String> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<String> statusList) {
+        this.statusList = statusList;
+    }
+
+    public List<String> getPayStatusList() {
+        return payStatusList;
+    }
+
+    public void setPayStatusList(List<String> payStatusList) {
+        this.payStatusList = payStatusList;
+    }
+}