BJ_FS / urbanops

Commit 09bad8be06fb00e5fd0bae8e38a26c37cacce94e

Authored by 王富生
2 parents a9f247f0 ad588236

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

Inline Side-by-side
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
  View file @09bad8b
1 1 package com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo;
2 2  
  3 +import com.baomidou.mybatisplus.annotation.TableField;
  4 +import com.fhs.core.trans.anno.Trans;
  5 +import com.fhs.core.trans.constant.TransType;
  6 +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
3 7 import io.swagger.v3.oas.annotations.media.Schema;
4 8 import lombok.*;
5 9 import java.util.*;
... ... @@ -33,9 +37,12 @@ public class OldtreesRespVO {
33 37 private String location;
34 38  
35 39 @Schema(description = "养护单位")
36   - @ExcelProperty("养护单位")
37 40 private String maintainunit;
38 41  
  42 + @Schema(description = "养护单位名称")
  43 + @ExcelProperty("养护单位")
  44 + private String maintainUnitName;
  45 +
39 46 @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
40 47 @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
41 48 private String oldtreeownership;
... ... @@ -180,4 +187,8 @@ public class OldtreesRespVO {
180 187 @ExcelProperty("部门id")
181 188 private Long deptId;
182 189  
  190 + private List<String> treeImgList;
  191 +
  192 + private List<String> nameplatephotoList;
  193 +
183 194 }
184 195 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/oldtreeschangelog/vo/OldtreesChangeLogRespVO.java
  View file @09bad8b
1   -package com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.*;
5   -import java.util.*;
6   -import org.springframework.format.annotation.DateTimeFormat;
7   -import java.time.LocalDateTime;
8   -import cn.idev.excel.annotation.*;
9   -
10   -@Schema(description = "管理后台 - 古树名木修改记录 Response VO")
11   -@Data
12   -@ExcelIgnoreUnannotated
13   -public class OldtreesChangeLogRespVO {
14   -
15   - @Schema(description = "id", example = "148")
16   - @ExcelProperty("id")
17   - private String id;
18   -
19   - @Schema(description = "garden_oldtrees 的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32596")
20   - @ExcelProperty("garden_oldtrees 的主键")
21   - private String oldtreeid;
22   -
23   - @Schema(description = "编号")
24   - @ExcelProperty("编号")
25   - private String famoustreenumber;
26   -
27   - @Schema(description = "级别--数据字典：一级、两级")
28   - @ExcelProperty("级别--数据字典：一级、两级")
29   - private String treelevel;
30   -
31   - @Schema(description = "树种", example = "2")
32   - @ExcelProperty("树种")
33   - private String treetype;
34   -
35   - @Schema(description = "所在地")
36   - @ExcelProperty("所在地")
37   - private String location;
38   -
39   - @Schema(description = "养护单位")
40   - @ExcelProperty("养护单位")
41   - private String maintainunit;
42   -
43   - @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
44   - @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
45   - private String oldtreeownership;
46   -
47   - @Schema(description = "生长地点")
48   - @ExcelProperty("生长地点")
49   - private String growlocation;
50   -
51   - @Schema(description = "拉丁名", example = "张三")
52   - @ExcelProperty("拉丁名")
53   - private String latinname;
54   -
55   - @Schema(description = "树高")
56   - @ExcelProperty("树高")
57   - private String treeheight;
58   -
59   - @Schema(description = "估测树龄")
60   - @ExcelProperty("估测树龄")
61   - private String estimationtreeage;
62   -
63   - @Schema(description = "胸径")
64   - @ExcelProperty("胸径")
65   - private String dbh;
66   -
67   - @Schema(description = "经度")
68   - @ExcelProperty("经度")
69   - private String longitude;
70   -
71   - @Schema(description = "纬度")
72   - @ExcelProperty("纬度")
73   - private String latitude;
74   -
75   - @Schema(description = "冠幅东西")
76   - @ExcelProperty("冠幅东西")
77   - private String canopyeastwest;
78   -
79   - @Schema(description = "冠幅南北")
80   - @ExcelProperty("冠幅南北")
81   - private String canopysouthnorth;
82   -
83   - @Schema(description = "管护责任单位")
84   - @ExcelProperty("管护责任单位")
85   - private String managedutyunit;
86   -
87   - @Schema(description = "干周")
88   - @ExcelProperty("干周")
89   - private String weekday;
90   -
91   - @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
92   - @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
93   - private String growthvigor;
94   -
95   - @Schema(description = "生长环境")
96   - @ExcelProperty("生长环境")
97   - private String growthenvironment;
98   -
99   - @Schema(description = "古树照片一")
100   - @ExcelProperty("古树照片一")
101   - private String treephotoone;
102   -
103   - @Schema(description = "春季养护管理措施")
104   - @ExcelProperty("春季养护管理措施")
105   - private String springmaintenance;
106   -
107   - @Schema(description = "夏季养护管理措施")
108   - @ExcelProperty("夏季养护管理措施")
109   - private String summermaintenance;
110   -
111   - @Schema(description = "秋季养护管理措施")
112   - @ExcelProperty("秋季养护管理措施")
113   - private String autumnmaintenance;
114   -
115   - @Schema(description = "冬季养护管理措施")
116   - @ExcelProperty("冬季养护管理措施")
117   - private String wintermaintenance;
118   -
119   - @Schema(description = "年度")
120   - @ExcelProperty("年度")
121   - private String annual;
122   -
123   - @Schema(description = "养护记录备注", example = "你说的对")
124   - @ExcelProperty("养护记录备注")
125   - private String curingremark;
126   -
127   - @Schema(description = "古树照片二")
128   - @ExcelProperty("古树照片二")
129   - private String treephototwo;
130   -
131   - @Schema(description = "古树照片三")
132   - @ExcelProperty("古树照片三")
133   - private String treephotothree;
134   -
135   - @Schema(description = "古树铭牌照片")
136   - @ExcelProperty("古树铭牌照片")
137   - private String nameplatephoto;
138   -
139   - @Schema(description = "数据状态(已更新、未更新)")
140   - @ExcelProperty("数据状态(已更新、未更新)")
141   - private String datastate;
142   -
143   - @Schema(description = "养护员工--作业队下派古树时选择的派发员工")
144   - @ExcelProperty("养护员工--作业队下派古树时选择的派发员工")
145   - private String curingstaff;
146   -
147   - @Schema(description = "状态（驳回/确认）")
148   - @ExcelProperty("状态（驳回/确认）")
149   - private String state;
150   -
151   - @Schema(description = "平台驳回状态（平台驳回）")
152   - @ExcelProperty("平台驳回状态（平台驳回）")
153   - private String platformstate;
154   -
155   - @Schema(description = "所属街道")
156   - @ExcelProperty("所属街道")
157   - private String street;
158   -
159   - @Schema(description = "负责人姓名", example = "芋艿")
160   - @ExcelProperty("负责人姓名")
161   - private String responsibleusername;
162   -
163   - @Schema(description = "负责人电话")
164   - @ExcelProperty("负责人电话")
165   - private String responsibleuserphone;
166   -
167   - @Schema(description = "创建者")
168   - @ExcelProperty("创建者")
169   - private String createby;
170   -
171   - @Schema(description = "创建时间")
172   - @ExcelProperty("创建时间")
173   - private LocalDateTime createtime;
174   -
175   - @Schema(description = "更新者")
176   - @ExcelProperty("更新者")
177   - private String updateby;
178   -
179   - @Schema(description = "更新时间")
180   - @ExcelProperty("更新时间")
181   - private String updatetime;
182   -
183   -}
184 1 \ No newline at end of file
  2 +package com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo;
  3 +
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.*;
  7 +import java.util.*;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +import java.time.LocalDateTime;
  10 +import cn.idev.excel.annotation.*;
  11 +
  12 +@Schema(description = "管理后台 - 古树名木修改记录 Response VO")
  13 +@Data
  14 +@ExcelIgnoreUnannotated
  15 +public class OldtreesChangeLogRespVO {
  16 +
  17 + @Schema(description = "id", example = "148")
  18 + @ExcelProperty("id")
  19 + private String id;
  20 +
  21 + @Schema(description = "garden_oldtrees 的主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32596")
  22 + @ExcelProperty("garden_oldtrees 的主键")
  23 + private String oldtreeid;
  24 +
  25 + @Schema(description = "编号")
  26 + @ExcelProperty("编号")
  27 + private String famoustreenumber;
  28 +
  29 + @Schema(description = "级别--数据字典：一级、两级")
  30 + @ExcelProperty("级别--数据字典：一级、两级")
  31 + private String treelevel;
  32 +
  33 + @Schema(description = "树种", example = "2")
  34 + @ExcelProperty("树种")
  35 + private String treetype;
  36 +
  37 + @Schema(description = "所在地")
  38 + @ExcelProperty("所在地")
  39 + private String location;
  40 +
  41 + @Schema(description = "养护单位")
  42 + @ExcelProperty("养护单位")
  43 + private String maintainunit;
  44 +
  45 + @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
  46 + @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
  47 + private String oldtreeownership;
  48 +
  49 + @Schema(description = "生长地点")
  50 + @ExcelProperty("生长地点")
  51 + private String growlocation;
  52 +
  53 + @Schema(description = "拉丁名", example = "张三")
  54 + @ExcelProperty("拉丁名")
  55 + private String latinname;
  56 +
  57 + @Schema(description = "树高")
  58 + @ExcelProperty("树高")
  59 + private String treeheight;
  60 +
  61 + @Schema(description = "估测树龄")
  62 + @ExcelProperty("估测树龄")
  63 + private String estimationtreeage;
  64 +
  65 + @Schema(description = "胸径")
  66 + @ExcelProperty("胸径")
  67 + private String dbh;
  68 +
  69 + @Schema(description = "经度")
  70 + @ExcelProperty("经度")
  71 + private String longitude;
  72 +
  73 + @Schema(description = "纬度")
  74 + @ExcelProperty("纬度")
  75 + private String latitude;
  76 +
  77 + @Schema(description = "冠幅东西")
  78 + @ExcelProperty("冠幅东西")
  79 + private String canopyeastwest;
  80 +
  81 + @Schema(description = "冠幅南北")
  82 + @ExcelProperty("冠幅南北")
  83 + private String canopysouthnorth;
  84 +
  85 + @Schema(description = "管护责任单位")
  86 + @ExcelProperty("管护责任单位")
  87 + private String managedutyunit;
  88 +
  89 + @Schema(description = "干周")
  90 + @ExcelProperty("干周")
  91 + private String weekday;
  92 +
  93 + @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
  94 + @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
  95 + private String growthvigor;
  96 +
  97 + @Schema(description = "生长环境")
  98 + @ExcelProperty("生长环境")
  99 + private String growthenvironment;
  100 +
  101 + @Schema(description = "古树照片一")
  102 + @ExcelProperty("古树照片一")
  103 + private String treephotoone;
  104 +
  105 + @Schema(description = "春季养护管理措施")
  106 + @ExcelProperty("春季养护管理措施")
  107 + private String springmaintenance;
  108 +
  109 + @Schema(description = "夏季养护管理措施")
  110 + @ExcelProperty("夏季养护管理措施")
  111 + private String summermaintenance;
  112 +
  113 + @Schema(description = "秋季养护管理措施")
  114 + @ExcelProperty("秋季养护管理措施")
  115 + private String autumnmaintenance;
  116 +
  117 + @Schema(description = "冬季养护管理措施")
  118 + @ExcelProperty("冬季养护管理措施")
  119 + private String wintermaintenance;
  120 +
  121 + @Schema(description = "年度")
  122 + @ExcelProperty("年度")
  123 + private String annual;
  124 +
  125 + @Schema(description = "养护记录备注", example = "你说的对")
  126 + @ExcelProperty("养护记录备注")
  127 + private String curingremark;
  128 +
  129 + @Schema(description = "古树照片二")
  130 + @ExcelProperty("古树照片二")
  131 + private String treephototwo;
  132 +
  133 + @Schema(description = "古树照片三")
  134 + @ExcelProperty("古树照片三")
  135 + private String treephotothree;
  136 +
  137 + @Schema(description = "古树铭牌照片")
  138 + @ExcelProperty("古树铭牌照片")
  139 + private String nameplatephoto;
  140 +
  141 + @Schema(description = "数据状态(已更新、未更新)")
  142 + @ExcelProperty("数据状态(已更新、未更新)")
  143 + private String datastate;
  144 +
  145 + @Schema(description = "养护员工--作业队下派古树时选择的派发员工")
  146 + @ExcelProperty("养护员工--作业队下派古树时选择的派发员工")
  147 + private String curingstaff;
  148 +
  149 + @Schema(description = "状态（驳回/确认）")
  150 + @ExcelProperty("状态（驳回/确认）")
  151 + private String state;
  152 +
  153 + @Schema(description = "平台驳回状态（平台驳回）")
  154 + @ExcelProperty("平台驳回状态（平台驳回）")
  155 + private String platformstate;
  156 +
  157 + @Schema(description = "所属街道")
  158 + @ExcelProperty("所属街道")
  159 + private String street;
  160 +
  161 + @Schema(description = "负责人姓名", example = "芋艿")
  162 + @ExcelProperty("负责人姓名")
  163 + private String responsibleusername;
  164 +
  165 + @Schema(description = "负责人电话")
  166 + @ExcelProperty("负责人电话")
  167 + private String responsibleuserphone;
  168 +
  169 + @Schema(description = "创建者")
  170 + @ExcelProperty("创建者")
  171 + private String createby;
  172 +
  173 + @Schema(description = "创建时间")
  174 + @ExcelProperty("创建时间")
  175 + private LocalDateTime createtime;
  176 +
  177 + @Schema(description = "更新者")
  178 + @ExcelProperty("更新者")
  179 + private String updateby;
  180 +
  181 + @Schema(description = "更新时间")
  182 + @ExcelProperty("更新时间")
  183 + private String updatetime;
  184 +
  185 + private List<String> treeImgList;
  186 +
  187 + private List<String> nameplatephotoList;
  188 +
  189 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/tree/vo/TreeRespVO.java
  View file @09bad8b
1   -package com.zteits.urbanops.module.garden.controller.admin.tree.vo;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.*;
5   -import java.util.*;
6   -import org.springframework.format.annotation.DateTimeFormat;
7   -import java.time.LocalDateTime;
8   -import cn.idev.excel.annotation.*;
9   -
10   -@Schema(description = "管理后台 - 一树一档案 Response VO")
11   -@Data
12   -@ExcelIgnoreUnannotated
13   -public class TreeRespVO {
14   -
15   - @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28236")
16   - @ExcelProperty("id")
17   - private Long id;
18   -
19   - @Schema(description = "编号")
20   - @ExcelProperty("编号")
21   - private String treenumber;
22   -
23   - @Schema(description = "拉丁名", example = "李四")
24   - @ExcelProperty("拉丁名")
25   - private String latinname;
26   -
27   - @Schema(description = "树种", example = "2")
28   - @ExcelProperty("树种")
29   - private String treetype;
30   -
31   - @Schema(description = "树高")
32   - @ExcelProperty("树高")
33   - private String treeheight;
34   -
35   - @Schema(description = "冠幅")
36   - @ExcelProperty("冠幅")
37   - private String canopy;
38   -
39   - @Schema(description = "胸径")
40   - @ExcelProperty("胸径")
41   - private String dbh;
42   -
43   - @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
44   - @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
45   - private String growthvigor;
46   -
47   - @Schema(description = "级别--数据字典：一级、两级")
48   - @ExcelProperty("级别--数据字典：一级、两级")
49   - private String treelevel;
50   -
51   - @Schema(description = "经度")
52   - @ExcelProperty("经度")
53   - private String longitude;
54   -
55   - @Schema(description = "纬度")
56   - @ExcelProperty("纬度")
57   - private String latitude;
58   -
59   - @Schema(description = "所在地")
60   - @ExcelProperty("所在地")
61   - private String location;
62   -
63   - @Schema(description = "养护单位")
64   - @ExcelProperty("养护单位")
65   - private String maintainunit;
66   -
67   - @Schema(description = "管护单位")
68   - @ExcelProperty("管护单位")
69   - private String managedutyunit;
70   -
71   - @Schema(description = "道路id")
72   - @ExcelProperty("道路id")
73   - private Long road;
74   -
75   - @Schema(description = "所属街道")
76   - @ExcelProperty("所属街道")
77   - private String street;
78   -
79   - @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
80   - @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
81   - private String oldtreeownership;
82   -
83   - @Schema(description = "数据状态(已更新、未更新)")
84   - @ExcelProperty("数据状态(已更新、未更新)")
85   - private String datastate;
86   -
87   - @Schema(description = "估测树龄")
88   - @ExcelProperty("估测树龄")
89   - private String estimationtreeage;
90   -
91   - @Schema(description = "冠幅东西")
92   - @ExcelProperty("冠幅东西")
93   - private String canopyeastwest;
94   -
95   - @Schema(description = "冠幅南北")
96   - @ExcelProperty("冠幅南北")
97   - private String canopysouthnorth;
98   -
99   - @Schema(description = "干周")
100   - @ExcelProperty("干周")
101   - private String weekday;
102   -
103   - @Schema(description = "生长地点")
104   - @ExcelProperty("生长地点")
105   - private String growlocation;
106   -
107   - @Schema(description = "生长环境")
108   - @ExcelProperty("生长环境")
109   - private String growthenvironment;
110   -
111   - @Schema(description = "树木照片一")
112   - @ExcelProperty("树木照片一")
113   - private String treephotoone;
114   -
115   - @Schema(description = "古树照片二")
116   - @ExcelProperty("古树照片二")
117   - private String treephototwo;
118   -
119   - @Schema(description = "古树照片三")
120   - @ExcelProperty("古树照片三")
121   - private String treephotothree;
122   -
123   - @Schema(description = "古树照片四")
124   - @ExcelProperty("古树照片四")
125   - private String treephotofour;
126   -
127   - @Schema(description = "古树照片五")
128   - @ExcelProperty("古树照片五")
129   - private String treephotofive;
130   -
131   - @Schema(description = "创建者")
132   - @ExcelProperty("创建者")
133   - private String createby;
134   -
135   - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
136   - @ExcelProperty("创建时间")
137   - private LocalDateTime createtime;
138   -
139   - @Schema(description = "更新者")
140   - @ExcelProperty("更新者")
141   - private String updateby;
142   -
143   - @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
144   - @ExcelProperty("更新时间")
145   - private LocalDateTime updatetime;
146   -
147   - @Schema(description = "备注", example = "你说的对")
148   - @ExcelProperty("备注")
149   - private String remark;
150   -
151   - @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17101")
152   - @ExcelProperty("部门id")
153   - private Long deptId;
154   -
155   -}
156 1 \ No newline at end of file
  2 +package com.zteits.urbanops.module.garden.controller.admin.tree.vo;
  3 +
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.fhs.core.trans.anno.Trans;
  6 +import com.fhs.core.trans.constant.TransType;
  7 +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
  8 +import io.swagger.v3.oas.annotations.media.Schema;
  9 +import lombok.*;
  10 +import java.util.*;
  11 +import org.springframework.format.annotation.DateTimeFormat;
  12 +import java.time.LocalDateTime;
  13 +import cn.idev.excel.annotation.*;
  14 +
  15 +@Schema(description = "管理后台 - 一树一档案 Response VO")
  16 +@Data
  17 +@ExcelIgnoreUnannotated
  18 +public class TreeRespVO {
  19 +
  20 + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28236")
  21 + @ExcelProperty("id")
  22 + private Long id;
  23 +
  24 + @Schema(description = "编号")
  25 + @ExcelProperty("编号")
  26 + private String treenumber;
  27 +
  28 + @Schema(description = "拉丁名", example = "李四")
  29 + @ExcelProperty("拉丁名")
  30 + private String latinname;
  31 +
  32 + @Schema(description = "树种", example = "2")
  33 + @ExcelProperty("树种")
  34 + private String treetype;
  35 +
  36 + @Schema(description = "树高")
  37 + @ExcelProperty("树高")
  38 + private String treeheight;
  39 +
  40 + @Schema(description = "冠幅")
  41 + @ExcelProperty("冠幅")
  42 + private String canopy;
  43 +
  44 + @Schema(description = "胸径")
  45 + @ExcelProperty("胸径")
  46 + private String dbh;
  47 +
  48 + @Schema(description = "生长势--数据字典：正常，衰弱，濒危，死亡")
  49 + @ExcelProperty("生长势--数据字典：正常，衰弱，濒危，死亡")
  50 + private String growthvigor;
  51 +
  52 + @Schema(description = "级别--数据字典：一级、两级")
  53 + @ExcelProperty("级别--数据字典：一级、两级")
  54 + private String treelevel;
  55 +
  56 + @Schema(description = "经度")
  57 + @ExcelProperty("经度")
  58 + private String longitude;
  59 +
  60 + @Schema(description = "纬度")
  61 + @ExcelProperty("纬度")
  62 + private String latitude;
  63 +
  64 + @Schema(description = "所在地")
  65 + @ExcelProperty("所在地")
  66 + private String location;
  67 +
  68 + @Schema(description = "养护单位")
  69 + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",
  70 + key = "id", fields = "name", ref = "maintainUnitName")
  71 + private String maintainunit;
  72 +
  73 + @Schema(description = "养护单位名称")
  74 + @ExcelProperty("养护单位")
  75 + private String maintainUnitName;
  76 +
  77 + @Schema(description = "管护单位")
  78 + @ExcelProperty("管护单位")
  79 + private String managedutyunit;
  80 +
  81 + @Schema(description = "道路id")
  82 + @ExcelProperty("道路id")
  83 + private Long road;
  84 +
  85 + @Schema(description = "所属街道")
  86 + @ExcelProperty("所属街道")
  87 + private String street;
  88 +
  89 + @Schema(description = "权属分类--数据字典：专业绿地和单位（居住区）")
  90 + @ExcelProperty("权属分类--数据字典：专业绿地和单位（居住区）")
  91 + private String oldtreeownership;
  92 +
  93 + @Schema(description = "数据状态(已更新、未更新)")
  94 + @ExcelProperty("数据状态(已更新、未更新)")
  95 + private String datastate;
  96 +
  97 + @Schema(description = "估测树龄")
  98 + @ExcelProperty("估测树龄")
  99 + private String estimationtreeage;
  100 +
  101 + @Schema(description = "冠幅东西")
  102 + @ExcelProperty("冠幅东西")
  103 + private String canopyeastwest;
  104 +
  105 + @Schema(description = "冠幅南北")
  106 + @ExcelProperty("冠幅南北")
  107 + private String canopysouthnorth;
  108 +
  109 + @Schema(description = "干周")
  110 + @ExcelProperty("干周")
  111 + private String weekday;
  112 +
  113 + @Schema(description = "生长地点")
  114 + @ExcelProperty("生长地点")
  115 + private String growlocation;
  116 +
  117 + @Schema(description = "生长环境")
  118 + @ExcelProperty("生长环境")
  119 + private String growthenvironment;
  120 +
  121 + @Schema(description = "树木照片一")
  122 + @ExcelProperty("树木照片一")
  123 + private String treephotoone;
  124 +
  125 + @Schema(description = "古树照片二")
  126 + @ExcelProperty("古树照片二")
  127 + private String treephototwo;
  128 +
  129 + @Schema(description = "古树照片三")
  130 + @ExcelProperty("古树照片三")
  131 + private String treephotothree;
  132 +
  133 + @Schema(description = "古树照片四")
  134 + @ExcelProperty("古树照片四")
  135 + private String treephotofour;
  136 +
  137 + @Schema(description = "古树照片五")
  138 + @ExcelProperty("古树照片五")
  139 + private String treephotofive;
  140 +
  141 + @Schema(description = "创建者")
  142 + @ExcelProperty("创建者")
  143 + private String createby;
  144 +
  145 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  146 + @ExcelProperty("创建时间")
  147 + private LocalDateTime createtime;
  148 +
  149 + @Schema(description = "更新者")
  150 + @ExcelProperty("更新者")
  151 + private String updateby;
  152 +
  153 + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
  154 + @ExcelProperty("更新时间")
  155 + private LocalDateTime updatetime;
  156 +
  157 + @Schema(description = "备注", example = "你说的对")
  158 + @ExcelProperty("备注")
  159 + private String remark;
  160 +
  161 + @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17101")
  162 + @ExcelProperty("部门id")
  163 + private Long deptId;
  164 +
  165 + private List<String> treeImgList;
  166 +
  167 + private List<String> treeImgListFile;
  168 +
  169 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/oldtrees/OldtreesDO.java
  View file @09bad8b
... ... @@ -240,5 +240,4 @@ public class OldtreesDO {
240 240 }
241 241 return this;
242 242 }
243   -
244 243 }
245 244 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/oldtrees/OldtreesMapper.java
  View file @09bad8b
... ... @@ -5,9 +5,12 @@ import java.util.*;
5 5 import com.zteits.urbanops.framework.common.pojo.PageResult;
6 6 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  8 +import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
8 9 import com.zteits.urbanops.module.garden.dal.dataobject.oldtrees.OldtreesDO;
  10 +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
9 11 import org.apache.ibatis.annotations.Mapper;
10 12 import com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo.*;
  13 +import org.springframework.util.ObjectUtils;
11 14  
12 15 /**
13 16 * 古树名木 Mapper
... ... @@ -18,7 +21,10 @@ import com.zteits.urbanops.module.garden.controller.admin.oldtrees.vo.*;
18 21 public interface OldtreesMapper extends BaseMapperX<OldtreesDO> {
19 22  
20 23 default PageResult<OldtreesDO> selectPage(OldtreesPageReqVO reqVO) {
21   - return selectPage(reqVO, new LambdaQueryWrapperX<OldtreesDO>()
  24 + MPJLambdaWrapperX<OldtreesDO> wrapper = new MPJLambdaWrapperX<OldtreesDO>()
  25 + .selectAs(DeptDO::getName, OldtreesDO::getMaintainunit)
  26 + .selectAll(OldtreesDO.class)
  27 + .leftJoin(DeptDO.class, DeptDO::getId, OldtreesDO::getMaintainunit)
22 28 .eqIfPresent(OldtreesDO::getFamoustreenumber, reqVO.getFamoustreenumber())
23 29 .eqIfPresent(OldtreesDO::getTreelevel, reqVO.getTreelevel())
24 30 .eqIfPresent(OldtreesDO::getTreetype, reqVO.getTreetype())
... ... @@ -60,7 +66,9 @@ public interface OldtreesMapper extends BaseMapperX&lt;OldtreesDO&gt; {
60 66 .eqIfPresent(OldtreesDO::getUpdateby, reqVO.getUpdateby())
61 67 .betweenIfPresent(OldtreesDO::getUpdatetime, reqVO.getUpdatetime())
62 68 .eqIfPresent(OldtreesDO::getDeptId, reqVO.getDeptId())
63   - .orderByDesc(OldtreesDO::getId));
  69 + .orderByDesc(OldtreesDO::getCreatetime);
  70 +
  71 + return selectJoinPage(reqVO, OldtreesDO.class, wrapper);
64 72 }
65 73  
66 74 default OldtreesDO selectByFamoustreenumber(String famoustreenumber) {
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/oldtreeschangelog/OldtreesChangeLogMapper.java
  View file @09bad8b
... ... @@ -5,7 +5,9 @@ import java.util.*;
5 5 import com.zteits.urbanops.framework.common.pojo.PageResult;
6 6 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  8 +import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
8 9 import com.zteits.urbanops.module.garden.dal.dataobject.oldtreeschangelog.OldtreesChangeLogDO;
  10 +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
9 11 import org.apache.ibatis.annotations.Mapper;
10 12 import com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo.*;
11 13  
... ... @@ -18,8 +20,11 @@ import com.zteits.urbanops.module.garden.controller.admin.oldtreeschangelog.vo.*
18 20 public interface OldtreesChangeLogMapper extends BaseMapperX<OldtreesChangeLogDO> {
19 21  
20 22 default PageResult<OldtreesChangeLogDO> selectPage(OldtreesChangeLogPageReqVO reqVO) {
21   - return selectPage(reqVO, new LambdaQueryWrapperX<OldtreesChangeLogDO>()
22   - .eqIfPresent(OldtreesChangeLogDO::getOldtreeid, reqVO.getOldtreeid())
  23 +
  24 + MPJLambdaWrapperX<OldtreesChangeLogDO> wrapper = new MPJLambdaWrapperX<OldtreesChangeLogDO>()
  25 + .selectAs(DeptDO::getName, OldtreesChangeLogDO::getMaintainunit)
  26 + .selectAll(OldtreesChangeLogDO.class)
  27 + .leftJoin(DeptDO.class, DeptDO::getId, OldtreesChangeLogDO::getMaintainunit)
23 28 .eqIfPresent(OldtreesChangeLogDO::getFamoustreenumber, reqVO.getFamoustreenumber())
24 29 .eqIfPresent(OldtreesChangeLogDO::getTreelevel, reqVO.getTreelevel())
25 30 .eqIfPresent(OldtreesChangeLogDO::getTreetype, reqVO.getTreetype())
... ... @@ -60,7 +65,10 @@ public interface OldtreesChangeLogMapper extends BaseMapperX&lt;OldtreesChangeLogDO
60 65 .betweenIfPresent(OldtreesChangeLogDO::getCreatetime, reqVO.getCreatetime())
61 66 .eqIfPresent(OldtreesChangeLogDO::getUpdateby, reqVO.getUpdateby())
62 67 .betweenIfPresent(OldtreesChangeLogDO::getUpdatetime, reqVO.getUpdatetime())
63   - .orderByDesc(OldtreesChangeLogDO::getId));
  68 + .orderByDesc(OldtreesChangeLogDO::getCreatetime);
  69 +
  70 + return selectJoinPage(reqVO, OldtreesChangeLogDO.class, wrapper);
  71 +
64 72 }
65 73  
66 74 }
67 75 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/tree/TreeMapper.java
  View file @09bad8b
... ... @@ -5,7 +5,9 @@ import java.util.*;
5 5 import com.zteits.urbanops.framework.common.pojo.PageResult;
6 6 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  8 +import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
8 9 import com.zteits.urbanops.module.garden.dal.dataobject.tree.TreeDO;
  10 +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
9 11 import org.apache.ibatis.annotations.Mapper;
10 12 import com.zteits.urbanops.module.garden.controller.admin.tree.vo.*;
11 13  
... ... @@ -18,7 +20,11 @@ import com.zteits.urbanops.module.garden.controller.admin.tree.vo.*;
18 20 public interface TreeMapper extends BaseMapperX<TreeDO> {
19 21  
20 22 default PageResult<TreeDO> selectPage(TreePageReqVO reqVO) {
21   - return selectPage(reqVO, new LambdaQueryWrapperX<TreeDO>()
  23 +
  24 + MPJLambdaWrapperX<TreeDO> wrapper = new MPJLambdaWrapperX<TreeDO>()
  25 + .selectAs(DeptDO::getName, TreeDO::getMaintainunit)
  26 + .selectAll(TreeDO.class)
  27 + .leftJoin(DeptDO.class, DeptDO::getId, TreeDO::getMaintainunit)
22 28 .eqIfPresent(TreeDO::getTreenumber, reqVO.getTreenumber())
23 29 .likeIfPresent(TreeDO::getLatinname, reqVO.getLatinname())
24 30 .eqIfPresent(TreeDO::getTreetype, reqVO.getTreetype())
... ... @@ -48,12 +54,13 @@ public interface TreeMapper extends BaseMapperX&lt;TreeDO&gt; {
48 54 .eqIfPresent(TreeDO::getTreephotofour, reqVO.getTreephotofour())
49 55 .eqIfPresent(TreeDO::getTreephotofive, reqVO.getTreephotofive())
50 56 .eqIfPresent(TreeDO::getCreateby, reqVO.getCreateby())
51   - .betweenIfPresent(TreeDO::getCreatetime, reqVO.getCreatetime())
52 57 .eqIfPresent(TreeDO::getUpdateby, reqVO.getUpdateby())
53 58 .betweenIfPresent(TreeDO::getUpdatetime, reqVO.getUpdatetime())
54 59 .eqIfPresent(TreeDO::getRemark, reqVO.getRemark())
55 60 .eqIfPresent(TreeDO::getDeptId, reqVO.getDeptId())
56   - .orderByDesc(TreeDO::getId));
  61 + .orderByDesc(TreeDO::getId);
  62 +
  63 + return selectJoinPage(reqVO, TreeDO.class, wrapper);
57 64 }
58 65  
59 66 default TreeDO selectByTreeNumber(String treeNumber) {
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/treechangelog/TreeChangeLogMapper.java
  View file @09bad8b
... ... @@ -5,7 +5,9 @@ import java.util.*;
5 5 import com.zteits.urbanops.framework.common.pojo.PageResult;
6 6 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  8 +import com.zteits.urbanops.framework.mybatis.core.query.MPJLambdaWrapperX;
8 9 import com.zteits.urbanops.module.garden.dal.dataobject.treechangelog.TreeChangeLogDO;
  10 +import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
9 11 import org.apache.ibatis.annotations.Mapper;
10 12 import com.zteits.urbanops.module.garden.controller.admin.treechangelog.vo.*;
11 13  
... ... @@ -18,7 +20,11 @@ import com.zteits.urbanops.module.garden.controller.admin.treechangelog.vo.*;
18 20 public interface TreeChangeLogMapper extends BaseMapperX<TreeChangeLogDO> {
19 21  
20 22 default PageResult<TreeChangeLogDO> selectPage(TreeChangeLogPageReqVO reqVO) {
21   - return selectPage(reqVO, new LambdaQueryWrapperX<TreeChangeLogDO>()
  23 +
  24 + MPJLambdaWrapperX<TreeChangeLogDO> wrapper = new MPJLambdaWrapperX<TreeChangeLogDO>()
  25 + .selectAs(DeptDO::getName, TreeChangeLogDO::getMaintainunit)
  26 + .selectAll(TreeChangeLogDO.class)
  27 + .leftJoin(DeptDO.class, DeptDO::getId, TreeChangeLogDO::getMaintainunit)
22 28 .eqIfPresent(TreeChangeLogDO::getTreeid, reqVO.getTreeid())
23 29 .eqIfPresent(TreeChangeLogDO::getTreenumber, reqVO.getTreenumber())
24 30 .likeIfPresent(TreeChangeLogDO::getLatinname, reqVO.getLatinname())
... ... @@ -53,7 +59,10 @@ public interface TreeChangeLogMapper extends BaseMapperX&lt;TreeChangeLogDO&gt; {
53 59 .eqIfPresent(TreeChangeLogDO::getUpdateby, reqVO.getUpdateby())
54 60 .betweenIfPresent(TreeChangeLogDO::getUpdatetime, reqVO.getUpdatetime())
55 61 .eqIfPresent(TreeChangeLogDO::getRemark, reqVO.getRemark())
56   - .orderByDesc(TreeChangeLogDO::getId));
  62 + .orderByDesc(TreeChangeLogDO::getId);
  63 +
  64 + return selectJoinPage(reqVO, TreeChangeLogDO.class, wrapper);
  65 +
57 66 }
58 67  
59 68 }
60 69 \ No newline at end of file
... ...