diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java index 5b60abf..a9b887d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java @@ -51,7 +51,7 @@ public class AssignTasksRespVO { private String note; @Schema(description = "派单模板文件路径(如:任务详情模板、填报表格等)") - private String templateFile; + private List templateFile; @Schema(description = "整体完成时间(仅当parent_finish=1时有值)") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java index a58ca0a..5861c41 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java @@ -8,6 +8,7 @@ import lombok.Data; import java.time.LocalDateTime; import java.util.Date; +import java.util.List; import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -68,7 +69,7 @@ public class AssignTasksInfoRespVO { @Schema(description = "单位提交的任务文件路径(如:填报表格、现场照片等)") @ExcelProperty("单位提交的任务文件路径(如:填报表格、现场照片等)") - private String dataFile; + private List dataFile; @Schema(description = "催缴次数(未完成时的提醒次数)", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("催缴次数(未完成时的提醒次数)") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.java index a3b2253..d5889b9 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasks/AssignTasksDO.java @@ -14,7 +14,7 @@ import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; * * @author 超级管理员 */ -@TableName("garden_assign_tasks") +@TableName(value = "garden_assign_tasks", autoResultMap = true) @KeySequence("garden_assign_tasks_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 @Data @EqualsAndHashCode(callSuper = true) @@ -44,7 +44,8 @@ public class AssignTasksDO extends BaseDO { /** * 派单模板文件路径(如:任务详情模板、填报表格等) */ - private String templateFile; + @TableField(typeHandler = JacksonTypeHandler.class) + private List templateFile; /** * 任务整体完成状态(0:未完成,1:已完成;所有关联单位均完成时自动更新为1) */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java index c058cd4..70e7a03 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java @@ -16,7 +16,7 @@ import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; * * @author 超级管理员 */ -@TableName("garden_assign_tasks_info") +@TableName(value = "garden_assign_tasks_info", autoResultMap = true) @KeySequence("garden_assign_tasks_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 @Data @EqualsAndHashCode(callSuper = true)