Merge remote-tracking branch 'origin/master'

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java

@@ -12,7 +12,8 @@ import java.util.Date;
  * @date: 2025/1/7
  **/
 @Data
-public class OaFormDto {
+public class OaFormDto implements Dto {
+    //保存时赋值
     @ApiModelProperty("创建人sid")
     private String createBySid;
     @ApiModelProperty("组织机构全路径")
@@ -21,4 +22,8 @@ public class OaFormDto {
     private String billNo;
     @ApiModelProperty("sid")
     private String sid;
+
+    //流程提交时赋值
+    @ApiModelProperty("任务id")
+    private String taskId;
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oamendapply;
 
 
+import com.yxt.anrui.oa.biz.oaform.OaFormDto;
 import com.yxt.common.core.dto.Dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -53,12 +54,9 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
-public class OaMendApplyDto implements Dto {
+public class OaMendApplyDto extends OaFormDto {
 
     private static final long serialVersionUID = -4536006302677264298L;
-    private String sid;
-    private String createBySid;
-    private String orgSidPath;
     @ApiModelProperty("补卡原因")
     private String remarks;
     @ApiModelProperty("补卡时间")
@@ -67,34 +65,4 @@ public class OaMendApplyDto implements Dto {
     private String linkFormSids;
     @ApiModelProperty("图片")
     private List<String> files = new ArrayList<>();
-
-    @ApiModelProperty("任务id")
-    private String taskId;
-
-    /* @ApiModelProperty("单据编号")
-    private String billNo; // 单据编号
-    @ApiModelProperty("申请人")
-    private String createByName;
-    @ApiModelProperty("申请部门sid")
-    private String deptSid;
-    @ApiModelProperty("申请部门名称")
-    private String deptName;
-
-      @ApiModelProperty("分公司sid")
-    private String useOrgSid;
-    @ApiModelProperty("分公司名称")
-    private String useOrgName;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty("办结日期")
-    private Date finishTime;
-    @ApiModelProperty("实例id")
-    private String procInstId;
-    @ApiModelProperty("流程定义id")
-    private String procDefId;
-    @ApiModelProperty("任务id")
-    private String taskId;
-    @ApiModelProperty("环节id")
-    private String nodeId;
-    @ApiModelProperty("流程状态")
-    private String nodeState;*/
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java

@@ -142,11 +142,11 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
             OaMendApply entity = new OaMendApply();
             BeanUtil.copyProperties(dto, entity, "sid");
 
-            OaFormDto oaFormDto = new OaFormDto();
-            BeanUtil.copyProperties(dto, oaFormDto);
-            oaFormDto.setBillNo("BKSQ");
-            oaFormDto.setSid(entity.getSid());
-            ResultBean<String> resultBean = oaFormService.saveOaForm(oaFormDto);
+            /*OaFormDto oaFormDto = new OaFormDto();
+            BeanUtil.copyProperties(dto, oaFormDto);*/
+            dto.setBillNo("BKSQ");
+            dto.setSid(entity.getSid());
+            ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
 
             if (!resultBean.getSuccess()) {
                 return rb;
@@ -262,8 +262,9 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
         return oaFormService.reject(dto);
     }
 
-     /**
+    /**
      * 提交时获取下一环节
+     *
      * @param query
      * @return
      */
@@ -281,6 +282,7 @@ public class OaMendApplyService extends MybatisBaseService<OaMendApplyMapper, Oa
 
     /**
      * 驳回时获取上一环节
+     *
      * @param query
      * @return
      */