From 4255a75d07f48c5af68cde589520ebcab51904a8 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Tue, 9 Dec 2025 23:27:02 +0800 Subject: [PATCH] 任务管理 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java | 8 ++++++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java | 17 ++--------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java | 47 ----------------------------------------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java | 54 +++++++++++++++++++++++++++++++++++++++++++++--------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java | 12 ++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java | 5 ----- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java | 15 --------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java | 10 ++++------ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java | 16 +++++++++------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java | 13 +++++++------ 11 files changed, 138 insertions(+), 133 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java index c6f5494..72b662c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java @@ -8,6 +8,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; +import com.zteits.urbanops.framework.translate.core.TranslateUtils; import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO; import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksRespVO; import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksSaveReqVO; @@ -84,6 +85,9 @@ public class AssignTasksController { @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')") public CommonResult getAssignTasks(@RequestParam("id") Long id) { AssignTasksDO assignTasks = assignTasksService.getAssignTasks(id); + if (assignTasks == null) { + return success(null); + } AssignTasksRespVO assignTasksRespVO = BeanUtils.toBean(assignTasks, AssignTasksRespVO.class); List assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId()); assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList); @@ -124,9 +128,9 @@ public class AssignTasksController { HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = assignTasksService.getAssignTasksPage(pageReqVO).getList(); - // 导出 Excel + List respVolist = BeanUtils.toBean(list, AssignTasksRespVO.class); ExcelUtils.write(response, "派单任务主表（记录派单任务基本信息）.xls", "数据", AssignTasksRespVO.class, - BeanUtils.toBean(list, AssignTasksRespVO.class)); + respVolist ); } @Operation(summary = "任务确认" ) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java index c236f27..23b29bd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java @@ -23,27 +23,14 @@ public class AssignTasksPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] deadline; - @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）") - private String templateFile; - @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）") private Integer parentFinish; - @Schema(description = "整体完成时间（仅当parent_finish=1时有值）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] finishTime; - - @Schema(description = "任务备注（如：特殊要求、注意事项等）") - private String note; - - @Schema(description = "创建人（关联用户ID，任务派发人）") - private String creator; - @Schema(description = "任务创建时间（派单时间）") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "修改人（关联用户ID，最后修改人）") - private String updater; + private String deadlineBeginTime; + private String deadlineEndTime; } 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 c288d5d..7950b17 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 @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fhs.core.trans.vo.VO; import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -18,54 +19,85 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE public class AssignTasksRespVO { @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3654") - @ExcelProperty("自增ID") private Long id; @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @ExcelProperty("任务名称") private String taskName; - @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("任务类型（关联数据字典，如：日常巡检、紧急维修等）") + @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String taskType; + @ExcelProperty(value = "任务类型") + private String taskTypeName; + + @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer parentFinish; + + @ExcelProperty(value = "任务整体完成状态") + private String parentFinishName; + + @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("派达时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Date createTime; @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("任务截止时间") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private Date deadline; + @Schema(description = "任务备注（如：特殊要求、注意事项等）") + @ExcelProperty("任务备注") + private String note; + @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）") - @ExcelProperty("派单模板文件路径（如：任务详情模板、填报表格等）") private String templateFile; - @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）") - private Integer parentFinish; - @Schema(description = "整体完成时间（仅当parent_finish=1时有值）") - @ExcelProperty("整体完成时间（仅当parent_finish=1时有值）") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private Date finishTime; - @Schema(description = "任务备注（如：特殊要求、注意事项等）") - @ExcelProperty("任务备注（如：特殊要求、注意事项等）") - private String note; - @Schema(description = "创建人（关联用户ID，任务派发人）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建人（关联用户ID，任务派发人）") private String creator; - @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("任务创建时间（派单时间）") - @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date createTime; - @Schema(description = "修改人（关联用户ID，最后修改人）") - @ExcelProperty("修改人（关联用户ID，最后修改人）") private String updater; private List companyIds; private List assignTaskInfoList; - + public void setParentFinish(Integer parentFinish) { + this.parentFinish = parentFinish; + // 手动固定值映射：0→未完成，1→已完成，其他→未知状态 + switch (parentFinish) { + case 0: + this.parentFinishName = "未完成"; + break; + case 1: + this.parentFinishName = "已完成"; + break; + default: // 包含null、2、3等非法值 + this.parentFinishName = "未知状态"; + break; + } + } + + public void setTaskType(String taskType) { + this.taskType = taskType; + //1=日常任务,2=古树任务,3=屋顶绿化 + switch (taskType) { + case "1": + this.taskTypeName = "日常任务"; + break; + case "2": + this.taskTypeName = "古树任务"; + break; + case "3": + this.taskTypeName = "屋顶绿化"; + break; + default: + this.taskTypeName = "未知"; + break; + } + } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java index 9c7e538..0808551 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java @@ -13,57 +13,19 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @Data public class AssignTasksInfoPageReqVO extends PageParam { - @Schema(description = "关联派单任务主表ID（外键，关联td_assign_tasks.id）", example = "1875") - private Long taskId; @Schema(description = "单位ID（关联单位表主键）", example = "11926") private String companyId; - @Schema(description = "单位ID（关联单位表主键）", example = "张三") - private String companyName; - @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216") private String writePersonId; - @Schema(description = "填报人姓名") - private String writePerson; - - @Schema(description = "填报人手机号") - private String writePersonPhone; - - @Schema(description = "填报时间（仅当finish=1时有值）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] writeTime; - @Schema(description = "单位任务完成状态（0：未完成，1：已完成）") private Integer finish; @Schema(description = "是否超期（0：未超期，1：超期；NULL：未到截止时间）") private Integer isOverdue; - @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）") - private String dataFile; - - @Schema(description = "催缴次数（未完成时的提醒次数）") - private Integer rushNum; - - @Schema(description = "新任务标记（0：未读，1：已读）") - private Integer newFlag; - - @Schema(description = "已读时间（仅当new_flag=1时有值）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] newFlagTime; - - @Schema(description = "驳回备注（当finish=2时，说明驳回原因）", example = "你说的对") - private String rejectRemark; - - @Schema(description = "单位任务确认状态（已确认/未确认，单位接收任务后需确认）") - private String confirm; - - @Schema(description = "确认时间（单位确认接收任务的时间）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] confirmTime; - @Schema(description = "创建人（关联用户ID，将任务派给该单位的操作人）") private String creator; @@ -71,16 +33,7 @@ public class AssignTasksInfoPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "修改人（关联用户ID，最后修改该记录的操作人）") - private String updater; - - @Schema(description = "备注", example = "你猜") - private String remark; - @Schema(description = "是否打回0：正常 1：打回") private Integer isReject; - @Schema(description = "0:正常1:停用", example = "1") - private Integer status; - } 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 d2c0d2a..746b13e 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 @@ -1,11 +1,15 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; +import java.util.Date; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情） Response VO") @Data @@ -13,15 +17,27 @@ import cn.idev.excel.annotation.*; public class AssignTasksInfoRespVO { @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148") - @ExcelProperty("自增ID") private Long id; @Schema(description = "关联派单任务主表ID（外键，关联td_assign_tasks.id）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1875") - @ExcelProperty("关联派单任务主表ID（外键，关联td_assign_tasks.id）") + //@ExcelProperty("关联派单任务主表ID（外键，关联td_assign_tasks.id）") private Long taskId; + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @ExcelProperty("任务名称") + private String taskName; + + @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private String taskType; + @ExcelProperty(value = "任务类型") + private String taskTypeName; + + @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("任务截止时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Date deadline; + @Schema(description = "单位ID（关联单位表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "11926") - @ExcelProperty("单位ID（关联单位表主键）") private String companyId; @Schema(description = "单位ID（关联单位表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @@ -29,7 +45,6 @@ public class AssignTasksInfoRespVO { private String companyName; @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216") - @ExcelProperty("填报人ID（单位指定的任务负责人）") private String writePersonId; @Schema(description = "填报人姓名") @@ -86,7 +101,8 @@ public class AssignTasksInfoRespVO { @Schema(description = "关联记录创建时间（派单给单位的时间）", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("关联记录创建时间（派单给单位的时间）") - private LocalDateTime createTime; + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Date createTime; @Schema(description = "修改人（关联用户ID，最后修改该记录的操作人）") @ExcelProperty("修改人（关联用户ID，最后修改该记录的操作人）") @@ -104,4 +120,24 @@ public class AssignTasksInfoRespVO { @ExcelProperty("0:正常1:停用") private Integer status; + public void setTaskType(String taskType) { + this.taskType = taskType; + //1=日常任务,2=古树任务,3=屋顶绿化 + switch (taskType) { + case "1": + this.taskTypeName = "日常任务"; + break; + case "2": + this.taskTypeName = "古树任务"; + break; + case "3": + this.taskTypeName = "屋顶绿化"; + break; + default: + this.taskTypeName = "未知"; + break; + } + } + + } 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 ea1b666..7f34021 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 @@ -106,4 +106,16 @@ public class AssignTasksInfoDO extends BaseDO { */ private Integer isReject; + /** + * 任务名称 + */ + private String taskName; + /** + * 任务类型（关联数据字典，如：日常巡检、紧急维修等） + */ + private String taskType; + /** + * 任务截止时间 + */ + private LocalDateTime deadline; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java index 93b735a..74b992a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java @@ -22,13 +22,8 @@ public interface AssignTasksMapper extends BaseMapperX { .likeIfPresent(AssignTasksDO::getTaskName, reqVO.getTaskName()) .eqIfPresent(AssignTasksDO::getTaskType, reqVO.getTaskType()) .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) - .eqIfPresent(AssignTasksDO::getTemplateFile, reqVO.getTemplateFile()) .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish()) - .betweenIfPresent(AssignTasksDO::getFinishTime, reqVO.getFinishTime()) - .eqIfPresent(AssignTasksDO::getNote, reqVO.getNote()) - .eqIfPresent(AssignTasksDO::getCreator, reqVO.getCreator()) .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(AssignTasksDO::getUpdater, reqVO.getUpdater()) .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) .orderByDesc(AssignTasksDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java index 5f3219d..c071bed 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java @@ -20,26 +20,11 @@ public interface AssignTasksInfoMapper extends BaseMapperX { default PageResult selectPage(AssignTasksInfoPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(AssignTasksInfoDO::getTaskId, reqVO.getTaskId()) .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId()) - .likeIfPresent(AssignTasksInfoDO::getCompanyName, reqVO.getCompanyName()) .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId()) - .eqIfPresent(AssignTasksInfoDO::getWritePerson, reqVO.getWritePerson()) - .eqIfPresent(AssignTasksInfoDO::getWritePersonPhone, reqVO.getWritePersonPhone()) - .betweenIfPresent(AssignTasksInfoDO::getWriteTime, reqVO.getWriteTime()) .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish()) .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue()) - .eqIfPresent(AssignTasksInfoDO::getDataFile, reqVO.getDataFile()) - .eqIfPresent(AssignTasksInfoDO::getRushNum, reqVO.getRushNum()) - .eqIfPresent(AssignTasksInfoDO::getNewFlag, reqVO.getNewFlag()) - .betweenIfPresent(AssignTasksInfoDO::getNewFlagTime, reqVO.getNewFlagTime()) - .eqIfPresent(AssignTasksInfoDO::getRejectRemark, reqVO.getRejectRemark()) - .eqIfPresent(AssignTasksInfoDO::getConfirm, reqVO.getConfirm()) - .betweenIfPresent(AssignTasksInfoDO::getConfirmTime, reqVO.getConfirmTime()) - .eqIfPresent(AssignTasksInfoDO::getCreator, reqVO.getCreator()) .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(AssignTasksInfoDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(AssignTasksInfoDO::getRemark, reqVO.getRemark()) .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject()) .orderByDesc(AssignTasksInfoDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java index 975051d..1fcf54a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java @@ -28,8 +28,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS_002; @@ -65,7 +64,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { AssignTasksDO assignTasks = BeanUtils.toBean(createReqVO, AssignTasksDO.class); assignTasksMapper.insert(assignTasks); //保存单位明细 - assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks.getId()); + assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks); //保存单位明细 // 返回 @@ -111,7 +110,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { .filter(Objects::nonNull) .filter(id -> !existingCompanyIds.contains(id)) // 直接用列表 contains() .collect(Collectors.toList()); - assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj.getId()); + assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj); } @Override @@ -150,8 +149,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { @Override public PageResult getAssignTasksPage(AssignTasksPageReqVO pageReqVO) { //add by wq 派单任务只能总公司查询 - DeptRespDTO deptRespDTO = deptApi.getDept(getLoginUserDeptId()); - if (deptRespDTO.getParentId() != 0) { + if (getCompanyId() != 100) { return null; } //add by wq 派单任务只能总公司查询 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java index 289bd6a..bcde302 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java @@ -1,11 +1,13 @@ package com.zteits.urbanops.module.garden.service.assigntasksinfo; -import java.util.*; -import jakarta.validation.*; -import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO; +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO; +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; +import jakarta.validation.Valid; + +import java.util.List; /** * 派单任务-单位关联表（记录单位接收派单后的执行详情） Service 接口 @@ -64,10 +66,10 @@ public interface AssignTasksInfoService { * @Description 同步保存单位派单详情 * @Date 2025/11/16 17:07 * @Param companyIds - * @param taskId + * @param assignTasks * @Return java.lang.Long */ - public void saveAssignTasksInfos(List companyIds, Long taskId); + public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks); /** * @Author wangqian diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index 22cbd83..1b8025b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -114,7 +114,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { } @Override - public void saveAssignTasksInfos(List companyIds, Long taskId) { + public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks) { // 获得用户基本信息 if (companyIds != null && companyIds.size() > 0) { //1、获取单位集合 @@ -129,13 +129,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { (oldValue, newValue) -> newValue )); for (String companyId : companyIds) { - AssignTasksInfoSaveReqVO assignTaskInfo = new AssignTasksInfoSaveReqVO(); + AssignTasksInfoDO assignTaskInfo = new AssignTasksInfoDO(); assignTaskInfo.setCompanyId(companyId); assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId))); - assignTaskInfo.setTaskId(taskId); - AssignTasksInfoDO assignTasksInfo = BeanUtils.toBean(assignTaskInfo, AssignTasksInfoDO.class); - - assignTasksInfoMapper.insert(assignTasksInfo); + assignTaskInfo.setTaskId(assignTasks.getId()); + assignTaskInfo.setTaskName(assignTasks.getTaskName()); + assignTaskInfo.setTaskType(assignTasks.getTaskType()); + assignTaskInfo.setDeadline(assignTasks.getDeadline()); + assignTasksInfoMapper.insert(assignTaskInfo); } } } -- libgit2 0.21.4