From 6d51501ca93f5bf46759f851988650477cf32e6c Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 12 六月 2024 18:02:45 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java | 138 ++++++++++++++++++++++----------------------- 1 files changed, 68 insertions(+), 70 deletions(-) diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTitle.java b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java similarity index 60% copy from smartor/src/main/java/com/smartor/domain/SvyLibTitle.java copy to smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java index d2170c9..85219f3 100644 --- a/smartor/src/main/java/com/smartor/domain/SvyLibTitle.java +++ b/smartor/src/main/java/com/smartor/domain/SvyTaskTemplate.java @@ -1,12 +1,9 @@ package com.smartor.domain; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -15,110 +12,117 @@ import com.ruoyi.common.core.domain.BaseEntity; /** - * 闂嵎瀵硅薄 svy_lib_title + * 浠诲姟闂嵎妯℃澘瀵硅薄 svy_task_template * * @author ruoyi - * @date 2023-03-02 + * @date 2024-06-12 */ @Data -@ApiModel(value = "SvyLibTitle", description = "闂嵎瀵硅薄") -public class SvyLibTitle extends BaseEntity { +public class SvyTaskTemplate extends BaseEntity { + private static final long serialVersionUID = 1L; /** * 鑷ID */ - @ApiModelProperty(value = "鑷ID") + @ApiModelProperty(value = "涓婚敭") private Long svyid; + + /** + * 妯℃澘闂嵎ID + */ + @Excel(name = " 妯℃澘闂嵎ID ") + @ApiModelProperty(value = "妯℃澘闂嵎ID") + private Long templateid; /** * 闂嵎鍒嗙被ID */ - @ApiModelProperty(value = "闂嵎鍒嗙被ID", required = true) @Excel(name = " 闂嵎鍒嗙被ID ") + @ApiModelProperty(value = "闂嵎鍒嗙被ID") private Long categoryid; /** * 闂嵎浠g爜 */ - @ApiModelProperty(value = "闂嵎浠g爜") @Excel(name = " 闂嵎浠g爜 ") + @ApiModelProperty(value = "闂嵎浠g爜") private String svycode; /** * 闂嵎鍚嶇О */ - @ApiModelProperty(value = "闂嵎鍚嶇О", required = true) @Excel(name = " 闂嵎鍚嶇О ") + @ApiModelProperty(value = "闂嵎鍚嶇О") private String svyname; /** * 鎻忚堪 */ - @ApiModelProperty(value = "鎻忚堪", required = true) @Excel(name = " 鎻忚堪 ") + @ApiModelProperty(value = "鎻忚堪") private String description; /** * 闂嵎浠嬬粛 */ - @ApiModelProperty(value = "闂嵎浠嬬粛") @Excel(name = " 闂嵎浠嬬粛 ") + @ApiModelProperty(value = "闂嵎浠嬬粛") private String introduce; /** * 闂嵎鎻愮ず */ - @ApiModelProperty(value = "闂嵎鎻愮ず") @Excel(name = " 闂嵎鎻愮ず ") + @ApiModelProperty(value = "闂嵎鎻愮ず") private String submitprompt; /** - * 妯℃澘ID + * 鏍囩 */ - @ApiModelProperty(value = "妯℃澘ID") - @Excel(name = " 妯℃澘ID ") - private Long templateid; + @Excel(name = "鏍囩") + @ApiModelProperty(value = "鏍囩") + private String tag; /** * 鐗堟湰 */ - @ApiModelProperty(value = "鐗堟湰") @Excel(name = " 鐗堟湰 ") + @ApiModelProperty(value = "鐗堟湰") private BigDecimal version; /** * 涓績搴撲唬鐮� */ - @ApiModelProperty(value = "涓績搴撲唬鐮�") @Excel(name = " 涓績搴撲唬鐮� ") + @ApiModelProperty(value = "涓績搴撲唬鐮�") private String centerlibrarycode; /** * 涓績搴揑D */ - @ApiModelProperty(value = "涓績搴揑D") @Excel(name = " 涓績搴揑D ") + @ApiModelProperty(value = "涓績搴揑D") private Long centerlibraryid; /** * 鏄惁鏈湴 */ - @ApiModelProperty(value = "鏄惁鏈湴") @Excel(name = " 鏄惁鏈湴 ") + @ApiModelProperty(value = "鏄惁鏈湴") private Long islocal; /** * 鏄惁鍚敤 */ - @ApiModelProperty(value = "鏄惁鍚敤") @Excel(name = " 鏄惁鍚敤 ") - private String isenable = "0"; + @ApiModelProperty(value = "鏄惁鍚敤") + private String isenable; /** * 鏈烘瀯ID */ - @ApiModelProperty(value = "鏈烘瀯ID") @Excel(name = " 鏈烘瀯ID ") + @ApiModelProperty(value = "鏈烘瀯ID") private String orgid; /** @@ -130,100 +134,94 @@ /** * 涓婁紶鏍囪 */ - @ApiModelProperty(value = "涓婁紶鏍囪") @Excel(name = " 涓婁紶鏍囪 ") + @ApiModelProperty(value = "涓婁紶鏍囪") private Long isupload; - /** * 涓婁紶鏃堕棿 */ - @ApiModelProperty(value = "涓婁紶鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty(value = "涓婁紶鏃堕棿") private Date uploadTime; /** - * 鐤剧梾鍚嶇О + * 闂id */ - @ApiModelProperty(value = "鐤剧梾鍚嶇О") - private String icdname; + @Excel(name = "闂id") + @ApiModelProperty(value = "闂id") + private String taskScriptId; /** - * 鐤剧梾ID + * 鐖禝D */ - @ApiModelProperty(value = "鐤剧梾ID") - private List<String> icdID; + @Excel(name = "鐖禝D") + @ApiModelProperty(value = "鐖禝D") + private Long pid; /** - * 闂嵎棰樼洰闆嗗悎 + * GUID */ - @ApiModelProperty(value = "闂嵎棰樼洰闆嗗悎") - private List<SvyLibTopic> svyLibTopics; + @Excel(name = "GUID") + @ApiModelProperty(value = "GUID") + private String guid; - /** - * 妯℃澘绉戝鍏宠仈闆嗗悎 - */ - @ApiModelProperty(value = "妯℃澘绉戝鍏宠仈闆嗗悎") - private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>(); - - /** - * 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎 - */ - @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎") - private Integer isoperation; /** * 绉戝鍚嶇О */ @Excel(name = "绉戝鍚嶇О") - @ApiModelProperty("绉戝鍚嶇О") - private String deptNames = ""; + @ApiModelProperty(value = "绉戝鍚嶇О") + private String deptNames; /** * 鏍囩淇℃伅 */ @Excel(name = "鏍囩淇℃伅") - @ApiModelProperty("鏍囩淇℃伅") - private String labelInfo = ""; + @ApiModelProperty(value = "鏍囩淇℃伅") + private String labelInfo; /** * 闄㈠尯 */ @Excel(name = "闄㈠尯") - @ApiModelProperty("闄㈠尯") - private String campus = ""; + @ApiModelProperty(value = "闄㈠尯") + private String campus; /** * 閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3 */ - @Excel(name = "闄㈤�傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3鍖�") - @ApiModelProperty("閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3") - private String suitway = ""; - + @Excel(name = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3") + @ApiModelProperty(value = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3") + private String suitway; /** * 鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級 */ - @ApiModelProperty("鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級") - private String otherdata = ""; + @Excel(name = "鍏跺畠鏁版嵁", readConverterExp = "瀛�=鍌ㄥ彉閲�") + @ApiModelProperty(value = "鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級") + private String otherdata; /** * 鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級 */ - @ApiModelProperty(value = "鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級") - @Excel(name = "鍊肩被鍨�", readConverterExp = "1=閫夐」,2=鏂囨湰,3=鏁板��") - private Long valueType; + @Excel(name = "鍊肩被鍨�", readConverterExp = "1=,閫�=椤�,2=,鏂�=鏈�,3=,鏁�=鍊�") + @ApiModelProperty(value = " 鍊肩被鍨嬶紙1 閫夐」 2 鏂囨湰 3 鏁板�硷級") + private String valueType; - + /** + * 鍥炲锛堟寚闂鐨勫洖澶嶏紝缁欓棶绛旈鐢ㄧ殑锛� + */ + @Excel(name = "鍥炲", readConverterExp = "鎸�=闂鐨勫洖澶嶏紝缁欓棶绛旈鐢ㄧ殑") @ApiModelProperty(value = "鍥炲锛堟寚闂鐨勫洖澶嶏紝缁欓棶绛旈鐢ㄧ殑锛�") private String reply; + /** + * 浠诲姟ID + */ + @Excel(name = "浠诲姟ID") + @ApiModelProperty(value = "浠诲姟ID") + private Long taskid; - public SvyLibTitle() { - } - public SvyLibTitle(Long svyid, String icdname) { - this.svyid = svyid; - this.icdname = icdname; - } } -- Gitblit v1.9.3