Merge remote-tracking branch 'origin/de_wangfs_202511' into de_wangfs_202511

王富生
2 parents a9f247f0 ad588236
Showing 8 changed files with 410 additions and 350 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtrees/vo/OldtreesRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtreeschangelog/vo/OldtreesChangeLogRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/tree/vo/TreeRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/oldtrees/OldtreesDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/oldtrees/OldtreesMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/oldtreeschangelog/OldtreesChangeLogMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/treechangelog/TreeChangeLogMapper.java
 package com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -33,9 +37,12 @@ public class OldtreesRespVO {
     private String location;
     @Schema(description = "养护单位")
-    @ExcelProperty("养护单位")
     private String maintainunit;
+    @Schema(description = "养护单位名称")
+    @ExcelProperty("养护单位")
+    private String maintainUnitName;
+
     @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
     @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
     private String oldtreeownership;
@@ -180,4 +187,8 @@ public class OldtreesRespVO {
     @ExcelProperty("部门id")
     private Long deptId;
+    private List<String> treeImgList;
+
+    private List<String> nameplatephotoList;
+
 }
 \ No newline at end of file
-package com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 古树名木修改记录 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class OldtreesChangeLogRespVO {
-
-    @Schema(description = "id", example = "148")
-    @ExcelProperty("id")
-    private String id;
-
-    @Schema(description = "garden_oldtrees 的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32596")
-    @ExcelProperty("garden_oldtrees 的主键")
-    private String oldtreeid;
-
-    @Schema(description = "编号")
-    @ExcelProperty("编号")
-    private String famoustreenumber;
-
-    @Schema(description = "级别--数据字典：一级、两级")
-    @ExcelProperty("级别--数据字典：一级、两级")
-    private String treelevel;
-
-    @Schema(description = "树种", example = "2")
-    @ExcelProperty("树种")
-    private String treetype;
-
-    @Schema(description = "所在地")
-    @ExcelProperty("所在地")
-    private String location;
-
-    @Schema(description = "养护单位")
-    @ExcelProperty("养护单位")
-    private String maintainunit;
-
-    @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
-    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
-    private String oldtreeownership;
-
-    @Schema(description = "生长地点")
-    @ExcelProperty("生长地点")
-    private String growlocation;
-
-    @Schema(description = "拉丁名", example = "张三")
-    @ExcelProperty("拉丁名")
-    private String latinname;
-
-    @Schema(description = "树高")
-    @ExcelProperty("树高")
-    private String treeheight;
-
-    @Schema(description = "估测树龄")
-    @ExcelProperty("估测树龄")
-    private String estimationtreeage;
-
-    @Schema(description = "胸径")
-    @ExcelProperty("胸径")
-    private String dbh;
-
-    @Schema(description = "经度")
-    @ExcelProperty("经度")
-    private String longitude;
-
-    @Schema(description = "纬度")
-    @ExcelProperty("纬度")
-    private String latitude;
-
-    @Schema(description = "冠幅东西")
-    @ExcelProperty("冠幅东西")
-    private String canopyeastwest;
-
-    @Schema(description = "冠幅南北")
-    @ExcelProperty("冠幅南北")
-    private String canopysouthnorth;
-
-    @Schema(description = "管护责任单位")
-    @ExcelProperty("管护责任单位")
-    private String managedutyunit;
-
-    @Schema(description = "干周")
-    @ExcelProperty("干周")
-    private String weekday;
-
-    @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
-    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
-    private String growthvigor;
-
-    @Schema(description = "生长环境")
-    @ExcelProperty("生长环境")
-    private String growthenvironment;
-
-    @Schema(description = "古树照片一")
-    @ExcelProperty("古树照片一")
-    private String treephotoone;
-
-    @Schema(description = "春季养护管理措施")
-    @ExcelProperty("春季养护管理措施")
-    private String springmaintenance;
-
-    @Schema(description = "夏季养护管理措施")
-    @ExcelProperty("夏季养护管理措施")
-    private String summermaintenance;
-
-    @Schema(description = "秋季养护管理措施")
-    @ExcelProperty("秋季养护管理措施")
-    private String autumnmaintenance;
-
-    @Schema(description = "冬季养护管理措施")
-    @ExcelProperty("冬季养护管理措施")
-    private String wintermaintenance;
-
-    @Schema(description = "年度")
-    @ExcelProperty("年度")
-    private String annual;
-
-    @Schema(description = "养护记录备注", example = "你说的对")
-    @ExcelProperty("养护记录备注")
-    private String curingremark;
-
-    @Schema(description = "古树照片二")
-    @ExcelProperty("古树照片二")
-    private String treephototwo;
-
-    @Schema(description = "古树照片三")
-    @ExcelProperty("古树照片三")
-    private String treephotothree;
-
-    @Schema(description = "古树铭牌照片")
-    @ExcelProperty("古树铭牌照片")
-    private String nameplatephoto;
-
-    @Schema(description = "数据状态(已更新、未更新)")
-    @ExcelProperty("数据状态(已更新、未更新)")
-    private String datastate;
-
-    @Schema(description = "养护员工--作业队下派古树时选择的派发员工")
-    @ExcelProperty("养护员工--作业队下派古树时选择的派发员工")
-    private String curingstaff;
-
-    @Schema(description = "状态（驳回/确认）")
-    @ExcelProperty("状态（驳回/确认）")
-    private String state;
-
-    @Schema(description = "平台驳回状态（平台驳回）")
-    @ExcelProperty("平台驳回状态（平台驳回）")
-    private String platformstate;
-
-    @Schema(description = "所属街道")
-    @ExcelProperty("所属街道")
-    private String street;
-
-    @Schema(description = "负责人姓名", example = "芋艿")
-    @ExcelProperty("负责人姓名")
-    private String responsibleusername;
-
-    @Schema(description = "负责人电话")
-    @ExcelProperty("负责人电话")
-    private String responsibleuserphone;
-
-    @Schema(description = "创建者")
-    @ExcelProperty("创建者")
-    private String createby;
-
-    @Schema(description = "创建时间")
-    @ExcelProperty("创建时间")
-    private LocalDateTime createtime;
-
-    @Schema(description = "更新者")
-    @ExcelProperty("更新者")
-    private String updateby;
-
-    @Schema(description = "更新时间")
-    @ExcelProperty("更新时间")
-    private String updatetime;
-
-}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 古树名木修改记录 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class OldtreesChangeLogRespVO {
+
+    @Schema(description = "id", example = "148")
+    @ExcelProperty("id")
+    private String id;
+
+    @Schema(description = "garden_oldtrees 的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32596")
+    @ExcelProperty("garden_oldtrees 的主键")
+    private String oldtreeid;
+
+    @Schema(description = "编号")
+    @ExcelProperty("编号")
+    private String famoustreenumber;
+
+    @Schema(description = "级别--数据字典：一级、两级")
+    @ExcelProperty("级别--数据字典：一级、两级")
+    private String treelevel;
+
+    @Schema(description = "树种", example = "2")
+    @ExcelProperty("树种")
+    private String treetype;
+
+    @Schema(description = "所在地")
+    @ExcelProperty("所在地")
+    private String location;
+
+    @Schema(description = "养护单位")
+    @ExcelProperty("养护单位")
+    private String maintainunit;
+
+    @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
+    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
+    private String oldtreeownership;
+
+    @Schema(description = "生长地点")
+    @ExcelProperty("生长地点")
+    private String growlocation;
+
+    @Schema(description = "拉丁名", example = "张三")
+    @ExcelProperty("拉丁名")
+    private String latinname;
+
+    @Schema(description = "树高")
+    @ExcelProperty("树高")
+    private String treeheight;
+
+    @Schema(description = "估测树龄")
+    @ExcelProperty("估测树龄")
+    private String estimationtreeage;
+
+    @Schema(description = "胸径")
+    @ExcelProperty("胸径")
+    private String dbh;
+
+    @Schema(description = "经度")
+    @ExcelProperty("经度")
+    private String longitude;
+
+    @Schema(description = "纬度")
+    @ExcelProperty("纬度")
+    private String latitude;
+
+    @Schema(description = "冠幅东西")
+    @ExcelProperty("冠幅东西")
+    private String canopyeastwest;
+
+    @Schema(description = "冠幅南北")
+    @ExcelProperty("冠幅南北")
+    private String canopysouthnorth;
+
+    @Schema(description = "管护责任单位")
+    @ExcelProperty("管护责任单位")
+    private String managedutyunit;
+
+    @Schema(description = "干周")
+    @ExcelProperty("干周")
+    private String weekday;
+
+    @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
+    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
+    private String growthvigor;
+
+    @Schema(description = "生长环境")
+    @ExcelProperty("生长环境")
+    private String growthenvironment;
+
+    @Schema(description = "古树照片一")
+    @ExcelProperty("古树照片一")
+    private String treephotoone;
+
+    @Schema(description = "春季养护管理措施")
+    @ExcelProperty("春季养护管理措施")
+    private String springmaintenance;
+
+    @Schema(description = "夏季养护管理措施")
+    @ExcelProperty("夏季养护管理措施")
+    private String summermaintenance;
+
+    @Schema(description = "秋季养护管理措施")
+    @ExcelProperty("秋季养护管理措施")
+    private String autumnmaintenance;
+
+    @Schema(description = "冬季养护管理措施")
+    @ExcelProperty("冬季养护管理措施")
+    private String wintermaintenance;
+
+    @Schema(description = "年度")
+    @ExcelProperty("年度")
+    private String annual;
+
+    @Schema(description = "养护记录备注", example = "你说的对")
+    @ExcelProperty("养护记录备注")
+    private String curingremark;
+
+    @Schema(description = "古树照片二")
+    @ExcelProperty("古树照片二")
+    private String treephototwo;
+
+    @Schema(description = "古树照片三")
+    @ExcelProperty("古树照片三")
+    private String treephotothree;
+
+    @Schema(description = "古树铭牌照片")
+    @ExcelProperty("古树铭牌照片")
+    private String nameplatephoto;
+
+    @Schema(description = "数据状态(已更新、未更新)")
+    @ExcelProperty("数据状态(已更新、未更新)")
+    private String datastate;
+
+    @Schema(description = "养护员工--作业队下派古树时选择的派发员工")
+    @ExcelProperty("养护员工--作业队下派古树时选择的派发员工")
+    private String curingstaff;
+
+    @Schema(description = "状态（驳回/确认）")
+    @ExcelProperty("状态（驳回/确认）")
+    private String state;
+
+    @Schema(description = "平台驳回状态（平台驳回）")
+    @ExcelProperty("平台驳回状态（平台驳回）")
+    private String platformstate;
+
+    @Schema(description = "所属街道")
+    @ExcelProperty("所属街道")
+    private String street;
+
+    @Schema(description = "负责人姓名", example = "芋艿")
+    @ExcelProperty("负责人姓名")
+    private String responsibleusername;
+
+    @Schema(description = "负责人电话")
+    @ExcelProperty("负责人电话")
+    private String responsibleuserphone;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String createby;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createtime;
+
+    @Schema(description = "更新者")
+    @ExcelProperty("更新者")
+    private String updateby;
+
+    @Schema(description = "更新时间")
+    @ExcelProperty("更新时间")
+    private String updatetime;
+
+    private List<String> treeImgList;
+
+    private List<String> nameplatephotoList;
+
+}
-package com.zteits.urbanops.module.garden.controller.admin.tree.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
-import cn.idev.excel.annotation.*;
-
-@Schema(description = "管理后台 - 一树一档案 Response VO")
-@Data
-@ExcelIgnoreUnannotated
-public class TreeRespVO {
-
-    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28236")
-    @ExcelProperty("id")
-    private Long id;
-
-    @Schema(description = "编号")
-    @ExcelProperty("编号")
-    private String treenumber;
-
-    @Schema(description = "拉丁名", example = "李四")
-    @ExcelProperty("拉丁名")
-    private String latinname;
-
-    @Schema(description = "树种", example = "2")
-    @ExcelProperty("树种")
-    private String treetype;
-
-    @Schema(description = "树高")
-    @ExcelProperty("树高")
-    private String treeheight;
-
-    @Schema(description = "冠幅")
-    @ExcelProperty("冠幅")
-    private String canopy;
-
-    @Schema(description = "胸径")
-    @ExcelProperty("胸径")
-    private String dbh;
-
-    @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
-    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
-    private String growthvigor;
-
-    @Schema(description = "级别--数据字典：一级、两级")
-    @ExcelProperty("级别--数据字典：一级、两级")
-    private String treelevel;
-
-    @Schema(description = "经度")
-    @ExcelProperty("经度")
-    private String longitude;
-
-    @Schema(description = "纬度")
-    @ExcelProperty("纬度")
-    private String latitude;
-
-    @Schema(description = "所在地")
-    @ExcelProperty("所在地")
-    private String location;
-
-    @Schema(description = "养护单位")
-    @ExcelProperty("养护单位")
-    private String maintainunit;
-
-    @Schema(description = "管护单位")
-    @ExcelProperty("管护单位")
-    private String managedutyunit;
-
-    @Schema(description = "道路id")
-    @ExcelProperty("道路id")
-    private Long road;
-
-    @Schema(description = "所属街道")
-    @ExcelProperty("所属街道")
-    private String street;
-
-    @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
-    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
-    private String oldtreeownership;
-
-    @Schema(description = "数据状态(已更新、未更新)")
-    @ExcelProperty("数据状态(已更新、未更新)")
-    private String datastate;
-
-    @Schema(description = "估测树龄")
-    @ExcelProperty("估测树龄")
-    private String estimationtreeage;
-
-    @Schema(description = "冠幅东西")
-    @ExcelProperty("冠幅东西")
-    private String canopyeastwest;
-
-    @Schema(description = "冠幅南北")
-    @ExcelProperty("冠幅南北")
-    private String canopysouthnorth;
-
-    @Schema(description = "干周")
-    @ExcelProperty("干周")
-    private String weekday;
-
-    @Schema(description = "生长地点")
-    @ExcelProperty("生长地点")
-    private String growlocation;
-
-    @Schema(description = "生长环境")
-    @ExcelProperty("生长环境")
-    private String growthenvironment;
-
-    @Schema(description = "树木照片一")
-    @ExcelProperty("树木照片一")
-    private String treephotoone;
-
-    @Schema(description = "古树照片二")
-    @ExcelProperty("古树照片二")
-    private String treephototwo;
-
-    @Schema(description = "古树照片三")
-    @ExcelProperty("古树照片三")
-    private String treephotothree;
-
-    @Schema(description = "古树照片四")
-    @ExcelProperty("古树照片四")
-    private String treephotofour;
-
-    @Schema(description = "古树照片五")
-    @ExcelProperty("古树照片五")
-    private String treephotofive;
-
-    @Schema(description = "创建者")
-    @ExcelProperty("创建者")
-    private String createby;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createtime;
-
-    @Schema(description = "更新者")
-    @ExcelProperty("更新者")
-    private String updateby;
-
-    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("更新时间")
-    private LocalDateTime updatetime;
-
-    @Schema(description = "备注", example = "你说的对")
-    @ExcelProperty("备注")
-    private String remark;
-
-    @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17101")
-    @ExcelProperty("部门id")
-    private Long deptId;
-
-}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.admin.tree.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import cn.idev.excel.annotation.*;
+
+@Schema(description = "管理后台 - 一树一档案 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TreeRespVO {
+
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28236")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "编号")
+    @ExcelProperty("编号")
+    private String treenumber;
+
+    @Schema(description = "拉丁名", example = "李四")
+    @ExcelProperty("拉丁名")
+    private String latinname;
+
+    @Schema(description = "树种", example = "2")
+    @ExcelProperty("树种")
+    private String treetype;
+
+    @Schema(description = "树高")
+    @ExcelProperty("树高")
+    private String treeheight;
+
+    @Schema(description = "冠幅")
+    @ExcelProperty("冠幅")
+    private String canopy;
+
+    @Schema(description = "胸径")
+    @ExcelProperty("胸径")
+    private String dbh;
+
+    @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
+    @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
+    private String growthvigor;
+
+    @Schema(description = "级别--数据字典：一级、两级")
+    @ExcelProperty("级别--数据字典：一级、两级")
+    private String treelevel;
+
+    @Schema(description = "经度")
+    @ExcelProperty("经度")
+    private String longitude;
+
+    @Schema(description = "纬度")
+    @ExcelProperty("纬度")
+    private String latitude;
+
+    @Schema(description = "所在地")
+    @ExcelProperty("所在地")
+    private String location;
+
+    @Schema(description = "养护单位")
+    @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
+            key = "id", fields = "name", ref = "maintainUnitName")
+    private String maintainunit;
+
+    @Schema(description = "养护单位名称")
+    @ExcelProperty("养护单位")
+    private String maintainUnitName;
+
+    @Schema(description = "管护单位")
+    @ExcelProperty("管护单位")
+    private String managedutyunit;
+
+    @Schema(description = "道路id")
+    @ExcelProperty("道路id")
+    private Long road;
+
+    @Schema(description = "所属街道")
+    @ExcelProperty("所属街道")
+    private String street;
+
+    @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
+    @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
+    private String oldtreeownership;
+
+    @Schema(description = "数据状态(已更新、未更新)")
+    @ExcelProperty("数据状态(已更新、未更新)")
+    private String datastate;
+
+    @Schema(description = "估测树龄")
+    @ExcelProperty("估测树龄")
+    private String estimationtreeage;
+
+    @Schema(description = "冠幅东西")
+    @ExcelProperty("冠幅东西")
+    private String canopyeastwest;
+
+    @Schema(description = "冠幅南北")
+    @ExcelProperty("冠幅南北")
+    private String canopysouthnorth;
+
+    @Schema(description = "干周")
+    @ExcelProperty("干周")
+    private String weekday;
+
+    @Schema(description = "生长地点")
+    @ExcelProperty("生长地点")
+    private String growlocation;
+
+    @Schema(description = "生长环境")
+    @ExcelProperty("生长环境")
+    private String growthenvironment;
+
+    @Schema(description = "树木照片一")
+    @ExcelProperty("树木照片一")
+    private String treephotoone;
+
+    @Schema(description = "古树照片二")
+    @ExcelProperty("古树照片二")
+    private String treephototwo;
+
+    @Schema(description = "古树照片三")
+    @ExcelProperty("古树照片三")
+    private String treephotothree;
+
+    @Schema(description = "古树照片四")
+    @ExcelProperty("古树照片四")
+    private String treephotofour;
+
+    @Schema(description = "古树照片五")
+    @ExcelProperty("古树照片五")
+    private String treephotofive;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String createby;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createtime;
+
+    @Schema(description = "更新者")
+    @ExcelProperty("更新者")
+    private String updateby;
+
+    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("更新时间")
+    private LocalDateTime updatetime;
+
+    @Schema(description = "备注", example = "你说的对")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17101")
+    @ExcelProperty("部门id")
+    private Long deptId;
+
+    private List<String> treeImgList;
+
+    private List<String> treeImgListFile;
+
+}
@@ -240,5 +240,4 @@ public class OldtreesDO {
         }
         return this;
     }
-
 }
 \ No newline at end of file
@@ -5,9 +5,12 @@ import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zteits.urbanops.module.garden.dal.dataobject.oldtrees.OldtreesDO;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo.*;
+import org.springframework.util.ObjectUtils;
 /**
  * 古树名木 Mapper
@@ -18,7 +21,10 @@ import com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo.*;
 public interface OldtreesMapper extends BaseMapperX<OldtreesDO> {
     default PageResult<OldtreesDO> selectPage(OldtreesPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<OldtreesDO>()
+        MPJLambdaWrapperX<OldtreesDO> wrapper = new MPJLambdaWrapperX<OldtreesDO>()
+                .selectAs(DeptDO::getName, OldtreesDO::getMaintainunit)
+                .selectAll(OldtreesDO.class)
+                .leftJoin(DeptDO.class, DeptDO::getId, OldtreesDO::getMaintainunit)
                 .eqIfPresent(OldtreesDO::getFamoustreenumber, reqVO.getFamoustreenumber())
                 .eqIfPresent(OldtreesDO::getTreelevel, reqVO.getTreelevel())
                 .eqIfPresent(OldtreesDO::getTreetype, reqVO.getTreetype())
@@ -60,7 +66,9 @@ public interface OldtreesMapper extends BaseMapperX&lt;OldtreesDO&gt; {
                 .eqIfPresent(OldtreesDO::getUpdateby, reqVO.getUpdateby())
                 .betweenIfPresent(OldtreesDO::getUpdatetime, reqVO.getUpdatetime())
                 .eqIfPresent(OldtreesDO::getDeptId, reqVO.getDeptId())
-                .orderByDesc(OldtreesDO::getId));
+                .orderByDesc(OldtreesDO::getCreatetime);
+
+        return selectJoinPage(reqVO, OldtreesDO.class, wrapper);
     }
     default OldtreesDO selectByFamoustreenumber(String famoustreenumber) {
@@ -5,7 +5,9 @@ import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zteits.urbanops.module.garden.dal.dataobject.oldtreeschangelog.OldtreesChangeLogDO;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo.*;
@@ -18,8 +20,11 @@ import com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo.*
 public interface OldtreesChangeLogMapper extends BaseMapperX<OldtreesChangeLogDO> {
     default PageResult<OldtreesChangeLogDO> selectPage(OldtreesChangeLogPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<OldtreesChangeLogDO>()
-                .eqIfPresent(OldtreesChangeLogDO::getOldtreeid, reqVO.getOldtreeid())
+
+        MPJLambdaWrapperX<OldtreesChangeLogDO> wrapper = new MPJLambdaWrapperX<OldtreesChangeLogDO>()
+                .selectAs(DeptDO::getName, OldtreesChangeLogDO::getMaintainunit)
+                .selectAll(OldtreesChangeLogDO.class)
+                .leftJoin(DeptDO.class, DeptDO::getId, OldtreesChangeLogDO::getMaintainunit)
                 .eqIfPresent(OldtreesChangeLogDO::getFamoustreenumber, reqVO.getFamoustreenumber())
                 .eqIfPresent(OldtreesChangeLogDO::getTreelevel, reqVO.getTreelevel())
                 .eqIfPresent(OldtreesChangeLogDO::getTreetype, reqVO.getTreetype())
@@ -60,7 +65,10 @@ public interface OldtreesChangeLogMapper extends BaseMapperX&lt;OldtreesChangeLogDO
                 .betweenIfPresent(OldtreesChangeLogDO::getCreatetime, reqVO.getCreatetime())
                 .eqIfPresent(OldtreesChangeLogDO::getUpdateby, reqVO.getUpdateby())
                 .betweenIfPresent(OldtreesChangeLogDO::getUpdatetime, reqVO.getUpdatetime())
-                .orderByDesc(OldtreesChangeLogDO::getId));
+                .orderByDesc(OldtreesChangeLogDO::getCreatetime);
+
+        return selectJoinPage(reqVO, OldtreesChangeLogDO.class, wrapper);
+
     }
 }
 \ No newline at end of file
@@ -5,7 +5,9 @@ import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zteits.urbanops.module.garden.dal.dataobject.tree.TreeDO;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.tree.vo.*;
@@ -18,7 +20,11 @@ import com.zteits.urbanops.module.garden.controller.admin.tree.vo.*;
 public interface TreeMapper extends BaseMapperX<TreeDO> {
     default PageResult<TreeDO> selectPage(TreePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<TreeDO>()
+
+        MPJLambdaWrapperX<TreeDO> wrapper = new MPJLambdaWrapperX<TreeDO>()
+                .selectAs(DeptDO::getName, TreeDO::getMaintainunit)
+                .selectAll(TreeDO.class)
+                .leftJoin(DeptDO.class, DeptDO::getId, TreeDO::getMaintainunit)
                 .eqIfPresent(TreeDO::getTreenumber, reqVO.getTreenumber())
                 .likeIfPresent(TreeDO::getLatinname, reqVO.getLatinname())
                 .eqIfPresent(TreeDO::getTreetype, reqVO.getTreetype())
@@ -48,12 +54,13 @@ public interface TreeMapper extends BaseMapperX&lt;TreeDO&gt; {
                 .eqIfPresent(TreeDO::getTreephotofour, reqVO.getTreephotofour())
                 .eqIfPresent(TreeDO::getTreephotofive, reqVO.getTreephotofive())
                 .eqIfPresent(TreeDO::getCreateby, reqVO.getCreateby())
-                .betweenIfPresent(TreeDO::getCreatetime, reqVO.getCreatetime())
                 .eqIfPresent(TreeDO::getUpdateby, reqVO.getUpdateby())
                 .betweenIfPresent(TreeDO::getUpdatetime, reqVO.getUpdatetime())
                 .eqIfPresent(TreeDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(TreeDO::getDeptId, reqVO.getDeptId())
-                .orderByDesc(TreeDO::getId));
+                .orderByDesc(TreeDO::getId);
+
+        return selectJoinPage(reqVO, TreeDO.class, wrapper);
     }
     default TreeDO selectByTreeNumber(String treeNumber) {
@@ -5,7 +5,9 @@ import java.util.*;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.zteits.urbanops.module.garden.dal.dataobject.treechangelog.TreeChangeLogDO;
+import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.treechangelog.vo.*;
@@ -18,7 +20,11 @@ import com.zteits.urbanops.module.garden.controller.admin.treechangelog.vo.*;
 public interface TreeChangeLogMapper extends BaseMapperX<TreeChangeLogDO> {
     default PageResult<TreeChangeLogDO> selectPage(TreeChangeLogPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<TreeChangeLogDO>()
+
+        MPJLambdaWrapperX<TreeChangeLogDO> wrapper = new MPJLambdaWrapperX<TreeChangeLogDO>()
+                .selectAs(DeptDO::getName, TreeChangeLogDO::getMaintainunit)
+                .selectAll(TreeChangeLogDO.class)
+                .leftJoin(DeptDO.class, DeptDO::getId, TreeChangeLogDO::getMaintainunit)
                 .eqIfPresent(TreeChangeLogDO::getTreeid, reqVO.getTreeid())
                 .eqIfPresent(TreeChangeLogDO::getTreenumber, reqVO.getTreenumber())
                 .likeIfPresent(TreeChangeLogDO::getLatinname, reqVO.getLatinname())
@@ -53,7 +59,10 @@ public interface TreeChangeLogMapper extends BaseMapperX&lt;TreeChangeLogDO&gt; {
                 .eqIfPresent(TreeChangeLogDO::getUpdateby, reqVO.getUpdateby())
                 .betweenIfPresent(TreeChangeLogDO::getUpdatetime, reqVO.getUpdatetime())
                 .eqIfPresent(TreeChangeLogDO::getRemark, reqVO.getRemark())
-                .orderByDesc(TreeChangeLogDO::getId));
+                .orderByDesc(TreeChangeLogDO::getId);
+
+        return selectJoinPage(reqVO, TreeChangeLogDO.class, wrapper);
+        
     }
 }
 \ No newline at end of file