19 changed files with 898 additions and 35 deletions
@ -0,0 +1,34 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.dto; |
||||
|
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
/** |
||||
* 仓库租用管理 数据传输对象实体类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseLeasingDTO extends WarehouseLeasingEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
} |
||||
@ -0,0 +1,66 @@
|
||||
package com.logpm.basicdata.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import org.springblade.core.tenant.mp.TenantEntity; |
||||
|
||||
import java.math.BigDecimal; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 仓库租用管理 |
||||
* |
||||
* @author zqb |
||||
* @create 2024-08-14 |
||||
*/ |
||||
@Data |
||||
@TableName("logpm_warehouse_leasing") |
||||
@ApiModel(value = "WarehouseLeasing对象", description = "仓库租用管理") |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseLeasingEntity extends TenantEntity { |
||||
|
||||
/** |
||||
* 客户id |
||||
*/ |
||||
@ApiModelProperty(value = "客户id") |
||||
private Long clientId; |
||||
/** |
||||
* 仓库id |
||||
*/ |
||||
@ApiModelProperty(value = "仓库id") |
||||
private Long warehouseId; |
||||
/** |
||||
* 租用类型 |
||||
*/ |
||||
@ApiModelProperty(value = "租用类型(1面积 2库位)") |
||||
private Integer type; |
||||
/** |
||||
* 租用库位数 |
||||
*/ |
||||
@ApiModelProperty(value = "租用库位数") |
||||
private BigDecimal storageLocationCount; |
||||
/** |
||||
* 租用面积 |
||||
*/ |
||||
@ApiModelProperty(value = "租用面积") |
||||
private BigDecimal leasedArea; |
||||
/** |
||||
* 月租金 |
||||
*/ |
||||
@ApiModelProperty(value = "月租金") |
||||
private BigDecimal monthlyRent; |
||||
/** |
||||
* 租赁合同开始时间 |
||||
*/ |
||||
@ApiModelProperty(value = "租赁合同开始时间") |
||||
private Date leaseCommencementDate; |
||||
/** |
||||
* 租赁合同结束时间 |
||||
*/ |
||||
@ApiModelProperty(value = "租赁合同结束时间") |
||||
private Date leaseTerminationDate; |
||||
|
||||
} |
||||
@ -0,0 +1,185 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.controller; |
||||
|
||||
import cn.hutool.core.util.ObjectUtil; |
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
||||
import com.logpm.basicdata.entity.BasicdataClientEntity; |
||||
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import com.logpm.basicdata.excel.WarehouseLeasingExcel; |
||||
import com.logpm.basicdata.feign.IBasicdataClientClient; |
||||
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; |
||||
import com.logpm.basicdata.service.IWarehouseLeasingService; |
||||
import com.logpm.basicdata.vo.ResidualAreaVO; |
||||
import com.logpm.basicdata.vo.WarehouseLeasingVO; |
||||
import com.logpm.basicdata.wrapper.WarehouseLeasingWrapper; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import io.swagger.annotations.ApiParam; |
||||
import lombok.AllArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.excel.util.ExcelUtil; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.secure.BladeUser; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.constant.BladeConstant; |
||||
import org.springblade.core.tool.utils.DateUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PostMapping; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RequestParam; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
import springfox.documentation.annotations.ApiIgnore; |
||||
|
||||
import javax.annotation.Resource; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
import javax.validation.Valid; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
/** |
||||
* 仓库租用管理 控制器 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
@RestController |
||||
@AllArgsConstructor |
||||
@RequestMapping("logpm-basicdata/warehouseLeasing") |
||||
@Api(value = "仓库租用管理", tags = "仓库租用管理接口") |
||||
public class WarehouseLeasingController extends BladeController { |
||||
|
||||
private final IWarehouseLeasingService warehouseLeasingService; |
||||
|
||||
@Resource |
||||
private IBasicdataWarehouseClient warehouseClient; |
||||
@Resource |
||||
private IBasicdataClientClient clientClient; |
||||
|
||||
/** |
||||
* 仓库租用管理 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@ApiOperationSupport(order = 1) |
||||
@ApiOperation(value = "详情", notes = "传入warehouseLeasing") |
||||
public R<WarehouseLeasingVO> detail(WarehouseLeasingEntity warehouseLeasing) { |
||||
WarehouseLeasingEntity detail = warehouseLeasingService.getOne(Condition.getQueryWrapper(warehouseLeasing)); |
||||
WarehouseLeasingVO warehouseLeasingVO = WarehouseLeasingWrapper.build().entityVO(detail); |
||||
BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseLeasingVO.getWarehouseId()); |
||||
if (ObjectUtil.isNotEmpty(warehouseEntity)) { |
||||
warehouseLeasingVO.setWarehouseName(warehouseEntity.getName()); |
||||
} |
||||
BasicdataClientEntity basicdataClient = clientClient.findEntityById(warehouseLeasingVO.getClientId()); |
||||
if (ObjectUtil.isNotEmpty(basicdataClient)) { |
||||
warehouseLeasingVO.setClientName(basicdataClient.getClientName()); |
||||
} |
||||
return R.data(warehouseLeasingVO); |
||||
} |
||||
|
||||
/** |
||||
* 仓库租用管理 分页 |
||||
*/ |
||||
@GetMapping("/list") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "分页", notes = "传入warehouseLeasing") |
||||
public R<IPage<WarehouseLeasingVO>> list(@ApiIgnore @RequestParam Map<String, Object> warehouseLeasing, Query query) { |
||||
IPage<WarehouseLeasingEntity> pages = warehouseLeasingService.page(Condition.getPage(query), Condition.getQueryWrapper(warehouseLeasing, WarehouseLeasingEntity.class)); |
||||
return R.data(WarehouseLeasingWrapper.build().pageVO(pages)); |
||||
} |
||||
|
||||
@GetMapping("/residualArea") |
||||
@ApiOperationSupport(order = 2) |
||||
@ApiOperation(value = "查询剩余面积", notes = "传入warehouseLeasing") |
||||
public R<ResidualAreaVO> residualArea(@RequestParam("warehouseId") Long warehouseId) { |
||||
return R.data(warehouseLeasingService.residualArea(warehouseId)); |
||||
} |
||||
|
||||
/** |
||||
* 仓库租用管理 自定义分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@ApiOperationSupport(order = 3) |
||||
@ApiOperation(value = "分页", notes = "传入warehouseLeasing") |
||||
public R<IPage<WarehouseLeasingVO>> page(WarehouseLeasingVO warehouseLeasing, Query query) { |
||||
IPage<WarehouseLeasingVO> pages = warehouseLeasingService.selectWarehouseLeasingPage(Condition.getPage(query), warehouseLeasing); |
||||
return R.data(pages); |
||||
} |
||||
|
||||
/** |
||||
* 仓库租用管理 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@ApiOperationSupport(order = 4) |
||||
@ApiOperation(value = "新增", notes = "传入warehouseLeasing") |
||||
public R save(@Valid @RequestBody WarehouseLeasingEntity warehouseLeasing) { |
||||
return R.status(warehouseLeasingService.save(warehouseLeasing)); |
||||
} |
||||
|
||||
/** |
||||
* 仓库租用管理 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@ApiOperationSupport(order = 5) |
||||
@ApiOperation(value = "修改", notes = "传入warehouseLeasing") |
||||
public R update(@Valid @RequestBody WarehouseLeasingEntity warehouseLeasing) { |
||||
return R.status(warehouseLeasingService.updateById(warehouseLeasing)); |
||||
} |
||||
|
||||
/** |
||||
* 仓库租用管理 新增或修改 |
||||
*/ |
||||
@PostMapping("/submit") |
||||
@ApiOperationSupport(order = 6) |
||||
@ApiOperation(value = "新增或修改", notes = "传入warehouseLeasing") |
||||
public R submit(@Valid @RequestBody WarehouseLeasingEntity warehouseLeasing) { |
||||
return R.status(warehouseLeasingService.saveOrUpdate(warehouseLeasing)); |
||||
} |
||||
|
||||
/** |
||||
* 仓库租用管理 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@ApiOperationSupport(order = 7) |
||||
@ApiOperation(value = "逻辑删除", notes = "传入ids") |
||||
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { |
||||
return R.status(warehouseLeasingService.deleteLogic(Func.toLongList(ids))); |
||||
} |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
*/ |
||||
@GetMapping("/export-warehouseLeasing") |
||||
@ApiOperationSupport(order = 9) |
||||
@ApiOperation(value = "导出数据", notes = "传入warehouseLeasing") |
||||
public void exportWarehouseLeasing(@ApiIgnore @RequestParam Map<String, Object> warehouseLeasing, BladeUser bladeUser, HttpServletResponse response) { |
||||
QueryWrapper<WarehouseLeasingEntity> queryWrapper = Condition.getQueryWrapper(warehouseLeasing, WarehouseLeasingEntity.class); |
||||
// if (!AuthUtil.isAdministrator()) {
|
||||
// queryWrapper.lambda().eq(WarehouseLeasing::getTenantId, bladeUser.getTenantId());
|
||||
//}
|
||||
queryWrapper.lambda().eq(WarehouseLeasingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); |
||||
List<WarehouseLeasingExcel> list = warehouseLeasingService.exportWarehouseLeasing(queryWrapper); |
||||
ExcelUtil.export(response, "仓库租用管理数据" + DateUtil.time(), "仓库租用管理数据表", list, WarehouseLeasingExcel.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,44 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.excel; |
||||
|
||||
|
||||
import lombok.Data; |
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty; |
||||
import com.alibaba.excel.annotation.write.style.ColumnWidth; |
||||
import com.alibaba.excel.annotation.write.style.ContentRowHeight; |
||||
import com.alibaba.excel.annotation.write.style.HeadRowHeight; |
||||
import java.io.Serializable; |
||||
|
||||
|
||||
/** |
||||
* 仓库租用管理 Excel实体类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
@Data |
||||
@ColumnWidth(25) |
||||
@HeadRowHeight(20) |
||||
@ContentRowHeight(18) |
||||
public class WarehouseLeasingExcel implements Serializable { |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,54 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.mapper; |
||||
|
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import com.logpm.basicdata.vo.WarehouseLeasingVO; |
||||
import com.logpm.basicdata.excel.WarehouseLeasingExcel; |
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.apache.ibatis.annotations.Param; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 仓库租用管理 Mapper 接口 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
public interface WarehouseLeasingMapper extends BaseMapper<WarehouseLeasingEntity> { |
||||
|
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param warehouseLeasing |
||||
* @return |
||||
*/ |
||||
List<WarehouseLeasingVO> selectWarehouseLeasingPage(IPage page, WarehouseLeasingVO warehouseLeasing); |
||||
|
||||
|
||||
/** |
||||
* 获取导出数据 |
||||
* |
||||
* @param queryWrapper |
||||
* @return |
||||
*/ |
||||
List<WarehouseLeasingExcel> exportWarehouseLeasing(@Param("ew") Wrapper<WarehouseLeasingEntity> queryWrapper); |
||||
|
||||
} |
||||
@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.basicdata.mapper.WarehouseLeasingMapper"> |
||||
|
||||
<!-- 通用查询映射结果 --> |
||||
<resultMap id="warehouseLeasingResultMap" type="com.logpm.basicdata.entity.WarehouseLeasingEntity"> |
||||
</resultMap> |
||||
|
||||
<select id="selectWarehouseLeasingPage" resultType="com.logpm.basicdata.vo.WarehouseLeasingVO"> |
||||
select t.*, |
||||
lww.name warehouseName, |
||||
case when t.lease_termination_date < CURDATE() then '是' |
||||
when t.lease_termination_date >= CURDATE() then '否' |
||||
else '' end expired, |
||||
lbc.client_name clientName |
||||
from logpm_warehouse_leasing t |
||||
left join logpm_warehouse_warehouse lww on lww.id = t.warehouse_id |
||||
left join logpm_basicdata_client lbc on lbc.id = t.client_id |
||||
where t.is_deleted = 0 |
||||
</select> |
||||
|
||||
|
||||
<select id="exportWarehouseLeasing" resultType="com.logpm.basicdata.excel.WarehouseLeasingExcel"> |
||||
SELECT * FROM logpm_warehouse_leasing ${ew.customSqlSegment} |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,54 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import com.logpm.basicdata.vo.ResidualAreaVO; |
||||
import com.logpm.basicdata.vo.WarehouseLeasingVO; |
||||
import com.logpm.basicdata.excel.WarehouseLeasingExcel; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 仓库租用管理 服务类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
public interface IWarehouseLeasingService extends BaseService<WarehouseLeasingEntity> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param warehouseLeasing |
||||
* @return |
||||
*/ |
||||
IPage<WarehouseLeasingVO> selectWarehouseLeasingPage(IPage<WarehouseLeasingVO> page, WarehouseLeasingVO warehouseLeasing); |
||||
|
||||
|
||||
/** |
||||
* 导出数据 |
||||
* |
||||
* @param queryWrapper |
||||
* @return |
||||
*/ |
||||
List<WarehouseLeasingExcel> exportWarehouseLeasing(Wrapper<WarehouseLeasingEntity> queryWrapper); |
||||
|
||||
ResidualAreaVO residualArea(Long warehouseId); |
||||
} |
||||
@ -0,0 +1,130 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.service.impl; |
||||
|
||||
import cn.hutool.core.collection.CollUtil; |
||||
import cn.hutool.core.convert.Convert; |
||||
import cn.hutool.core.util.ObjectUtil; |
||||
import cn.hutool.core.util.StrUtil; |
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
||||
import com.logpm.basicdata.entity.BasicdataWarehouseEntity; |
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import com.logpm.basicdata.excel.WarehouseLeasingExcel; |
||||
import com.logpm.basicdata.feign.IBasicdataWarehouseClient; |
||||
import com.logpm.basicdata.mapper.WarehouseLeasingMapper; |
||||
import com.logpm.basicdata.service.IWarehouseLeasingService; |
||||
import com.logpm.basicdata.vo.ResidualAreaVO; |
||||
import com.logpm.basicdata.vo.WarehouseLeasingVO; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.core.secure.utils.AuthUtil; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.system.entity.User; |
||||
import org.springblade.system.feign.IUserClient; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import javax.annotation.Resource; |
||||
import java.math.BigDecimal; |
||||
import java.util.HashSet; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.Set; |
||||
import java.util.stream.Collectors; |
||||
|
||||
/** |
||||
* 仓库租用管理 服务实现类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
@Service |
||||
public class WarehouseLeasingServiceImpl extends BaseServiceImpl<WarehouseLeasingMapper, WarehouseLeasingEntity> implements IWarehouseLeasingService { |
||||
|
||||
@Resource |
||||
private IUserClient userClient; |
||||
@Resource |
||||
private IBasicdataWarehouseClient warehouseClient; |
||||
|
||||
@Override |
||||
public IPage<WarehouseLeasingVO> selectWarehouseLeasingPage(IPage<WarehouseLeasingVO> page, WarehouseLeasingVO warehouseLeasing) { |
||||
List<WarehouseLeasingVO> warehouseLeasingVOS = baseMapper.selectWarehouseLeasingPage(page, warehouseLeasing); |
||||
if (CollUtil.isNotEmpty(warehouseLeasingVOS)) { |
||||
// 获取修改用户id
|
||||
Set<Long> collect = new HashSet<>(); |
||||
warehouseLeasingVOS.forEach(expenseDispatchPriceUnitVO -> { |
||||
collect.add(expenseDispatchPriceUnitVO.getCreateUser()); |
||||
collect.add(expenseDispatchPriceUnitVO.getUpdateUser()); |
||||
}); |
||||
if (CollUtil.isNotEmpty(collect)) { |
||||
R<List<User>> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(collect, StrUtil.COMMA)); |
||||
if (R.isSuccess(listR)) { |
||||
List<User> userList = listR.getData(); |
||||
// 封装成map
|
||||
Map<Long, User> userMap = userList.stream().collect(Collectors.toMap(User::getId, user -> user)); |
||||
warehouseLeasingVOS.forEach(expenseDispatchPriceUnitVO -> { |
||||
if (userMap.containsKey(expenseDispatchPriceUnitVO.getCreateUser())) { |
||||
expenseDispatchPriceUnitVO.setCreateUserName(userMap.get(expenseDispatchPriceUnitVO.getCreateUser()).getRealName()); |
||||
expenseDispatchPriceUnitVO.setUpdateUserName(userMap.get(expenseDispatchPriceUnitVO.getUpdateUser()).getRealName()); |
||||
} |
||||
}); |
||||
} |
||||
} |
||||
} |
||||
return page.setRecords(warehouseLeasingVOS); |
||||
} |
||||
|
||||
|
||||
@Override |
||||
public List<WarehouseLeasingExcel> exportWarehouseLeasing(Wrapper<WarehouseLeasingEntity> queryWrapper) { |
||||
List<WarehouseLeasingExcel> warehouseLeasingList = baseMapper.exportWarehouseLeasing(queryWrapper); |
||||
// warehouseLeasingList.forEach(warehouseLeasing -> {
|
||||
// warehouseLeasing.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseLeasing.getType()));
|
||||
//});
|
||||
return warehouseLeasingList; |
||||
} |
||||
|
||||
@Override |
||||
public ResidualAreaVO residualArea(Long warehouseId) { |
||||
BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId); |
||||
ResidualAreaVO residualAreaVO = new ResidualAreaVO(); |
||||
if (warehouseEntity != null) { |
||||
BigDecimal acreage = warehouseEntity.getAcreage(); |
||||
BigDecimal divide = BigDecimal.ZERO; |
||||
if (ObjectUtil.isNotEmpty(acreage)) { |
||||
if(ObjectUtil.isNotEmpty(warehouseEntity.getTemporaryTurnoverArea())){ |
||||
divide = acreage.subtract(warehouseEntity.getTemporaryTurnoverArea()); |
||||
}else{ |
||||
divide = acreage; |
||||
} |
||||
if (ObjectUtil.isNotEmpty(warehouseEntity.getSeating())) { |
||||
BigDecimal singleStorageArea = divide.divide(new BigDecimal(warehouseEntity.getSeating()), 2, BigDecimal.ROUND_UP); |
||||
residualAreaVO.setSingleStorageArea(Convert.toStr(singleStorageArea)); |
||||
} |
||||
} |
||||
List<WarehouseLeasingEntity> list = this.list(Wrappers.<WarehouseLeasingEntity>lambdaQuery().eq(WarehouseLeasingEntity::getWarehouseId, warehouseId)); |
||||
if (CollUtil.isNotEmpty(list)) { |
||||
BigDecimal sum = list.stream().map(WarehouseLeasingEntity::getLeasedArea).reduce(BigDecimal.ZERO, BigDecimal::add); |
||||
residualAreaVO.setResidualArea(Convert.toStr(divide.subtract(sum))); |
||||
}else{ |
||||
residualAreaVO.setResidualArea(Convert.toStr(divide)); |
||||
} |
||||
} |
||||
return residualAreaVO; |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,46 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.vo; |
||||
|
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
|
||||
import java.io.Serializable; |
||||
|
||||
/** |
||||
* 剩余面积 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
@Data |
||||
public class ResidualAreaVO implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 剩余可用面积 |
||||
*/ |
||||
@ApiModelProperty(value = "剩余可用面积") |
||||
private String residualArea; |
||||
|
||||
/** |
||||
* 单库位面积 |
||||
*/ |
||||
@ApiModelProperty(value = "单库位面积") |
||||
private String singleStorageArea; |
||||
|
||||
} |
||||
@ -0,0 +1,65 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.vo; |
||||
|
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
|
||||
/** |
||||
* 仓库租用管理 视图实体类 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
@Data |
||||
@EqualsAndHashCode(callSuper = true) |
||||
public class WarehouseLeasingVO extends WarehouseLeasingEntity { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 仓库名称 |
||||
*/ |
||||
@ApiModelProperty(value = "仓库名称") |
||||
private String warehouseName; |
||||
|
||||
/** |
||||
* 是否过期 |
||||
*/ |
||||
@ApiModelProperty(value = "是否过期") |
||||
private String expired; |
||||
|
||||
/** |
||||
* 客户名称 |
||||
*/ |
||||
@ApiModelProperty(value = "客户名称") |
||||
private String clientName; |
||||
|
||||
/** |
||||
* 修改人名称 |
||||
*/ |
||||
@ApiModelProperty(value = "修改人名称") |
||||
private String updateUserName; |
||||
|
||||
/** |
||||
* 创建人名称 |
||||
*/ |
||||
@ApiModelProperty(value = "创建人名称") |
||||
private String createUserName; |
||||
|
||||
} |
||||
@ -0,0 +1,50 @@
|
||||
/* |
||||
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* |
||||
* Redistributions of source code must retain the above copyright notice, |
||||
* this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* Neither the name of the dreamlu.net developer nor the names of its |
||||
* contributors may be used to endorse or promote products derived from |
||||
* this software without specific prior written permission. |
||||
* Author: Chill 庄骞 (smallchill@163.com) |
||||
*/ |
||||
package com.logpm.basicdata.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import com.logpm.basicdata.entity.WarehouseLeasingEntity; |
||||
import com.logpm.basicdata.vo.WarehouseLeasingVO; |
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 仓库租用管理 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author zqb |
||||
* @since 2024-08-14 |
||||
*/ |
||||
public class WarehouseLeasingWrapper extends BaseEntityWrapper<WarehouseLeasingEntity, WarehouseLeasingVO> { |
||||
|
||||
public static WarehouseLeasingWrapper build() { |
||||
return new WarehouseLeasingWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public WarehouseLeasingVO entityVO(WarehouseLeasingEntity warehouseLeasing) { |
||||
WarehouseLeasingVO warehouseLeasingVO = Objects.requireNonNull(BeanUtil.copy(warehouseLeasing, WarehouseLeasingVO.class)); |
||||
|
||||
//User createUser = UserCache.getUser(warehouseLeasing.getCreateUser());
|
||||
//User updateUser = UserCache.getUser(warehouseLeasing.getUpdateUser());
|
||||
//warehouseLeasingVO.setCreateUserName(createUser.getName());
|
||||
//warehouseLeasingVO.setUpdateUserName(updateUser.getName());
|
||||
|
||||
return warehouseLeasingVO; |
||||
} |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue