租赁去掉查询字典改为直接存值

mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java

@@ -134,32 +134,9 @@ public class LeaseApplicationService {
             }
         }
         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;
-                    }
-                }
-            }
-        }
-    }
 
     /**
      * 新增租赁管理
@@ -225,30 +202,9 @@ public class LeaseApplicationService {
      */
     public LeasePO getInfo(Long 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;
-                }
-            }
-        }
-    }
 
     /**
      * @param leaseIds

mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java

@@ -65,9 +65,15 @@ public class Lease extends BaseVOEntity{
     @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/resources/mapper/basic/lease/LeaseMapper.xml

@@ -54,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.del_flag,
             a.service_items_code,
             a.second_subject_code,
+            a.second_subject_name,
+            a.service_items_name,
             a.bill_days
         from lease a
         LEFT JOIN warehouse w ON a.warehouse_id = w.warehouse_id AND w.del_flag = 1