diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java
index 4b943082..2dea2d9b 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/u8c/service/impl/SalesBillingServiceImpl.java
@@ -29,9 +29,10 @@ public class SalesBillingServiceImpl implements ISalesBillingService {
     private IU8cSalesBillingService iu8cSalesBillingService;
 
     private final String appId = "800035";
+
+    private final String apiCode = "8000350047";
     //这个接口调错了。要用开发的那个审批接口
-    //private final String apiCode = "8000350047";
-    private final String apiCode = "8000350060";
+//    private final String apiCode = "8000350060";
     private final String publicKey = "ZJYATW/MfYZX7zF0eAh4DJXbyTLwUtwSoSz5Y/o1ksAaN/dCe7eDIk+3zDUT+v578prj";
     private final String secretKey = "+5BUkLQh3iX3VHgEt5bE2IPh+ZeebGvDaEspsvVu739Ar6sFnwg+fpPod4t6XhoTj3JzOP8MtA1LSGvL+2BWG8c/o7DKi92S4mr3zcGearA=";
 
@@ -124,8 +125,10 @@ public class SalesBillingServiceImpl implements ISalesBillingService {
         queryinfo.put("code", code);
         queryinfo.put("corp", entity.getCorp());//公司编码
         queryinfo.put("date_begin", entity.getDateBegin());//单据开始日期
-        queryinfo.put("date_end", entity.getDateEnd());//单据结束日期
-        approveinfo.put("approvid", entity.getApprovid());//审批人
+//        queryinfo.put("date_end", entity.getDateEnd());//单据结束日期
+        queryinfo.put("date_end", "2099-05-24");//单据结束日期
+//        approveinfo.put("approvid", entity.getApprovid());//审批人
+        approveinfo.put("approvid", "15715849962");//审批人
         approveinfo.put("approveDate", entity.getApprovedate());//审核时间
         approveinfo.put("status", entity.getStatus());//审批状态（Y：通过，N：不通过，R：驳回）
         approveinfo.put("note", entity.getNote());//批语
@@ -135,14 +138,14 @@ public class SalesBillingServiceImpl implements ISalesBillingService {
         params = data.toJSONString();
 
         //用新的审批接口
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("billno",entity.getCode());
-        jsonObject.put("corpcode",entity.getCorp());
-        jsonObject.put("billType","saleinvoice");
-        jsonObject.put("userCode","15715849962");
-        jsonObject.put("ckeckResult","Y");
-        jsonObject.put("ckeckNote","审批通过");
-        params = jsonObject.toString();
+//        JSONObject jsonObject = new JSONObject();
+//        jsonObject.put("billno",entity.getCode());
+//        jsonObject.put("corpcode",entity.getCorp());
+//        jsonObject.put("billType","saleinvoice");
+//        jsonObject.put("userCode","15715849962");
+//        jsonObject.put("ckeckResult","Y");
+//        jsonObject.put("ckeckNote","审批通过");
+//        params = jsonObject.toString();
         return params;
     }
 
diff --git a/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml
index 617674c7..e99309ea 100644
--- a/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml
+++ b/service/src/main/java/com/hzya/frame/sysnew/integratedForegroundTask/entity/SysIntegratedForegroundTaskEntity.xml
@@ -19,24 +19,24 @@
     <!-- 查询的字段-->
     <sql id = "SysIntegratedForegroundTaskEntity_Base_Column_List">
         id
-       ,workshop_name 
-        ,plug_id 
-        ,plug_name 
-        ,remark 
-        ,sorts 
-        ,create_user_id 
-        ,create_time 
-        ,modify_user_id 
-        ,modify_time 
-        ,sts 
-        ,org_id 
+       ,workshop_name
+        ,plug_id
+        ,plug_name
+        ,remark
+        ,sorts
+        ,create_user_id
+        ,create_time
+        ,modify_user_id
+        ,modify_time
+        ,sts
+        ,org_id
      </sql>
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-SysIntegratedForegroundTaskEntity-result" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
     select
     <include refid="SysIntegratedForegroundTaskEntity_Base_Column_List" />
     from sys_integrated_foreground_task
-    <trim prefix="where" prefixOverrides="and"> 
+    <trim prefix="where" prefixOverrides="and">
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="workshopName != null and workshopName != ''"> and workshop_name = #{workshopName} </if>
             <if test="plugId != null and plugId != ''"> and plug_id = #{plugId} </if>
@@ -54,11 +54,11 @@
     <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.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity">
         select  count(1)   from sys_integrated_foreground_task
-    <trim prefix="where" prefixOverrides="and"> 
+    <trim prefix="where" prefixOverrides="and">
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="workshopName != null and workshopName != ''"> and workshop_name = #{workshopName} </if>
             <if test="plugId != null and plugId != ''"> and plug_id = #{plugId} </if>
@@ -82,10 +82,10 @@
     select
     <include refid="SysIntegratedForegroundTaskEntity_Base_Column_List" />
     from sys_integrated_foreground_task
-    <trim prefix="where" prefixOverrides="and"> 
+    <trim prefix="where" prefixOverrides="and">
         <if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
             <if test="workshopName != null and workshopName != ''"> and workshop_name like concat('%',#{workshopName},'%') </if>
-            <if test="plugId != null and plugId != ''"> and plug_id like concat('%',#{plugId},'%') </if>
+            <if test="plugId != null and plugId != ''"> and plug_id  = #{plugId}, </if>
             <if test="plugName != null and plugName != ''"> and plug_name like concat('%',#{plugName},'%') </if>
             <if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </if>
             <if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
@@ -106,7 +106,7 @@
     select
     <include refid="SysIntegratedForegroundTaskEntity_Base_Column_List" />
     from sys_integrated_foreground_task
-    <trim prefix="where" prefixOverrides="and"> 
+    <trim prefix="where" prefixOverrides="and">
          <if test="id != null and id != ''"> or id = #{id} </if>
              <if test="workshopName != null and workshopName != ''"> or workshop_name = #{workshopName} </if>
              <if test="plugId != null and plugId != ''"> or plug_id = #{plugId} </if>
@@ -164,11 +164,11 @@
             <if test="org_id != null and org_id != ''"> #{org_id} ,</if>
     <if test="sts == null ">'Y',</if>
   </trim>
-  )  
+  )
 </insert>
 <!-- 批量新增 -->
 <insert id="entityInsertBatch" >
-  insert into sys_integrated_foreground_task(workshop_name, plug_id, plug_name, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,  sts) 
+  insert into sys_integrated_foreground_task(workshop_name, plug_id, plug_name, remark, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,  sts)
     values
     <foreach collection="entities" item="entity" separator=",">
     (#{entity.workshopName},#{entity.plugId},#{entity.plugName},#{entity.remark},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id}, 'Y')
@@ -219,7 +219,7 @@ where id = #{id}
 <!-- 多条件逻辑删除 -->
 <update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integratedForegroundTask.entity.SysIntegratedForegroundTaskEntity" >
 update sys_integrated_foreground_task  set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
- <trim prefix="where" prefixOverrides="and"> 
+ <trim prefix="where" prefixOverrides="and">
         <if test="id != null and id != ''"> and id = #{id} </if>
             <if test="workshopName != null and workshopName != ''"> and workshop_name = #{workshopName} </if>
             <if test="plugId != null and plugId != ''"> and plug_id = #{plugId} </if>