From e42eb0098b036351549b6089d7069a8c17d421d3 Mon Sep 17 00:00:00 2001 From: zhousq Date: Wed, 6 Dec 2023 11:45:39 +0800 Subject: [PATCH] =?UTF-8?q?2023-12-6=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E7=94=9F=E6=88=90=E7=9A=84=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lzbi/generator/util/GenUtils.java | 2 +- .../lzbi/generator/util/VelocityUtils.java | 4 +- .../DcBusiTargetDraftMonthController.java | 0 .../draft/domain/DcBusiTargetDraftMonth.java | 232 ++++++++++++++++++ .../mapper/DcBusiTargetDraftMonthMapper.java | 0 .../DcBusiTargetDraftMonthService.java | 0 .../draft/DcBusiTargetDraftMonthMapper.xml | 0 7 files changed, 235 insertions(+), 3 deletions(-) create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java create mode 100644 lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java create mode 100644 lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml diff --git a/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java b/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java index 19ee20a..3da405e 100644 --- a/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java +++ b/lzbi-generator/src/main/java/com/lzbi/generator/util/GenUtils.java @@ -217,7 +217,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表|联美)", ""); } /** diff --git a/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java b/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java index 6979658..c8adae5 100644 --- a/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java +++ b/lzbi-generator/src/main/java/com/lzbi/generator/util/VelocityUtils.java @@ -175,11 +175,11 @@ public class VelocityUtils if (template.contains("domain.java.vm")) { - fileName = StringUtils.format("{}/domain/{}Dao.java", javaPath, className); + fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); } if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) { - fileName = StringUtils.format("{}/domain/{}Dao.java", javaPath, genTable.getSubTable().getClassName()); + fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); } else if (template.contains("mapper.java.vm")) { diff --git a/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java b/lzbi-module/src/main/java/com/lzbi/draft/controller/DcBusiTargetDraftMonthController.java new file mode 100644 index 0000000..e69de29 diff --git a/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java new file mode 100644 index 0000000..2d1aa44 --- /dev/null +++ b/lzbi-module/src/main/java/com/lzbi/draft/domain/DcBusiTargetDraftMonth.java @@ -0,0 +1,232 @@ +package com.lzbi.draft.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 指标数据底稿(月)对象 dc_busi_target_draft_month + * + * @author zhousq + * @date 2023-12-06 + */ +@Data +public class DcBusiTargetDraftMonth extends BaseModuleEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 公司名称 */ + @Excel(name = "公司名称") + private String companyName; + + /** 公司ID */ + private Long companyId; + + /** 组织机构ID */ + private Long orgId; + + /** 组织机构名称 */ + @Excel(name = "组织机构名称") + private String orgName; + + /** 统计单元编码 */ + @Excel(name = "统计单元编码") + private String assetCode; + + /** 统计单元名称 */ + @Excel(name = "统计单元名称") + private String assetName; + + /** 所属专业编码 */ + @Excel(name = "所属专业编码") + private String fieldCode; + + /** 所属专业名称 */ + @Excel(name = "所属专业名称") + private String fieldName; + + /** 指标别名 */ + @Excel(name = "指标别名") + private String targetNameAlias; + + /** 指标名称 */ + @Excel(name = "指标名称") + private String targetName; + + /** 指标编码 */ + @Excel(name = "指标编码") + private String targetCode; + + /** 指标单位 */ + @Excel(name = "指标单位") + private String targetUint; + + /** 年 */ + @Excel(name = "年") + private String countYear; + + /** 月 */ + @Excel(name = "月") + private String countMonth; + + /** 和值 */ + @Excel(name = "和值") + private BigDecimal valSum; + + /** 均值 */ + @Excel(name = "均值") + private BigDecimal valAvgAll; + + /** 非空均值 */ + @Excel(name = "非空均值") + private BigDecimal valAvgNull; + + /** 计划值 */ + @Excel(name = "计划值") + private BigDecimal valPlan; + + /** 创建人 */ + private String createdBy; + + /** 创建时间 */ + private Date createdTime; + + /** 更新人 */ + private String updatedBy; + + /** 更新时间 */ + private Date updatedTime; + + /** 1日 */ + @Excel(name = "1日") + private BigDecimal valP1; + + /** 2日 */ + @Excel(name = "2日") + private BigDecimal valP2; + + /** 3日 */ + @Excel(name = "3日") + private BigDecimal valP3; + + /** 4日 */ + @Excel(name = "4日") + private BigDecimal valP4; + + /** 5日 */ + @Excel(name = "5日") + private BigDecimal valP5; + + /** 6日 */ + @Excel(name = "6日") + private BigDecimal valP6; + + /** 7日 */ + @Excel(name = "7日") + private BigDecimal valP7; + + /** 8日 */ + @Excel(name = "8日") + private BigDecimal valP8; + + /** 9日 */ + @Excel(name = "9日") + private BigDecimal valP9; + + /** 10日 */ + @Excel(name = "10日") + private BigDecimal valP10; + + /** 11日 */ + @Excel(name = "11日") + private BigDecimal valP11; + + /** 12日 */ + @Excel(name = "12日") + private BigDecimal valP12; + + /** 13日 */ + @Excel(name = "13日") + private BigDecimal valP13; + + /** 14日 */ + @Excel(name = "14日") + private BigDecimal valP14; + + /** 15日 */ + @Excel(name = "15日") + private BigDecimal valP15; + + /** 16日 */ + @Excel(name = "16日") + private BigDecimal valP16; + + /** 17日 */ + @Excel(name = "17日") + private BigDecimal valP17; + + /** 18日 */ + @Excel(name = "18日") + private BigDecimal valP18; + + /** 19日 */ + @Excel(name = "19日") + private BigDecimal valP19; + + /** 20日 */ + @Excel(name = "20日") + private BigDecimal valP20; + + /** 21日 */ + @Excel(name = "21日") + private BigDecimal valP21; + + /** 22日 */ + @Excel(name = "22日") + private BigDecimal valP22; + + /** 23日 */ + @Excel(name = "23日") + private BigDecimal valP23; + + /** 24日 */ + @Excel(name = "24日") + private BigDecimal valP24; + + /** 25日 */ + @Excel(name = "25日") + private BigDecimal valP25; + + /** 26日 */ + @Excel(name = "26日") + private BigDecimal valP26; + + /** 27日 */ + @Excel(name = "27日") + private BigDecimal valP27; + + /** 28日 */ + @Excel(name = "28日") + private BigDecimal valP28; + + /** 29日 */ + @Excel(name = "29日") + private BigDecimal valP29; + + /** 30日 */ + @Excel(name = "30日") + private BigDecimal valP30; + + /** 31日 */ + @Excel(name = "31日") + private BigDecimal valP31; + +} diff --git a/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java b/lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftMonthMapper.java new file mode 100644 index 0000000..e69de29 diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiTargetDraftMonthService.java new file mode 100644 index 0000000..e69de29 diff --git a/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml b/lzbi-module/src/main/resources/mapper/draft/DcBusiTargetDraftMonthMapper.xml new file mode 100644 index 0000000..e69de29