BJ_FS / urbanops

Commit 4255a75d07f48c5af68cde589520ebcab51904a8

Authored by wangqian
1 parent 0c59519a

任务管理

Inline Side-by-side
Showing 11 changed files with 138 additions and 133 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java
  View file @4255a75
... ... @@ -8,6 +8,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam;
8 8 import com.zteits.urbanops.framework.common.pojo.PageResult;
9 9 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
10 10 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
  11 +import com.zteits.urbanops.framework.translate.core.TranslateUtils;
11 12 import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO;
12 13 import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksRespVO;
13 14 import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksSaveReqVO;
... ... @@ -84,6 +85,9 @@ public class AssignTasksController {
84 85 @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')")
85 86 public CommonResult<AssignTasksRespVO> getAssignTasks(@RequestParam("id") Long id) {
86 87 AssignTasksDO assignTasks = assignTasksService.getAssignTasks(id);
  88 + if (assignTasks == null) {
  89 + return success(null);
  90 + }
87 91 AssignTasksRespVO assignTasksRespVO = BeanUtils.toBean(assignTasks, AssignTasksRespVO.class);
88 92 List<AssignTasksInfoDO> assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId());
89 93 assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList);
... ... @@ -124,9 +128,9 @@ public class AssignTasksController {
124 128 HttpServletResponse response) throws IOException {
125 129 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
126 130 List<AssignTasksDO> list = assignTasksService.getAssignTasksPage(pageReqVO).getList();
127   - // 导出 Excel
  131 + List<AssignTasksRespVO> respVolist = BeanUtils.toBean(list, AssignTasksRespVO.class);
128 132 ExcelUtils.write(response, "派单任务主表（记录派单任务基本信息）.xls", "数据", AssignTasksRespVO.class,
129   - BeanUtils.toBean(list, AssignTasksRespVO.class));
  133 + respVolist );
130 134 }
131 135  
132 136 @Operation(summary = "任务确认" )
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java
  View file @4255a75
... ... @@ -23,27 +23,14 @@ public class AssignTasksPageReqVO extends PageParam {
23 23 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
24 24 private LocalDateTime[] deadline;
25 25  
26   - @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）")
27   - private String templateFile;
28   -
29 26 @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）")
30 27 private Integer parentFinish;
31 28  
32   - @Schema(description = "整体完成时间（仅当parent_finish=1时有值）")
33   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - private LocalDateTime[] finishTime;
35   -
36   - @Schema(description = "任务备注（如：特殊要求、注意事项等）")
37   - private String note;
38   -
39   - @Schema(description = "创建人（关联用户ID，任务派发人）")
40   - private String creator;
41   -
42 29 @Schema(description = "任务创建时间（派单时间）")
43 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
44 31 private LocalDateTime[] createTime;
45 32  
46   - @Schema(description = "修改人（关联用户ID，最后修改人）")
47   - private String updater;
  33 + private String deadlineBeginTime;
  34 + private String deadlineEndTime;
48 35  
49 36 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java
  View file @4255a75
... ... @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo;
3 3 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
4 4 import cn.idev.excel.annotation.ExcelProperty;
5 5 import com.fasterxml.jackson.annotation.JsonFormat;
  6 +import com.fhs.core.trans.vo.VO;
6 7 import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
7 8 import io.swagger.v3.oas.annotations.media.Schema;
8 9 import lombok.Data;
... ... @@ -18,54 +19,85 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
18 19 public class AssignTasksRespVO {
19 20  
20 21 @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3654")
21   - @ExcelProperty("自增ID")
22 22 private Long id;
23 23  
24 24 @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
25 25 @ExcelProperty("任务名称")
26 26 private String taskName;
27 27  
28   - @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
29   - @ExcelProperty("任务类型（关联数据字典，如：日常巡检、紧急维修等）")
  28 + @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
30 29 private String taskType;
  30 + @ExcelProperty(value = "任务类型")
  31 + private String taskTypeName;
  32 +
  33 + @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED)
  34 + private Integer parentFinish;
  35 +
  36 + @ExcelProperty(value = "任务整体完成状态")
  37 + private String parentFinishName;
  38 +
  39 + @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED)
  40 + @ExcelProperty("派达时间")
  41 + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  42 + private Date createTime;
31 43  
32 44 @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED)
33 45 @ExcelProperty("任务截止时间")
34 46 @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35 47 private Date deadline;
36 48  
  49 + @Schema(description = "任务备注（如：特殊要求、注意事项等）")
  50 + @ExcelProperty("任务备注")
  51 + private String note;
  52 +
37 53 @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）")
38   - @ExcelProperty("派单模板文件路径（如：任务详情模板、填报表格等）")
39 54 private String templateFile;
40 55  
41   - @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED)
42   - @ExcelProperty("任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）")
43   - private Integer parentFinish;
44   -
45 56 @Schema(description = "整体完成时间（仅当parent_finish=1时有值）")
46   - @ExcelProperty("整体完成时间（仅当parent_finish=1时有值）")
47 57 @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
48 58 private Date finishTime;
49 59  
50   - @Schema(description = "任务备注（如：特殊要求、注意事项等）")
51   - @ExcelProperty("任务备注（如：特殊要求、注意事项等）")
52   - private String note;
53   -
54 60 @Schema(description = "创建人（关联用户ID，任务派发人）", requiredMode = Schema.RequiredMode.REQUIRED)
55   - @ExcelProperty("创建人（关联用户ID，任务派发人）")
56 61 private String creator;
57 62  
58   - @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED)
59   - @ExcelProperty("任务创建时间（派单时间）")
60   - @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
61   - private Date createTime;
62   -
63 63 @Schema(description = "修改人（关联用户ID，最后修改人）")
64   - @ExcelProperty("修改人（关联用户ID，最后修改人）")
65 64 private String updater;
66 65  
67 66 private List<String> companyIds;
68 67 private List<AssignTasksInfoDO> assignTaskInfoList;
69 68  
70   -
  69 + public void setParentFinish(Integer parentFinish) {
  70 + this.parentFinish = parentFinish;
  71 + // 手动固定值映射：0→未完成，1→已完成，其他→未知状态
  72 + switch (parentFinish) {
  73 + case 0:
  74 + this.parentFinishName = "未完成";
  75 + break;
  76 + case 1:
  77 + this.parentFinishName = "已完成";
  78 + break;
  79 + default: // 包含null、2、3等非法值
  80 + this.parentFinishName = "未知状态";
  81 + break;
  82 + }
  83 + }
  84 +
  85 + public void setTaskType(String taskType) {
  86 + this.taskType = taskType;
  87 + //1=日常任务,2=古树任务,3=屋顶绿化
  88 + switch (taskType) {
  89 + case "1":
  90 + this.taskTypeName = "日常任务";
  91 + break;
  92 + case "2":
  93 + this.taskTypeName = "古树任务";
  94 + break;
  95 + case "3":
  96 + this.taskTypeName = "屋顶绿化";
  97 + break;
  98 + default:
  99 + this.taskTypeName = "未知";
  100 + break;
  101 + }
  102 + }
71 103 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java
  View file @4255a75
... ... @@ -13,57 +13,19 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
13 13 @Data
14 14 public class AssignTasksInfoPageReqVO extends PageParam {
15 15  
16   - @Schema(description = "关联派单任务主表ID（外键，关联td_assign_tasks.id）", example = "1875")
17   - private Long taskId;
18 16  
19 17 @Schema(description = "单位ID（关联单位表主键）", example = "11926")
20 18 private String companyId;
21 19  
22   - @Schema(description = "单位ID（关联单位表主键）", example = "张三")
23   - private String companyName;
24   -
25 20 @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216")
26 21 private String writePersonId;
27 22  
28   - @Schema(description = "填报人姓名")
29   - private String writePerson;
30   -
31   - @Schema(description = "填报人手机号")
32   - private String writePersonPhone;
33   -
34   - @Schema(description = "填报时间（仅当finish=1时有值）")
35   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
36   - private LocalDateTime[] writeTime;
37   -
38 23 @Schema(description = "单位任务完成状态（0：未完成，1：已完成）")
39 24 private Integer finish;
40 25  
41 26 @Schema(description = "是否超期（0：未超期，1：超期；NULL：未到截止时间）")
42 27 private Integer isOverdue;
43 28  
44   - @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）")
45   - private String dataFile;
46   -
47   - @Schema(description = "催缴次数（未完成时的提醒次数）")
48   - private Integer rushNum;
49   -
50   - @Schema(description = "新任务标记（0：未读，1：已读）")
51   - private Integer newFlag;
52   -
53   - @Schema(description = "已读时间（仅当new_flag=1时有值）")
54   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
55   - private LocalDateTime[] newFlagTime;
56   -
57   - @Schema(description = "驳回备注（当finish=2时，说明驳回原因）", example = "你说的对")
58   - private String rejectRemark;
59   -
60   - @Schema(description = "单位任务确认状态（已确认/未确认，单位接收任务后需确认）")
61   - private String confirm;
62   -
63   - @Schema(description = "确认时间（单位确认接收任务的时间）")
64   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
65   - private LocalDateTime[] confirmTime;
66   -
67 29 @Schema(description = "创建人（关联用户ID，将任务派给该单位的操作人）")
68 30 private String creator;
69 31  
... ... @@ -71,16 +33,7 @@ public class AssignTasksInfoPageReqVO extends PageParam {
71 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
72 34 private LocalDateTime[] createTime;
73 35  
74   - @Schema(description = "修改人（关联用户ID，最后修改该记录的操作人）")
75   - private String updater;
76   -
77   - @Schema(description = "备注", example = "你猜")
78   - private String remark;
79   -
80 36 @Schema(description = "是否打回0：正常 1：打回")
81 37 private Integer isReject;
82 38  
83   - @Schema(description = "0:正常1:停用", example = "1")
84   - private Integer status;
85   -
86 39 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
  View file @4255a75
1 1 package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo;
2 2  
  3 +import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
  4 +import cn.idev.excel.annotation.ExcelProperty;
  5 +import com.fasterxml.jackson.annotation.JsonFormat;
3 6 import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.*;
5   -import java.util.*;
6   -import org.springframework.format.annotation.DateTimeFormat;
  7 +import lombok.Data;
  8 +
7 9 import java.time.LocalDateTime;
8   -import cn.idev.excel.annotation.*;
  10 +import java.util.Date;
  11 +
  12 +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
9 13  
10 14 @Schema(description = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情） Response VO")
11 15 @Data
... ... @@ -13,15 +17,27 @@ import cn.idev.excel.annotation.*;
13 17 public class AssignTasksInfoRespVO {
14 18  
15 19 @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148")
16   - @ExcelProperty("自增ID")
17 20 private Long id;
18 21  
19 22 @Schema(description = "关联派单任务主表ID（外键，关联td_assign_tasks.id）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1875")
20   - @ExcelProperty("关联派单任务主表ID（外键，关联td_assign_tasks.id）")
  23 + //@ExcelProperty("关联派单任务主表ID（外键，关联td_assign_tasks.id）")
21 24 private Long taskId;
22 25  
  26 + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  27 + @ExcelProperty("任务名称")
  28 + private String taskName;
  29 +
  30 + @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  31 + private String taskType;
  32 + @ExcelProperty(value = "任务类型")
  33 + private String taskTypeName;
  34 +
  35 + @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED)
  36 + @ExcelProperty("任务截止时间")
  37 + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  38 + private Date deadline;
  39 +
23 40 @Schema(description = "单位ID（关联单位表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "11926")
24   - @ExcelProperty("单位ID（关联单位表主键）")
25 41 private String companyId;
26 42  
27 43 @Schema(description = "单位ID（关联单位表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
... ... @@ -29,7 +45,6 @@ public class AssignTasksInfoRespVO {
29 45 private String companyName;
30 46  
31 47 @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216")
32   - @ExcelProperty("填报人ID（单位指定的任务负责人）")
33 48 private String writePersonId;
34 49  
35 50 @Schema(description = "填报人姓名")
... ... @@ -86,7 +101,8 @@ public class AssignTasksInfoRespVO {
86 101  
87 102 @Schema(description = "关联记录创建时间（派单给单位的时间）", requiredMode = Schema.RequiredMode.REQUIRED)
88 103 @ExcelProperty("关联记录创建时间（派单给单位的时间）")
89   - private LocalDateTime createTime;
  104 + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  105 + private Date createTime;
90 106  
91 107 @Schema(description = "修改人（关联用户ID，最后修改该记录的操作人）")
92 108 @ExcelProperty("修改人（关联用户ID，最后修改该记录的操作人）")
... ... @@ -104,4 +120,24 @@ public class AssignTasksInfoRespVO {
104 120 @ExcelProperty("0:正常1:停用")
105 121 private Integer status;
106 122  
  123 + public void setTaskType(String taskType) {
  124 + this.taskType = taskType;
  125 + //1=日常任务,2=古树任务,3=屋顶绿化
  126 + switch (taskType) {
  127 + case "1":
  128 + this.taskTypeName = "日常任务";
  129 + break;
  130 + case "2":
  131 + this.taskTypeName = "古树任务";
  132 + break;
  133 + case "3":
  134 + this.taskTypeName = "屋顶绿化";
  135 + break;
  136 + default:
  137 + this.taskTypeName = "未知";
  138 + break;
  139 + }
  140 + }
  141 +
  142 +
107 143 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java
  View file @4255a75
... ... @@ -106,4 +106,16 @@ public class AssignTasksInfoDO extends BaseDO {
106 106 */
107 107 private Integer isReject;
108 108  
  109 + /**
  110 + * 任务名称
  111 + */
  112 + private String taskName;
  113 + /**
  114 + * 任务类型（关联数据字典，如：日常巡检、紧急维修等）
  115 + */
  116 + private String taskType;
  117 + /**
  118 + * 任务截止时间
  119 + */
  120 + private LocalDateTime deadline;
109 121 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java
  View file @4255a75
... ... @@ -22,13 +22,8 @@ public interface AssignTasksMapper extends BaseMapperX&lt;AssignTasksDO&gt; {
22 22 .likeIfPresent(AssignTasksDO::getTaskName, reqVO.getTaskName())
23 23 .eqIfPresent(AssignTasksDO::getTaskType, reqVO.getTaskType())
24 24 .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
25   - .eqIfPresent(AssignTasksDO::getTemplateFile, reqVO.getTemplateFile())
26 25 .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish())
27   - .betweenIfPresent(AssignTasksDO::getFinishTime, reqVO.getFinishTime())
28   - .eqIfPresent(AssignTasksDO::getNote, reqVO.getNote())
29   - .eqIfPresent(AssignTasksDO::getCreator, reqVO.getCreator())
30 26 .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime())
31   - .eqIfPresent(AssignTasksDO::getUpdater, reqVO.getUpdater())
32 27 .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline())
33 28 .orderByDesc(AssignTasksDO::getId));
34 29 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java
  View file @4255a75
... ... @@ -20,26 +20,11 @@ public interface AssignTasksInfoMapper extends BaseMapperX&lt;AssignTasksInfoDO&gt; {
20 20  
21 21 default PageResult<AssignTasksInfoDO> selectPage(AssignTasksInfoPageReqVO reqVO) {
22 22 return selectPage(reqVO, new LambdaQueryWrapperX<AssignTasksInfoDO>()
23   - .eqIfPresent(AssignTasksInfoDO::getTaskId, reqVO.getTaskId())
24 23 .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId())
25   - .likeIfPresent(AssignTasksInfoDO::getCompanyName, reqVO.getCompanyName())
26 24 .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId())
27   - .eqIfPresent(AssignTasksInfoDO::getWritePerson, reqVO.getWritePerson())
28   - .eqIfPresent(AssignTasksInfoDO::getWritePersonPhone, reqVO.getWritePersonPhone())
29   - .betweenIfPresent(AssignTasksInfoDO::getWriteTime, reqVO.getWriteTime())
30 25 .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish())
31 26 .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue())
32   - .eqIfPresent(AssignTasksInfoDO::getDataFile, reqVO.getDataFile())
33   - .eqIfPresent(AssignTasksInfoDO::getRushNum, reqVO.getRushNum())
34   - .eqIfPresent(AssignTasksInfoDO::getNewFlag, reqVO.getNewFlag())
35   - .betweenIfPresent(AssignTasksInfoDO::getNewFlagTime, reqVO.getNewFlagTime())
36   - .eqIfPresent(AssignTasksInfoDO::getRejectRemark, reqVO.getRejectRemark())
37   - .eqIfPresent(AssignTasksInfoDO::getConfirm, reqVO.getConfirm())
38   - .betweenIfPresent(AssignTasksInfoDO::getConfirmTime, reqVO.getConfirmTime())
39   - .eqIfPresent(AssignTasksInfoDO::getCreator, reqVO.getCreator())
40 27 .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime())
41   - .eqIfPresent(AssignTasksInfoDO::getUpdater, reqVO.getUpdater())
42   - .eqIfPresent(AssignTasksInfoDO::getRemark, reqVO.getRemark())
43 28 .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject())
44 29 .orderByDesc(AssignTasksInfoDO::getId));
45 30 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java
  View file @4255a75
... ... @@ -28,8 +28,7 @@ import java.util.Objects;
28 28 import java.util.stream.Collectors;
29 29  
30 30 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
31   -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId;
32   -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  31 +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*;
33 32 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS;
34 33 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS_002;
35 34  
... ... @@ -65,7 +64,7 @@ public class AssignTasksServiceImpl implements AssignTasksService {
65 64 AssignTasksDO assignTasks = BeanUtils.toBean(createReqVO, AssignTasksDO.class);
66 65 assignTasksMapper.insert(assignTasks);
67 66 //保存单位明细
68   - assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks.getId());
  67 + assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks);
69 68 //保存单位明细
70 69  
71 70 // 返回
... ... @@ -111,7 +110,7 @@ public class AssignTasksServiceImpl implements AssignTasksService {
111 110 .filter(Objects::nonNull)
112 111 .filter(id -> !existingCompanyIds.contains(id)) // 直接用列表 contains()
113 112 .collect(Collectors.toList());
114   - assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj.getId());
  113 + assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj);
115 114 }
116 115  
117 116 @Override
... ... @@ -150,8 +149,7 @@ public class AssignTasksServiceImpl implements AssignTasksService {
150 149 @Override
151 150 public PageResult<AssignTasksDO> getAssignTasksPage(AssignTasksPageReqVO pageReqVO) {
152 151 //add by wq 派单任务只能总公司查询
153   - DeptRespDTO deptRespDTO = deptApi.getDept(getLoginUserDeptId());
154   - if (deptRespDTO.getParentId() != 0) {
  152 + if (getCompanyId() != 100) {
155 153 return null;
156 154 }
157 155 //add by wq 派单任务只能总公司查询
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java
  View file @4255a75
1 1 package com.zteits.urbanops.module.garden.service.assigntasksinfo;
2 2  
3   -import java.util.*;
4   -import jakarta.validation.*;
5   -import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.*;
6   -import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
7 3 import com.zteits.urbanops.framework.common.pojo.PageResult;
8   -import com.zteits.urbanops.framework.common.pojo.PageParam;
  4 +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO;
  5 +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO;
  6 +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO;
  7 +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.List;
9 11  
10 12 /**
11 13 * 派单任务-单位关联表（记录单位接收派单后的执行详情） Service 接口
... ... @@ -64,10 +66,10 @@ public interface AssignTasksInfoService {
64 66 * @Description 同步保存单位派单详情
65 67 * @Date 2025/11/16 17:07
66 68 * @Param companyIds
67   - * @param taskId
  69 + * @param assignTasks
68 70 * @Return java.lang.Long
69 71 */
70   - public void saveAssignTasksInfos(List<String> companyIds, Long taskId);
  72 + public void saveAssignTasksInfos(List<String> companyIds, AssignTasksDO assignTasks);
71 73  
72 74 /**
73 75 * @Author wangqian
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
  View file @4255a75
... ... @@ -114,7 +114,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
114 114 }
115 115  
116 116 @Override
117   - public void saveAssignTasksInfos(List<String> companyIds, Long taskId) {
  117 + public void saveAssignTasksInfos(List<String> companyIds, AssignTasksDO assignTasks) {
118 118 // 获得用户基本信息
119 119 if (companyIds != null && companyIds.size() > 0) {
120 120 //1、获取单位集合
... ... @@ -129,13 +129,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService {
129 129 (oldValue, newValue) -> newValue
130 130 ));
131 131 for (String companyId : companyIds) {
132   - AssignTasksInfoSaveReqVO assignTaskInfo = new AssignTasksInfoSaveReqVO();
  132 + AssignTasksInfoDO assignTaskInfo = new AssignTasksInfoDO();
133 133 assignTaskInfo.setCompanyId(companyId);
134 134 assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId)));
135   - assignTaskInfo.setTaskId(taskId);
136   - AssignTasksInfoDO assignTasksInfo = BeanUtils.toBean(assignTaskInfo, AssignTasksInfoDO.class);
137   -
138   - assignTasksInfoMapper.insert(assignTasksInfo);
  135 + assignTaskInfo.setTaskId(assignTasks.getId());
  136 + assignTaskInfo.setTaskName(assignTasks.getTaskName());
  137 + assignTaskInfo.setTaskType(assignTasks.getTaskType());
  138 + assignTaskInfo.setDeadline(assignTasks.getDeadline());
  139 + assignTasksInfoMapper.insert(assignTaskInfo);
139 140 }
140 141 }
141 142 }
... ...