系统升级bug修改

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

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

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -202,7 +202,7 @@ public class InvWarehouseController extends BaseController {
                 }
             });
         }
-        return ResultVOUtils.success(results);
+        return ResultVOUtils.success(results.stream().distinct().collect(Collectors.toList()));
     }
 
 

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

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.bean.BeanUtil;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
@@ -141,7 +142,7 @@ public class BasicBussinessTypeController extends BaseController {
 
             bussinessTypeSaveRequest.setAction("SC" + CustomUtil.getId());
             BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity();
-            BeanUtils.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity);
+            BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity);
             basicBussinessTypeEntity.setId(IdUtil.getSnowflakeNextId());
             basicBussinessTypeService.insertBussinessType(basicBussinessTypeEntity);
         } else {
@@ -171,7 +172,7 @@ public class BasicBussinessTypeController extends BaseController {
             }
 
             BasicBussinessTypeEntity basicBussinessTypeEntity = new BasicBussinessTypeEntity();
-            BeanUtils.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity);
+            BeanUtil.copyProperties(bussinessTypeSaveRequest, basicBussinessTypeEntity);
             basicBussinessTypeService.updateBussinessType(basicBussinessTypeEntity);
 
         } else {

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

@@ -126,7 +126,7 @@ public class BasicCorpController extends BaseController {
         if (basicUnitMaintainSaveRequest.getCorpType() == 1) {
             basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
         } else if (basicUnitMaintainSaveRequest.getCorpType() == 2) {
-            basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
+            basicUnitMaintainEntity.setOutType(0);
         } else {
             basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN);
         }
@@ -158,7 +158,14 @@ public class BasicCorpController extends BaseController {
         return ResultVOUtils.success("修改成功");
     }
 
-    //    @AuthRuleAnnotation("")
+    /**
+     * 手持终端客户端下载
+     *
+     * @param basicUnitMaintainFilterRequest
+     * @param bindingResult
+     * @return
+     */
+    @AuthRuleAnnotation("")
     @GetMapping("/udiwms/unit/download")
     public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                           BindingResult bindingResult) {
@@ -167,10 +174,11 @@ public class BasicCorpController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<Integer> corpTypeLists = new ArrayList<>();
-        corpTypeLists.add(1);
+//        corpTypeLists.add(1);
         corpTypeLists.add(2);
+        corpTypeLists.add(4);
         basicUnitMaintainFilterRequest.setCorpTypeLists(corpTypeLists);
-        basicUnitMaintainFilterRequest.setOutType(0);
+//        basicUnitMaintainFilterRequest.setOutType(0);
         List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
         PageInfo<BasicCorpEntity> pageInfo;
@@ -355,7 +363,7 @@ public class BasicCorpController extends BaseController {
         basicDataRequest.setDeleteRequest(deleteRequest);
         basicDataRequest.setKey(SyncDelType.BASIC_CORP_MAINTAIN);
         Long userId = getUserId();
-        spGetHttpClient.deleteBasicData(basicDataRequest,userId+"");
+        spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
         return ResultVOUtils.success("删除成功");
     }
 

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.Objects;
 
 @Data
 @TableName(value = "auth_warehouse")
@@ -107,5 +108,13 @@ public class InvWarehouseEntity {
     @TableField(exist = false)
     private String warehouseName;//仓库名字
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        InvWarehouseEntity person = (InvWarehouseEntity) o;
+        return Objects.equals(code, person.getCode());
+    }
+
 
 }