From 280603288532fd8de537c3ade5bbe8451cd69bc9 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 26 Sep 2023 11:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8D=87=E7=BA=A7bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/config/HdSchemaExecutor.java | 2 +- .../auth/InvWarehouseController.java | 2 +- .../basic/BasicBussinessTypeController.java | 5 +++-- .../controller/basic/BasicCorpController.java | 18 +++++++++++++----- .../api/entity/auth/InvWarehouseEntity.java | 9 +++++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java b/src/main/java/com/glxp/api/config/HdSchemaExecutor.java index 11e026126..e352ed79a 100644 --- a/src/main/java/com/glxp/api/config/HdSchemaExecutor.java +++ b/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")); } } diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 376ae4f35..87ccd6c94 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/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())); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 6595942d0..42d34ea5e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/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 { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 529bda673..56c454ea7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/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 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 basicUnitMaintainEntities; basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo 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("删除成功"); } diff --git a/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java b/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java index 8e502e289..a7a8ffffe 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java +++ b/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()); + } + }