diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index 39c80d1e6..a168a29ac 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -22,16 +22,14 @@ import com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO; import com.mhd.basic.interfaces.dto.lease.LeaseDTO; import com.mhd.basic.interfaces.dto.shipperLeaseDetailsApi.ShipperLeaseDetailsDTO; import com.mhd.common.core.domain.dto.BusinessDataPushDTO; +import com.mhd.common.core.enums.DictCode; import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.BmsServiceFeign; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.WmsServiceFeign; -import com.mhd.system.api.domain.BatchDetailFeignPO; -import com.mhd.system.api.domain.MaterialInventoryDTO; -import com.mhd.system.api.domain.MaterialInventoryPO; -import com.mhd.system.api.domain.WarehouseFeignPO; +import com.mhd.system.api.domain.*; import com.mhd.system.api.model.LoginUser; import com.mhd.system.service.ISysDictTypeService; import io.swagger.annotations.ApiModelProperty; @@ -135,7 +133,32 @@ public class LeaseApplicationService { } } } - return leaseDomainService.queryList(leaseDO); + List leasePOS = leaseDomainService.queryList(leaseDO); + getdictDate(leasePOS); + return leasePOS; + } + + private void getdictDate(List leasePOS) { + for (LeasePO leasePO : leasePOS) { + List sysDictData = dictTypeService.selectDictDataByType(leasePO.getServiceItemsCode()); + if (sysDictData != null && sysDictData.size() > 0){ + for (SysDictData dict : sysDictData) { + if (leasePO.getServiceItemsCode().equals(dict.getDictValue())){ + leasePO.setServiceItemsName(dict.getDictLabel()); + break; + } + } + } + List sysDictData2 = dictTypeService.selectDictDataByType(leasePO.getSecondSubjectCode()); + if (sysDictData2 != null && sysDictData2.size() > 0){ + for (SysDictData dict2 : sysDictData2) { + if (leasePO.getSecondSubjectCode().equals(dict2.getDictValue())){ + leasePO.setServiceItemsName(dict2.getDictLabel()); + break; + } + } + } + } } /** @@ -201,7 +224,30 @@ public class LeaseApplicationService { * 获取租赁管理详细信息 */ public LeasePO getInfo(Long leaseId) { - return leaseDomainService.getInfo(leaseId); + LeasePO info = leaseDomainService.getInfo(leaseId); + getdict(info); + return info; + } + + private void getdict(LeasePO leasePO) { + List sysDictData = dictTypeService.selectDictDataByType(leasePO.getServiceItemsCode()); + if (sysDictData != null && sysDictData.size() > 0){ + for (SysDictData dict : sysDictData) { + if (leasePO.getServiceItemsCode().equals(dict.getDictValue())){ + leasePO.setServiceItemsName(dict.getDictLabel()); + break; + } + } + } + List sysDictData2 = dictTypeService.selectDictDataByType(leasePO.getSecondSubjectCode()); + if (sysDictData2 != null && sysDictData2.size() > 0){ + for (SysDictData dict2 : sysDictData2) { + if (leasePO.getSecondSubjectCode().equals(dict2.getDictValue())){ + leasePO.setServiceItemsName(dict2.getDictLabel()); + break; + } + } + } } /** diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java index a942af918..bf21e4df2 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java @@ -61,4 +61,13 @@ public class Lease extends BaseVOEntity{ @ApiModelProperty("备注") private String remark; + + @ApiModelProperty("费用类别") + private String serviceItemsCode; + + @ApiModelProperty("费用科目") + private String secondSubjectCode; + + @ApiModelProperty(name = "出账日") + private Integer billDays; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java index b934f01ad..8670192bd 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java @@ -64,4 +64,19 @@ public class LeasePO extends BaseVOEntity{ @ApiModelProperty("备注") private String remark; + + @ApiModelProperty("费用类别") + private String serviceItemsCode; + + @ApiModelProperty("费用类别") + private String serviceItemsName; + + @ApiModelProperty("费用科目") + private String secondSubjectCode; + + @ApiModelProperty("费用科目") + private String secondSubjectName; + + @ApiModelProperty(name = "出账日") + private Integer billDays; } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java index 41a2a2e5d..36cac6dce 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java @@ -68,6 +68,21 @@ public class LeaseDO extends BaseVOEntity{ @JsonFormat(pattern = "yyyy-MM-dd") private Date time; + @ApiModelProperty("费用类别") + private String serviceItemsCode; + + @ApiModelProperty("费用类别") + private String serviceItemsName; + + @ApiModelProperty("费用科目") + private String secondSubjectCode; + + @ApiModelProperty("费用科目") + private String secondSubjectName; + + @ApiModelProperty(name = "出账日") + private Integer billDays; + @ApiModelProperty(name = "创建时间查询条件开始日期") private String createTimeStart; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java index 170b17899..3fd7986bd 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java @@ -66,6 +66,21 @@ public class LeaseDTO extends BaseVOEntity{ @ApiModelProperty("备注") private String remark; + @ApiModelProperty("费用类别") + private String serviceItemsCode; + + @ApiModelProperty("费用类别") + private String serviceItemsName; + + @ApiModelProperty("费用科目") + private String secondSubjectCode; + + @ApiModelProperty("费用科目") + private String secondSubjectName; + + @ApiModelProperty(name = "出账日") + private Integer billDays; + @ApiModelProperty(name = "创建时间查询条件开始日期") private String createTimeStart; diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml index ebef601df..c21f7d1c1 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml @@ -51,7 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.update_time, a.update_by, a.update_by_name, - a.del_flag + a.del_flag, + a.service_items_code, + a.second_subject_code, + a.bill_days from lease a LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1