From 01e5715351a7c528f5a744c6c7c9efe3644de11b Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 20 Mar 2025 14:03:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=85=E5=8E=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/boxes/admin/BokingPageDTO.java | 16 +++++ .../canteen/entity/BoxesBookingEntity.java | 8 +++ .../canteen/entity/BoxesInfoEntity.java | 1 + .../controller/BoxesBookingController.java | 10 ++-- .../canteen/service/BoxesBookingService.java | 5 ++ .../service/impl/BoxesBookingServiceImpl.java | 60 +++++++++++++++++++ .../bsd/pjcloud/flow/task/entity/Process.java | 4 ++ .../task/service/impl/ProcessServiceImpl.java | 2 +- .../admin/api/feign/RemoteUserService.java | 10 ++++ .../admin/controller/SysUserController.java | 13 ++++ .../pjcloud/admin/service/SysUserService.java | 8 +++ .../service/impl/SysUserServiceImpl.java | 6 ++ 12 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/boxes/admin/BokingPageDTO.java diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/boxes/admin/BokingPageDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/boxes/admin/BokingPageDTO.java new file mode 100644 index 000000000..8402b2693 --- /dev/null +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/boxes/admin/BokingPageDTO.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.canteen.dto.boxes.admin; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "预约分页查询参数") +public class BokingPageDTO { + + private String userName; + + private String mobile; + + private String boxesName; +} diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java index 429a12824..bd9a0c211 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesBookingEntity.java @@ -123,4 +123,12 @@ public class BoxesBookingEntity extends Model { @Schema(description="审核原因") private String checkReason; + + @Schema(description="包厢名称") + @TableField(exist = false) + private String boxesName; + + @Schema(description="用户名称") + @TableField(exist = false) + private String userName; } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java index 6f592eb89..c4fdf67c5 100644 --- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java +++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/entity/BoxesInfoEntity.java @@ -113,4 +113,5 @@ public class BoxesInfoEntity extends Model { @Schema(description="部门id") private Long deptId; + } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java index bb5c55d31..39ccf9ac2 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/BoxesBookingController.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.canteen.dto.boxes.admin.BokingPageDTO; import com.bsd.pjcloud.canteen.vo.AppMakeSaveReqVO; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; @@ -49,17 +50,14 @@ public class BoxesBookingController { /** * 分页查询 * @param page 分页对象 - * @param boxesBooking 包厢预约记录表 + * @param bokingPageDTO 包厢预约记录表 * @return */ @Operation(summary = "分页查询" , description = "分页查询" ) @GetMapping("/page" ) @PreAuthorize("@pms.hasPermission('canteen_boxesBooking_view')" ) - public R getBoxesBookingPage(@ParameterObject Page page, @ParameterObject BoxesBookingEntity boxesBooking) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(Objects.nonNull(boxesBooking.getBoxesId()),BoxesBookingEntity::getBoxesId,boxesBooking.getBoxesId()); - wrapper.like(Objects.nonNull(boxesBooking.getUserId()),BoxesBookingEntity::getUserId,boxesBooking.getUserId()); - return R.ok(boxesBookingService.page(page, wrapper)); + public R getBoxesBookingPage(@ParameterObject Page page, @ParameterObject BokingPageDTO bokingPageDTO) { + return R.ok(boxesBookingService.pageScope(page, bokingPageDTO)); } diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesBookingService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesBookingService.java index 0dda91632..cfbb9469e 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesBookingService.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/BoxesBookingService.java @@ -1,6 +1,8 @@ package com.bsd.pjcloud.canteen.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.bsd.pjcloud.canteen.dto.boxes.admin.BokingPageDTO; import com.bsd.pjcloud.canteen.entity.BoxesBookingEntity; import com.bsd.pjcloud.canteen.vo.AppMakeSaveReqVO; import com.bsd.pjcloud.common.core.util.R; @@ -14,4 +16,7 @@ public interface BoxesBookingService extends IService { * @return */ R createBooking(AppMakeSaveReqVO createReqVO); + + + Object pageScope(Page page, BokingPageDTO bokingPageDTO); } \ No newline at end of file diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java index 1e2258bbd..0ede5315e 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java @@ -1,8 +1,16 @@ package com.bsd.pjcloud.canteen.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.excel.util.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bsd.pjcloud.admin.api.entity.SysUser; +import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.canteen.constant.CanteenFlowConstant; +import com.bsd.pjcloud.canteen.dto.boxes.admin.BokingPageDTO; import com.bsd.pjcloud.canteen.dto.flow.BxMarkingFlowDto; import com.bsd.pjcloud.canteen.entity.BoxesBookingEntity; import com.bsd.pjcloud.canteen.entity.BoxesInfoEntity; @@ -13,6 +21,7 @@ import com.bsd.pjcloud.canteen.service.BoxesBookingService; import com.bsd.pjcloud.canteen.vo.AppMakeSaveReqVO; import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.resolver.ParamResolver; import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; @@ -20,10 +29,15 @@ import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; import com.bsd.pjcloud.flow.task.entity.Process; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import java.beans.beancontext.BeanContext; import java.time.LocalDate; +import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; /** * 包厢预约记录表 @@ -43,6 +57,7 @@ public class BoxesBookingServiceImpl extends ServiceImpl wrapper = Wrappers.lambdaQuery(); + String mobile = bokingPageDTO.getMobile(); + String userName = bokingPageDTO.getUserName(); + String boxesName = bokingPageDTO.getBoxesName(); + if (StringUtils.isNotBlank(mobile) || StringUtils.isNotBlank(userName)){ + R> likeNameOrByMobileScope = remoteUserService.getLikeNameOrByMobileScope(userName, mobile); + List userIds = likeNameOrByMobileScope.getData().stream().map(sysUser -> sysUser.getUserId()).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(userIds)){ + return new Page<>(page.getCurrent(), page.getSize()); + } + wrapper.in(BoxesBookingEntity::getUserId,userIds); + } + if (StringUtils.isNotBlank(boxesName)){ + LambdaQueryWrapper boxesInfoEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + boxesInfoEntityLambdaQueryWrapper.like(BoxesInfoEntity::getName,boxesName); + List boxesInfoEntities = boxesInfoMapper.selectListByScope(boxesInfoEntityLambdaQueryWrapper, DataScope.of()); + List boxesIds = boxesInfoEntities.stream().map(boxesInfoEntity -> boxesInfoEntity.getId()).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(boxesIds)){ + return new Page<>(page.getCurrent(), page.getSize()); + } + wrapper.in(BoxesBookingEntity::getBoxesId,boxesIds); + } + Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + List records = pageData.getRecords(); + Set boxesIds = records.stream().map(boxesBookingEntity -> boxesBookingEntity.getBoxesId()).collect(Collectors.toSet()); + Set usersIds = records.stream().map(boxesBookingEntity -> boxesBookingEntity.getUserId()).collect(Collectors.toSet()); + + + List boxesInfoEntities = boxesInfoMapper.selectByIds(boxesIds); + Map boxMap = boxesInfoEntities.stream() + .collect(Collectors.toMap(BoxesInfoEntity::getId, entity -> entity)); + R> userMapData = remoteUserService.getUserMap(usersIds); + Map userMap = userMapData.getData(); + + if (!CollectionUtils.isEmpty(records)){ + records.stream().forEach(record -> { + record.setBoxesName(boxMap.get(record.getBoxesId()) == null ? "" : boxMap.get(record.getBoxesId()).getName()); + record.setUserName(userMap.get(record.getUserId()) == null ? "" : userMap.get(record.getUserId()).getUsername()); + }); + } + return pageData; + } } \ No newline at end of file diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java index 9af700318..8d4d66e0e 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/Process.java @@ -141,4 +141,8 @@ public class Process { @TableField("business_key") private String businessKey; + +// @Schema(description = "表单详情路由") +// @TableField("form_detail") +// private String formDetail; } diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java index 04963fc20..3c7dd9b55 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java @@ -225,7 +225,7 @@ public class ProcessServiceImpl extends ServiceImpl impl p.setAdminList(process.getAdminList()); p.setRangeShow(stringBuilder.toString()); p.setBusinessKey(process.getBusinessKey()); - +// p.setFormDetail(process.getFormDetail()); this.save(p); // 保存范围 diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java index 192035788..2e68e3023 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java @@ -20,11 +20,14 @@ package com.bsd.pjcloud.admin.api.feign; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.bsd.pjcloud.admin.api.dto.UserDTO; import com.bsd.pjcloud.admin.api.dto.UserInfo; import com.bsd.pjcloud.admin.api.entity.SysUser; import com.bsd.pjcloud.admin.api.vo.UserVO; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; +import com.bsd.pjcloud.common.core.exception.ErrorCodes; +import com.bsd.pjcloud.common.core.util.MsgUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.feign.annotation.NoToken; import io.swagger.v3.oas.annotations.media.Schema; @@ -175,4 +178,11 @@ public interface RemoteUserService { */ @GetMapping("/user/getUserMap") R> getUserMap(@RequestParam(value = "userIds") Set userIds); + + + + + @GetMapping("/user/getLikeNameOrByMobileScope") + R< List> getLikeNameOrByMobileScope(@RequestParam(value = "name",required = false) String name, + @RequestParam(value = "mobile",required = false) String mobile); } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index 3796ea6f7..6b9512fce 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -413,4 +413,17 @@ public class SysUserController { Map userMap = list.stream().collect(Collectors.toMap(SysUser::getUserId, user -> user)); return R.ok(userMap); } + + + @Inner + @GetMapping("/getLikeNameOrByMobileScope") + public R< List> getLikeNameOrByMobileScope(@RequestParam(value = "name",required = false) String name, + @RequestParam(value = "mobile",required = false) String mobile) { + List user = userService.listScopeByLikeNameOrByMobileScope(Wrappers.query().lambda() + .like(StringUtils.isNotBlank(name),SysUser::getName, name).eq(StringUtils.isNotBlank(mobile),SysUser::getPhone, mobile)); + if (user == null) { + return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERINFO_EMPTY, name, mobile)); + } + return R.ok(user); + } } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java index 38f2804ee..c2c98a66d 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java @@ -210,4 +210,12 @@ public interface SysUserService extends IService { * 开启审批 */ void applyFlow(SysUser user); + + + /** + * 根据用户名或者手机号获取数据库权限的用户信息 + * @param eq + * @return + */ + List listScopeByLikeNameOrByMobileScope(LambdaQueryWrapper eq); } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index c65fd1733..2aadddc41 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -842,6 +842,12 @@ public class SysUserServiceImpl extends ServiceImpl impl baseMapper.updateById(updateObj); } + @Override + public List listScopeByLikeNameOrByMobileScope(LambdaQueryWrapper eq) { + + return baseMapper.selectListByScope(eq, DataScope.of()); + } + private SysUserServiceImpl getSelf() { return SpringUtil.getBean(getClass()); } From 6aa0cb09284b7f9313204bc6649f47370929719d Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 20 Mar 2025 14:11:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bsd/pjcloud/supermarket/controller/SmErpSpuController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index 316a6d2f3..ad1eb3c84 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -88,7 +88,7 @@ public class SmErpSpuController { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode()); wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarcode()), SmErpSpuEntity::getBarcode,supermarketSpu.getBarcode()); - wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName()); + wrapper.like(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName()); return R.ok(smErpSpuService.pageScope(page, wrapper)); } From cd0a5e603bcef28e7d70e5b26ef2d566b698a5a1 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 20 Mar 2025 14:32:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/erpspu/SmErpSpuImportDto.java | 8 +++---- .../service/impl/SmErpSpuServiceImpl.java | 22 +++++++++++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java index e168159d0..0d2ad0440 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java @@ -40,22 +40,22 @@ public class SmErpSpuImportDto { private Integer packageNum; // 装数 @ExcelProperty("进价") - private Integer purchasePrice; // 进价 + private Double purchasePrice; // 进价 @ExcelProperty("零售价") - private Integer retailPrice; // 零售价 + private Double retailPrice; // 零售价 @ExcelProperty("货商") private String supplier; // 货商 @ExcelProperty("促销价") - private Integer promotionPrice; // 促销价 + private Double promotionPrice; // 促销价 @ExcelProperty("商品性质") private String commodityNature; // 商品性质 @ExcelProperty("成本单价") - private Integer costPrice; // 成本单价 + private Double costPrice; // 成本单价 @ExcelProperty("库存上限") private int inventoryUpperLimit; // 库存上限 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index b45767b8b..fb6cfe0bb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -44,6 +44,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -644,8 +646,24 @@ public class SmErpSpuServiceImpl extends ServiceImpl