OA上线复测问题修复

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/OaFbdDocumentService.java

@@ -1,8 +1,8 @@
 package com.usky.oa.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.usky.oa.domain.OaFbdDocument;
 import com.usky.common.mybatis.core.CrudService;
-import org.springframework.stereotype.Component;
 
 /**
  * <p>
@@ -12,19 +12,13 @@ import org.springframework.stereotype.Component;
  * @author fu
  * @since 2025-02-20
  */
-public interface OaFbdDocumentService extends CrudService<OaFbdDocument>{
+public interface OaFbdDocumentService extends CrudService<OaFbdDocument> {
 
     /**
-     * 新增发布申请
-     * @param oaFbdDocument
-     */
-    void add(OaFbdDocument oaFbdDocument);
+     * 新增发布申请 或 更新发布申请
+     **/
+    void addOrUpDate(OaFbdDocument oaFbdDocument, JSONObject node);
 
-    /**
-     * 更新发布申请
-     * @param oaFbdDocument
-     */
-    void update(OaFbdDocument oaFbdDocument);
 
     // 获取审批表数据
     void getOaApproval(OaFbdDocument oaFbdDocument);

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaDocumentServiceImpl.java

@@ -204,6 +204,8 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         queryWrapper.select(OaFormDefinition::getFieldInfo).eq(OaFormDefinition::getId, oaDocument.get("formId"));
         OaFormDefinition oaFormDefinition = oaFormDefinitionMapper.selectOne(queryWrapper);
 
+        JSONObject node = oaDocument.getJSONObject("node");
+
         if (oaFormDefinition == null) {
             throw new BusinessException("新增表单模板不存在！请联系管理员");
         }
@@ -220,7 +222,7 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
                 oaCgdDocumentService.add(JSON.parseObject(oaDocument.toJSONString(), OaCgdDocument.class));
                 break;
             case "FBD":
-                oaFbdDocumentService.add(JSON.parseObject(oaDocument.toJSONString(), OaFbdDocument.class));
+                oaFbdDocumentService.addOrUpDate(JSON.parseObject(oaDocument.toJSONString(), OaFbdDocument.class), node);
                 break;
             default:
                 throw new BusinessException("新增表单模板不存在！请联系管理员");
@@ -236,6 +238,8 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
         OaFormDefinition oaFormDefinition = oaFormDefinitionMapper.selectOne(queryWrapper);
         String sign = oaFormDefinition.getFieldInfo();
 
+        JSONObject node = jsonDocument.getJSONObject("node");
+
         switch (sign) {
             case "QJD":
                 oaQjdDocumentService.updateQjDocument(JSON.parseObject(jsonDocument.toJSONString(), OaQjdDocument.class));
@@ -247,7 +251,7 @@ public class OaDocumentServiceImpl extends AbstractCrudService<OaDocumentMapper,
                 oaCgdDocumentService.update(JSON.parseObject(jsonDocument.toJSONString(), OaCgdDocument.class));
                 break;
             case "FBD":
-                oaFbdDocumentService.update(JSON.parseObject(jsonDocument.toJSONString(), OaFbdDocument.class));
+                oaFbdDocumentService.addOrUpDate(JSON.parseObject(jsonDocument.toJSONString(), OaFbdDocument.class), node);
                 break;
             default:
                 throw new BusinessException("单据模板不存在！请联系管理员");

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/impl/OaFbdDocumentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.usky.oa.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
@@ -15,7 +16,6 @@ import com.usky.system.domain.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -63,86 +63,74 @@ public class OaFbdDocumentServiceImpl extends AbstractCrudService<OaFbdDocumentM
     private OaApprovalService oaApprovalService;
 
     @Override
-    public void add(OaFbdDocument oaFbdDocument) {
+    public void addOrUpDate(OaFbdDocument oaFbdDocument, JSONObject node) {
         // 校验表单数据
         validateDocument(oaFbdDocument);
 
-        Long userId = SecurityUtils.getUserId();
-        String username = SecurityUtils.getUsername();
-        Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
-        Integer tenantId = SecurityUtils.getTenantId();
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss");
-        LocalDateTime now = LocalDateTime.now();
-        String formattedDate = now.format(formatter);
-
-        LambdaQueryWrapper<OaFormDefinition> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(OaFormDefinition::getFormSign).eq(OaFormDefinition::getId, oaFbdDocument.getFormId());
-        OaFormDefinition oaFormDefinition = oaFormDefinitionMapper.selectOne(queryWrapper);
-        String sign = oaFormDefinition.getFormSign();
-        String docNo = sign + "-" + formattedDate;
-
-        // 插入发布表数据
-        oaFbdDocument.setDocNo(docNo);
-        oaFbdDocument.setProposer(userId);
-        oaFbdDocument.setCreateBy(username);
-        oaFbdDocument.setCreateTime(now);
-        oaFbdDocument.setDeptId(deptId);
-        oaFbdDocument.setTenantId(tenantId);
-        oaFbdDocumentMapper.insert(oaFbdDocument);
-
-        // 插入单据表数据
-        OaDocument oaDocument = new OaDocument();
-        oaDocument.setFormId(oaFbdDocument.getFormId());
-        oaDocument.setType(sign);
-        oaDocument.setDocNo(docNo);
-        oaDocument.setProposer(userId);
-        oaDocument.setDocStatus(oaFbdDocument.getDocStatus());
-        oaDocument.setCreateBy(username);
-        oaDocument.setCreateTime(oaFbdDocument.getCreateTime());
-        oaDocument.setDeptId(deptId);
-        oaDocument.setTenantId(tenantId);
-        oaDocumentMapper.insert(oaDocument);
-
-        // 插入审批表数据,第一条审批记录
-        if (oaFbdDocument.getDocStatus().equals(1)) {
-            getOaApproval(oaFbdDocument);
-        }
-    }
-
-    // 更新发布表数据
-    //@Transactional(rollbackFor = Exception.class)
-    @Transactional
-    @Override
-    public void update(OaFbdDocument oaFbdDocument) {
-        // 验证文档
-        validateDocument(oaFbdDocument);
-
-        // 获取当前用户和时间
         String username = SecurityUtils.getUsername();
         LocalDateTime now = LocalDateTime.now();
         Integer tenantId = SecurityUtils.getTenantId();
-
-        // 设置更新信息
-        oaFbdDocument.setUpdateBy(username);
-        oaFbdDocument.setUpdateTime(now);
-
-        // 更新发布表数据
-        oaFbdDocumentMapper.updateById(oaFbdDocument);
-
-        // 更新总单据状态
-        oaDocumentMapper.update(null, Wrappers.lambdaUpdate(OaDocument.class)
-                .eq(OaDocument::getDocNo, oaFbdDocument.getDocNo())
-                .set(OaDocument::getDocStatus, oaFbdDocument.getDocStatus())
-                .set(OaDocument::getUpdateBy, username)
-                .set(OaDocument::getUpdateTime, now)
-        );
-
-        // 如果文档状态为1，创建并插入审批记录
-        if (oaFbdDocument.getDocStatus() == 1) {
-            OaFbdDocument updatedDocument = oaFbdDocumentMapper.selectById(oaFbdDocument.getId());
-            getOaApproval(updatedDocument);
+        String sign = null;
+
+        if (oaFbdDocument.getId() == null) {
+            // 插入操作
+            Long userId = SecurityUtils.getUserId();
+            Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
+
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss");
+            String formattedDate = now.format(formatter);
+
+            LambdaQueryWrapper<OaFormDefinition> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.select(OaFormDefinition::getFormSign).eq(OaFormDefinition::getId, oaFbdDocument.getFormId());
+            OaFormDefinition oaFormDefinition = oaFormDefinitionMapper.selectOne(queryWrapper);
+            sign = oaFormDefinition.getFormSign();
+            String docNo = sign + "-" + formattedDate;
+
+            oaFbdDocument.setDocNo(docNo);
+            oaFbdDocument.setProposer(userId);
+            oaFbdDocument.setCreateBy(username);
+            oaFbdDocument.setCreateTime(now);
+            oaFbdDocument.setDeptId(deptId);
+            oaFbdDocument.setTenantId(tenantId);
+            oaFbdDocumentMapper.insert(oaFbdDocument);
+
+            // 插入单据表数据
+            OaDocument oaDocument = new OaDocument();
+            oaDocument.setFormId(oaFbdDocument.getFormId());
+            oaDocument.setType(sign);
+            oaDocument.setDocNo(docNo);
+            oaDocument.setProposer(userId);
+            oaDocument.setDocStatus(oaFbdDocument.getDocStatus());
+            oaDocument.setCreateBy(username);
+            oaDocument.setCreateTime(now);
+            oaDocument.setDeptId(deptId);
+            oaDocument.setTenantId(tenantId);
+            oaDocumentMapper.insert(oaDocument);
+
+            if (oaFbdDocument.getDocStatus().equals(1)) {
+                getOaApproval(oaFbdDocument);
+            }
+        } else {
+            // 更新操作
+            oaFbdDocument.setUpdateBy(username);
+            oaFbdDocument.setUpdateTime(now);
+            oaFbdDocumentMapper.updateById(oaFbdDocument);
+
+            oaDocumentMapper.update(null, Wrappers.lambdaUpdate(OaDocument.class)
+                    .eq(OaDocument::getDocNo, oaFbdDocument.getDocNo())
+                    .set(OaDocument::getDocStatus, oaFbdDocument.getDocStatus())
+                    .set(OaDocument::getUpdateBy, username)
+                    .set(OaDocument::getUpdateTime, now)
+            );
+
+            if (oaFbdDocument.getDocStatus() == 1) {
+                OaFbdDocument updatedDocument = oaFbdDocumentMapper.selectById(oaFbdDocument.getId());
+                getOaApproval(updatedDocument);
+            }
+
+            sign = oaFbdDocumentMapper.selectById(oaFbdDocument.getId()).getDocNo().split("-")[0];
         }
+        oaApprovalGeneration.nodeSave(node, sign);
     }
 
     // 获取审批表数据
@@ -157,8 +145,6 @@ public class OaFbdDocumentServiceImpl extends AbstractCrudService<OaFbdDocumentM
 
         switch (oaNode.getNodeScope()) {
             case 0:
-            case 1:
-            case 2:
                 userIds = Arrays.stream(oaNode.getProposer().split(",")).map(Long::parseLong).collect(Collectors.toList());
                 break;
             case 3:

service-oa/service-oa-biz/src/main/java/com/usky/oa/service/utils/OaApprovalGeneration.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -86,14 +87,10 @@ public class OaApprovalGeneration {
 
                 switch (nodeScope) {
                     case 0:
-                    case 2:
                         proposer = node.getString("appointApprover");
                         break;
                     case 1:
-                        Long deptLeader = getDeptLeader();
-                        if (deptLeader != null) {
-                            proposer = deptLeader.toString();
-                        }
+                    case 2:
                         break;
                     case 3:
                         deptId2 = node.getInteger("deptId");
@@ -153,14 +150,10 @@ public class OaApprovalGeneration {
 
                 switch (nodeScope) {
                     case 0:
-                    case 2:
                         proposer = node.getString("appointApprover");
                         break;
                     case 1:
-                        Long deptLeader = getDeptLeader();
-                        if (deptLeader != null) {
-                            proposer = deptLeader.toString();
-                        }
+                    case 2:
                         break;
                     case 3:
                         deptId2 = node.getInteger("deptId");
@@ -186,6 +179,25 @@ public class OaApprovalGeneration {
         }
     }
 
+    public void nodeSave(JSONObject jsonObject, String sign) {
+        Integer flowId = selectBySign(sign).getId();
+        List<JSONObject> nodeList = jsonObject.getJSONArray("node").toJavaList(JSONObject.class);
+        String proposer = null;
+        for (JSONObject node : nodeList) {
+            String nodeNo = node.getString("nodebh");
+            Integer nodeScope = node.getInteger("nodeScope");
+            proposer = node.getString("appointApprover");
+
+            OaNode oaNode = new OaNode();
+            if (nodeScope == 1) {
+                oaNode.setProposer(getDeptLeader().toString());
+            } else if (nodeScope == 2) {
+                oaNode.setProposer(proposer);
+            }
+            oaNodeMapper.update(oaNode, new LambdaQueryWrapper<OaNode>().eq(OaNode::getFlowId, flowId).eq(OaNode::getNodeNo, nodeNo));
+        }
+    }
+
     public Long getDeptLeader() {
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
         Integer tenantId = SecurityUtils.getTenantId();
@@ -195,13 +207,7 @@ public class OaApprovalGeneration {
                 .eq(SysDept::getDeptId, deptId)
                 .select(SysDept::getLeader);
         SysDept deptLeader = sysDeptMapper.selectOne(deptLeaderQuery);
-        Long leader = Long.valueOf(deptLeader.getLeader());
-
-        LambdaQueryWrapper<SysUser> userQuery = new LambdaQueryWrapper<>();
-        userQuery.select(SysUser::getUserId)
-                .eq(SysUser::getUserId, leader);
-        SysUser sysUser = sysUserMapper.selectOne(userQuery);
-        return sysUser.getUserId();
+        return Long.valueOf(deptLeader.getLeader());
     }
 
     // 根据单据类型获取流程信息