diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java index 7f9231bc2..3cf818778 100644 --- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java @@ -5,7 +5,9 @@ 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.dto.UserInfo; +import com.bsd.pjcloud.admin.api.entity.SysDept; import com.bsd.pjcloud.admin.api.entity.SysDictItem; +import com.bsd.pjcloud.admin.api.feign.RemoteDeptService; import com.bsd.pjcloud.admin.api.feign.RemoteDictService; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.common.core.exception.ServiceException; @@ -98,6 +100,8 @@ public class VisitorsServiceImpl extends ServiceImpl deptByDeptId = remoteDeptService.getDeptByDeptId(deptId); + bean.setDeptName(deptByDeptId.getData().getName()); String uniqueToken = UUID.randomUUID().toString(); String token = uniqueToken.replace("-", ""); @@ -316,12 +326,12 @@ public class VisitorsServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(visitors.getType())&&VisitorTypeEnum.ZDYQ.getType().equals(visitors.getType())){ - wrapper.eq(VisitorsEntity::getUserId, userId); - wrapper.eq(VisitorsEntity::getType, visitors.getType()); - }else { +// if (StringUtils.isNotBlank(visitors.getType())&&VisitorTypeEnum.ZDYQ.getType().equals(visitors.getType())){ +// wrapper.eq(VisitorsEntity::getUserId, userId); + wrapper.eq(StringUtils.isNotBlank(visitors.getType()),VisitorsEntity::getType, visitors.getType()); +// }else { wrapper.eq(VisitorsEntity::getReceiveId, userId); - } +// } wrapper.eq(StringUtils.isNotBlank(visitors.getCheckStatus()),VisitorsEntity::getCheckStatus, visitors.getCheckStatus()); wrapper.orderByDesc(VisitorsEntity::getCreateTime); Page pageData = baseMapper.selectPage(page, wrapper); diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java index ee8253d37..2206d5da8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java @@ -113,7 +113,7 @@ public class InventoryRecordEditDTO { private Integer totalAmount; - @Schema(description="收货数量") + @Schema(description="收款金额") private Integer receiveAmount; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java index b8a0d899e..e5b160016 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java @@ -91,6 +91,9 @@ public class InventoryRecordSaveDTO { @NotNull private String orderType; + @Schema(description="收款金额") + private Integer receiveAmount; + /** * @Link SmCgPlanSaveItemDTO */