杉泰oa评论人设置为oa发起人 数据表新增userId字段

mjava-shantai/src/main/java/com/malk/shantai/entity/Shantai.java

@@ -22,5 +22,8 @@ public class Shantai {
     //有效位 1:正常  0:删除
     private String validFlag;
 
+    //OA提交人用户id
+    private String userId;
+
 
 }

mjava-shantai/src/main/java/com/malk/shantai/service/impl/StDingProcServiceImpl.java

@@ -212,14 +212,22 @@ public class StDingProcServiceImpl extends ServiceImpl<ShantaiMapper, Shantai> i
         body.put("form",form);
 
         Map document = JSONObject.parseObject(UtilHttp.doPost(stEkbConfig.getPreUrl() + ("/api/openapi/v2.2/flow/data"), null, param, body));
+
+        Shantai shantai = new Shantai();
+        shantai.setProcInstId(procInstId);
+        shantai.setState("3");
+        shantai.setUserId(userId);
+        shantaiMapper.insert(shantai);
+
         log.info("新增单据成功:{}",document);
     }
 
     @Override
     public McR commentSync(Map map,String flowId){
+        String procInstId = map.get("procInstId").toString();
         //查询表中是否存在同步评论记录
         LambdaQueryWrapper<Shantai> shantaiLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        shantaiLambdaQueryWrapper.eq(Shantai::getFlowId,flowId)
+        shantaiLambdaQueryWrapper.eq(Shantai::getProcInstId,procInstId)
                 .eq(Shantai::getValidFlag,"1");
         Shantai shantai = shantaiMapper.selectOne(shantaiLambdaQueryWrapper);
 
@@ -257,9 +265,9 @@ public class StDingProcServiceImpl extends ServiceImpl<ShantaiMapper, Shantai> i
         }
 
         String state = map.get("state").toString();
-        String procInstId = map.get("procInstId").toString();
 
-        if (Objects.nonNull(shantai) && dentries.isEmpty()){
+
+        if (Objects.nonNull(shantai) && shantai.getState().equals("2") && dentries.isEmpty()){
             log.info("该单据Id:{}本次无水单上传，不进行同步",flowId);
             return McR.success();
         }
@@ -282,8 +290,10 @@ public class StDingProcServiceImpl extends ServiceImpl<ShantaiMapper, Shantai> i
             //更新表中同步状态
             if (dentries.isEmpty()){
                 shantai.setState("2");
+                shantai.setFlowId(flowId);
             }else {
                 shantai.setState("1");
+                shantai.setFlowId(flowId);
             }
             //更新评论状态
             shantaiMapper.updateById(shantai);