From de2f7fe7f23ac338b7d6997a74b3715e9b1a7cc7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 十一月 2023 10:56:18 +0800
Subject: [PATCH] 1、行政区保存功能，修改自动加上行政区级别，及删除标志 2、单点登录中增加了获得所有组织机构的功能，及增加组织机构枚举类型 3、增加农户实体、农户类型实体、分水口实体等相关功能
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java
index 3b79344..dced96f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictVoMapper.java
@@ -1,12 +1,12 @@
package com.dy.pipIrrBase.district;
import com.dy.pipIrrGlobal.pojoBa.BaDistrict;
-import com.dy.pipIrrGlobal.util.TypeConversionDistrict;
+import com.dy.pipIrrGlobal.util.TypeConversionEnum;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
-@Mapper(uses = {TypeConversionDistrict.class})
+@Mapper(uses = {TypeConversionEnum.class})
public interface DistrictVoMapper {
DistrictVoMapper INSTANCT = Mappers.getMapper(DistrictVoMapper.class);
/**
@@ -14,8 +14,12 @@
* @param vo 鍊煎璞�
* @return po
*/
- @Mapping(target = "id", ignore = true)
+ @Mapping(target = "id", source = "supperId")
+ @Mapping(target = "supperId", source = "supperId")
@Mapping(target = "name", source = "name")
+ @Mapping(target = "num", source = "num")
@Mapping(target = "level", source = "level", qualifiedByName = "districtLevelByteToObj")
+ @Mapping(target = "deleted", source = "deleted", qualifiedByName = "deletedByteToObj")
+ @Mapping(target = "subDistricts", ignore = true)
BaDistrict convert(DistrictVo vo);
}
--
Gitblit v1.8.0