From e3843fdad87c21d499bed58a726fc4efa55b4d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com> Date: Mon, 6 Jun 2022 20:34:20 +0800 Subject: [PATCH] =?UTF-8?q?id=20int=E6=94=B9long?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../farm/controller/admin/project/vo/ProjectBaseVO.java | 2 +- .../farm/controller/admin/project/vo/ProjectExcelVO.java | 2 +- .../controller/admin/project/vo/ProjectExportReqVO.java | 2 +- .../farm/controller/admin/project/vo/ProjectPageReqVO.java | 2 +- .../controller/admin/project/vo/ProjectSearchPageReqVO.java | 2 +- .../module/farm/controller/admin/task/vo/TaskBaseVO.java | 6 +++--- .../module/farm/controller/admin/task/vo/TaskExcelVO.java | 6 +++--- .../farm/controller/admin/task/vo/TaskExportReqVO.java | 6 +++--- .../module/farm/controller/admin/task/vo/TaskPageReqVO.java | 6 +++--- .../farm/controller/admin/task/vo/TaskPageSearchReqVO.java | 6 +++--- .../farm/controller/admin/taskCate/vo/TaskCateBaseVO.java | 2 +- .../farm/controller/admin/taskCate/vo/TaskCateExcelVO.java | 2 +- .../controller/admin/taskCate/vo/TaskCateExportReqVO.java | 2 +- .../controller/admin/taskCate/vo/TaskCatePageReqVO.java | 2 +- .../yudao/module/farm/dal/dataobject/project/ProjectDO.java | 2 +- .../yudao/module/farm/dal/dataobject/task/TaskDO.java | 6 +++--- .../module/farm/dal/dataobject/taskCate/TaskCateDO.java | 2 +- .../module/farm/service/project/ProjectServiceImpl.java | 4 ++-- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java index b7cffa65..b635bb1a 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectBaseVO.java @@ -29,7 +29,7 @@ public class ProjectBaseVO { @ApiModelProperty("父级区域") private JSONArray areas; - private Integer cropId; + private Long cropId; @ApiModelProperty("成员选择") private JSONArray members; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java index 4078689d..ff546607 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExcelVO.java @@ -31,7 +31,7 @@ public class ProjectExcelVO { private JSONArray areas; private JSONArray members; - private Integer cropId; + private Long cropId; @ExcelProperty("项目图片") private JSONArray images; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java index be5bce33..a2437489 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectExportReqVO.java @@ -24,7 +24,7 @@ public class ProjectExportReqVO { private JSONArray areas; - private Integer cropId; + private Long cropId; private JSONArray members; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java index c63cf2c6..20a42f46 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectPageReqVO.java @@ -27,7 +27,7 @@ public class ProjectPageReqVO extends PageParam { private JSONArray areas; private JSONArray members; - private Integer cropId; + private Long cropId; @ApiModelProperty(value = "项目图片") private JSONArray images; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java index 35c948b6..f8baaeeb 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/project/vo/ProjectSearchPageReqVO.java @@ -31,7 +31,7 @@ public class ProjectSearchPageReqVO extends PageParam { private JSONArray areas; - private Integer cropId; + private Long cropId; private JSONArray members; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java index b3439f2b..48bd54d7 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskBaseVO.java @@ -20,14 +20,14 @@ public class TaskBaseVO { private Integer cropId; private Integer cropNum; - private Integer taskCateId; - private Integer taskCateName; + private Long taskCateId; + private Long taskCateName; @ApiModelProperty(value = "") private JSONArray resources; private JSONArray areas; - private Integer mainPerson; + private Long mainPerson; private JSONArray executorPerson; private Integer workingHours; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java index 4cc4e218..c55bbcee 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExcelVO.java @@ -25,14 +25,14 @@ public class TaskExcelVO { @ExcelProperty("") private Integer cropNum; - private Integer taskCateId; - private Integer taskCateName; + private Long taskCateId; + private Long taskCateName; @ExcelProperty("") private JSONArray resources; private JSONArray areas; - private Integer mainPerson; + private Long mainPerson; private JSONArray executorPerson; private Integer workingHours; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java index 2ec1d71e..e727f563 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskExportReqVO.java @@ -17,14 +17,14 @@ public class TaskExportReqVO { private Integer cropId; private Integer cropNum; - private Integer taskCateId; - private Integer taskCateName; + private Long taskCateId; + private Long taskCateName; @ApiModelProperty(value = "") private JSONArray resources; private JSONArray areas; - private Integer mainPerson; + private Long mainPerson; private JSONArray executorPerson; private Integer workingHours; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java index d6ad9d95..676dd11d 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageReqVO.java @@ -19,14 +19,14 @@ public class TaskPageReqVO extends PageParam { private Integer cropId; private Integer cropNum; - private Integer taskCateId; - private Integer taskCateName; + private Long taskCateId; + private Long taskCateName; @ApiModelProperty(value = "") private JSONArray resources; private JSONArray areas; - private Integer mainPerson; + private Long mainPerson; private JSONArray executorPerson; private Integer workingHours; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java index d6872d87..5a039337 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/task/vo/TaskPageSearchReqVO.java @@ -24,15 +24,15 @@ public class TaskPageSearchReqVO extends PageParam { private Integer cropId; private Integer cropNum; - private Integer taskCateId; - private Integer taskCateName; + private Long taskCateId; + private Long taskCateName; @ApiModelProperty(value = "") private JSONArray resources; private JSONArray areas; - private Integer mainPerson; + private Long mainPerson; private JSONArray executorPerson; private Integer workingHours; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateBaseVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateBaseVO.java index 3e1aa0eb..57389b56 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateBaseVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateBaseVO.java @@ -17,7 +17,7 @@ public class TaskCateBaseVO { private Long parentId; @ApiModelProperty(value = "") - private Integer projectId; + private Long projectId; @ApiModelProperty(value = "", required = true) @NotNull(message = "不能为空") diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExcelVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExcelVO.java index 1b8cabb8..e23d3268 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExcelVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExcelVO.java @@ -18,7 +18,7 @@ public class TaskCateExcelVO { private Long parentId; @ExcelProperty("") - private Integer projectId; + private Long projectId; @ExcelProperty("") private String name; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExportReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExportReqVO.java index 3285bd67..eab92314 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExportReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCateExportReqVO.java @@ -16,7 +16,7 @@ public class TaskCateExportReqVO { private Long parentId; @ApiModelProperty(value = "") - private Integer projectId; + private Long projectId; @ApiModelProperty(value = "") private String name; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCatePageReqVO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCatePageReqVO.java index 08c4120e..f2ebaa4f 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCatePageReqVO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/taskCate/vo/TaskCatePageReqVO.java @@ -18,7 +18,7 @@ public class TaskCatePageReqVO extends PageParam { private Long parentId; @ApiModelProperty(value = "") - private Integer projectId; + private Long projectId; @ApiModelProperty(value = "") private String name; diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java index 1d0886aa..e690c9bf 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java @@ -41,7 +41,7 @@ public class ProjectDO extends BaseDO { @TableField(typeHandler = JacksonTypeHandler.class) private JSONArray areas; - private Integer cropId; + private Long cropId; @ApiModelProperty("成员选择") @TableField(typeHandler = JacksonTypeHandler.class) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java index ce6680a6..7c002ba8 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/task/TaskDO.java @@ -34,7 +34,7 @@ public class TaskDO extends BaseDO { private Integer cropNum; @ApiModelProperty("负责人id") - private Integer mainPerson; + private Long mainPerson; @ApiModelProperty("执行人idList") @TableField(typeHandler = JacksonTypeHandler.class) @@ -44,9 +44,9 @@ public class TaskDO extends BaseDO { private Integer workingHours; @ApiModelProperty("任务id") - private Integer taskCateId; + private Long taskCateId; @ApiModelProperty("任务内容id") - private Integer taskCateName; + private Long taskCateName; @ApiModelProperty("资源") @TableField(typeHandler = JacksonTypeHandler.class) diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/taskCate/TaskCateDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/taskCate/TaskCateDO.java index dd542516..595b34b7 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/taskCate/TaskCateDO.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/taskCate/TaskCateDO.java @@ -31,7 +31,7 @@ public class TaskCateDO extends BaseDO { /** * */ - private Integer projectId; + private Long projectId; /** * */ diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java index bcb7a15d..317f8a38 100644 --- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java +++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java @@ -146,7 +146,7 @@ public class ProjectServiceImpl implements ProjectService { }); } //任务分类名 - taskCateSet.add(item.getTaskCateId().longValue()); + taskCateSet.add(item.getTaskCateId()); }); List joinPerson = new ArrayList(personSet); @@ -164,7 +164,7 @@ public class ProjectServiceImpl implements ProjectService { if (Long.valueOf(taskDO.getProjectId()).equals(projectListDTO.getId())){ //任务名 for (TaskCateDO taskCateDO : taskCateDOList) { - if (taskCateDO.getId().equals(Long.valueOf(taskDO.getTaskCateId()))){ + if (taskCateDO.getId().equals(taskDO.getTaskCateId())){ projectListDTO.setTaskName(taskCateDO.getName()); } }