weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

租赁增加费用科目、类别，天数 查询的时候从字典获取值

Browse Source
This commit is contained in:
zhou-hongcheng
2026-03-14 13:51:53 +08:00
parent fb2b24aa94
commit 7fac8be315
6 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java
+52 -6
View File
@@ -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<LeasePO> leasePOS = leaseDomainService.queryList(leaseDO);
getdictDate(leasePOS);
return leasePOS;
}
private void getdictDate(List<LeasePO> leasePOS) {
for (LeasePO leasePO : leasePOS) {
List<SysDictData> 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<SysDictData> 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> 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<SysDictData> 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;
}
}
}
}
/**
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java
+9
View File
@@ -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;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java
+15
View File
@@ -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;
}
mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java
+15
View File
@@ -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;
mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java
+15
View File
@@ -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;
mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml
+4 -1
View File
@@ -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
</sql>