Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -43,10 +43,7 @@ import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inv.*;
 import com.glxp.api.service.purchase.SupProductService;
 import com.glxp.api.service.system.SystemParamConfigService;
-import com.glxp.api.util.CustomUtil;
-import com.glxp.api.util.DateUtil;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.OrderNoTypeBean;
+import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -495,7 +492,7 @@ public class IoCodeTempController extends BaseController {
 
         //校验预验收库存是否已存在
         if (bussinessTypeEntity.isScanPreIn()) {
-            if (bussinessTypeEntity.getBackPreinType() == 1) {//按单出库&& bussinessTypeEntity.isPreInBack()
+            if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库&& bussinessTypeEntity.isPreInBack()
                 String orderIds = addOrderRequest.getCheckPreInOrders();
                 if (StrUtil.isNotEmpty(orderIds)) {
                     String[] orderIdArray = orderIds.split(",");
@@ -1097,8 +1094,8 @@ public class IoCodeTempController extends BaseController {
         IoOrderDetailCodeEntity orderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(orderEntity.getBillNo(), codeTempEntity.getRelId(), codeTempEntity.getBatchNo());
         if (orderDetailCodeEntity != null) {
             //扫码数量-1
-            int orderCount = orderDetailCodeEntity.getCount();
-            int orderReCount = orderDetailCodeEntity.getReCount();
+            int orderCount = IntUtil.value(orderDetailCodeEntity.getCount());
+            int orderReCount = IntUtil.value(orderDetailCodeEntity.getReCount());
             if (orderCount > 1) {
                 orderDetailCodeEntity.setCount(orderCount - 1);
                 orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -555,7 +555,8 @@ public class IoOrderDetailBizController extends BaseController {
     @Log(title = "发票管理", businessType = BusinessType.DELETE)
     public BaseResponse deleteById(@RequestBody IoOrderInvoiceEntity ioOrderInvoiceEntity) {
 
-        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
+        IoOrderInvoiceResponse ioOrderInvoiceResponse = orderDetailBizService.selectByinvoiceId(ioOrderInvoiceEntity.getId());
+
         //更改 登记状态
         IoOrderDetailCodeEntity ioOrderDetailBizEntity = new IoOrderDetailCodeEntity();
 
@@ -565,16 +566,16 @@ public class IoOrderDetailBizController extends BaseController {
 
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
 
-        ioOrderDetailBizEntity.setId(ioOrderInvoiceEntity.getRegId());
+        ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().intValue());
 
+        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
         List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest);
-        if (list == null && list.size() == 0) {
+        if(list.size()==0){
             ioOrderDetailBizEntity.setRegStatus(false);
         }
         orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
         return ResultVOUtils.success();
 
-
     }
 
     /**

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -139,7 +139,7 @@ public class IoOrderReviewController extends BaseController {
             }
 
             if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP)
-                spGetHttp.reviewOrder(updateExportStatusRequest);
+                spGetHttp.reviewOrder(updateExportStatusRequest, getUserId() + "");
             return updateReview(getUser(), orderEntity);
         } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {
             return thirdUpdateReview(getUser(), orderEntity);
@@ -224,7 +224,6 @@ public class IoOrderReviewController extends BaseController {
                     acceptOrderEntity.setFinishAccept(true);
                     return ResultVOUtils.success(acceptOrderEntity);
                 }
-
                 return ResultVOUtils.success(acceptOrderEntity);
             }
 
@@ -269,12 +268,15 @@ public class IoOrderReviewController extends BaseController {
                     redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo());
                     redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
                     return ResultVOUtils.success("验收成功！");
-                } else
-
+                } else {
                     return updateReview(authAdmin, orderEntity);
+                }
             }
-        } else
+        } else {
+
             return updateReview(authAdmin, orderEntity);
+        }
+
     }
 
     @Resource

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -24,6 +24,8 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+    IoOrderInvoiceResponse selectByinvoiceId(Long id);
+
 
     /**
      * 查询单条单据业务详情

src/main/java/com/glxp/api/entity/auth/InvBusUserEntity.java

@@ -12,7 +12,7 @@ import java.util.Date;
 @Data
 @TableName(value = "auth_user_bustype")
 public class InvBusUserEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
     @TableField(value = "userId")
     private String userId;

src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java

@@ -18,7 +18,7 @@ public class BasicBusTypePreEntity {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -407,4 +407,9 @@ public class BasicBussinessTypeEntity {
     private boolean advancePreIn;
     @TableField(value = "sortNum")
     private Integer sortNum;
+
+    //是否按货位出库    0：不按货位出库，1:按货位出库
+    @TableField(value = "spaceOut")
+    private int spaceOut;
+
 }

src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java

@@ -148,6 +148,7 @@ public class IoCodeEntity implements Serializable {
             return 0;
         return count;
     }
+
     @JsonIgnore
     public int getMyReCount() {
         if (reCount == null) {

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -138,13 +138,13 @@ public class IoOrderDetailCodeEntity {
      * 单据数量
      */
     @TableField(value = "`count`")
-    private int count;
+    private Integer count;
 
     /**
      * 扫码数量
      */
     @TableField(value = "reCount")
-    private int reCount;
+    private Integer reCount;
 
     /**
      * 备注

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 @TableName(value = "io_order_invoice")
 public class IoOrderInvoiceEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "pur_receive")
 public class PurReceiveEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/CustomerContactEntity.java

@@ -38,7 +38,7 @@ public class CustomerContactEntity{
     @TableField("comments")
     private String comments;
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "pur_order")
 public class PurOrderEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 @Data
 @TableName(value = "sync_data_bustypes")
 public class SyncDataBustypeEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
     @TableField(value = "`action`")
     private String action;
@@ -24,4 +24,8 @@ public class SyncDataBustypeEntity {
     private Integer orderStatus;        //单据状态
     @TableField(value = "`direct`")
     private int direct;         //1:UDI管理系统->SPMS  2:SPMS->UDI管理系统
+    @TableField(value = "`syncStatus`")
+    private Integer syncStatus;       //同步后单据状态
+    @TableField(value = "`syncChange`")
+    private boolean syncChange;       //同步后是否自动补单
 }

src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java

@@ -20,7 +20,7 @@ public class ThrBusTypeOriginEntity {
     /**
      * id
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/entity/thrsys/ThrCorpEntity.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @TableName("thr_corp")
 public class ThrCorpEntity {
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     @TableField("unitId")

src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java

@@ -20,7 +20,7 @@ import java.util.Date;
 @TableName("thr_products")
 public class ThrProductsEntity {
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 
     /**

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -146,9 +146,15 @@ public class SpGetHttpClient {
     }
 
     //验收自助平台单据--直连接口
-    public BaseResponse<String> reviewOrder(ReviewFinishRequest reviewFinishRequest) {
+    public BaseResponse<String> reviewOrder(ReviewFinishRequest reviewFinishRequest, String userId) {
+
+
+        List<String> header = (List<String>) Convert.toList(buildHeader());
+        header.add("ADMIN_ID");
+        header.add(userId);
+
         String json = JSONUtil.toJsonStr(reviewFinishRequest);
-        String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/inout/order/web/updateStatus", json, buildHeader());
+        String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/spms/inout/order/web/updateStatus", json,  Convert.toStrArray(header));
         BaseResponse<String> response =
                 JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
                 });
@@ -158,6 +164,8 @@ public class SpGetHttpClient {
 
     //    最小销售标识获取国家库信息
     public BaseResponse<PageSimpleResponse<ProductInfoEntity>> getSyncDi(ProductInfoFilterRequest productInfoFilterRequest) {
+
+
         Map<String, String> paramMap = new HashMap<>(16);
         paramMap.put("nameCode", productInfoFilterRequest.getNameCode());
         paramMap.put("page", productInfoFilterRequest.getPage() + "");

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -1,6 +1,5 @@
 package com.glxp.api.res.basic;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 /**
@@ -151,4 +150,6 @@ public class BasicBussinessTypeResponse {
     private Integer backPreinType;
     private Boolean advancePreIn;
     private Integer sortNum;
+
+    private int spaceOut;
 }

src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java

@@ -83,6 +83,8 @@ public class IoOrderInvoiceResponse {
 
     private String ggxh;
     private String licenseUrl;
+    private Long bizIdFk;
+
 
 
     public static final String COL_ID = "id";

src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java

@@ -71,7 +71,7 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
         //获取当前仓库下的最大货位编码
         String maxSpaceCode = invSpaceDao.getMaxSpaceCode(null);
         if (StrUtil.isBlank(maxSpaceCode)) {
-            maxSpaceCode = "0000";
+            maxSpaceCode = "1000";
         }
         String spaceCode = getSpaceCode(maxSpaceCode);
         invSpace.setCode(spaceCode);

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -86,6 +86,9 @@ public class IoChangeInoutService {
     //普通出入库单据流转
     public void genNewOrder(IoOrderEntity orderEntity, List<InvProductDetailEntity> invProductDetailEntities) {
 
+        if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP && (orderEntity.getOutChangeEnable() != null && !orderEntity.getOutChangeEnable())) {
+            return;
+        }
         BasicBusTypePreEntity basicBusTypePreEntity = basicBusTypePreService.findByOriginAction(orderEntity.getAction());
         List<IoCodeEntity> codeEnttities = codeService.findByOrderId(orderEntity.getBillNo());
         if (basicBusTypePreEntity.getSupplementAll()) {//全量补单

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -44,6 +44,7 @@ public interface IoOrderDetailBizService {
     List<IoOrderDetailBizEntity> checkOrderList(String orderId);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+    IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -175,6 +175,11 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.filterListInv(orderDetailBizRequest);
     }
 
+    @Override
+    public IoOrderInvoiceResponse selectByinvoiceId(Long id) {
+        return ioOrderDetailBizDao.selectByinvoiceId(id);
+    }
+
     @Override
     public Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity) {
         return ioOrderDetailBizDao.updateById(ioOrderDetailBizEntity) > 0;

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -154,7 +155,8 @@ public class IoOrderServiceImpl implements IoOrderService {
 
     @Override
     public List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime) {
-        return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime));
+        return orderDao.selectList(Wrappers.lambdaQuery(IoOrderEntity.class).eq(IoOrderEntity::getAction, action).eq(IoOrderEntity::getStatus, status)
+                .between(IoOrderEntity::getUpdateTime, lastUpdateTime, cn.hutool.core.date.DateUtil.date()));
     }
 
 
@@ -737,7 +739,8 @@ public class IoOrderServiceImpl implements IoOrderService {
             //查询往来单位名称
             if (StrUtil.isNotBlank(order.getFromCorp())) {
                 BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
-                response.setFromCorpName(corpEntity.getName());
+                if (corpEntity != null)
+                    response.setFromCorpName(corpEntity.getName());
             } else if (StrUtil.isNotBlank(order.getFromInvCode())) {
                 String fromInvName = invWarehouseDao.selectNameByCode(order.getFromInvCode());
                 response.setFromCorpName(fromInvName);

src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java

@@ -1,6 +1,8 @@
 package com.glxp.api.service.purchase.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.purchase.PurOrderDao;
 import com.glxp.api.dao.purchase.PurPlanDao;
@@ -56,7 +58,8 @@ public class PurOrderServiceImpl implements PurOrderService {
 
     @Override
     public List<PurOrderEntity> findByStatus(String billType, Integer status, Date lastUpdateTime) {
-        return purOrderDao.selectList(new QueryWrapper<PurOrderEntity>().eq("billType", billType).eq("status", status).gt("updateTime", lastUpdateTime));
+        return purOrderDao.selectList(Wrappers.lambdaQuery(PurOrderEntity.class).eq(PurOrderEntity::getBillType, billType).eq(PurOrderEntity::getStatus, status)
+                .between(PurOrderEntity::getUpdateTime, lastUpdateTime, DateUtil.date()));
     }
 
     @Override

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -272,6 +272,9 @@ public class HeartService {
                     uploadData(exportType, taskId, x -> x.getSysSettingData(info, taskId, now, syncTime));
                 }
                 break;
+            case IO_ORDER:
+                if(needExec())
+                break;
         }
     }
 
@@ -552,19 +555,17 @@ public class HeartService {
         syncTimeMap.put("isNew", true);
         syncTimeMap.put("oldDate", syncTime);
         StringBuffer remark = new StringBuffer();
-
+        boolean ge = false;
+        if (syncTime != null) {
+            ge = true;
+        }
         //确认有开启扫码单据类型同步
         if (needExec(info.getTypeScan())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
             List<BasicBussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.list(Wrappers.lambdaQuery(BasicBussinessTypeEntity.class)
-                    .le((boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime, now)
+                    .between(ge, BasicBussinessTypeEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), BasicBussinessTypeEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(bussinessTypeEntities)) {
@@ -575,16 +576,11 @@ public class HeartService {
         }
         //确认有开启业务单据类型同步
         if (needExec(info.getTypeBus())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
             List<BasicBusTypeChangeEntity> busTypeChangeList = busTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
-                    .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
+                    .between(ge, BasicBusTypeChangeEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(busTypeChangeList)) {
@@ -598,16 +594,11 @@ public class HeartService {
 
         //确认有开启第三方单据类型同步
         if (needExec(info.getTypeThird())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_BUSTYPE_ORIGIN);
             List<ThrBusTypeOriginEntity> thrBusTypeOriginEntities = thrBusTypeOriginService.list(Wrappers.lambdaQuery(ThrBusTypeOriginEntity.class)
-                    .le((boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime, now)
+                    .between(ge, ThrBusTypeOriginEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), ThrBusTypeOriginEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(thrBusTypeOriginEntities)) {
@@ -649,19 +640,18 @@ public class HeartService {
         SpsSyncDataResponse dataResponse = null;
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
+        boolean ge = false;
+        if (syncTime != null) {
+            ge = true;
+        }
         StringBuffer remark = new StringBuffer();
         //确认有开启部门信息同步
         if (needExec(info.getBasicDept())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.DEPT_DATA);
             List<DeptEntity> deptEntityList = deptService.list(Wrappers.lambdaQuery(DeptEntity.class)
-                    .le((boolean) map.get("isNew"), DeptEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), DeptEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), DeptEntity::getUpdateTime, now)
+                    .between(ge, DeptEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), DeptEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(deptEntityList)) {
@@ -670,8 +660,9 @@ public class HeartService {
                 remark.append("部门信息：").append(deptEntityList.size()).append("条\n");
             }
             List<DeptUserEntity> deptUserEntityList = deptUserService.list(Wrappers.lambdaQuery(DeptUserEntity.class)
-                    .le((boolean) map.get("isNew"), DeptUserEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), DeptUserEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), DeptUserEntity::getUpdateTime, now)
+                    .between(ge, DeptUserEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), DeptUserEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(deptUserEntityList)) {
@@ -685,16 +676,11 @@ public class HeartService {
 
         //确认有开启仓库字典同步
         if (needExec(info.getBasicInv())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.WAREHOUSE_DICT);
             List<InvWarehouseEntity> warehouseEntityList = warehouseService.list(Wrappers.lambdaQuery(InvWarehouseEntity.class)
-                    .le((boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime, now)
+                    .between(ge, InvWarehouseEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), InvWarehouseEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(warehouseEntityList)) {
@@ -705,8 +691,9 @@ public class HeartService {
                 dataResponse.setInvWarehouseEntities(warehouseEntityList);
             }
             List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.list(Wrappers.lambdaQuery(WarehouseUserEntity.class)
-                    .le((boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime, now)
+                    .between(ge, WarehouseUserEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), WarehouseUserEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(warehouseUserEntities)) {
@@ -717,8 +704,9 @@ public class HeartService {
                 dataResponse.setWarehouseUserEntities(warehouseUserEntities);
             }
             List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.list(Wrappers.lambdaQuery(WarehouseBussinessTypeEntity.class)
-                    .le((boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime, now)
+                    .between(ge, WarehouseBussinessTypeEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), WarehouseBussinessTypeEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
@@ -729,8 +717,9 @@ public class HeartService {
                 remark.append("仓库单据类型信息：").append(warehouseBussinessTypeEntities.size()).append("条\n");
             }
             List<InvSpace> invSpaceList = invSpaceService.list(Wrappers.lambdaQuery(InvSpace.class)
-                    .le((boolean) map.get("isNew"), InvSpace::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), InvSpace::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), InvSpace::getUpdateTime, now)
+                    .between(ge, InvSpace::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), InvSpace::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(invSpaceList)) {
@@ -744,16 +733,11 @@ public class HeartService {
 
         //确认有开启用户信息同步
         if (needExec(info.getSysUser())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.USER_DATA);
             List<AuthAdmin> adminList = adminService.list(Wrappers.lambdaQuery(AuthAdmin.class)
-                    .le((boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now)
-                    .between(!(boolean) map.get("isNew"), AuthAdmin::getLastModifyTime
+                    .le(!ge && (boolean) map.get("isNew"), AuthAdmin::getLastModifyTime, now)
+                    .between(ge, AuthAdmin::getLastModifyTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), AuthAdmin::getLastModifyTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(adminList)) {
@@ -764,8 +748,9 @@ public class HeartService {
                 remark.append("系统用户信息：").append(adminList.size()).append("条\n");
             }
             List<InvBusUserEntity> busUserEntities = invBusUserService.list(Wrappers.lambdaQuery(InvBusUserEntity.class)
-                    .le((boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime, now)
+                    .between(ge, InvBusUserEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(busUserEntities)) {
@@ -802,19 +787,18 @@ public class HeartService {
         SpsSyncThrDataResponse dataResponse = null;
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
+        boolean ge = false;
+        if (syncTime != null) {
+            ge = true;
+        }
         StringBuffer remark = new StringBuffer();
         //确认有开启第三方部门信息同步
         if (needExec(info.getBasicThirdInv())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_DEPT);
             List<ThrDeptEntity> deptEntityList = thrDeptService.list(Wrappers.lambdaQuery(ThrDeptEntity.class)
-                    .le((boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime, now)
+                    .between(ge, ThrDeptEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), ThrDeptEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(deptEntityList)) {
@@ -826,16 +810,11 @@ public class HeartService {
 
         //确认有开启第三方仓库信息同步
         if (needExec(info.getBasicThirdInv())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_WAREHOUSE);
             List<ThrInvWarehouseEntity> warehouseEntityList = thrInvWarehouseService.list(Wrappers.lambdaQuery(ThrInvWarehouseEntity.class)
-                    .le((boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime, now)
+                    .between(ge, ThrInvWarehouseEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), ThrInvWarehouseEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(warehouseEntityList)) {
@@ -849,16 +828,11 @@ public class HeartService {
 
         //确认有开启仓库字典同步
         if (needExec(info.getBasicThirdProducts())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_PRODUCTS);
             List<ThrProductsEntity> productsEntityList = thrProductsService.list(Wrappers.lambdaQuery(ThrProductsEntity.class)
-                    .le((boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime, now)
+                    .between(ge, ThrProductsEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), ThrProductsEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(productsEntityList)) {
@@ -872,16 +846,11 @@ public class HeartService {
 
         //确认有开启第三方往来单位信息同步
         if (needExec(info.getBasicThirdCorp())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.THR_CORP);
             List<ThrCorpEntity> corpEntities = thrCorpService.list(Wrappers.lambdaQuery(ThrCorpEntity.class)
-                    .le((boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime, now)
+                    .between(ge, ThrCorpEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), ThrCorpEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(corpEntities)) {
@@ -925,18 +894,17 @@ public class HeartService {
         SpsSyncSysSettingResponse dataResponse = null;
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
+        boolean ge = false;
+        if (syncTime != null) {
+            ge = true;
+        }
         StringBuffer remark = new StringBuffer();
         if (needExec(info.getSystemConfig())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SYSTEM_PARAM_CONFIG);
             List<SystemParamConfigEntity> systemParamConfigEntities = systemParamConfigService.list(Wrappers.lambdaQuery(SystemParamConfigEntity.class)
-                    .le((boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime, now)
+                    .between(ge, SystemParamConfigEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SystemParamConfigEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(systemParamConfigEntities)) {
@@ -946,16 +914,11 @@ public class HeartService {
             }
         }
         if (needExec(info.getEntrustAction())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.ENTRUST_ACCEPT);
             List<EntrustReceEntity> entrustReceEntities = entrustReceService.list(Wrappers.lambdaQuery(EntrustReceEntity.class)
-                    .le((boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime, now)
+                    .between(ge, EntrustReceEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), EntrustReceEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(entrustReceEntities)) {
@@ -967,16 +930,11 @@ public class HeartService {
             }
         }
         if (needExec(info.getPrintConfig())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.PRINT_CONFIG);
             List<SystemPDFModuleEntity> systemPDFModuleEntities = systemPDFModuleService.list(Wrappers.lambdaQuery(SystemPDFModuleEntity.class)
-                    .le((boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now)
-                    .between(!(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time
+                    .le(!ge && (boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time, now)
+                    .between(ge, SystemPDFModuleEntity::getUpdate_time, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SystemPDFModuleEntity::getUpdate_time
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(systemPDFModuleEntities)) {
@@ -988,8 +946,9 @@ public class HeartService {
             }
 
             List<SystemPDFTemplateEntity> systemPDFTemplateEntities = systemPDFTemplateService.list(Wrappers.lambdaQuery(SystemPDFTemplateEntity.class)
-                    .le((boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now)
-                    .between(!(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time
+                    .le(!ge && (boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time, now)
+                    .between(ge, SystemPDFTemplateEntity::getUpdate_time, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SystemPDFTemplateEntity::getUpdate_time
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(systemPDFTemplateEntities)) {
@@ -1001,8 +960,9 @@ public class HeartService {
             }
 
             List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceCodeEntity.class)
-                    .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime, now)
+                    .between(ge, SysPdfTemplateRelevanceCodeEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceCodeEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceCodeEntities)) {
@@ -1014,8 +974,9 @@ public class HeartService {
             }
 
             List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceBizEntity.class)
-                    .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime, now)
+                    .between(ge, SysPdfTemplateRelevanceBizEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceBizEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceBizEntities)) {
@@ -1027,8 +988,9 @@ public class HeartService {
             }
 
             List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceLabelEntity.class)
-                    .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime, now)
+                    .between(ge, SysPdfTemplateRelevanceLabelEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceLabelEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceLabelEntities)) {
@@ -1040,8 +1002,9 @@ public class HeartService {
             }
 
             List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceStatemenEntity.class)
-                    .le((boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, now)
+                    .between(ge, SysPdfTemplateRelevanceStatemenEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), SysPdfTemplateRelevanceStatemenEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(sysPdfTemplateRelevanceStatemenEntities)) {
@@ -1054,16 +1017,11 @@ public class HeartService {
         }
 
         if (needExec(info.getScanChangeConfig())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.SCAN_CHANGE);
             List<BasicBusTypePreEntity> basicBusTypePreEntities = iBasicBusTypePreService.list(Wrappers.lambdaQuery(BasicBusTypePreEntity.class)
-                    .le((boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime, now)
+                    .between(ge, BasicBusTypePreEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), BasicBusTypePreEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(basicBusTypePreEntities)) {
@@ -1073,16 +1031,11 @@ public class HeartService {
             }
         }
         if (needExec(info.getBusChangeConfig())) {
-            Map<String, Object> map;
-            if (syncTime == null) {
-                map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE);
-            } else {
-                map = syncTimeMap;
-                now = syncTime;
-            }
+            Map<String, Object> map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BUS_TYPE_CHANGE);
             List<BasicBusTypeChangeEntity> basicBusTypeChangeEntities = iBasicBusTypeChangeService.list(Wrappers.lambdaQuery(BasicBusTypeChangeEntity.class)
-                    .le((boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
-                    .between(!(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
+                    .le(!ge && (boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime, now)
+                    .between(ge, BasicBusTypeChangeEntity::getUpdateTime, syncTime, now)
+                    .between(!ge && !(boolean) map.get("isNew"), BasicBusTypeChangeEntity::getUpdateTime
                             , map.get("oldDate"), now)
             );
             if (CollectionUtil.isNotEmpty(basicBusTypeChangeEntities)) {
@@ -1356,6 +1309,8 @@ public class HeartService {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    SyncDataBustypeService syncDataBustypeService;
 
     //下载最近更新扫码单据--上级服务
     @Transactional(propagation = Propagation.NESTED)
@@ -1391,24 +1346,38 @@ public class HeartService {
                             try {
                                 List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
                                 for (IoOrderEntity orderEntity : orderEntities) {
+
+                                    SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
                                     orderEntity.setUpdateTime(null);
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+                                    if (syncDataBustypeEntity != null) {
+                                        if (syncDataBustypeEntity.getSyncStatus() == 1) {
+                                            orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT);
+                                            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
+                                        }
+                                        if (syncDataBustypeEntity.isSyncChange()) {
+                                            orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange());
+                                        }
+                                    }
                                     IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
                                     if (temp == null) {
                                         orderEntity.setId(null);
                                         orderService.insertOrder(orderEntity);
                                         insetOrderDb(syncDataResponse, orderEntity);
                                         orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
-                                        addInoutService.dealProcess(orderEntity);
-                                        orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
-                                        if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
-                                            ioCheckInoutService.check(orderEntity.getBillNo());
+                                        if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) {
+                                            addInoutService.dealProcess(orderEntity);
+                                            orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
+                                            if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {
+                                                ioCheckInoutService.check(orderEntity.getBillNo());
+                                            }
                                         }
+
                                     }
                                 }
-                                if (fileJson != null&&fileJson.size()>0) {
+                                if (fileJson != null && fileJson.size() > 0) {
                                     List<String> syncFiles = fileJson.toList(String.class);
                                     if (CollUtil.isNotEmpty(syncFiles)) {
                                         idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()]));

src/main/java/com/glxp/api/service/sync/SyncDataBustypeService.java

@@ -10,6 +10,9 @@ public interface SyncDataBustypeService extends IService<SyncDataBustypeEntity>
 
     List<SyncDataBustypeEntity> findAll(Integer direct);
 
+    SyncDataBustypeEntity findByAction(String action, Integer direct);
+
+
     boolean deleteAll(Integer direct);
 
     void inserts(List<SyncDataBustypeEntity> syncDataBustypeEntities);

src/main/java/com/glxp/api/service/sync/impl/SyncDataBustypeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.sync.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.sync.SyncDataBustypeDao;
@@ -23,6 +24,17 @@ public class SyncDataBustypeServiceImpl extends ServiceImpl<SyncDataBustypeDao,
         return syncDataBustypeDao.selectList(new QueryWrapper<SyncDataBustypeEntity>().eq("direct", direct));
     }
 
+    @Override
+    public SyncDataBustypeEntity findByAction(String action, Integer direct) {
+
+
+        List<SyncDataBustypeEntity> syncDataBustypeEntities = syncDataBustypeDao.selectList(new QueryWrapper<SyncDataBustypeEntity>().eq(direct != null, "direct", direct).eq("action", action));
+        if (CollUtil.isNotEmpty(syncDataBustypeEntities)) {
+            return syncDataBustypeEntities.get(0);
+        }
+        return null;
+    }
+
     @Override
     public boolean deleteAll(Integer direct) {
         return syncDataBustypeDao.delete(new QueryWrapper<SyncDataBustypeEntity>().eq("direct", direct)) > 0 ? true : false;

src/main/java/com/glxp/api/util/IntUtil.java

@@ -0,0 +1,18 @@
+package com.glxp.api.util;
+
+public class IntUtil {
+
+    public static int value(Integer value) {
+        if (value == null)
+            return 0;
+        else return value.intValue();
+
+    }
+
+    public static long value(Long value) {
+        if (value == null)
+            return 0l;
+        else return value.longValue();
+
+    }
+}

src/main/resources/mybatis/mapper/auth/InvSpaceDao.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.glxp.api.dao.auth.InvSpaceDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.InvSpace">
-        <id column="id" jdbcType="INTEGER" property="id"/>
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.InvSpace">
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="type" jdbcType="VARCHAR" property="type"/>
@@ -390,11 +390,12 @@
     </select>
 
     <select id="getMaxSpaceCode" resultType="java.lang.String">
-        select max(code)
-        from auth_space
+        select max(CONVERT(code, signed))
+        from auth_space;
         <where>
             <if test="invCode != null and invCode != ''">
-                and invWarehouseCode = #{invCode}
+                and invWarehouseCode =
+                    #{invCode}
             </if>
         </where>
     </select>

src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.auth.WarehouseBussinessTypeDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity">
         <!--@mbg.generated-->
         <!--@Table auth_warehouse_bustype-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>

src/main/resources/mybatis/mapper/auth/WarehouseUserDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.auth.WarehouseUserDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.auth.WarehouseUserEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.auth.WarehouseUserEntity">
         <!--@mbg.generated-->
         <!--@Table auth_warehouse_user-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="userId" jdbcType="BIGINT" property="userid"/>
         <result column="userName" jdbcType="VARCHAR" property="username"/>

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -73,7 +73,7 @@
                                    thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp,
                                    thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate,
                                    checkExpire, checkCertExpire, preInBackAction, backPreinType,
-                                   sortNum)
+                                   sortNum, spaceOut)
         values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder},
                 #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc},
                 #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn},
@@ -86,7 +86,7 @@
                 #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp},
                 #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate},
                 #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType},
-                #{sortNum})
+                #{sortNum}, #{spaceOut})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">

src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.basic.BasicHospTypeDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicHospTypeEntity">
+    <resultMap id="BaseResultMap" autoMapping="true" type="com.glxp.api.entity.basic.BasicHospTypeEntity">
         <!--@mbg.generated-->
         <!--@Table basic_hosp_type-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="parentCode" jdbcType="VARCHAR" property="parentCode"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>

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

@@ -23,6 +23,11 @@
         group by io_order_detail_biz.id
     </select>
 
+    <select id="selectByinvoiceId" parameterType="java.lang.Long"  resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        select * from io_order_invoice where id= #{id}
+    </select>
+
+
 
     <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
         select io_order_detail_code.*,

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

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.inout.IoOrderUploadLogDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoOrderUploadLogEntity">
+    <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.inout.IoOrderUploadLogEntity">
         <!--@mbg.generated-->
         <!--@Table io_order_upload_log-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="billNo" jdbcType="VARCHAR" property="billNo"/>
         <result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
         <result column="billType" jdbcType="VARCHAR" property="billType"/>

src/main/resources/mybatis/mapper/inv/InvInnerOrderPdfTempDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.inv.InvInnerOrderPdfTempDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
+  <resultMap autoMapping="true" id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity">
     <!--@mbg.generated-->
     <!--@Table inv_inner_order_pdf_temp-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="genkey" jdbcType="VARCHAR" property="genkey" />
     <result column="fileName" jdbcType="VARCHAR" property="fileName" />
     <result column="filePath" jdbcType="VARCHAR" property="filePath" />

src/main/resources/mybatis/mapper/inv/InvInnerOrderPrintDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.inv.InvInnerOrderPrintDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.inv.InvInnerOrderPrintEntity">
     <!--@mbg.generated-->
     <!--@Table inv_inner_order_print-->
-    <id column="id" jdbcType="INTEGER" property="id"/>
+<!--    <id column="id" jdbcType="INTEGER" property="id"/>-->
     <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk"/>
     <result column="udiCode" jdbcType="VARCHAR" property="udiCode"/>
     <result column="productId" jdbcType="VARCHAR" property="productId"/>

src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.purchase.PurOrderDetailDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.purchase.PurOrderDetailEntity">
     <!--@mbg.generated-->
     <!--@Table pur_order_detail-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
     <result column="productId" jdbcType="INTEGER" property="productId" />
     <result column="productName" jdbcType="VARCHAR" property="productName" />

src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml

@@ -11,13 +11,13 @@
 
     <insert id="inserts" parameterType="com.glxp.api.entity.system.SyncDataBustypeEntity" useGeneratedKeys="true">
         replace INTO sync_data_bustypes
-                (id, `action`, `name`, outChange, orderStatus, direct)
+                (id, `action`, `name`, outChange, orderStatus, direct, syncStatus, syncChange)
                 values
 
         <foreach collection="syncDataBustypeEntities" item="item" index="index"
                  separator=",">
             (#{item.id}, #{item.action}, #{item.name},
-             #{item.outChange}, #{item.orderStatus}, #{item.direct})
+             #{item.outChange}, #{item.orderStatus}, #{item.direct}, #{item.syncStatus}, #{item.syncChange})
         </foreach>
     </insert>
 </mapper>

src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.system.SyncDataChangeBustypesDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
+    <resultMap id="BaseResultMap"  autoMapping="true" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
         <!--@mbg.generated-->
         <!--@Table sync_data_change_bustypes-->
-        <id column="id" jdbcType="INTEGER" property="id"/>
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="outChange" jdbcType="TINYINT" property="outChange"/>

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceBizDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceBizDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_biz-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceCodeDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceCodeDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_code-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceLabelDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceLabelDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_label-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/system/SysPdfTemplateRelevanceStatemenDao.xml

@@ -1,10 +1,10 @@
 <?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.glxp.api.dao.system.SysPdfTemplateRelevanceStatemenDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
+  <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
     <!--@mbg.generated-->
     <!--@Table sys_pdf_template_relevance_statemen-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+<!--    <id column="id" jdbcType="INTEGER" property="id" />-->
     <result column="templateId" jdbcType="INTEGER" property="templateId" />
     <result column="customerId" jdbcType="BIGINT" property="customerId" />
     <result column="adminId" jdbcType="INTEGER" property="adminId" />

src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml

@@ -3,8 +3,8 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.thrsys.ThrBusTypeOriginDao">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
-        <id column="id" jdbcType="INTEGER" property="id"/>
+    <resultMap id="BaseResultMap" autoMapping="true"  type="com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity">
+<!--        <id column="id" jdbcType="INTEGER" property="id"/>-->
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="action" jdbcType="VARCHAR" property="action"/>
         <result column="thirdSys" jdbcType="VARCHAR" property="thirdSys"/>

src/main/resources/schemas/schema_v2.1.sql

@@ -408,4 +408,7 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'nameCode', 'varchar(255)', 1
 CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'supId', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'expireDate', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'produceDate', 'varchar(255)', 1);
-CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'serialNo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'serialNo', 'varchar(255)', 1);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);