转办

bpm-client-http/src/main/java/com/srm/bpm/facde/ProcessFLowHttpClient.java

@@ -155,4 +155,23 @@ public class ProcessFLowHttpClient extends BaseHttpClient {
         final R<String> oneR = restTemplateUtil.getOne(this.host + processUrl + "/print/tmp", params, user, String.class);
         return oneR;
     }
+
+    /**
+     * 转办处理
+     *
+     * @param billId           审批单主键
+     * @param taskId           任务主键
+     * @param transferUserIds  转办目标用户ID列表
+     * @param remark           转办意见
+     * @param user             当前用户
+     * @return 操作结果
+     */
+    public R transfer(Long billId, Long taskId, String transferUserIds, String remark, String user) {
+        Map<String, Object> params = Maps.newHashMap();
+        params.put("billId", billId);
+        params.put("taskId", taskId);
+        params.put("transferUserIds", transferUserIds);
+        params.put("remark", remark);
+        return restTemplateUtil.postNoReturn(this.host + "/bill/flow/rest/transfer", JSON.parseObject(JSON.toJSONString(params)), user);
+    }
 }

bpm-core/src/main/java/com/srm/bpm/facade/rest/BillProcessRestController.java

@@ -12,11 +12,7 @@ import com.srm.bpm.logic.vo.BillDetailVO;
 import com.srm.bpm.logic.vo.ProcessTypeVO;
 import com.srm.common.data.rest.R;
 
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Set;
@@ -139,4 +135,14 @@ public class BillProcessRestController {
         boolean readState = billLogic.readBill(billId);
         return R.state(readState);
     }
+
+    @PostMapping("/transfer")
+    public R transfer(Long billId, Long taskId, String transferUserIds, String remark) {
+
+        // 调用流程转办接口
+        final String userCode = loginUserHolder.getUserCode();
+
+        billLogic.transferUser(billId, taskId.toString(), transferUserIds, userCode, remark);
+        return R.ok();
+    }
 }

bpm-core/src/main/java/com/srm/bpm/infra/service/impl/BillTaskServiceImpl.java

@@ -109,6 +109,7 @@ public class BillTaskServiceImpl extends BaseServiceImpl<BillTaskDao, BillTaskEn
                         .eq(BillTaskEntity::getBillId, billId)
                         .eq(BillTaskEntity::getTaskId, taskId)
                         .eq(BillTaskEntity::getUserCode, userCode)
+                        //.eq(BillTaskEntity::getNodeStatus,BillTaskStatus.APPROVAL.getStatus())
                         .orderByDesc(BillTaskEntity::getSort);
         final java.util.Optional<BillTaskEntity> optional = unique(queryWrapper);
         if (!optional.isPresent()) {

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillBtnLogicImpl.java

@@ -657,7 +657,7 @@ public class BillBtnLogicImpl implements BillBtnLogic {
             split.add(BillBtnConst.BTN_CANCEL);
             split.add(BillBtnConst.BTN_TRACK);
             split.add(BillBtnConst.BTN_ENDORSE);
-            split.add(BillBtnConst.BTN_TRANSFER);
+            //split.add(BillBtnConst.BTN_TRANSFER);
             split.add(BillBtnConst.BTN_TRANSFER_NEW);
             return btns.stream().filter(a -> split.contains(a)).collect(Collectors.toList());
         } else {

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillLogicImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.srm.bpm.facde.oa.OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client;
 import com.srm.bpm.facde.oa.ReceiveRequestInfoByJsonDto;
 import com.srm.bpm.infra.entity.BillBizDataEntity;
 import com.srm.bpm.infra.entity.BillDataJsonEntity;
@@ -1523,6 +1524,7 @@ public class BillLogicImpl implements BillLogic {
      */
     @Override
     public void transferUser(long billId, String taskId, String transferUser, String userCode, String opinion) {
+        // 查找当前用户的任务（只查找状态为APPROVAL的任务）
         final Optional<BillTaskEntity> taskOpt = billBpmnLogic
                 .findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
 
@@ -1534,6 +1536,7 @@ public class BillLogicImpl implements BillLogic {
         final int taskNodeStatus = task.getNodeStatus();
         BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(taskNodeStatus);
 
+        // 只允许状态为APPROVAL的任务进行转办
         if (billTaskStatus != BillTaskStatus.APPROVAL) {
             throw new RbException(BillCode.BILL_TASK_HAS_APPROVED);
         }
@@ -1546,29 +1549,55 @@ public class BillLogicImpl implements BillLogic {
         List<BillTaskEntity> insertLists = Lists.newArrayList();
 
         for (String targetUser : split) {
+            // 检查目标用户是否已经是当前节点的审批人（包括转办任务）
             List<BillTaskEntity> existingTasks = billTaskService
                     .findApprovingByBillAndTaskId(billId, taskId);
             boolean isExistingApprover = existingTasks.stream()
-                    .anyMatch(t -> targetUser.equals(t.getUserCode()));
+                    .anyMatch(t -> targetUser.equals(t.getUserCode()) &&
+                            t.getNodeStatus() == BillTaskStatus.APPROVAL.getStatus());
 
             if (isExistingApprover) {
                 throw new RbException("不能转办给当前节点已有的审批人");
             }
 
-            final BillTaskEntity transferTask = BeanUtil.sourceToTarget(task, BillTaskEntity.class);
-            transferTask.setSourceTaskId(task.getId());
+            //
+            BillTaskEntity transferTask = new  BillTaskEntity();
+
+            transferTask.setBillId(billId);
+            transferTask.setUserCode(targetUser);
             transferTask.setSourceUserCode(userCode);
+            transferTask.setSourceTaskId(task.getId());
+
+            transferTask.setTransferId(null);
+
             transferTask.setTaskType(BillTaskType.TRANSFER.getValue());
-            transferTask.setUserCode(targetUser);
-            transferTask.setId(null);
-            transferTask.setCreationTime(LocalDateTime.now());
+            transferTask.setProcessId(task.getProcessId());
+
+            transferTask.setNodeApproverId(task.getNodeApproverId());
+
+            transferTask.setNodeName(task.getNodeName());
+            transferTask.setNodeStatus(BillTaskStatus.APPROVAL.getStatus());
+            transferTask.setDateline(0);    // 清空原任务时间戳
+
+
+            transferTask.setOpinion(null);  // 清空原任务意见
+            transferTask.setAction(BillAction.transfer.name());   // 清空原任务操作
+
+            transferTask.setTaskId(taskId);
+            transferTask.setLastTaskId(task.getTaskId());
+            transferTask.setSort(System.currentTimeMillis());
+
+            transferTask.setTaskNodeKey(task.getTaskNodeKey());
+            transferTask.setLastNodeKey(task.getTaskNodeKey());
+
             insertLists.add(transferTask);
         }
 
         billTaskService.saveBatch(insertLists);
 
+        // 更新原任务状态为已转办
         task.setNodeStatus(BillTaskStatus.TRANSFER.getStatus());
-        task.setOpinion(Strings.isNullOrEmpty(opinion) ? "转办" : opinion);
+        task.setOpinion(opinion);
         task.setDateline(DateTimeUtil.unixTime());
         billTaskService.upldate(task);
 
@@ -1576,6 +1605,30 @@ public class BillLogicImpl implements BillLogic {
         sends.addAll(insertLists);
         sends.add(task);
         flowMsgLogic.sendMsg(sends);
+
+
+        //链接OA统一待办审批
+        BillItemVO billItemVO = new BillItemVO();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new  OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+        billItemVO.setId(billId);
+        //给已转发的发送已办
+        billItemVO.setStatus(14);
+        billItemVO.setTaskid(taskId);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = this.findrequestInfo(billItemVO);
+        String token =this.getToken4();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
+            o1.ofsTodoDatabyEten(requestdata,token);
+        }
+
+        //给审批中的发送待办
+        billItemVO.setStatus(1);
+        billItemVO.setTaskid(taskId);
+        List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos1 = this.findrequestInfo(billItemVO);
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos1){
+            String requestdata =o1.getRequestData(requestInfoByJsonDto,"0");
+            o1.ofsTodoDatabyEten(requestdata,token);
+        }
     }
 
     /**

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/FlowMsgLogicImpl.java

@@ -128,7 +128,8 @@ public class FlowMsgLogicImpl implements FlowMsgLogic {
 		final BillTaskStatus billTaskStatus = BillTaskStatus.valueTo(nodeStatus);
 		Set<String> receivers = Sets.newConcurrentHashSet();
 		final String approver = taskEntity.getUserCode();
-		final String content = "转办" + getContent(createUser, billTaskStatus, receivers, approver);
+		//final String content = "转办" + getContent(createUser, billTaskStatus, receivers, approver);
+		final String content = getContent(createUser, billTaskStatus, receivers, approver);
 		List<FlowMsgDTO> msgDTOS = Lists.newArrayListWithExpectedSize(receivers.size());
 		receivers.forEach(a -> {
 			FlowMsgDTO flowMsgDTO = FlowMsgDTO.build(a, createUser, content, title, push, taskEntity.getNodeName(),

bpm-core/src/main/resources/mapper/bpm/infra/ToaBillDao.xml

@@ -296,11 +296,15 @@
             AND tasknode.node_status = #{status}
         </if>
         <if test="status ==1 and  taskid != ''"  >
-            AND task.task_id != #{taskid} AND task.node_status = #{status} AND task.is_deleted=0
+            <!-- AND task.task_id != #{taskid} AND task.node_status = #{status} AND task.is_deleted=0 -->
+            AND task.node_status = #{status} AND task.is_deleted=0
         </if>
         <if test="status ==2 and taskid != ''">
             AND task.task_id = #{taskid}
         </if>
+        <if test="status ==14 and taskid != ''">
+            AND task.task_id = #{taskid} AND task.node_status = #{status} AND task.is_deleted=0
+        </if>
         ORDER BY task.id desc
     </select>