Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents b5587b01 d1b757a5
Showing 21 changed files with 268 additions and 6 deletions
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailRespVO.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskReturnReqVO.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/convert/task/BpmProcessInstanceConvert.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/framework/flowable/core/util/FlowableUtils.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskService.java
urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/service/task/BpmTaskServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/maininfo/vo/MainInfoHasTaskPageReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/process/AppGardenApprovalDetailRespVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskApproveReqVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java
@@ -107,6 +107,10 @@ public class BpmApprovalDetailRespVO {
         @Schema(description = "签名", example = "https://www.iocoder.cn/sign.png")
         private String signPicUrl;
+        // add by yanhuiqing 扩展审批图片
+        @Schema(description = "审批附件url", example = "https://www.iocoder.cn/sign.png")
+        private List<String> attattmentUrls;
+
     }
 }
@@ -21,6 +21,10 @@ public class BpmTaskApproveReqVO {
     @Schema(description = "签名", example = "https://www.iocoder.cn/sign.png")
     private String signPicUrl;
+    // add by yanhuiqing 扩展审批图片
+    @Schema(description = "审批附件url", example = "https://www.iocoder.cn/sign.png")
+    private List<String> attattmentUrls;
+
     @Schema(description = "变量实例（动态表单）", requiredMode = Schema.RequiredMode.REQUIRED)
     private Map<String, Object> variables;
@@ -35,6 +35,10 @@ public class BpmTaskRespVO {
     @Schema(description = "审批理由", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private String reason;
+    // add by yanhuiqing 扩展审批图片
+    @Schema(description = "审批附件url", example = "https://www.iocoder.cn/sign.png")
+    private List<String> attattmentUrls;
+
     @Schema(description = "任务负责人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048")
     @JsonIgnore // 不返回，只是方便后续读取，赋值给 ownerUser
     private Long owner;
@@ -5,6 +5,8 @@ import lombok.Data;
 import jakarta.validation.constraints.NotEmpty;
+import java.util.List;
+
 @Schema(description = "管理后台 - 退回流程任务的 Request VO")
 @Data
 public class BpmTaskReturnReqVO {
@@ -21,4 +23,8 @@ public class BpmTaskReturnReqVO {
     @NotEmpty(message = "退回意见不能为空")
     private String reason;
+    // add by yanhuiqing 扩展审批图片
+    @Schema(description = "审批附件url", example = "https://www.iocoder.cn/sign.png")
+    private List<String> attattmentUrls;
+
 }
@@ -206,7 +206,8 @@ public interface BpmProcessInstanceConvert {
         }
         return BeanUtils.toBean(task, BpmApprovalDetailRespVO.ActivityNodeTask.class)
                 .setStatus(FlowableUtils.getTaskStatus(task)).setReason(FlowableUtils.getTaskReason(task))
-                .setSignPicUrl(FlowableUtils.getTaskSignPicUrl(task));
+                .setSignPicUrl(FlowableUtils.getTaskSignPicUrl(task))
+                .setAttattmentUrls(FlowableUtils.getTaskAttachPicUrl(task));
     }
     default Set<Long> parseUserIds(HistoricProcessInstance processInstance,
@@ -105,4 +105,9 @@ public class BpmnVariableConstants {
      */
     public static final String TASK_SIGN_PIC_URL = "TASK_SIGN_PIC_URL";
+    /**
+     * 审批附件 - 图片 URL
+     */
+    public static final String TASK_APPROVE_PIC_URL = "TASK_APPROVE_PIC_URL";
+
 }
@@ -24,6 +24,7 @@ import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.TaskInfo;
+import org.flowable.task.api.history.HistoricTaskInstance;
 import java.util.HashMap;
 import java.util.List;
@@ -359,4 +360,12 @@ public class FlowableUtils {
         return getExpressionValue(variableContainer, expressionString);
     }
+    /**
+     * add by yanhuiqing 新增获取审批任务附件图片
+     * @param task
+     * @return
+     */
+    public static List<String> getTaskAttachPicUrl(TaskInfo task) {
+        return (List<String>) task.getTaskLocalVariables().get(BpmnVariableConstants.TASK_APPROVE_PIC_URL);
+    }
 }
@@ -212,6 +212,54 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService 
                     historicProcessInstance, processInstanceStatus, activities, tasks);
             runActivityNodes = getRunApproveNodeList(startUserId, bpmnModel, processDefinition, processVariables,
                     activities, tasks);
+            /**
+             *  // ========== 新增：处理附件URL列表 add by yanhuiqing==========
+             */
+
+            // 步骤1：获取流程实例ID（转为字符串，适配Flowable的String类型ID）
+            String processInstanceId = reqVO.getProcessInstanceId() != null ? reqVO.getProcessInstanceId().toString() : null;
+
+            // 步骤2：处理已结束节点的tasks附件URL
+            if (CollUtil.isNotEmpty(runActivityNodes)) {
+                runActivityNodes.forEach(activityNode -> {
+                    if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                        activityNode.getTasks().forEach(task -> {
+                            // 传入流程实例ID和任务ID，查询附件URL
+                            List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                            task.setAttattmentUrls(urlList); // 为task设置附件URL列表
+                        });
+                    }
+                });
+            }
+            if (CollUtil.isNotEmpty(endActivityNodes)) {
+                endActivityNodes.forEach(activityNode -> {
+                    if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                        activityNode.getTasks().forEach(task -> {
+                            // 传入流程实例ID和任务ID，查询附件URL
+                            List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                            task.setAttattmentUrls(urlList); // 为task设置附件URL列表
+                        });
+                    }
+                });
+            }
+
+            // 步骤3：处理运行中节点的tasks附件URL
+            if (CollUtil.isNotEmpty(runActivityNodes)) {
+                runActivityNodes.forEach(activityNode -> {
+                    if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                        activityNode.getTasks().forEach(task -> {
+                            List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                            task.setAttattmentUrls(urlList);
+                        });
+                    }
+                });
+            }
+
+            /**
+             *  // ========== end 新增：处理附件URL列表 add by yanhuiqing==========
+             */
+
+
         }
         // 2.2 流程已经结束，直接 return，无需预测
@@ -242,6 +290,69 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService 
         List<ActivityNode> simulateActivityNodes = getSimulateApproveNodeList(startUserId, bpmnModel,
                 processDefinitionInfo,
                 processVariables, activities, needSimulateTaskDefKeysByReturn);
+        /**
+         *  // ========== 新增：处理附件URL列表 add by yanhuiqing==========
+         */
+
+        // 步骤1：获取流程实例ID（转为字符串，适配Flowable的String类型ID）
+        String processInstanceId = reqVO.getProcessInstanceId() != null ? reqVO.getProcessInstanceId().toString() : null;
+
+        // 步骤2：处理已结束节点的tasks附件URL
+        if (CollUtil.isNotEmpty(runActivityNodes)) {
+            runActivityNodes.forEach(activityNode -> {
+                if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                    activityNode.getTasks().forEach(task -> {
+                        // 传入流程实例ID和任务ID，查询附件URL
+                        List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                        task.setAttattmentUrls(urlList); // 为task设置附件URL列表
+                    });
+                }
+            });
+        }
+        if (CollUtil.isNotEmpty(endActivityNodes)) {
+            endActivityNodes.forEach(activityNode -> {
+                if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                    activityNode.getTasks().forEach(task -> {
+                        // 传入流程实例ID和任务ID，查询附件URL
+                        List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                        task.setAttattmentUrls(urlList); // 为task设置附件URL列表
+                    });
+                }
+            });
+        }
+
+        // 步骤3：处理运行中节点的tasks附件URL
+        if (CollUtil.isNotEmpty(runActivityNodes)) {
+            runActivityNodes.forEach(activityNode -> {
+                if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                    activityNode.getTasks().forEach(task -> {
+                        List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                        task.setAttattmentUrls(urlList);
+                    });
+                }
+            });
+        }
+
+        // 步骤4：处理模拟节点的tasks附件URL（如果有）
+        if (CollUtil.isNotEmpty(simulateActivityNodes)) {
+            simulateActivityNodes.forEach(activityNode -> {
+                if (CollUtil.isNotEmpty(activityNode.getTasks())) {
+                    activityNode.getTasks().forEach(task -> {
+                        List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, task.getId());
+                        task.setAttattmentUrls(urlList);
+                    });
+                }
+            });
+        }
+
+        // 步骤5：处理待办任务的附件URL
+        if (todoTask != null) {
+            List<String> urlList = taskService.getAttachmentUrlList(processInstanceId, todoTask.getId());
+            todoTask.setAttattmentUrls(urlList);;
+        }
+        /**
+         *  // ========== end 新增：处理附件URL列表 add by yanhuiqing==========
+         */
         // 4. 拼接最终数据
         return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance,
@@ -7,6 +7,7 @@ import com.zteits.urbanops.module.bpm.enums.definition.BpmUserTaskTimeoutHandler
 import jakarta.validation.Valid;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.history.HistoricActivityInstance;
+import org.flowable.engine.task.Attachment;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.TaskInfo;
 import org.flowable.task.api.history.HistoricTaskInstance;
@@ -329,4 +330,16 @@ public interface BpmTaskService {
      */
     void triggerTask(String processInstanceId, String taskDefineKey);
+
+
+    //---------------------------------------------------------------
+    //扩展芋道 bpm不支持，审批时上传的附件问题 add by yanhuiqing
+
+    /**
+     * 扩展 功能支持 审批人上传的附件类型
+     * @param taskId
+     * @param processInstanceId
+     * @return
+    */
+    List<String> getAttachmentUrlList(String processInstanceId, String taskId);
 }
@@ -49,6 +49,7 @@ import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.runtime.ActivityInstance;
 import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.engine.task.Attachment;
 import org.flowable.task.api.DelegationState;
 import org.flowable.task.api.Task;
 import org.flowable.task.api.TaskInfo;
@@ -63,6 +64,7 @@ import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -586,6 +588,27 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         // 2.2 添加评论
         taskService.addComment(task.getId(), task.getProcessInstanceId(), BpmCommentTypeEnum.APPROVE.getType(),
                 BpmCommentTypeEnum.APPROVE.formatComment(reqVO.getReason()));
+        /**
+         * add by yanhuiqing 审批附件 begin
+         */
+
+        List<String> urlList = reqVO.getAttattmentUrls();
+        if(ObjectUtil.isNotEmpty(urlList)){
+            String targetUrls = CollUtil.isEmpty(urlList)?StrUtil.EMPTY:urlList.stream()
+                    .filter(StrUtil::isNotEmpty)
+                    .distinct()
+                    .collect(Collectors.joining(","));
+            String attachmentName = "审批附件-" + BpmCommentTypeEnum.APPROVE.getType();
+            String attachmentType = "URL"; // 附件类型标记为URL（可自定义）
+            String description = BpmCommentTypeEnum.APPROVE.getName()+"的附件";
+            taskService.createAttachment(attachmentType,task.getId(),task.getProcessInstanceId(),attachmentName,description,targetUrls);
+            taskService.setVariableLocal(task.getId(), BpmnVariableConstants.TASK_APPROVE_PIC_URL, reqVO.getAttattmentUrls());
+
+        }
+        /**
+         * add by yanhuiqing 审批附件 end
+         */
+
         // 3. 设置流程变量。如果流程变量前端传空，需要从历史实例中获取，原因：前端表单如果在当前节点无可编辑的字段时 variables 一定会为空
         // 场景一：A 节点发起，B 节点表单无可编辑字段，审批通过时，C 节点需要流程变量获取下一个执行节点，但因为 B 节点无可编辑的字段，variables 为空，流程可能出现问题。
@@ -904,6 +927,25 @@ public class BpmTaskServiceImpl implements BpmTaskService {
      * @param reqVO         前端参数封装
      */
     public void returnTask(Long userId, BpmnModel bpmnModel, Task currentTask, FlowElement targetElement, BpmTaskReturnReqVO reqVO) {
+
+        /**
+         * add by yanhuiqing 审批附件 begin
+         */
+        List<String> urlList = reqVO.getAttattmentUrls();
+        if(CollUtil.isNotEmpty(urlList)){
+            String targetUrls = CollUtil.isEmpty(urlList)?StrUtil.EMPTY:urlList.stream()
+                    .filter(StrUtil::isNotEmpty)
+                    .distinct()
+                    .collect(Collectors.joining(","));
+            String attachmentName = "审批附件-" + BpmCommentTypeEnum.RETURN.getType();
+            String attachmentType = "URL"; // 附件类型标记为URL（可自定义）
+            String description = BpmCommentTypeEnum.RETURN.getName()+"的附件";
+            taskService.createAttachment(attachmentType,currentTask.getId(),currentTask.getProcessInstanceId(),attachmentName,description,targetUrls);
+        }
+        /**
+         * add by yanhuiqing 审批附件 end
+         */
+
         // 1. 获得所有需要回撤的任务 taskDefinitionKey，用于稍后的 moveActivityIdsToSingleActivityId 回撤
         // 1.1 获取所有正常进行的任务节点 Key
         List<Task> taskList = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).list();
@@ -1643,6 +1685,28 @@ public class BpmTaskServiceImpl implements BpmTaskService {
         FlowableUtils.execute(execution.getTenantId(),
                 () -> runtimeService.trigger(execution.getId()));
     }
+    //扩展 add by yanhuiqing
+    @Override
+    public List<String> getAttachmentUrlList(String processInstanceId, String taskId) {
+
+        List<Attachment> attachmentList = taskService.getProcessInstanceAttachments(processInstanceId);
+        // 空列表直接返回空集合（避免null）
+        if (CollUtil.isEmpty(attachmentList)) {
+            return new ArrayList<>();
+        }
+
+        List<String> targetList = new ArrayList<>();
+        for(Attachment a : attachmentList){
+            if(taskId.equals(a.getTaskId())){
+                String urls = a.getUrl();
+                String[] array = urls.split(",");
+                targetList.addAll(Arrays.asList(array));
+            }
+        }
+        return targetList.stream()
+                .distinct() // 核心：去重
+                .collect(Collectors.toList());
+    }
     /**
      * 获得自身的代理对象，解决 AOP 生效问题
@@ -36,6 +36,9 @@ public class AppInspectionPlanCommitSaveReqVO {
     @NotNull(message = "转交状态: 1:未转交;2:已转交不能为空")
     private Integer transState;
+    @Schema(description = "紧急程度" )
+    private Integer pressingType;
+
     @Schema(description = "转交问题单编码", requiredMode = Schema.RequiredMode.REQUIRED)
     private String transWorkNo;
@@ -6,6 +6,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -37,11 +38,11 @@ public class AppInspectionPlanRespVO {
     @Schema(description = "执行开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate beginTime;
+    private LocalDateTime beginTime;
     @Schema(description = "执行时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate endTime;
+    private LocalDateTime endTime;
     @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer finishState;
@@ -50,9 +50,9 @@ public class AppMaintainPlanPageRoadRespVO{
     private Integer planFinishNum;
     @Schema(description = "执行开始时间")
-    private LocalDate beginTime;
+    private LocalDateTime beginTime;
     @Schema(description = "执行时间")
-    private LocalDate endTime;
+    private LocalDateTime endTime;
 }
 \ No newline at end of file
@@ -27,6 +27,7 @@ public interface AppGardenWorkOrderConvert {
         orderReqVO.setSourceName("园林巡查上报");
         orderReqVO.setThirdWorkNo(planNo);
         orderReqVO.setOrderType("C");
+        orderReqVO.setPressingType(createReqVO.getPressingType());
         orderReqVO.setFinishDate(LocalDateTime.now());
         orderReqVO.setBusiLine(inspectionPlanDO.getBusiLine());
         orderReqVO.setLatLonType(3);
@@ -169,7 +169,7 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
                 .inspectionState(createReqVO.getInspectionState()).transState(createReqVO.getTransState())
                 .transWorkNo(createReqVO.getTransWorkNo())
                 .userId(userId).userName(userName)
-                .finishTime(now).creatorName(userName).updaterName(userName)
+                .creatorName(userName).updaterName(userName)
                 .remark(createReqVO.getRemark()).imgHost(createReqVO.getImgHost()).build();
         inspectionPlanCommit.setCreator(userId+"");
         inspectionPlanCommit.setUpdater(userId+"");
@@ -39,6 +39,8 @@ public class MainInfoHasTaskPageReqVO extends PageParam {
     private String busiLine;
     @Schema(description = "工单号")
     private String orderNo;
+    @Schema(description = "工单类型 Q:快速工单,C:普通工单,O:其他工单")
+    private String orderType;
     @Schema(description = "工单名称", example = "张三")
     private String orderName;
     @Schema(description = "工单描述", example = "你说的对")
@@ -303,6 +303,8 @@ public class AppGardenWorkOrderController {
                 rejReqVO.setCurTaskKey(reqVO.getTaskKey());
                 rejReqVO.setReason(reqVO.getReason());
                 rejReqVO.setWorkerDataId(reqVO.getWorkerDataId());
+                List<String> returnImgs = reqVO.getReturnImgs();
+                rejReqVO.setReturnImgs(returnImgs);
                 this.returnPreviousNode(rejReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_CONFIRM_REJECT.getDesc()+"<--结束");
                 return success(true);
@@ -335,6 +337,7 @@ public class AppGardenWorkOrderController {
                 returnApproveReqVO.setAgree(approveStatus);
                 returnApproveReqVO.setReason(reqVO.getReason());
                 returnApproveReqVO.setId(reqVO.getTaskId());
+                returnApproveReqVO.setReturnImgs(reqVO.getReturnImgs());
                 this.approveTask(returnApproveReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_TEAM_LEADER_RETURN.getDesc()+"<--结束");
                 return success(true);
@@ -348,6 +351,7 @@ public class AppGardenWorkOrderController {
                 inspectStartReqVO.setAgree(revokeStatus);
                 inspectStartReqVO.setReason(reqVO.getReason());
                 inspectStartReqVO.setId(reqVO.getTaskId());
+                inspectStartReqVO.setReturnImgs(reqVO.getReturnImgs());
                 this.approveTask(inspectStartReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束");
                 return success(true);
@@ -379,6 +383,7 @@ public class AppGardenWorkOrderController {
                 inspectReqVO.setAgree(verifyStatus);
                 inspectReqVO.setReason(reqVO.getReason());
                 inspectReqVO.setId(reqVO.getTaskId());
+                inspectReqVO.setReturnImgs(reqVO.getReturnImgs());
                 this.approveTask(inspectReqVO);
                 log.info("当前操作："+OperateTypeEnum.YL_INSPECTOR_START_FINISH.getDesc()+"<--结束");
                 return success(true);
@@ -111,6 +111,9 @@ public class AppGardenApprovalDetailRespVO {
         @Schema(description = "签名", example = "https://www.iocoder.cn/sign.png")
         private String signPicUrl;
+        // add by yanhuiqing 扩展审批图片
+        @Schema(description = "审批附件url", example = "https://www.iocoder.cn/sign.png")
+        private List<String> attattmentUrls;
     }
@@ -37,4 +37,7 @@ public class AppGardenTaskApproveReqVO {
     //@NotEmpty(message = "工单的数据id不能为空")
     private Long workerDataId;
+    @Schema(description = "退回时的拍照图片")
+    private List<String> returnImgs;
+
 }
 \ No newline at end of file
@@ -92,6 +92,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
+            "  <if test='query.orderType != null'>",
+            "    AND m.order_type = #{query.orderType}",
+            "  </if>",
             "  <if test='query.taskId != null'>",
             "    AND t.ID_ = #{query.taskId}",
             "  </if>",
@@ -208,6 +211,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
+            "  <if test='query.orderType != null'>",
+            "    AND m.order_type = #{query.orderType}",
+            "  </if>",
             "  <if test='query.taskId != null'>",
             "    AND t.ID_ = #{query.taskId}",
             "  </if>",
@@ -316,6 +322,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
+            "  <if test='query.orderType != null'>",
+            "    AND m.order_type = #{query.orderType}",
+            "  </if>",
             "  <if test='query.taskId != null'>",
             "    AND t.ID_ = #{query.taskId}",
             "  </if>",
@@ -433,6 +442,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
+            "  <if test='query.orderType != null'>",
+            "    AND m.order_type = #{query.orderType}",
+            "  </if>",
             "  <if test='query.taskId != null'>",
             "    AND t.ID_ = #{query.taskId}",
             "  </if>",
@@ -544,6 +556,9 @@ public interface MainInfoExtMapper extends BaseMapperX&lt;MainInfoDO&gt; {
             "  <if test='query.curingLevelId != null'>",
             "    AND m.curing_level_id = #{query.curingLevelId}",
             "  </if>",
+            "  <if test='query.orderType != null'>",
+            "    AND m.order_type = #{query.orderType}",
+            "  </if>",
             "  <if test='query.taskId != null'>",
             "    AND t.ID_ = #{query.taskId}",
             "  </if>",
@@ -229,6 +229,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         //TODO 审批候选人需要赋值
         Map<String, List<Long>> nextAssignees = new HashMap<>();
         targetVO.setNextAssignees(nextAssignees);
+        targetVO.setAttattmentUrls(reqVO.getReturnImgs());
         taskService.approveTask(SecurityFrameworkUtils.getLoginUserId(),targetVO);
     }
@@ -314,6 +315,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         String currentTaskey = reqVO.getCurTaskKey();
         targetVO.setTargetTaskDefinitionKey(TaskNodeUtils.getPreviousNodeName(currentTaskey));
         Long userId = SecurityFrameworkUtils.getLoginUserId();
+        targetVO.setAttattmentUrls(reqVO.getReturnImgs());
         taskService.returnTask(userId, targetVO);
     }
@@ -431,6 +433,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
         //TODO 先写死
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
+        //需求是APP端 只查普通工单
+        taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
         //selectWorkOrderUniqueMyPage 个性化 去重 按工单唯一处理
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderUniqueMyPage(pageVO,taskBuzReqVO);
         return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi);
@@ -465,6 +469,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
         //TODO 先写死
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
+        //需求是APP端 只查普通工单
+        taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
         //已办改为获取最新一条数据
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDoneUniquePage(pageVO,taskBuzReqVO);
         return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper, adminUserApi);
@@ -500,6 +506,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
         //TODO 先写死
         //taskBuzReqVO.setKey(BpmCommonConstant.BPM_GARDEN_INSPECT_WO);
+        //需求是APP端 只查普通工单
+        taskBuzReqVO.setOrderType(BpmCommonConstant.ORDER_TYPE_C);
         PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderTodoPage(pageVO,taskBuzReqVO);
         return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper,adminUserApi);
     }