feat(workflow): 完善工作流程审批功能

- 在TaskLogNextCmd中添加remarks字段用于备注信息存储
- 添加rejectedStepFlag字段控制步骤是否可被打回
- 实现打回功能逻辑，包括设置当前步骤为打回状态和申请步骤为进行中
- 优化任务日志分页查询功能，使用统一的列表页面接口
- 修复CUTROAD_WORK枚举值描述错误，从"短路作业"改为"断路路作业"
- 在打回操作中注释掉归档和删除逻辑，避免数据重复处理

web-adapter/src/main/java/com/zcloud/eightwork/web/EightworkInfoController.java

@@ -5,6 +5,8 @@ import com.zcloud.eightwork.api.EightworkInfoServiceI;
 import com.zcloud.eightwork.dto.EightworkInfoAddCmd;
 import com.zcloud.eightwork.dto.EightworkInfoPageQry;
 import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd;
+import com.zcloud.eightwork.dto.ForceTerminateCmd;
+import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO;
 import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
@@ -82,10 +84,17 @@ public class EightworkInfoController {
     }
 
     @ApiOperation("强制终止工作流")
-    @PostMapping("/forceTerminate/{id}")
-    public Response forceTerminate(@PathVariable("id") Long id) {
-        eightworkInfoService.forceTerminate(id);
+    @PostMapping("/forceTerminate")
+    public Response forceTerminate(@RequestBody ForceTerminateCmd cmd) {
+        eightworkInfoService.forceTerminate(cmd.getId(), cmd.getCloseReason());
         return SingleResponse.buildSuccess();
     }
+
+    @ApiOperation("按作业类型统计")
+    @PostMapping("/statisticsByWorkType")
+    public MultiResponse<StatisticsByWorkTypeCO> statisticsByWorkType(@RequestBody EightworkInfoPageQry qry) {
+        return MultiResponse.of(eightworkInfoService.statisticsByWorkType(qry));
+    }
+
 }
 

web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoRemoveExe.java

@@ -2,6 +2,7 @@ package com.zcloud.eightwork.command;
 
 import com.alibaba.cola.exception.BizException;
 import com.zcloud.eightwork.domain.gateway.EightworkInfoGateway;
+import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

web-app/src/main/java/com/zcloud/eightwork/command/EightworkInfoSaveDraftExe.java

@@ -1,13 +1,19 @@
 package com.zcloud.eightwork.command;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.exception.BizException;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.eightwork.domain.gateway.TaskFlowGateway;
+import com.zcloud.eightwork.domain.model.MeasuresLogsE;
 import com.zcloud.eightwork.domain.model.TaskFlowE;
+import com.zcloud.eightwork.domain.model.TaskLogE;
 import com.zcloud.eightwork.domain.model.enums.TaskLogStatus;
 import com.zcloud.eightwork.dto.EightworkInfoSaveDraftCmd;
+import com.zcloud.eightwork.dto.TaskLogNextCmd;
 import com.zcloud.eightwork.dto.TaskSignStepInfoCmd;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
 import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO;
@@ -23,7 +29,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 八险作业暂存执行器
@@ -114,6 +122,12 @@ public class EightworkInfoSaveDraftExe {
         // 7. 处理其他安全措施
         handleOtherMeasures(existingInfo.getWorkId(), cmd.getWorkType(), cmd.getOthers());
 
+        // 8. 处理安全措施
+        measuresLogsRepository.physicalDeleteByWorkId(existingInfo.getWorkId());
+        if(ObjectUtil.isNotEmpty(cmd.getOthers()) && cmd.getOthers().containsKey("measures")) {
+            handleMeasuresStep(cmd,existingInfo.getWorkId());
+        }
+
         log.info("暂存更新成功: workId={}", existingInfo.getWorkId());
     }
 
@@ -152,6 +166,11 @@ public class EightworkInfoSaveDraftExe {
         // 4. 处理其他安全措施
         handleOtherMeasures(eightworkInfo.getWorkId(), cmd.getWorkType(), cmd.getOthers());
 
+        // 5. 处理安全措施
+        if(ObjectUtil.isNotEmpty(cmd.getOthers()) && cmd.getOthers().containsKey("measures")) {
+            handleMeasuresStep(cmd,eightworkInfo.getWorkId());
+        }
+
         log.info("暂存创建成功: workId={}", eightworkInfo.getWorkId());
     }
 
@@ -292,4 +311,37 @@ public class EightworkInfoSaveDraftExe {
 
         log.info("暂存时已保存其他安全措施: workId={}, content={}", workId, otherMeasures);
     }
+
+    /**
+     * 处理安全措施确认步骤
+     * 保存安全措施记录
+     */
+    private void handleMeasuresStep(EightworkInfoSaveDraftCmd cmd,String workId) {
+        log.info("暂存 处理安全措施确认");
+
+        List<MeasuresLogsE> measuresList = new ArrayList<>();
+        JSONArray array = cmd.getOthers().getJSONArray("measures");
+        if (array != null) {
+            for (int i = 0; i < array.size(); i++) {
+                MeasuresLogsE item = JSONUtil.toBean(array.getJSONObject(i).toJSONString(), MeasuresLogsE.class);
+                item.setWorkId(workId);
+                measuresList.add(item);
+            }
+        }
+
+        if (ObjectUtil.isNotEmpty(cmd.getOthers().get("measuresType")) && cmd.getOthers().get("measuresType").equals("2")) {
+            measuresLogsRepository.updateBatchById(measuresList.stream().map(item -> {
+                MeasuresLogsDO d = new MeasuresLogsDO();
+                BeanUtils.copyProperties(item, d);
+                return d;
+            }).collect(Collectors.toList()));
+        } else {
+            measuresLogsRepository.saveBatch(measuresList.stream().map(item -> {
+                MeasuresLogsDO d = new MeasuresLogsDO();
+                BeanUtils.copyProperties(item, d, "id");
+                d.setType(1);
+                return d;
+            }).collect(Collectors.toList()));
+        }
+    }
 }

web-app/src/main/java/com/zcloud/eightwork/command/TaskLogAddExe.java

@@ -1,20 +1,27 @@
 package com.zcloud.eightwork.command;
 
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.exception.BizException;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.eightwork.domain.gateway.TaskFlowGateway;
 import com.zcloud.eightwork.domain.gateway.TaskLogGateway;
+import com.zcloud.eightwork.domain.model.MeasuresLogsE;
 import com.zcloud.eightwork.domain.model.TaskFlowE;
 import com.zcloud.eightwork.domain.model.enums.TaskLogStatus;
 import com.zcloud.eightwork.domain.model.enums.WorkCodeEnum;
+import com.zcloud.eightwork.dto.EightworkInfoSaveDraftCmd;
 import com.zcloud.eightwork.dto.TaskLogAddCmd;
 import com.zcloud.eightwork.dto.TaskSignStepInfoCmd;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
+import com.zcloud.eightwork.persistence.dataobject.MeasuresLogsDO;
 import com.zcloud.eightwork.persistence.dataobject.TaskLogDO;
 import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository;
+import com.zcloud.eightwork.persistence.repository.MeasuresLogsRepository;
 import com.zcloud.eightwork.persistence.repository.TaskLogRepository;
 import com.zcloud.gbscommon.utils.DateUtil;
 import com.zcloud.gbscommon.utils.Tools;
@@ -59,6 +66,7 @@ public class TaskLogAddExe {
     private final TaskFlowGateway taskFlowGateway;
     private final EightworkInfoRepository eightworkInfoRepository;
     private final StringRedisTemplate stringRedisTemplate;
+    private final MeasuresLogsRepository measuresLogsRepository;
 
     @Transactional(rollbackFor = Exception.class)
     public List<TaskLogDO> execute(TaskLogAddCmd cmd) {
@@ -92,7 +100,7 @@ public class TaskLogAddExe {
         }
 
         // 2. 检查状态，暂存（0）或打回（2）都可以转正式提交
-        if (!TaskLogStatus.NOT_STARTED.getCode().equals(existingInfo.getStatus()) &&
+        if (!TaskLogStatus.IN_PROGRESS.getCode().equals(existingInfo.getStatus()) &&
             !TaskLogStatus.REJECTED.equalsCode(existingInfo.getStatus())) {
             throw new BizException("只能从暂存状态或打回状态转为正式提交");
         }
@@ -139,6 +147,12 @@ public class TaskLogAddExe {
         // 9. 批量保存
         taskLogRepository.saveBatch(taskLogs);
 
+        // 10. 处理安全措施
+        measuresLogsRepository.physicalDeleteByWorkId(existingInfo.getWorkId());
+        if(ObjectUtil.isNotEmpty(cmd.getOthers()) && cmd.getOthers().containsKey("measures")) {
+            handleMeasuresStep(cmd,existingInfo.getWorkId());
+        }
+
         log.info("作业流程创建成功（从暂存）: workId={}, stepCount={}", existingInfo.getWorkId(), taskLogs.size());
         return taskLogs;
     }
@@ -176,6 +190,11 @@ public class TaskLogAddExe {
         // 5. 批量保存
         taskLogRepository.saveBatch(taskLogs);
 
+        // 6. 处理安全措施
+        if(ObjectUtil.isNotEmpty(cmd.getOthers()) && cmd.getOthers().containsKey("measures")) {
+            handleMeasuresStep(cmd,workId);
+        }
+
         log.info("作业流程创建成功: workId={}, stepCount={}", workId, taskLogs.size());
         return taskLogs;
     }
@@ -427,6 +446,39 @@ public class TaskLogAddExe {
         return mergedJson.toJSONString();
     }
 
+    /**
+     * 处理安全措施确认步骤
+     * 保存安全措施记录
+     */
+    private void handleMeasuresStep(TaskLogAddCmd cmd, String workId) {
+        log.info("暂存 处理安全措施确认");
+
+        List<MeasuresLogsE> measuresList = new ArrayList<>();
+        JSONArray array = cmd.getOthers().getJSONArray("measures");
+        if (array != null) {
+            for (int i = 0; i < array.size(); i++) {
+                MeasuresLogsE item = JSONUtil.toBean(array.getJSONObject(i).toJSONString(), MeasuresLogsE.class);
+                item.setWorkId(workId);
+                measuresList.add(item);
+            }
+        }
+
+        if (ObjectUtil.isNotEmpty(cmd.getOthers().get("measuresType")) && cmd.getOthers().get("measuresType").equals("2")) {
+            measuresLogsRepository.updateBatchById(measuresList.stream().map(item -> {
+                MeasuresLogsDO d = new MeasuresLogsDO();
+                BeanUtils.copyProperties(item, d);
+                return d;
+            }).collect(Collectors.toList()));
+        } else {
+            measuresLogsRepository.saveBatch(measuresList.stream().map(item -> {
+                MeasuresLogsDO d = new MeasuresLogsDO();
+                BeanUtils.copyProperties(item, d, "id");
+                d.setType(1);
+                return d;
+            }).collect(Collectors.toList()));
+        }
+    }
+
     /**
      * 构建票号 Redis Key
      * 格式: eightwork:ticket:no:{作业类型代码}:{日期}

web-app/src/main/java/com/zcloud/eightwork/command/TaskLogUpdateExe.java

@@ -231,6 +231,7 @@ public class TaskLogUpdateExe {
         log.info("完成当前步骤: stepName={}, status={}", currentLog.getStepName(), cmd.getStatus());
 
         currentLog.setStatus(cmd.getStatus());
+        currentLog.setRemarks(cmd.getRemarks());
 
         // 签字步骤，保存签字图片
         if (SIGN_STEP_FLAG.equals(currentLog.getSignStepFlag())) {
@@ -699,6 +700,9 @@ public class TaskLogUpdateExe {
         // 更新 eightworkInfo.info（只更新本次变化的步骤）
         updateEightworkInfo(cmd.getWorkId(), actionLogs);
 
+        // 保存关闭原因到主表 info
+        saveCloseReason(cmd.getWorkId(), cmd.getOthers());
+
         // 更新主表状态为998
         eightworkInfoRepository.updateWorkStatus(
                 cmd.getWorkId(),
@@ -709,6 +713,53 @@ public class TaskLogUpdateExe {
         log.info("工作流已强制终止: workId={}, skippedSteps={}", cmd.getWorkId(), actionLogs.size() - 1);
     }
 
+    /**
+     * 保存强制终止关闭原因到主表 info
+     */
+    private void saveCloseReason(String workId, JSONObject others) {
+        if (others == null || !others.containsKey("closeReason")) {
+            return;
+        }
+
+        String closeReason = others.getString("closeReason");
+        if (StringUtils.isBlank(closeReason)) {
+            return;
+        }
+
+        EightworkInfoDO infoDO = eightworkInfoRepository.getOne(
+                new LambdaQueryWrapper<EightworkInfoDO>()
+                        .eq(EightworkInfoDO::getWorkId, workId)
+        );
+
+        if (infoDO == null) {
+            log.warn("未找到作业信息: workId={}", workId);
+            return;
+        }
+
+        // 解析现有的 info
+        JSONObject infoJson;
+        if (StringUtils.isNotBlank(infoDO.getInfo())) {
+            try {
+                infoJson = JSONObject.parseObject(infoDO.getInfo());
+            } catch (Exception e) {
+                log.warn("解析 info 失败，使用空对象: workId={}", workId, e);
+                infoJson = new JSONObject();
+            }
+        } else {
+            infoJson = new JSONObject();
+        }
+
+        // 添加关闭原因
+        infoJson.put("closeReason", closeReason);
+        infoJson.put("closeTime", DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
+
+        // 更新到数据库
+        infoDO.setInfo(infoJson.toJSONString());
+        eightworkInfoRepository.updateById(infoDO);
+
+        log.info("已保存关闭原因: workId={}, closeReason={}", workId, closeReason);
+    }
+
     /**
      * 处理打回工作流
      * status为2时打回到申请步骤，删除后续流程，允许修改后重新提交
@@ -723,22 +774,43 @@ public class TaskLogUpdateExe {
             throw new BizException("未找到对应的步骤记录");
         }
 
+        // 设置当前步骤为打回状态
+        List<TaskLogDO> actionLogs = new ArrayList<>();
+        currentLog.setStatus(TaskLogStatus.REJECTED.getCode());
+        addActionLog(actionLogs, currentLog);
+
+        // 设置申请步骤为进行中
+        TaskLogE applyFlow = allLogs.stream()
+                .filter(f -> FIRST_STEP_ID.equals(f.getStepId()))
+                .findFirst()
+                .orElseThrow(() -> new BizException("未找到申请步骤配置"));
+        applyFlow.setStatus(TaskLogStatus.IN_PROGRESS.getCode());
+        addActionLog(actionLogs, applyFlow);
+
+        // 更新本次步骤变化
+        taskLogRepository.updateBatchById(actionLogs);
+
+
+        /*
+         * 打回后状态锁死 不需要归档数据
+         */
+
         // 1. 归档当前的 task_log 记录（除了申请步骤）
-        archiveTaskLogs(allLogs);
+//        archiveTaskLogs(allLogs);
 
         // 2. 归档辅助数据（delay、gas、measures）
-        archiveSupplementaryInfo(cmd.getWorkId());
+//        archiveSupplementaryInfo(cmd.getWorkId());
 
         // 3. 删除除申请步骤外的所有 task_log
-        deleteTaskLogsExceptFirst(cmd.getWorkId());
+//        deleteTaskLogsExceptFirst(cmd.getWorkId());
 
         // 4. 删除辅助数据（delay、gas、measures）
-        deleteSupplementaryInfo(cmd.getWorkId());
-
+//        deleteSupplementaryInfo(cmd.getWorkId());
+//
         // 5. 新建一条新的申请记录，status=0（暂存状态）
-        createNewApplyTaskLog(cmd.getWorkId());
+//        createNewApplyTaskLog(cmd.getWorkId());
 
-        // 6. 更新主表状态为暂存，添加打回信息
+        // 6. 更新主表状态为打回，添加打回信息
         updateMainInfoForReject(cmd.getWorkId(), currentLog, cmd.getOthers());
 
         // 7. 发送待办完成事件
@@ -1035,8 +1107,8 @@ public class TaskLogUpdateExe {
      * 如果现有记录数少于签字人数，自动创建新记录
      */
     private void handleMultipleSignStep(TaskLogE firstLog, List<TaskLogE> existingLogs,
-                                         List<TaskSignStepInfoCmd> signInfos,
-                                         List<TaskLogDO> actionLogs, List<TaskLogE> allLogs) {
+                                        List<TaskSignStepInfoCmd> signInfos,
+                                        List<TaskLogDO> actionLogs, List<TaskLogE> allLogs) {
         int existingCount = existingLogs.size();
         int requiredCount = signInfos.size();
 

web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java

@@ -4,14 +4,18 @@ import com.alibaba.cola.dto.PageResponse;
 import com.zcloud.eightwork.command.convertor.EightworkInfoCoConvertor;
 import com.zcloud.eightwork.dto.EightworkInfoPageQry;
 import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO;
+import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
+import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO;
 import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -48,5 +52,15 @@ public class EightworkInfoQueryExe {
         List<EightworkInfoCO> examCenterCOS = eightworkInfoCoConvertor.converDOsToCOs(pageResponse.getData());
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
+
+    public List<StatisticsByWorkTypeCO> statisticsByWorkType(EightworkInfoPageQry qry) {
+        Map<String, Object> params = PageQueryHelper.toHashMap(qry);
+        List<StatisticsByWorkTypeDTO> statisticsByWorkTypeDTOS = eightworkInfoRepository.statisticsByWorkType(params);
+        return statisticsByWorkTypeDTOS.stream().map(statisticsByWorkTypeDTO -> {
+            StatisticsByWorkTypeCO statisticsByWorkTypeCO = new StatisticsByWorkTypeCO();
+            BeanUtils.copyProperties(statisticsByWorkTypeDTO, statisticsByWorkTypeCO);
+            return statisticsByWorkTypeCO;
+        }).collect(Collectors.toList());
+    }
 }
 

web-app/src/main/java/com/zcloud/eightwork/service/EightworkInfoServiceImpl.java

@@ -17,6 +17,7 @@ import com.zcloud.eightwork.dto.EightworkInfoPageQry;
 import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd;
 import com.zcloud.eightwork.dto.TaskLogNextCmd;
 import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO;
+import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
 import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository;
 import lombok.AllArgsConstructor;
@@ -24,6 +25,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * web-app
  *
@@ -80,15 +83,16 @@ public class EightworkInfoServiceImpl implements EightworkInfoServiceI {
      * 业务逻辑参考 TaskLogUpdateExe.handleForceTerminate 方法
      * 1. 根据主表 ID 查询 workId
      * 2. 查找当前正在进行的步骤（status=0）
-     * 3. 构建 TaskLogNextCmd 并设置 status=998
+     * 3. 构建 TaskLogNextCmd 并设置 status=998 和关闭原因
      * 4. 调用 TaskLogService.nextStep 处理强制终止
      *
      * @param id 主表 ID
+     * @param closeReason 关闭原因
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void forceTerminate(Long id) {
-        log.info("强制终止工作流: id={}", id);
+    public void forceTerminate(Long id, String closeReason) {
+        log.info("强制终止工作流: id={}, closeReason={}", id, closeReason);
 
         // 1. 根据主表 ID 查询 EightworkInfoDO 获取 workId
         EightworkInfoDO infoDO = eightworkInfoRepository.getById(id);
@@ -118,10 +122,22 @@ public class EightworkInfoServiceImpl implements EightworkInfoServiceI {
         cmd.setStepId(currentLog.getStepId());
         cmd.setStatus(998); // 强制终止状态码
 
+        // 设置关闭原因到 others
+        if (org.apache.commons.lang.StringUtils.isNotBlank(closeReason)) {
+            com.alibaba.fastjson.JSONObject others = new com.alibaba.fastjson.JSONObject();
+            others.put("closeReason", closeReason);
+            cmd.setOthers(others);
+        }
+
         // 4. 调用 TaskLogService.nextStep 处理强制终止
         taskLogService.nextStep(cmd);
 
-        log.info("工作流已强制终止: workId={}, stepId={}", workId, currentLog.getStepId());
+        log.info("工作流已强制终止: workId={}, stepId={}, closeReason={}", workId, currentLog.getStepId(), closeReason);
+    }
+
+    @Override
+    public List<StatisticsByWorkTypeCO> statisticsByWorkType(EightworkInfoPageQry qry){
+        return eightworkInfoQueryExe.statisticsByWorkType(qry);
     }
 }
 

web-app/src/main/java/com/zcloud/eightwork/service/TaskLogServiceImpl.java

@@ -62,7 +62,7 @@ public class TaskLogServiceImpl implements TaskLogServiceI {
         TaskLogNextCmd taskLogNextCmd = new TaskLogNextCmd(commitTaskLogDO.getId(),
                 commitTaskLogDO.getWorkId(),
                 commitTaskLogDO.getStepId(),
-                TaskLogStatus.APPROVED.getCode(),null,null,null,cmd.getOthers(),null,null,null);
+                TaskLogStatus.APPROVED.getCode(),cmd.getOthers());
 
         taskLogUpdateExe.nextStep(taskLogNextCmd);
         return SingleResponse.buildSuccess();

web-client/src/main/java/com/zcloud/eightwork/api/EightworkInfoServiceI.java

@@ -6,6 +6,9 @@ import com.zcloud.eightwork.dto.EightworkInfoAddCmd;
 import com.zcloud.eightwork.dto.EightworkInfoPageQry;
 import com.zcloud.eightwork.dto.EightworkInfoUpdateCmd;
 import com.zcloud.eightwork.dto.clientobject.EightworkInfoCO;
+import com.zcloud.eightwork.dto.clientobject.StatisticsByWorkTypeCO;
+
+import java.util.List;
 
 /**
  * web-client
@@ -30,7 +33,10 @@ public interface EightworkInfoServiceI {
      * 强制终止工作流
      *
      * @param id 主表 ID
+     * @param closeReason 关闭原因
      */
-    void forceTerminate(Long id);
+    void forceTerminate(Long id, String closeReason);
+
+    List<StatisticsByWorkTypeCO> statisticsByWorkType(EightworkInfoPageQry qry);
 }
 

web-client/src/main/java/com/zcloud/eightwork/dto/EightworkInfoPageQry.java

@@ -26,6 +26,7 @@ public class EightworkInfoPageQry extends PageQuery {
      * - `ne`: 不等比较查询，对应SQL的!=操作符
      */
     private String eqWorkType;
+    private List<Long> inCorpInfoId;
     private String eqCheckNo;
     private Integer eqStatus;
     private String eqWorkLevel;

web-client/src/main/java/com/zcloud/eightwork/dto/ForceTerminateCmd.java

@@ -0,0 +1,26 @@
+package com.zcloud.eightwork.dto;
+
+import com.alibaba.cola.dto.Command;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author fangjiakai
+ * @date 2026/03/31 13:30
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ForceTerminateCmd extends Command {
+    @ApiModelProperty(value = "主键", name = "id", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+    @ApiModelProperty(value = "关闭原因", name = "closeReason")
+    private String closeReason;
+}

web-client/src/main/java/com/zcloud/eightwork/dto/TaskFlowAddCmd.java

@@ -81,6 +81,8 @@ public class TaskFlowAddCmd extends Command {
     @NotNull(message = "是否可以添加安全措施")
     private Integer measuresStepFlag;
 
+    @ApiModelProperty(value = "是否可以打回1是2否", name = "rejectedStepFlag")
+    private Integer rejectedStepFlag;
 
 
     @ApiModelProperty(value = "0无分支1有分支开始2有分支结束", name = "branchFlag", required = true)

web-client/src/main/java/com/zcloud/eightwork/dto/TaskLogNextCmd.java

@@ -53,5 +53,15 @@ public class TaskLogNextCmd extends Command {
     //附件
     @ApiModelProperty(value = "附件")
     private String filePath;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    public TaskLogNextCmd(Long id, String workId, Long stepId, Integer status, JSONObject others) {
+        this.id = id;
+        this.workId = workId;
+        this.stepId = stepId;
+        this.status = status;
+        this.others = others;
+    }
 }
 

web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/StatisticsByWorkTypeCO.java

@@ -0,0 +1,25 @@
+package com.zcloud.eightwork.dto.clientobject;
+
+import com.alibaba.cola.dto.ClientObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fangjiakai
+ * @date 2026/03/31 13:42
+ */
+@Data
+public class StatisticsByWorkTypeCO extends ClientObject {
+    @ApiModelProperty(value = "企业ID")
+    private Long corpinfoId;
+    @ApiModelProperty(value = "暂存数")
+    private Integer draftCount;
+    @ApiModelProperty(value = "进行中数")
+    private Integer doingCount;
+    @ApiModelProperty(value = "打回数")
+    private Integer rejectedCount;
+    @ApiModelProperty(value = "强制终止数")
+    private Integer forceTerminateCount;
+    @ApiModelProperty(value = "完成数")
+    private Integer doneCount;
+}

web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskFlowCO.java

@@ -59,6 +59,9 @@ public class TaskFlowCO extends ClientObject {
     private Integer selectSignStep;
     @ApiModelProperty(value = "是否可以添加安全措施")
     private Integer measuresStepFlag;
+    //是否可以打回1是2否
+    @ApiModelProperty(value = "是否可以打回1是2否")
+    private Integer rejectedStepFlag;
     //0无分支1有分支开始2有分支结束
     @ApiModelProperty(value = "0无分支1有分支开始2有分支结束")
     private Integer branchFlag;

web-client/src/main/java/com/zcloud/eightwork/dto/clientobject/TaskLogCO.java

@@ -100,6 +100,9 @@ public class TaskLogCO extends ClientObject {
     private Integer selectSignStep;
     @ApiModelProperty(value = "是否可以添加安全措施")
     private Integer measuresStepFlag;
+    //是否可以打回1是2否
+    @ApiModelProperty(value = "是否可以打回1是2否")
+    private Integer rejectedStepFlag;
     //0无分支1有分支开始2有分支结束
     @ApiModelProperty(value = "0无分支1有分支开始2有分支结束")
     private Integer branchFlag;

web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskFlowE.java

@@ -46,6 +46,8 @@ public class TaskFlowE extends BaseE {
         private Integer selectSignStep;
        //是否可以添加安全措施
         private Integer measuresStepFlag;
+        //是否可以打回1是2否
+        private Integer rejectedStepFlag;
         //0无分支1有分支开始2有分支结束
         private Integer branchFlag;
         //branch_flag == 1  分支节点ID

web-domain/src/main/java/com/zcloud/eightwork/domain/model/TaskLogE.java

@@ -69,6 +69,8 @@ public class TaskLogE extends BaseE {
         private Integer selectSignStep;
         //是否可以添加安全措施
         private Integer measuresStepFlag;
+        //是否可以打回1是2否
+        private Integer rejectedStepFlag;
         //0无分支1有分支开始2有分支结束
         private Integer branchFlag;
         //branch_flag == 1  分支节点ID
@@ -123,6 +125,7 @@ public class TaskLogE extends BaseE {
                 this.specialStepCode = log.getSpecialStepCode();
                 this.selectSignStep = log.getSelectSignStep();
                 this.measuresStepFlag = log.getMeasuresStepFlag();
+                this.rejectedStepFlag = log.getRejectedStepFlag();
                 this.branchFlag = log.getBranchFlag();
                 this.branchStep = log.getBranchStep();
                 this.branchMergeStep = log.getBranchMergeStep();

web-domain/src/main/java/com/zcloud/eightwork/domain/model/enums/WorkCodeEnum.java

@@ -17,7 +17,7 @@ public enum WorkCodeEnum {
     BLINDBOARD_WORK("blindboard_work", "MBCD","盲板抽堵作业"),
     BREAKGROUND_WORK("breakground_work", "DT","动土作业"),
     CONFINEDSPACE_WORK("confinedspace_work", "SXKJ","受限空间作业"),
-    CUTROAD_WORK("cutroad_work", "DL","短路作业"),
+    CUTROAD_WORK("cutroad_work", "DL","断路路作业"),
     ELECTRICITY_WORK("electricity_work", "LSYD","临时用电作业"),
     HIGH_WORK("high_work", "GC","高处作业"),
     HOISTING("hoisting_work", "DZ","吊装作业");

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/ConfinedSpaceMapper.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.zcloud.eightwork.persistence.mapper.ConfinedSpaceMapper">
-
-</mapper>
-

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskFlowDO.java

@@ -62,6 +62,9 @@ public class TaskFlowDO extends BaseDO {
     private Integer selectSignStep;
     @ApiModelProperty(value = "是否可以添加安全措施")
     private Integer measuresStepFlag;
+    //是否可以打回1是2否
+    @ApiModelProperty(value = "是否可以打回1是2否")
+    private Integer rejectedStepFlag;
     //0无分支1有分支开始2有分支结束
     @ApiModelProperty(value = "0无分支1有分支开始2有分支结束")
     private Integer branchFlag;

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/TaskLogDO.java

@@ -98,6 +98,9 @@ public class TaskLogDO extends BaseDO {
     private Integer selectSignStep;
     @ApiModelProperty(value = "是否可以添加安全措施")
     private Integer measuresStepFlag;
+    //是否可以打回1是2否
+    @ApiModelProperty(value = "是否可以打回1是2否")
+    private Integer rejectedStepFlag;
     //0无分支1有分支开始2有分支结束
     @ApiModelProperty(value = "0无分支1有分支开始2有分支结束")
     private Integer branchFlag;

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/dataobject/dto/StatisticsByWorkTypeDTO.java

@@ -0,0 +1,31 @@
+package com.zcloud.eightwork.persistence.dataobject.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jjb.saas.framework.repository.basedo.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author fangjiakai
+ * @date 2026/03/31 13:47
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class StatisticsByWorkTypeDTO extends BaseDO {
+    @ApiModelProperty(value = "企业ID")
+    private Long corpinfoId;
+    @ApiModelProperty(value = "暂存数")
+    private Integer draftCount;
+    @ApiModelProperty(value = "进行中数")
+    private Integer doingCount;
+    @ApiModelProperty(value = "打回数")
+    private Integer rejectedCount;
+    @ApiModelProperty(value = "强制终止数")
+    private Integer forceTerminateCount;
+    @ApiModelProperty(value = "完成数")
+    private Integer doneCount;
+
+}

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/EightworkInfoMapper.java

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jjb.saas.framework.datascope.annotation.DataScope;
 import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
+import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,5 +26,7 @@ import java.util.Map;
 public interface EightworkInfoMapper extends BaseMapper<EightworkInfoDO> {
 
     IPage<EightworkInfoDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> parmas, String menuPerms);
+
+    List<StatisticsByWorkTypeDTO> statisticsByWorkType(@Param("params") Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/mapper/TaskLogMapper.java

@@ -1,12 +1,16 @@
 package com.zcloud.eightwork.persistence.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zcloud.eightwork.domain.model.TodoCountE;
+import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
 import com.zcloud.eightwork.persistence.dataobject.TaskLogDO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * web-infrastructure
@@ -17,6 +21,7 @@ import java.util.List;
 @Mapper
 public interface TaskLogMapper extends BaseMapper<TaskLogDO> {
 
+    IPage<EightworkInfoDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> parmas, String menuPerms);
     List<TodoCountE> getTodoCount(@Param("orgId") Long orgId,@Param("userId") Long userId);
 
     List<TodoCountE> getTodoCountForWork(@Param("orgId") Long orgId,@Param("userId") Long userId,@Param("workType") String workType);

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/EightworkInfoRepository.java

@@ -3,6 +3,7 @@ package com.zcloud.eightwork.persistence.repository;
 import com.alibaba.cola.dto.PageResponse;
 import com.jjb.saas.framework.repository.repo.BaseRepository;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
+import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -21,5 +22,7 @@ public interface EightworkInfoRepository extends BaseRepository<EightworkInfoDO>
     List<EightworkInfoDO> listAllByWorkIds(List<String> workIds);
 
     Long countByWorkType(String workType);
+
+    List<StatisticsByWorkTypeDTO> statisticsByWorkType(Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/EightworkInfoRepositoryImpl.java

@@ -10,6 +10,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.eightwork.domain.model.enums.MenuEnum;
 import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
+import com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO;
 import com.zcloud.eightwork.persistence.mapper.EightworkInfoMapper;
 import com.zcloud.eightwork.persistence.repository.EightworkInfoRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
@@ -66,4 +67,9 @@ public class EightworkInfoRepositoryImpl extends BaseRepositoryImpl<EightworkInf
         queryWrapper.eq(EightworkInfoDO::getWorkType, workType);
         return count(queryWrapper);
     }
+
+    @Override
+    public  List<StatisticsByWorkTypeDTO> statisticsByWorkType(Map<String, Object> params){
+        return eightworkInfoMapper.statisticsByWorkType(params);
+    }
 }

web-infrastructure/src/main/java/com/zcloud/eightwork/persistence/repository/impl/TaskLogRepositoryImpl.java

@@ -4,9 +4,12 @@ import com.alibaba.cola.dto.PageResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
 import com.zcloud.eightwork.domain.model.TodoCountE;
+import com.zcloud.eightwork.domain.model.enums.MenuEnum;
+import com.zcloud.eightwork.persistence.dataobject.EightworkInfoDO;
 import com.zcloud.eightwork.persistence.dataobject.TaskLogDO;
 import com.zcloud.eightwork.persistence.mapper.TaskLogMapper;
 import com.zcloud.eightwork.persistence.repository.TaskLogRepository;
@@ -31,14 +34,10 @@ public class TaskLogRepositoryImpl extends BaseRepositoryImpl<TaskLogMapper, Tas
 
     @Override
     public PageResponse<TaskLogDO> listPage(Map<String, Object> params) {
-        IPage<TaskLogDO> iPage = new Query<TaskLogDO>().getPage(params);
-        QueryWrapper<TaskLogDO> queryWrapper = new QueryWrapper<>();
-        PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
-        queryWrapper.and(wrapper -> wrapper.eq("act_user", params.get("userId"))
-                .or(wrapper1 -> wrapper1.isNull("act_user").eq("act_user_department", params.get("departmentId"))));
-        queryWrapper.orderByDesc("create_time");
-        IPage<TaskLogDO> result = taskLogMapper.selectPage(iPage, queryWrapper);
-        return PageHelper.pageToResponse(result, result.getRecords());
+        Page<Map<String,Object>> page =  new Page<>(Integer.parseInt(params.get("pageIndex").toString()),Integer.parseInt(params.get("pageSize").toString()));
+        String menuPerms = "";
+        IPage<EightworkInfoDO> iPage = taskLogMapper.listPage(page, params,menuPerms);
+        return PageHelper.pageToResponse(iPage, iPage.getRecords());
     }
 
     @Override

web-infrastructure/src/main/resources/mapper/EightworkInfoMapper.xml

@@ -88,5 +88,27 @@
         order by t.create_time desc
     </select>
 
+    <select id="statisticsByWorkType" resultType="com.zcloud.eightwork.persistence.dataobject.dto.StatisticsByWorkTypeDTO">
+        select t.corpinfo_id,
+               sum(case t.status when 0 then 1 else 0 end) as draftCount,
+                sum(case t.status when 1 then 1 else 0 end) as doingCount,
+                sum(case t.status when 2 then 1 else 0 end) as rejectedCount,
+                sum(case t.status when 998 then 1 else 0 end) as forceTerminateCount,
+                sum(case t.status when 999 then 1 else 0 end) as doneCount
+
+        from eightwork_info t
+        where t.delete_enum = 'FALSE'
+        <if test="params.eqWorkType != null and params.eqWorkType != ''">
+            and t.work_type = #{params.eqWorkType}
+        </if>
+        <if test="params.inCorpInfoId != null and params.inCorpInfoId.size() > 0">
+            and t.corpinfo_id in
+            <foreach collection="params.inCorpInfoId" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by t.corpinfo_id
+    </select>
+
 </mapper>
 

web-infrastructure/src/main/resources/mapper/TaskLogMapper.xml

@@ -3,6 +3,25 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.zcloud.eightwork.persistence.mapper.TaskLogMapper">
+    <select id="listPage" resultType="com.zcloud.eightwork.persistence.dataobject.TaskLogDO">
+        select task_log.*
+        from task_log
+        left join eightwork_info on task_log.work_id = eightwork_info.work_id
+        where eightwork_info.delete_enum = 'FALSE'
+        <if test="params.eqWorkType != null">
+            and task_log.work_type = #{params.eqWorkType}
+        </if>
+        <if test="params.eqStatus != null">
+            and task_log.status = #{params.eqStatus}
+        </if>
+        <if test="params.eqStepId != null">
+            and task_log.step_id = #{params.eqStepId}
+        </if>
+        and (task_log.act_user = #{params.userId}
+        or (task_log.act_user_department = #{params.departmentId}
+        and task_log.act_user is null))
+        order by task_log.create_time desc
+    </select>
 
     <select id="getTodoCount" resultType="com.zcloud.eightwork.domain.model.TodoCountE">
         select task_log.work_type,
@@ -11,8 +30,10 @@
                  left join eightwork_info on task_log.work_id = eightwork_info.work_id
         where task_log.status = 0
           and eightwork_info.status != 0
-        and (task_log.act_user = #{userId}
-           or (task_log.act_user_department = #{orgId} and task_log.act_user is null))
+          and eightwork_info.delete_enum = 'FALSE'
+          and (task_log.act_user = #{userId}
+           or (task_log.act_user_department = #{orgId}
+          and task_log.act_user is null))
         group by task_log.work_type
     </select>
 
@@ -25,6 +46,7 @@
         where task_log.status = 0
           and task_log.work_type = #{workType}
           and eightwork_info.status != 0
+          and eightwork_info.delete_enum = 'FALSE'
           and (task_log.act_user = #{userId}
            or (task_log.act_user_department = #{orgId}
           and task_log.act_user is null))