From dc70d46e8ae714e532a856b9d80b94f599cdbbcb Mon Sep 17 00:00:00 2001 From: zhousq Date: Fri, 15 Dec 2023 08:34:17 +0800 Subject: [PATCH] =?UTF-8?q?2023-12-15=20=E4=BF=AE=E6=94=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lzbi-generator/src/main/resources/vm/java/domain.java.vm | 6 ++++++ lzbi-generator/src/main/resources/vm/java/service.java.vm | 3 ++- .../java/com/lzbi/draft/domain/DcBusiBillModelMaster.java | 6 ------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lzbi-generator/src/main/resources/vm/java/domain.java.vm b/lzbi-generator/src/main/resources/vm/java/domain.java.vm index 919565d..41c781e 100644 --- a/lzbi-generator/src/main/resources/vm/java/domain.java.vm +++ b/lzbi-generator/src/main/resources/vm/java/domain.java.vm @@ -6,6 +6,8 @@ import ${import}; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; +import io.swagger.annotations.ApiModelProperty; +import lombok.experimental.Accessors; import com.lzbi.common.annotation.Excel; #if($table.crud || $table.sub) import com.lzbi.module.base.BaseModuleEntity; @@ -25,6 +27,7 @@ import com.lzbi.common.core.domain.TreeEntity; #set($Entity="TreeEntity") #end @Data +@Accessors(chain = true) public class ${ClassName} extends ${Entity} { private static final long serialVersionUID = 1L; @@ -41,11 +44,14 @@ public class ${ClassName} extends ${Entity} #end #if($parentheseIndex != -1) @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty(name = "${comment}",notes = "") #elseif($column.javaType == 'Date') @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(name = "${comment}",notes = "") #else @Excel(name = "${comment}") + @ApiModelProperty(name = "${comment}",notes = "$column.javaField") #end #end private $column.javaType $column.javaField; diff --git a/lzbi-generator/src/main/resources/vm/java/service.java.vm b/lzbi-generator/src/main/resources/vm/java/service.java.vm index 7245529..92c5edb 100644 --- a/lzbi-generator/src/main/resources/vm/java/service.java.vm +++ b/lzbi-generator/src/main/resources/vm/java/service.java.vm @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; import com.lzbi.common.utils.DateUtils; +import com.lzbi.common.utils.StringUtils import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end @@ -156,7 +157,7 @@ public class ${ClassName}Service extends ServiceImpl<${ClassName}Mapper, ${Class } if (list.size() > 0) { - baseMapper.batch${subClassName}list); + baseMapper.batch${subClassName}(list); } } } diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java index ca9ed68..0e32378 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiBillModelMaster.java @@ -1,15 +1,9 @@ package com.lzbi.draft.domain; import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.experimental.Accessors; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import lombok.Data; import com.lzbi.common.annotation.Excel; import com.lzbi.module.base.BaseModuleEntity;