From b47510d8080cd23b6cb6b9a2c0d5d16296ffda33 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 5 Feb 2025 11:23:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=A9=E9=98=B5=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/wjxDjxx/entity/WjxDjxxTmxx.java | 10 ++ .../kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml | 4 +- .../service/impl/WjxDjxxServiceImpl.java | 64 ++++++++- .../wjxWjxx/controller/WjxWjxxController.java | 2 +- .../service/impl/WjxWjxxServiceImpl.java | 33 +++++ .../controller/WjxWjxxTmlbController.java | 18 +-- .../kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java | 9 ++ .../kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java | 17 +++ .../service/IWjxWjxxTmlbService.java | 12 +- .../service/impl/WjxWjxxTmlbServiceImpl.java | 134 +++++++++++++++++- .../kc/wjxWjxxTmlb/vo/ScaleItemRows.java | 11 ++ .../modules/kc/wjxWjxxTmlb/vo/ScaleItems.java | 9 ++ .../kc/wjxWjxxTmlb/vo/WjxWjxxTmlbPage.java | 8 ++ pom.xml | 6 +- 14 files changed, 310 insertions(+), 27 deletions(-) create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/ScaleItemRows.java create mode 100644 jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/vo/ScaleItems.java diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java index a137d416..d50754c6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/entity/WjxDjxxTmxx.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx; +import org.jeecg.modules.kc.wjxWjxxTmlb.vo.ScaleItemRows; +import org.jeecg.modules.kc.wjxWjxxTmlb.vo.ScaleItems; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -74,6 +76,12 @@ public class WjxDjxxTmxx implements Serializable { @TableField(exist = false) private List wjxWjxxTmxxList; + @TableField(exist = false) + private List items; + + @TableField(exist = false) + private List itemRows; + @TableField(exist = false) private String tktda; @TableField(exist = false) @@ -82,4 +90,6 @@ public class WjxDjxxTmxx implements Serializable { private String djtmid; @TableField(exist = false) private String wjSubtype; + @TableField(exist = false) + private String xxtitle; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml index a869249c..681225fb 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml @@ -117,7 +117,7 @@