bug修改

src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java

@@ -8,17 +8,20 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
-import com.glxp.api.constant.BasicExportStatusEnum;
+import com.glxp.api.constant.*;
-import com.glxp.api.constant.BasicExportStatusTimeEnum;
-import com.glxp.api.constant.BusinessType;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
 import com.glxp.api.req.sync.BasicExportTimeRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.sync.SpSyncUdiResponse;
+import com.glxp.api.res.sync.SpsSyncBusResponse;
+import com.glxp.api.res.sync.SpsSyncDataResponse;
+import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.sync.BasicExportService;
 import com.glxp.api.service.sync.BasicExportTimeService;
+import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.RedisUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -226,4 +229,6 @@ public class SpsSyncExportStatusController {
     }
 
 
+
+
 }

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -100,7 +100,7 @@
 
             <if test="supInoivceSearch != null">
                 <if test="invoiceActions1 != null and invoiceActions2 == null">
-                    AND ((`action` in
+                    AND (`action` in
                     <foreach collection="invoiceActions1" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
@@ -108,13 +108,13 @@
                 </if>
 
                 <if test="invoiceActions1 == null and invoiceActions2 != null">
-                    or (
+                    and (
                             `action` in
                     <foreach collection="invoiceActions2" index="index" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                     and status = 7
-                            ))
+                            )
                 </if>
 
                 <if test="invoiceActions1 != null and invoiceActions2 != null">