id int改long
This commit is contained in:
小久哥
+1
-1
@@ -29,7 +29,7 @@ public class ProjectBaseVO {
|
||||
@ApiModelProperty("父级区域")
|
||||
private JSONArray areas;
|
||||
|
||||
private Integer cropId;
|
||||
private Long cropId;
|
||||
|
||||
@ApiModelProperty("成员选择")
|
||||
private JSONArray members;
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class ProjectExcelVO {
|
||||
private JSONArray areas;
|
||||
private JSONArray members;
|
||||
|
||||
private Integer cropId;
|
||||
private Long cropId;
|
||||
|
||||
@ExcelProperty("项目图片")
|
||||
private JSONArray images;
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ public class ProjectExportReqVO {
|
||||
|
||||
private JSONArray areas;
|
||||
|
||||
private Integer cropId;
|
||||
private Long cropId;
|
||||
|
||||
private JSONArray members;
|
||||
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class ProjectSearchPageReqVO extends PageParam {
|
||||
|
||||
private JSONArray areas;
|
||||
|
||||
private Integer cropId;
|
||||
private Long cropId;
|
||||
|
||||
private JSONArray members;
|
||||
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ public class TaskCateBaseVO {
|
||||
private Long parentId;
|
||||
|
||||
@ApiModelProperty(value = "")
|
||||
private Integer projectId;
|
||||
private Long projectId;
|
||||
|
||||
@ApiModelProperty(value = "", required = true)
|
||||
@NotNull(message = "不能为空")
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ public class TaskCateExcelVO {
|
||||
private Long parentId;
|
||||
|
||||
@ExcelProperty("")
|
||||
private Integer projectId;
|
||||
private Long projectId;
|
||||
|
||||
@ExcelProperty("")
|
||||
private String name;
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ public class TaskCateExportReqVO {
|
||||
private Long parentId;
|
||||
|
||||
@ApiModelProperty(value = "")
|
||||
private Integer projectId;
|
||||
private Long projectId;
|
||||
|
||||
@ApiModelProperty(value = "")
|
||||
private String name;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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)
|
||||
|
||||
+3
-3
@@ -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)
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ public class TaskCateDO extends BaseDO {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer projectId;
|
||||
private Long projectId;
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
||||
+2
-2
@@ -146,7 +146,7 @@ public class ProjectServiceImpl implements ProjectService {
|
||||
});
|
||||
}
|
||||
//任务分类名
|
||||
taskCateSet.add(item.getTaskCateId().longValue());
|
||||
taskCateSet.add(item.getTaskCateId());
|
||||
});
|
||||
|
||||
List<Long> joinPerson = new ArrayList<Long>(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());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user