自助平台确认状态同步问题

src/main/java/com/glxp/api/config/HdSchemaExecutor.java

@@ -76,6 +76,5 @@ public class HdSchemaExecutor implements ApplicationRunner {
     public void buildSchemas() {
 //        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
         schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
-//        schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
     }
 }

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -121,11 +121,11 @@ public class BasicCorpController {
         BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity();
         BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
         basicUnitMaintainEntity.setErpId(CustomUtil.getId());
-        if(basicUnitMaintainSaveRequest.getCorpType()==1){
+        if (basicUnitMaintainSaveRequest.getCorpType() == 1) {
             basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
-        }else if(basicUnitMaintainSaveRequest.getCorpType()==2){
+        } else if (basicUnitMaintainSaveRequest.getCorpType() == 2) {
             basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
-        }else{
+        } else {
             basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN);
         }
         basicUnitMaintainEntity.setUpdateTime(new Date());
@@ -164,7 +164,11 @@ public class BasicCorpController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
+        List<Integer> corpTypeLists = new ArrayList<>();
+        corpTypeLists.add(1);
+        corpTypeLists.add(2);
+        basicUnitMaintainFilterRequest.setCorpTypeLists(corpTypeLists);
+        basicUnitMaintainFilterRequest.setOutType(0);
         List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo;

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

@@ -1294,7 +1294,6 @@ public class HeartService {
         if (CollUtil.isNotEmpty(syncDataResponse.getDeptUserEntities()))
             logs = logs + "部门用户信息：" + syncDataResponse.getDeptUserEntities().size() + "条\n";
 
-
         if (CollUtil.isNotEmpty(syncDataResponse.getInvSpaces()))
             logs = logs + "货位信息：" + syncDataResponse.getInvSpaces().size() + "条\n";
 
@@ -1341,10 +1340,6 @@ public class HeartService {
                             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.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
-                                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                 if (syncDataBustypeEntity != null) {
                                     if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) {
                                         orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT);
@@ -1356,6 +1351,10 @@ public class HeartService {
                                 }
                                 IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
                                 if (temp == null) {
+                                    orderEntity.setFromType(ConstantStatus.FROM_UDISP);
+                                    orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
+                                    orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
+                                    orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                     orderEntity.setId(null);
                                     orderService.insertOrder(orderEntity);
                                     insetOrderDb(syncDataResponse, orderEntity);