grpu8

service/service-cbs/service-cbs.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.hzya.frame:service:${revision}" level="project" />
+  </component>
+</module>

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDao.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.dao;
+package com.hzya.frame.cbs8.dao;
 
 import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
 
 /**
  * @Description 代发代扣

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IAgentPaymentDetailDao.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.dao;
+package com.hzya.frame.cbs8.dao;
 
 import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
 
 /**
  * @Description 代发代扣明细

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ICbsLogDao.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.dao;
+package com.hzya.frame.cbs8.dao;
 
 import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.cbs8.entity.CbsLogEntity;
 
 /**
  * @Description cbs8支付日志

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/IPaymentDao.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.dao;
+package com.hzya.frame.cbs8.dao;
 
 import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 
 /**
  * oa集成cbs

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/ITransactionDetailDao.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.dao;
+package com.hzya.frame.cbs8.dao;
 
 import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
+import com.hzya.frame.cbs8.entity.TransactionDetailEntity;
 
 /**
  * @Description cbs交易明细 oa底表

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDaoImpl.java

@@ -1,8 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.dao.impl;
+package com.hzya.frame.cbs8.dao.impl;
 
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.dao.IAgentPaymentDao;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
 import org.springframework.stereotype.Repository;
 
 /**

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/AgentPaymentDetailDaoImpl.java

@@ -1,8 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.dao.impl;
+package com.hzya.frame.cbs8.dao.impl;
 
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.dao.IAgentPaymentDetailDao;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
 import org.springframework.stereotype.Repository;
 
 /**

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/CbsLogDaoImpl.java

@@ -1,8 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.dao.impl;
+package com.hzya.frame.cbs8.dao.impl;
 
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao;
-import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.cbs8.dao.ICbsLogDao;
+import com.hzya.frame.cbs8.entity.CbsLogEntity;
 import org.springframework.stereotype.Repository;
 
 /**

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/PaymentDaoImpl.java

@@ -1,8 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.dao.impl;
+package com.hzya.frame.cbs8.dao.impl;
 
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.seeyon.cbs8.dao.IPaymentDao;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.dao.IPaymentDao;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 import org.springframework.stereotype.Repository;
 
 /**

service/service-cbs/src/main/java/com.hzya.frame/cbs8/dao/impl/TransactionDetailDaoImpl.java

@@ -1,10 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.dao.impl;
+package com.hzya.frame.cbs8.dao.impl;
 
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.seeyon.cbs8.dao.IPaymentDao;
-import com.hzya.frame.seeyon.cbs8.dao.ITransactionDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
+import com.hzya.frame.cbs8.dao.ITransactionDetailDao;
+import com.hzya.frame.cbs8.entity.TransactionDetailEntity;
 import org.springframework.stereotype.Repository;
 
 /**

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.cbs8.entity;
+package com.hzya.frame.cbs8.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentDetailEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDetailDaoImpl">
-    <resultMap id="get-AgentPaymentDetailEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <resultMap id="get-AgentPaymentDetailEntity-result" type="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         <result property="id" column="id" />
         <result property="formmainId" column="formmainId" />
         <result property="tabName" column="tabName" />
@@ -31,7 +31,7 @@
 
 
     <!-- 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-AgentPaymentDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <select id="entity_list_base" resultMap="get-AgentPaymentDetailEntity-result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         select
         <include refid="AgentPaymentDetailEntity_Base_Column_List"/>
         from (
@@ -63,7 +63,7 @@
         </trim>
     </select>
 
-    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <update id="entity_update" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         update formson_0225 set
         <trim suffix="" suffixOverrides=",">
             <if test="payDate != null and payDate !='' ">field0045 =#{payDate},</if>
@@ -73,7 +73,7 @@
     </update>
 
     <!-- 更新支付结果 -->
-    <update id="entity_update_result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity">
+    <update id="entity_update_result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity">
         update formson_0225 set
         <trim suffix="" suffixOverrides=",">
             <if test="payDate != null and payDate !='' ">field0045 =#{payDate},</if>

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.cbs8.entity;
+package com.hzya.frame.cbs8.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/AgentPaymentEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.dao.impl.AgentPaymentDaoImpl">
-    <resultMap id="get-AgentPaymentEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <resultMap id="get-AgentPaymentEntity-result" type="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         <result property="oaId" column="oaId" />
         <result property="title" column="title" />
         <result property="finishedflag" column="finishedflag" />
@@ -35,7 +35,7 @@
 
 
     <!-- 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <select id="entity_list_base" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         select
         <include refid="AgentPaymentEntity_Base_Column_List"/>
        from (
@@ -74,7 +74,7 @@
         </trim>
     </select>
 
-    <select id="entity_list_base_unpaid" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <select id="entity_list_base_unpaid" resultMap="get-AgentPaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         select
         <include refid="AgentPaymentEntity_Base_Column_List"/>
         from (
@@ -115,7 +115,7 @@
     </select>
 
 
-    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity">
+    <update id="entity_update" parameterType="com.hzya.frame.cbs8.entity.AgentPaymentEntity">
         update formmain_0224 set
         <trim suffix="" suffixOverrides=",">
             <if test="applyCode != null and applyCode !='' ">field0043 =#{applyCode},</if>

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.cbs8.entity;
+package com.hzya.frame.cbs8.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/CbsLogEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.dao.impl.CbsLogDaoImpl">
-    <resultMap id="get-CbsLogEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <resultMap id="get-CbsLogEntity-result" type="com.hzya.frame.cbs8.entity.CbsLogEntity">
         <result property="id" column="id" />
         <result property="oa_id" column="oa_id" />
         <result property="bill_code" column="bill_code" />
@@ -35,7 +35,7 @@
     </sql>
 
     <!-- 查询推送失败，用户手动发起请求 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <select id="entity_list_base" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         select
         <include refid="CbsLogEntity_Base_Column_List"/>
         from
@@ -56,7 +56,7 @@
         </trim>
     </select>
 
-    <select id="entity_list_like" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <select id="entity_list_like" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         select
         <include refid="CbsLogEntity_Base_Column_List"/>
         from
@@ -78,7 +78,7 @@
         </trim>
     </select>
 
-    <select id="CbsLogEntity_list_base_in_payment" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <select id="CbsLogEntity_list_base_in_payment" resultMap="get-CbsLogEntity-result" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         select
         <include refid="CbsLogEntity_Base_Column_List"/>
         from
@@ -100,7 +100,7 @@
 
 
     <!--修改视图支付状态-->
-    <update id="entity_update" parameterType="com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity">
+    <update id="entity_update" parameterType="com.hzya.frame.cbs8.entity.CbsLogEntity">
         update formmain_0232 set
         <trim suffix="" suffixOverrides=",">
             <if test="pay_state != null and pay_state !='' ">field0010 =#{pay_state},</if>

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.cbs8.entity;
+package com.hzya.frame.cbs8.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/PaymentEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
-    <resultMap id="get-PaymentEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <resultMap id="get-PaymentEntity-result" type="com.hzya.frame.cbs8.entity.PaymentEntity">
         <result property="referenceNum" column="referenceNum" />
         <result property="busType" column="busType" />
         <result property="title" column="title" />
@@ -143,7 +143,7 @@
                 left join ORG_UNIT unit on unit.id =formmain_0209.field0002
     </sql>
     <!-- 采用==查询 -->
-    <select id="entity_list_base" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="entity_list_base" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         select v.* from (
         <include refid="base_sql"/>
         ) v
@@ -176,7 +176,7 @@
     </select>
 
     <!-- 查询交易成功，且电子回单为空的，上传电子回单用 -->
-    <select id="PaymentEntity_list_base_elec_isnull" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="PaymentEntity_list_base_elec_isnull" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
        <!-- select
         <include refid="PaymentEntity_Base_Column_List"/>
         from
@@ -247,7 +247,7 @@
         </trim>
     </select>
     <!-- 查询待支付的 -->
-    <select id="PaymentEntity_list_base_unpaid" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="PaymentEntity_list_base_unpaid" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
      select v.* from (
         <include refid="base_sql"/>
         ) v
@@ -284,7 +284,7 @@
 
 
     <!-- 查询未完成的 采用==查询 -->
-    <select id="PaymentEntity_list_base_in_payment" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <select id="PaymentEntity_list_base_in_payment" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         select
         <include refid="PaymentEntity_Base_Column_List"/>
         from
@@ -321,7 +321,7 @@
 
 
     <!--修改视图支付状态-->
-    <update id="PaymentEntity_update_payState" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <update id="PaymentEntity_update_payState" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         update ${tableName} set
         <trim suffix="" suffixOverrides=",">
             <if test="payDate != null and payDate !='' ">${payDateField} =#{payDate},</if>
@@ -332,7 +332,7 @@
     </update>
 
     <!--修改电子回单-->
-    <update id="PaymentEntity_update_electronic" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
+    <update id="PaymentEntity_update_electronic" parameterType="com.hzya.frame.cbs8.entity.PaymentEntity">
         update ${tableName} set ${receiptFiled}=#{receipt} where id = #{oaId} and ${receiptFiled} is null
     </update>
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.cbs8.entity;
+package com.hzya.frame.cbs8.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/entity/TransactionDetailEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
-    <resultMap id="get-TransactionDetailEntity-result" type="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+    <resultMap id="get-TransactionDetailEntity-result" type="com.hzya.frame.cbs8.entity.TransactionDetailEntity">
         <result property="id" column="id" />
         <result property="accountNo" column="accountNo" />
         <result property="accountName" column="accountName" />
@@ -39,7 +39,7 @@
     </sql>
 
     <!--  采用==查询 -->
-    <select id="TransactionDetailEntity_list_base" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+    <select id="TransactionDetailEntity_list_base" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.cbs8.entity.TransactionDetailEntity">
         select
         <include refid="TransactionDetailEntity_Base_Column_List"/>
         from
@@ -64,7 +64,7 @@
         </trim>
     </select>
     <!-- 只查询交易流水号-->
-    <select id="TransactionDetailEntity_list_serialNumber" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity">
+    <select id="TransactionDetailEntity_list_serialNumber" resultMap="get-TransactionDetailEntity-result" parameterType="com.hzya.frame.cbs8.entity.TransactionDetailEntity">
         select
         field0005 as transactionSerialNumber
         from

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentDetailService.java

@@ -1,8 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.service;
+package com.hzya.frame.cbs8.service;
 
 import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
 
 /**
  * @Description 代发代扣明细

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IAgentPaymentService.java

@@ -1,8 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.service;
+package com.hzya.frame.cbs8.service;
 
 import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
 
 import java.util.List;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbs8Service.java

@@ -3,7 +3,7 @@ package com.hzya.frame.cbs8.service;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.cbs8.dto.req.*;
 import com.hzya.frame.cbs8.dto.res.*;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 
 import java.util.List;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ICbsLogService.java

@@ -1,8 +1,8 @@
-package com.hzya.frame.seeyon.cbs8.service;
+package com.hzya.frame.cbs8.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.cbs8.entity.CbsLogEntity;
 import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 
 import java.util.List;

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/IPaymentService.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.service;
+package com.hzya.frame.cbs8.service;
 
 import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 
 import java.util.List;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/ITransactionDetailService.java

@@ -1,7 +1,7 @@
-package com.hzya.frame.seeyon.cbs8.service;
+package com.hzya.frame.cbs8.service;
 
 import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
+import com.hzya.frame.cbs8.entity.TransactionDetailEntity;
 
 import java.util.List;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentDetailServiceImpl.java

@@ -1,12 +1,10 @@
-package com.hzya.frame.seeyon.cbs8.service.impl;
+package com.hzya.frame.cbs8.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.service.impl.BaseService;
-import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService;
+import com.hzya.frame.cbs8.dao.IAgentPaymentDetailDao;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.service.IAgentPaymentDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/AgentPaymentServiceImpl.java

@@ -1,14 +1,13 @@
-package com.hzya.frame.seeyon.cbs8.service.impl;
+package com.hzya.frame.cbs8.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.service.impl.BaseService;
-import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDao;
-import com.hzya.frame.seeyon.cbs8.dao.IAgentPaymentDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentDetailEntity;
-import com.hzya.frame.seeyon.cbs8.entity.AgentPaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentDetailService;
-import com.hzya.frame.seeyon.cbs8.service.IAgentPaymentService;
+import com.hzya.frame.cbs8.dao.IAgentPaymentDao;
+import com.hzya.frame.cbs8.entity.AgentPaymentDetailEntity;
+import com.hzya.frame.cbs8.entity.AgentPaymentEntity;
+import com.hzya.frame.cbs8.service.IAgentPaymentDetailService;
+import com.hzya.frame.cbs8.service.IAgentPaymentService;
 import com.hzya.frame.web.exception.BaseSystemException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ExtServiceImpl.java

@@ -7,7 +7,7 @@ import com.hzya.frame.cbs8.dto.req.*;
 import com.hzya.frame.cbs8.service.ICbs8ExtService;
 import com.hzya.frame.cbs8.util.CBSUtil;
 import com.hzya.frame.cbs8.util.CbsAccessToken;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 import com.hzya.frame.stringutil.StringUtil;
 import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 import com.hzya.frame.web.exception.BaseSystemException;

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/Cbs8ServiceImpl.java

@@ -12,8 +12,8 @@ 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.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.service.IPaymentService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/CbsLogServiceImpl.java

@@ -1,17 +1,16 @@
-package com.hzya.frame.seeyon.cbs8.service.impl;
+package com.hzya.frame.cbs8.service.impl;
 
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.service.impl.BaseService;
 import com.hzya.frame.cbs8.util.PayState;
-import com.hzya.frame.seeyon.cbs8.dao.ICbsLogDao;
-import com.hzya.frame.seeyon.cbs8.entity.CbsLogEntity;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.ICbsLogService;
+import com.hzya.frame.cbs8.dao.ICbsLogDao;
+import com.hzya.frame.cbs8.entity.CbsLogEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.service.ICbsLogService;
 import com.hzya.frame.seeyon.util.RestUtil;
 import com.hzya.frame.stringutil.StringUtil;
 import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/PaymentServiceImpl.java

@@ -1,14 +1,13 @@
-package com.hzya.frame.seeyon.cbs8.service.impl;
+package com.hzya.frame.cbs8.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.service.impl.BaseService;
 import com.hzya.frame.cbs8.util.PayState;
-import com.hzya.frame.seeyon.cbs8.dao.IPaymentDao;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
+import com.hzya.frame.cbs8.dao.IPaymentDao;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
+import com.hzya.frame.cbs8.service.IPaymentService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

service/service-cbs/src/main/java/com.hzya.frame/cbs8/service/impl/TransactionDetailServiceImpl.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.cbs8.service.impl;
+package com.hzya.frame.cbs8.service.impl;
 
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.StrUtil;
@@ -7,10 +7,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.service.impl.BaseService;
-import com.hzya.frame.seeyon.cbs8.dao.ITransactionDetailDao;
-import com.hzya.frame.seeyon.cbs8.entity.TransactionDetailEntity;
-import com.hzya.frame.seeyon.cbs8.service.IPaymentService;
-import com.hzya.frame.seeyon.cbs8.service.ITransactionDetailService;
+import com.hzya.frame.cbs8.dao.ITransactionDetailDao;
+import com.hzya.frame.cbs8.entity.TransactionDetailEntity;
+import com.hzya.frame.cbs8.service.ITransactionDetailService;
 import com.hzya.frame.stringutil.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/IPayBillDao.java

@@ -1,10 +1,8 @@
-package com.hzya.frame.seeyon.paybill.dao;
+package com.hzya.frame.paybill.dao;
 
-import com.hzya.frame.seeyon.entity.SeeYonInterFaceEntity;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import com.hzya.frame.paybill.entity.PayBillEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author 👻👻👻👻👻👻👻👻👻👻 gjh

service/service-cbs/src/main/java/com.hzya.frame/paybill/dao/impl/PayBillDaoImpl.java

@@ -1,14 +1,12 @@
-package com.hzya.frame.seeyon.paybill.dao.impl;
+package com.hzya.frame.paybill.dao.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.seeyon.entity.SeeYonInterFaceEntity;
-import com.hzya.frame.seeyon.paybill.dao.IPayBillDao;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import com.hzya.frame.paybill.dao.IPayBillDao;
+import com.hzya.frame.paybill.entity.PayBillEntity;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author 👻👻👻👻👻👻👻👻👻👻 gjh

service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.java

@@ -1,4 +1,4 @@
-package com.hzya.frame.seeyon.paybill.entity;
+package com.hzya.frame.paybill.entity;
 
 import com.hzya.frame.web.entity.BaseEntity;
 

service/service-cbs/src/main/java/com.hzya.frame/paybill/entity/PayBillEntity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzya.frame.seeyon.paybill.dao.impl.PayBillDaoImpl">
-    <resultMap id="get-PayBillEntity-result" type="com.hzya.frame.seeyon.paybill.entity.PayBillEntity" >
+    <resultMap id="get-PayBillEntity-result" type="com.hzya.frame.paybill.entity.PayBillEntity" >
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="pkOrg" column="pk_org" jdbcType="VARCHAR"/>
         <result property="billDate" column="bill_date" jdbcType="VARCHAR"/>
@@ -14,7 +14,7 @@
     </resultMap>
 
     <!--工程项目查询-->
-    <select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.seeyon.paybill.entity.PayBillEntity">
+    <select id="PayBillEntity_list_base" resultMap="get-PayBillEntity-result" parameterType="com.hzya.frame.paybill.entity.PayBillEntity">
        SELECT
         body.id as id,
         field0070 AS bill_date,

service/service-cbs/src/main/java/com.hzya.frame/paybill/service/IPayBillService.java

@@ -1,13 +1,10 @@
-package com.hzya.frame.seeyon.paybill.service;
+package com.hzya.frame.paybill.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.basedao.service.IBaseService;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
 import com.hzya.frame.web.entity.JsonResultEntity;
 
-import java.util.List;
-
 /**
  *
  * @content huoqu

service/service-cbs/src/main/java/com.hzya.frame/paybill/service/impl/PayBillServiceImpl.java

@@ -1,15 +1,14 @@
-package com.hzya.frame.seeyon.paybill.service.impl;
+package com.hzya.frame.paybill.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hzya.frame.basedao.service.impl.BaseService;
 import com.hzya.frame.bip.v3.v2207.util.BipUtil;
-import com.hzya.frame.seeyon.cbs8.entity.PaymentEntity;
-import com.hzya.frame.seeyon.paybill.dao.IPayBillDao;
-import com.hzya.frame.seeyon.paybill.entity.PayBillEntity;
-import com.hzya.frame.seeyon.paybill.service.IPayBillService;
-import com.hzya.frame.seeyon.service.impl.SeeYonInterFaceImpl;
+import com.hzya.frame.cbs8.entity.PaymentEntity;
+import com.hzya.frame.paybill.dao.IPayBillDao;
+import com.hzya.frame.paybill.entity.PayBillEntity;
+import com.hzya.frame.paybill.service.IPayBillService;
 import com.hzya.frame.web.entity.JsonResultEntity;
 import org.apache.commons.collections.CollectionUtils;
 import org.jetbrains.annotations.NotNull;

service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/dao/impl/AcctVouchInfoDaoImpl.java

@@ -1,12 +1,11 @@
 package com.hzya.frame.grpU8.acctVouchInfo.dao.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.hzya.frame.mdm.mdmModule.entity.MdmModuleEntity;
-import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import com.hzya.frame.grpU8.acctVouchInfo.dao.IAcctVouchInfoDao;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
 import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntityVo;
 import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
 
 import java.util.List;
 

service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/entity/AcctVouchInfoEntity.java

@@ -1,6 +1,5 @@
 package com.hzya.frame.grpU8.acctVouchInfo.entity;
 
-import java.util.Date;
 import com.hzya.frame.web.entity.BaseEntity;
 /**
  * 子表(AcctVouchInfo)实体类
@@ -9,7 +8,7 @@ import com.hzya.frame.web.entity.BaseEntity;
  * @since 2024-07-09 11:25:15
  */
 public class AcctVouchInfoEntity extends BaseEntity {
- 
+
   /**  年度 */
    private String acct_year;
   /**  月份 */

service/service-grp/src/main/java/com/hzya/frame/grpU8/acctVouchInfo/service/IAcctVouchInfoService.java

@@ -1,10 +1,9 @@
 package com.hzya.frame.grpU8.acctVouchInfo.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
-import com.hzya.frame.web.entity.JsonResultEntity;
-import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
 import com.hzya.frame.basedao.service.IBaseService;
+import com.hzya.frame.grpU8.acctVouchInfo.entity.AcctVouchInfoEntity;
+import com.hzya.frame.sysnew.application.entity.SysExtensionApiEntity;
 /**
  * 子表(AcctVouchInfo)表服务接口
  *

service/service-grp/src/main/java/com/hzya/frame/grpU8/dictCheckType/dao/impl/DictCheckTypeDaoImpl.java

@@ -1,13 +1,11 @@
 package com.hzya.frame.grpU8.dictCheckType.dao.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntity;
-import com.hzya.frame.grpU8.dictAcctSubj.entity.DictAcctSubjEntityVo;
-import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
 import com.hzya.frame.grpU8.dictCheckType.dao.IDictCheckTypeDao;
+import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntity;
 import com.hzya.frame.grpU8.dictCheckType.entity.DictCheckTypeEntityVo;
 import org.springframework.stereotype.Repository;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
 
 import java.util.List;
 

service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/IAttachmentFileDao.java

@@ -1,13 +1,13 @@
-package com.hzya.frame.grpU8.nxproof.attachment.dao;/*
-* @Description 附件
-* @Author xiangerlin 
-  @Date 2022-10-26 11:17
-*/
-
-
-import com.hzya.frame.basedao.dao.IBaseDao;
-import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
-
-public interface IAttachmentFileDao extends IBaseDao<AttachmentFileEntity, String> {
-    Integer saveData(AttachmentFileEntity entity);
-}
+package com.hzya.frame.grpU8.nxproof.attachment.dao;/*
+* @Description 附件
+* @Author xiangerlin 
+  @Date 2022-10-26 11:17
+*/
+
+
+import com.hzya.frame.basedao.dao.IBaseDao;
+import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
+
+public interface IAttachmentFileDao extends IBaseDao<AttachmentFileEntity, String> {
+    Integer saveData(AttachmentFileEntity entity);
+}

service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/dao/impl/AttachmentFileDaoImpl.java

@@ -1,23 +1,23 @@
-package com.hzya.frame.grpU8.nxproof.attachment.dao.impl;/*
-* @Description 附件
-* @Author xiangerlin 
-  @Date 2022-10-26 11:18
-*/
-
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.hzya.frame.basedao.dao.MybatisGenericDao;
-import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao;
-import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
-import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class AttachmentFileDaoImpl extends MybatisGenericDao<AttachmentFileEntity, String> implements IAttachmentFileDao {
-    @DS("#entity.dataSourceCode")
-    @Override
-    public Integer saveData(AttachmentFileEntity entity) {
-        Integer o = super.insert("com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity.AttachmentFileEntity_insert", entity);
-        return o;
-    }
-}
+package com.hzya.frame.grpU8.nxproof.attachment.dao.impl;/*
+* @Description 附件
+* @Author xiangerlin 
+  @Date 2022-10-26 11:18
+*/
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.hzya.frame.basedao.dao.MybatisGenericDao;
+import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao;
+import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
+import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class AttachmentFileDaoImpl extends MybatisGenericDao<AttachmentFileEntity, String> implements IAttachmentFileDao {
+    @DS("#entity.dataSourceCode")
+    @Override
+    public Integer saveData(AttachmentFileEntity entity) {
+        Integer o = super.insert("com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity.AttachmentFileEntity_insert", entity);
+        return o;
+    }
+}

service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.java

@@ -1,120 +1,120 @@
-package com.hzya.frame.grpU8.nxproof.attachment.entity;/*
-* @Description 附件表
-* @Author xiangerlin 
-  @Date 2022-10-26 10:40
-*/
-
-
-import com.hzya.frame.web.entity.BaseEntity;
-
-public class AttachmentFileEntity  extends BaseEntity {
-
-   private String aTGuid;//主键id
-   private String createDate;//创建日期
-   private String createID;//创建人id
-   private String updateDate;//更新日期
-   private String updateID;//更新人id
-   private String deleteDate;//删除日期
-   private String deleteID;//删除人
-   private String aTFileName;//附件名
-   private String aTExtName;//附件后缀名
-   private byte[] aTFile;//附件 二进制文件
-   private String relationApp;//固定传 OER
-   private String isDELETE;//删除标记 0是未删除
-
-    public String getaTGuid() {
-        return aTGuid;
-    }
-
-    public void setaTGuid(String aTGuid) {
-        this.aTGuid = aTGuid;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getCreateID() {
-        return createID;
-    }
-
-    public void setCreateID(String createID) {
-        this.createID = createID;
-    }
-
-    public String getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(String updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    public String getUpdateID() {
-        return updateID;
-    }
-
-    public void setUpdateID(String updateID) {
-        this.updateID = updateID;
-    }
-
-    public String getDeleteDate() {
-        return deleteDate;
-    }
-
-    public void setDeleteDate(String deleteDate) {
-        this.deleteDate = deleteDate;
-    }
-
-    public String getDeleteID() {
-        return deleteID;
-    }
-
-    public void setDeleteID(String deleteID) {
-        this.deleteID = deleteID;
-    }
-
-    public String getaTFileName() {
-        return aTFileName;
-    }
-
-    public void setaTFileName(String aTFileName) {
-        this.aTFileName = aTFileName;
-    }
-
-    public String getaTExtName() {
-        return aTExtName;
-    }
-
-    public void setaTExtName(String aTExtName) {
-        this.aTExtName = aTExtName;
-    }
-
-    public byte[] getaTFile() {
-        return aTFile;
-    }
-
-    public void setaTFile(byte[] aTFile) {
-        this.aTFile = aTFile;
-    }
-
-    public String getRelationApp() {
-        return relationApp;
-    }
-
-    public void setRelationApp(String relationApp) {
-        this.relationApp = relationApp;
-    }
-
-    public String getIsDELETE() {
-        return isDELETE;
-    }
-
-    public void setIsDELETE(String isDELETE) {
-        this.isDELETE = isDELETE;
-    }
-}
+package com.hzya.frame.grpU8.nxproof.attachment.entity;/*
+* @Description 附件表
+* @Author xiangerlin 
+  @Date 2022-10-26 10:40
+*/
+
+
+import com.hzya.frame.web.entity.BaseEntity;
+
+public class AttachmentFileEntity  extends BaseEntity {
+
+   private String aTGuid;//主键id
+   private String createDate;//创建日期
+   private String createID;//创建人id
+   private String updateDate;//更新日期
+   private String updateID;//更新人id
+   private String deleteDate;//删除日期
+   private String deleteID;//删除人
+   private String aTFileName;//附件名
+   private String aTExtName;//附件后缀名
+   private byte[] aTFile;//附件 二进制文件
+   private String relationApp;//固定传 OER
+   private String isDELETE;//删除标记 0是未删除
+
+    public String getaTGuid() {
+        return aTGuid;
+    }
+
+    public void setaTGuid(String aTGuid) {
+        this.aTGuid = aTGuid;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateID() {
+        return createID;
+    }
+
+    public void setCreateID(String createID) {
+        this.createID = createID;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getUpdateID() {
+        return updateID;
+    }
+
+    public void setUpdateID(String updateID) {
+        this.updateID = updateID;
+    }
+
+    public String getDeleteDate() {
+        return deleteDate;
+    }
+
+    public void setDeleteDate(String deleteDate) {
+        this.deleteDate = deleteDate;
+    }
+
+    public String getDeleteID() {
+        return deleteID;
+    }
+
+    public void setDeleteID(String deleteID) {
+        this.deleteID = deleteID;
+    }
+
+    public String getaTFileName() {
+        return aTFileName;
+    }
+
+    public void setaTFileName(String aTFileName) {
+        this.aTFileName = aTFileName;
+    }
+
+    public String getaTExtName() {
+        return aTExtName;
+    }
+
+    public void setaTExtName(String aTExtName) {
+        this.aTExtName = aTExtName;
+    }
+
+    public byte[] getaTFile() {
+        return aTFile;
+    }
+
+    public void setaTFile(byte[] aTFile) {
+        this.aTFile = aTFile;
+    }
+
+    public String getRelationApp() {
+        return relationApp;
+    }
+
+    public void setRelationApp(String relationApp) {
+        this.relationApp = relationApp;
+    }
+
+    public String getIsDELETE() {
+        return isDELETE;
+    }
+
+    public void setIsDELETE(String isDELETE) {
+        this.isDELETE = isDELETE;
+    }
+}

service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/entity/AttachmentFileEntity.xml

@@ -1,86 +1,86 @@
-<?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.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
-    <resultMap id="get-AttachmentFileEntity-result" type="com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
-
-        <result property="aTGuid" column="aTGuid" />
-        <result property="createDate" column="createDate" />
-        <result property="createID" column="createID" />
-        <result property="updateDate" column="updateDate" />
-        <result property="updateID" column="updateID" />
-        <result property="deleteDate" column="deleteDate" />
-        <result property="deleteID" column="deleteID" />
-        <result property="aTFileName" column="aTFileName" />
-        <result property="aTExtName" column="aTExtName" />
-        <result column="aTFile" property="aTFile" jdbcType="BLOB"  typeHandler="org.apache.ibatis.type.BlobTypeHandler" />
-        <result property="relationApp" column="relationApp" />
-        <result property="isDELETE" column="isDELETE" />
-    </resultMap>
-
-
-    <sql id="AttachmentFileEntity_Base_Column_List">
-        ATGuid,
-        CreateDate,
-        CreateID,
-        UpdateDate,
-        UpdateID,
-        DeleteDate,
-        DeleteID,
-        ATFileName,
-        ATExtName,
-        ATFile,
-        RelationApp,
-        ISDELETE
-	</sql>
-
-
-
-    <!-- 查询 采用==查询 -->
-    <select id="AttachmentFileEntity_list_base" resultMap="get-AttachmentFileEntity-result" parameterType="com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
-        select
-        <include refid="AttachmentFileEntity_Base_Column_List" />
-        FROM
-        AT_AttachmentFile
-        <trim prefix="where" prefixOverrides="and">
-            <if test="aTGuid != null and aTGuid !='' "> aTGuid = #{aTGuid} </if>
-            <if test="aTFileName != null and aTFileName !='' ">and aTFileName = #{aTFileName} </if>
-        </trim>
-    </select>
-
-
-    <insert id="AttachmentFileEntity_insert" parameterType="com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
-        insert into AT_AttachmentFile(
-        <trim suffix="" suffixOverrides=",">
-            <if test="aTGuid != null and aTGuid !='' ">aTGuid,</if>
-            <if test="createDate != null and createDate !='' "> createDate, </if>
-            <if test="createID != null and createID !='' "> createID, </if>
-            <if test="updateDate != null and updateDate !='' ">   updateDate ,</if>
-            <if test="updateID != null and updateID !='' ">updateID,</if>
-            <if test="deleteDate != null and deleteDate !='' ">deleteDate,</if>
-            <if test="deleteID != null and deleteID !='' ">deleteID,</if>
-            <if test="aTFileName != null and aTFileName !='' ">aTFileName,</if>
-            <if test="aTExtName != null and aTExtName !='' ">aTExtName,</if>
-            <if test="aTFile != null and aTFile !='' ">aTFile,</if>
-            relationApp,
-            isDELETE
-        </trim>
-        )values
-        (
-        <trim suffix="" suffixOverrides=",">
-            <if test="aTGuid != null and aTGuid !='' ">#{aTGuid},</if>
-            <if test="createDate != null and createDate !='' "> #{createDate}, </if>
-            <if test="createID != null and createID !='' "> #{createID}, </if>
-            <if test="updateDate != null and updateDate !='' ">   #{updateDate} ,</if>
-            <if test="updateID != null and updateID !='' ">#{updateID},</if>
-            <if test="deleteDate != null and deleteDate !='' ">#{deleteDate},</if>
-            <if test="deleteID != null and deleteID !='' ">#{deleteID},</if>
-            <if test="aTFileName != null and aTFileName !='' ">#{aTFileName},</if>
-            <if test="aTExtName != null and aTExtName !='' ">#{aTExtName},</if>
-            <if test="aTFile != null and aTFile !='' ">#{aTFile,typeHandler=org.apache.ibatis.type.BlobTypeHandler},</if>
-            'OER',
-            0
-
-        </trim>
-        )
-    </insert>
-</mapper>
+<?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.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
+    <resultMap id="get-AttachmentFileEntity-result" type="com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
+
+        <result property="aTGuid" column="aTGuid" />
+        <result property="createDate" column="createDate" />
+        <result property="createID" column="createID" />
+        <result property="updateDate" column="updateDate" />
+        <result property="updateID" column="updateID" />
+        <result property="deleteDate" column="deleteDate" />
+        <result property="deleteID" column="deleteID" />
+        <result property="aTFileName" column="aTFileName" />
+        <result property="aTExtName" column="aTExtName" />
+        <result column="aTFile" property="aTFile" jdbcType="BLOB"  typeHandler="org.apache.ibatis.type.BlobTypeHandler" />
+        <result property="relationApp" column="relationApp" />
+        <result property="isDELETE" column="isDELETE" />
+    </resultMap>
+
+
+    <sql id="AttachmentFileEntity_Base_Column_List">
+        ATGuid,
+        CreateDate,
+        CreateID,
+        UpdateDate,
+        UpdateID,
+        DeleteDate,
+        DeleteID,
+        ATFileName,
+        ATExtName,
+        ATFile,
+        RelationApp,
+        ISDELETE
+	</sql>
+
+
+
+    <!-- 查询 采用==查询 -->
+    <select id="AttachmentFileEntity_list_base" resultMap="get-AttachmentFileEntity-result" parameterType="com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
+        select
+        <include refid="AttachmentFileEntity_Base_Column_List" />
+        FROM
+        AT_AttachmentFile
+        <trim prefix="where" prefixOverrides="and">
+            <if test="aTGuid != null and aTGuid !='' "> aTGuid = #{aTGuid} </if>
+            <if test="aTFileName != null and aTFileName !='' ">and aTFileName = #{aTFileName} </if>
+        </trim>
+    </select>
+
+
+    <insert id="AttachmentFileEntity_insert" parameterType="com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity">
+        insert into AT_AttachmentFile(
+        <trim suffix="" suffixOverrides=",">
+            <if test="aTGuid != null and aTGuid !='' ">aTGuid,</if>
+            <if test="createDate != null and createDate !='' "> createDate, </if>
+            <if test="createID != null and createID !='' "> createID, </if>
+            <if test="updateDate != null and updateDate !='' ">   updateDate ,</if>
+            <if test="updateID != null and updateID !='' ">updateID,</if>
+            <if test="deleteDate != null and deleteDate !='' ">deleteDate,</if>
+            <if test="deleteID != null and deleteID !='' ">deleteID,</if>
+            <if test="aTFileName != null and aTFileName !='' ">aTFileName,</if>
+            <if test="aTExtName != null and aTExtName !='' ">aTExtName,</if>
+            <if test="aTFile != null and aTFile !='' ">aTFile,</if>
+            relationApp,
+            isDELETE
+        </trim>
+        )values
+        (
+        <trim suffix="" suffixOverrides=",">
+            <if test="aTGuid != null and aTGuid !='' ">#{aTGuid},</if>
+            <if test="createDate != null and createDate !='' "> #{createDate}, </if>
+            <if test="createID != null and createID !='' "> #{createID}, </if>
+            <if test="updateDate != null and updateDate !='' ">   #{updateDate} ,</if>
+            <if test="updateID != null and updateID !='' ">#{updateID},</if>
+            <if test="deleteDate != null and deleteDate !='' ">#{deleteDate},</if>
+            <if test="deleteID != null and deleteID !='' ">#{deleteID},</if>
+            <if test="aTFileName != null and aTFileName !='' ">#{aTFileName},</if>
+            <if test="aTExtName != null and aTExtName !='' ">#{aTExtName},</if>
+            <if test="aTFile != null and aTFile !='' ">#{aTFile,typeHandler=org.apache.ibatis.type.BlobTypeHandler},</if>
+            'OER',
+            0
+
+        </trim>
+        )
+    </insert>
+</mapper>

service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/IAttachmentFileService.java

@@ -1,37 +1,37 @@
-package com.hzya.frame.grpU8.nxproof.attachment.service;/*
-* @Description
-* @Author xiangerlin 
-  @Date 2022-10-26 11:19
-*/
-
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
-
-import java.util.List;
-
-public interface IAttachmentFileService {
-
-    /**
-     * 保存附件
-     * @param entity
-     */
-    void saveAttachment(AttachmentFileEntity entity);
-
-    List<AttachmentFileEntity> queryFile(AttachmentFileEntity entity)throws Exception;
-
-    /**
-     * 调用http接口查询单据附件
-     * @param billCode
-     * @return
-     * @throws Exception
-     */
-    List<JSONObject> queryFileByCode(String billCode)throws Exception;
-
-    /**
-     * 附件上传
-     * @param fileList
-     * @param mlid
-     * @param kjnd
-     */
-    void uploadAttachment(List<JSONObject> fileList,String mlid,String kjnd);
-}
+package com.hzya.frame.grpU8.nxproof.attachment.service;/*
+* @Description
+* @Author xiangerlin 
+  @Date 2022-10-26 11:19
+*/
+
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
+
+import java.util.List;
+
+public interface IAttachmentFileService {
+
+    /**
+     * 保存附件
+     * @param entity
+     */
+    void saveAttachment(AttachmentFileEntity entity);
+
+    List<AttachmentFileEntity> queryFile(AttachmentFileEntity entity)throws Exception;
+
+    /**
+     * 调用http接口查询单据附件
+     * @param billCode
+     * @return
+     * @throws Exception
+     */
+    List<JSONObject> queryFileByCode(String billCode)throws Exception;
+
+    /**
+     * 附件上传
+     * @param fileList
+     * @param mlid
+     * @param kjnd
+     */
+    void uploadAttachment(List<JSONObject> fileList,String mlid,String kjnd);
+}

service/service-grp/src/main/java/com/hzya/frame/grpU8/nxproof/attachment/service/impl/AttachmentFileServiceImpl.java

@@ -1,229 +1,229 @@
-package com.hzya.frame.grpU8.nxproof.attachment.service.impl;/*
-* @Description
-* @Author xiangerlin 
-  @Date 2022-10-26 11:20
-*/
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.hzya.frame.basedao.service.impl.BaseService;
-import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao;
-import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
-import com.hzya.frame.grpU8.nxproof.attachment.service.IAttachmentFileService;
-import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity;
-import com.hzya.frame.grpU8.nxproof.oerannex.service.IOerAnnexService;
-import com.hzya.frame.grpU8.nxproof.oerdjml.dto.FileInfoDTO;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.*;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-@Service
-public class AttachmentFileServiceImpl extends BaseService<AttachmentFileEntity,String> implements IAttachmentFileService {
-
-    Logger logger = LogManager.getLogger(getClass());
-
-    protected IAttachmentFileDao attachmentFileDao;
-
-    @Autowired
-    public void setBillLogDao(IAttachmentFileDao dao) {
-        this.attachmentFileDao = dao;
-        this.dao=dao;
-    }
-    @Autowired
-    private IOerAnnexService oerAnnexService;
-    /**
-     * 保存附件
-     * @param entity
-     */
-    @Override
-    public void saveAttachment(AttachmentFileEntity entity) {
-        entity.setaTGuid("A1:"+IdUtil.fastUUID());
-        String date = DateUtil.format(new Date(), "yyyyMMdd HH:mm:ss");
-        entity.setCreateDate(date);
-        entity.setUpdateDate(date);
-        String fileName = entity.getaTFileName();
-        if (StrUtil.isNotEmpty(fileName)){
-            int index = fileName.lastIndexOf(".");
-            if (index > 0){
-                String suffix = fileName.substring(index);
-                entity.setaTExtName(suffix);
-                String prefix = fileName.substring(0,index);
-                entity.setaTFileName(prefix);
-            }
-        }
-        attachmentFileDao.save("AttachmentFileEntity_insert",entity);
-    }
-
-    @Override
-    public List<AttachmentFileEntity> queryFile(AttachmentFileEntity entity) throws Exception {
-        List<AttachmentFileEntity> list = attachmentFileDao.query(entity);
-        return list;
-    }
-
-    /**
-     * 调用http接口查询单据附件
-     *
-     * @param billCode 单据号
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public List<JSONObject> queryFileByCode(String billCode) throws Exception {
-        List<JSONObject> list = new ArrayList<>();
-        if (StrUtil.isNotEmpty(billCode)){
-            JSONObject params = new JSONObject();
-            params.put("billNo",billCode);
-            String res = HttpRequest.post("/grp/af/findFilesBB").body(params.toString()).execute().body();
-            logger.info("根据单号:{},查询到到附件列表为:{}",billCode,res);
-            if (StrUtil.isNotEmpty(res)){
-                JSONObject resJson = JSONObject.parseObject(res);
-                int pageCount = resJson.getIntValue("pageCount");
-                boolean success = resJson.getBoolean("success");
-                if (success){
-                    String dataStr = resJson.getString("data");
-                    list = JSONObject.parseArray(dataStr,JSONObject.class);
-                    if (null != list && list.size() >0){
-                        for (JSONObject jsonObject : list) {
-                            String fileName = jsonObject.getString("fileName");
-                            if (StrUtil.isNotEmpty(fileName)){
-                                // 使用indexOf找到"."的位置
-                                int dotIndex = fileName.lastIndexOf('.');
-                                // 确保找到了"."，防止indexOf返回-1的情况
-                                if (dotIndex != -1){
-                                    String ext_name = fileName.substring(dotIndex);
-                                    jsonObject.put("Ext",ext_name);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return list;
-    }
-
-    /**
-     * 附件上传
-     *
-     * @param fileList
-     * @param mlid
-     * @param kjnd
-     */
-    @Override
-    public void uploadAttachment(List<JSONObject> fileList, String mlid, String kjnd) {
-        if (CollectionUtils.isNotEmpty(fileList) && StrUtil.isNotEmpty(mlid) && StrUtil.isNotEmpty(kjnd)){
-            try {
-                //附件下载
-                List<FileInfoDTO> fileInfoList = fileDownload(fileList);
-                //附件保存到grp库里
-                if (CollectionUtils.isNotEmpty(fileInfoList)){
-                    //保存前先删一下历史附件
-                    OerAnnexEntity delete = new OerAnnexEntity();
-                    //delete.setGsdm(Constant.CONFIGMAP.get("gsdm"));
-                    delete.setKjnd(kjnd);
-                    delete.setMlid(mlid);
-                    //oerAnnexService.deleteAnnex(delete);
-                    int no = 1;
-                    for (FileInfoDTO fileInfo : fileInfoList) {
-                        try {
-                            AttachmentFileEntity fileEntity = new AttachmentFileEntity();
-                            String fileName = URLDecoder.decode(fileInfo.getFile_name(), "UTF-8");
-                            fileEntity.setaTFileName(fileName);
-                            fileEntity.setaTFile(fileInfo.getData());
-                            this.saveAttachment(fileEntity);
-                            //保存附件关系
-                            OerAnnexEntity annexEntity = new OerAnnexEntity();
-                            annexEntity.setMlid(mlid);
-                            annexEntity.setKjnd(kjnd);
-                            annexEntity.setAnnexName(fileName);
-                            annexEntity.setAnnexSize(Convert.toLong(fileInfo.getFile_size()));
-                            annexEntity.setOnlyid(fileEntity.getaTGuid());
-                            annexEntity.setXh(String.valueOf(no));
-                            oerAnnexService.saveAnnex(annexEntity);
-                            no++;
-                        }catch (Exception e){
-                            logger.error("保存附件到grp出错:{}",e);
-                        }
-                    }
-                }
-            }catch (Exception e){
-                logger.error("保存附件到grp出错:{}",e);
-            }
-        }
-    }
-
-    private List<FileInfoDTO> fileDownload(List<JSONObject> fileList){
-        String dir = "1";
-        List<FileInfoDTO> files = new ArrayList<>();
-        //1、下载附件
-        for (JSONObject fileObj : fileList) {
-            try {
-                FileInfoDTO fileInfoDTO = new FileInfoDTO();
-                String url = fileObj.getString("url");
-                String fileName = URLDecoder.decode(fileObj.getString("fileName"));
-                File file = HttpUtil.downloadFileFromUrl(url, dir);
-                if (null != file){
-                    String zipPath = dir + File.separator + fileName.split("\\.")[0] + ".zip";
-                    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipPath), Charset.forName("GBK"));
-                    writeZipFile(file, zos,fileName);
-                    zos.close();
-                    // 获取压缩文件的字节数组
-                    File zipFile = new File(zipPath);
-                    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream((int) zipFile.length());
-                    BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(zipFile));
-                    int buf_size = 1024;
-                    byte[] buffer = new byte[buf_size];
-                    int len = 0;
-                    while (-1 != (len = bufferedInputStream.read(buffer, 0, buf_size))) {
-                        byteArrayOutputStream.write(buffer, 0, len);
-                    }
-                    byte[] fileByte = byteArrayOutputStream.toByteArray();
-                    fileInfoDTO.setData(fileByte);
-                    fileInfoDTO.setFile_size(fileObj.getString("size"));
-                    fileInfoDTO.setFile_name(fileName);
-                    files.add(fileInfoDTO);
-                }
-            }catch (Exception e){
-                logger.error("上传附件出错:{}",e);
-            }
-        }
-        return files;
-    }
-    private void writeZipFile(File file,ZipOutputStream zos,String fileName){
-        if (null != file && null !=zos){
-            try {
-                logger.info("=====压缩文件=====");
-                zos.putNextEntry(new ZipEntry(fileName));
-                FileInputStream fos = new FileInputStream(file);
-                BufferedInputStream bis = new BufferedInputStream(fos);
-                int len;
-                byte[] buf = new byte[1024];
-                while ((len = bis.read(buf, 0, 1024)) != -1) {
-                    zos.write(buf, 0, len);
-                }
-                bis.close();
-                fos.close();
-                logger.info("=====压缩完成=====");
-            }catch (Exception e){
-                e.printStackTrace();
-                logger.error("=====压缩文件出错=====");
-            }
-        }
-    }
-}
+package com.hzya.frame.grpU8.nxproof.attachment.service.impl;/*
+* @Description
+* @Author xiangerlin 
+  @Date 2022-10-26 11:20
+*/
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.hzya.frame.basedao.service.impl.BaseService;
+import com.hzya.frame.grpU8.nxproof.attachment.dao.IAttachmentFileDao;
+import com.hzya.frame.grpU8.nxproof.attachment.entity.AttachmentFileEntity;
+import com.hzya.frame.grpU8.nxproof.attachment.service.IAttachmentFileService;
+import com.hzya.frame.grpU8.nxproof.oerannex.entity.OerAnnexEntity;
+import com.hzya.frame.grpU8.nxproof.oerannex.service.IOerAnnexService;
+import com.hzya.frame.grpU8.nxproof.oerdjml.dto.FileInfoDTO;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.net.URLDecoder;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+@Service
+public class AttachmentFileServiceImpl extends BaseService<AttachmentFileEntity,String> implements IAttachmentFileService {
+
+    Logger logger = LogManager.getLogger(getClass());
+
+    protected IAttachmentFileDao attachmentFileDao;
+
+    @Autowired
+    public void setBillLogDao(IAttachmentFileDao dao) {
+        this.attachmentFileDao = dao;
+        this.dao=dao;
+    }
+    @Autowired
+    private IOerAnnexService oerAnnexService;
+    /**
+     * 保存附件
+     * @param entity
+     */
+    @Override
+    public void saveAttachment(AttachmentFileEntity entity) {
+        entity.setaTGuid("A1:"+IdUtil.fastUUID());
+        String date = DateUtil.format(new Date(), "yyyyMMdd HH:mm:ss");
+        entity.setCreateDate(date);
+        entity.setUpdateDate(date);
+        String fileName = entity.getaTFileName();
+        if (StrUtil.isNotEmpty(fileName)){
+            int index = fileName.lastIndexOf(".");
+            if (index > 0){
+                String suffix = fileName.substring(index);
+                entity.setaTExtName(suffix);
+                String prefix = fileName.substring(0,index);
+                entity.setaTFileName(prefix);
+            }
+        }
+        attachmentFileDao.save("AttachmentFileEntity_insert",entity);
+    }
+
+    @Override
+    public List<AttachmentFileEntity> queryFile(AttachmentFileEntity entity) throws Exception {
+        List<AttachmentFileEntity> list = attachmentFileDao.query(entity);
+        return list;
+    }
+
+    /**
+     * 调用http接口查询单据附件
+     *
+     * @param billCode 单据号
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<JSONObject> queryFileByCode(String billCode) throws Exception {
+        List<JSONObject> list = new ArrayList<>();
+        if (StrUtil.isNotEmpty(billCode)){
+            JSONObject params = new JSONObject();
+            params.put("billNo",billCode);
+            String res = HttpRequest.post("/grp/af/findFilesBB").body(params.toString()).execute().body();
+            logger.info("根据单号:{},查询到到附件列表为:{}",billCode,res);
+            if (StrUtil.isNotEmpty(res)){
+                JSONObject resJson = JSONObject.parseObject(res);
+                int pageCount = resJson.getIntValue("pageCount");
+                boolean success = resJson.getBoolean("success");
+                if (success){
+                    String dataStr = resJson.getString("data");
+                    list = JSONObject.parseArray(dataStr,JSONObject.class);
+                    if (null != list && list.size() >0){
+                        for (JSONObject jsonObject : list) {
+                            String fileName = jsonObject.getString("fileName");
+                            if (StrUtil.isNotEmpty(fileName)){
+                                // 使用indexOf找到"."的位置
+                                int dotIndex = fileName.lastIndexOf('.');
+                                // 确保找到了"."，防止indexOf返回-1的情况
+                                if (dotIndex != -1){
+                                    String ext_name = fileName.substring(dotIndex);
+                                    jsonObject.put("Ext",ext_name);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 附件上传
+     *
+     * @param fileList
+     * @param mlid
+     * @param kjnd
+     */
+    @Override
+    public void uploadAttachment(List<JSONObject> fileList, String mlid, String kjnd) {
+        if (CollectionUtils.isNotEmpty(fileList) && StrUtil.isNotEmpty(mlid) && StrUtil.isNotEmpty(kjnd)){
+            try {
+                //附件下载
+                List<FileInfoDTO> fileInfoList = fileDownload(fileList);
+                //附件保存到grp库里
+                if (CollectionUtils.isNotEmpty(fileInfoList)){
+                    //保存前先删一下历史附件
+                    OerAnnexEntity delete = new OerAnnexEntity();
+                    //delete.setGsdm(Constant.CONFIGMAP.get("gsdm"));
+                    delete.setKjnd(kjnd);
+                    delete.setMlid(mlid);
+                    //oerAnnexService.deleteAnnex(delete);
+                    int no = 1;
+                    for (FileInfoDTO fileInfo : fileInfoList) {
+                        try {
+                            AttachmentFileEntity fileEntity = new AttachmentFileEntity();
+                            String fileName = URLDecoder.decode(fileInfo.getFile_name(), "UTF-8");
+                            fileEntity.setaTFileName(fileName);
+                            fileEntity.setaTFile(fileInfo.getData());
+                            this.saveAttachment(fileEntity);
+                            //保存附件关系
+                            OerAnnexEntity annexEntity = new OerAnnexEntity();
+                            annexEntity.setMlid(mlid);
+                            annexEntity.setKjnd(kjnd);
+                            annexEntity.setAnnexName(fileName);
+                            annexEntity.setAnnexSize(Convert.toLong(fileInfo.getFile_size()));
+                            annexEntity.setOnlyid(fileEntity.getaTGuid());
+                            annexEntity.setXh(String.valueOf(no));
+                            oerAnnexService.saveAnnex(annexEntity);
+                            no++;
+                        }catch (Exception e){
+                            logger.error("保存附件到grp出错:{}",e);
+                        }
+                    }
+                }
+            }catch (Exception e){
+                logger.error("保存附件到grp出错:{}",e);
+            }
+        }
+    }
+
+    private List<FileInfoDTO> fileDownload(List<JSONObject> fileList){
+        String dir = "1";
+        List<FileInfoDTO> files = new ArrayList<>();
+        //1、下载附件
+        for (JSONObject fileObj : fileList) {
+            try {
+                FileInfoDTO fileInfoDTO = new FileInfoDTO();
+                String url = fileObj.getString("url");
+                String fileName = URLDecoder.decode(fileObj.getString("fileName"));
+                File file = HttpUtil.downloadFileFromUrl(url, dir);
+                if (null != file){
+                    String zipPath = dir + File.separator + fileName.split("\\.")[0] + ".zip";
+                    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipPath), Charset.forName("GBK"));
+                    writeZipFile(file, zos,fileName);
+                    zos.close();
+                    // 获取压缩文件的字节数组
+                    File zipFile = new File(zipPath);
+                    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream((int) zipFile.length());
+                    BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(zipFile));
+                    int buf_size = 1024;
+                    byte[] buffer = new byte[buf_size];
+                    int len = 0;
+                    while (-1 != (len = bufferedInputStream.read(buffer, 0, buf_size))) {
+                        byteArrayOutputStream.write(buffer, 0, len);
+                    }
+                    byte[] fileByte = byteArrayOutputStream.toByteArray();
+                    fileInfoDTO.setData(fileByte);
+                    fileInfoDTO.setFile_size(fileObj.getString("size"));
+                    fileInfoDTO.setFile_name(fileName);
+                    files.add(fileInfoDTO);
+                }
+            }catch (Exception e){
+                logger.error("上传附件出错:{}",e);
+            }
+        }
+        return files;
+    }
+    private void writeZipFile(File file,ZipOutputStream zos,String fileName){
+        if (null != file && null !=zos){
+            try {
+                logger.info("=====压缩文件=====");
+                zos.putNextEntry(new ZipEntry(fileName));
+                FileInputStream fos = new FileInputStream(file);
+                BufferedInputStream bis = new BufferedInputStream(fos);
+                int len;
+                byte[] buf = new byte[1024];
+                while ((len = bis.read(buf, 0, 1024)) != -1) {
+                    zos.write(buf, 0, len);
+                }
+                bis.close();
+                fos.close();
+                logger.info("=====压缩完成=====");
+            }catch (Exception e){
+                e.printStackTrace();
+                logger.error("=====压缩文件出错=====");
+            }
+        }
+    }
+}