From d79e5d47b85c7b3076e493222e2bc62d7d7c2867 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 14 Jan 2025 11:40:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?oaform=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/oa/biz/oaform/OaFormDto.java | 3 ++ .../oa/biz/oamendapply/OaMendApplyDto.java | 36 ++----------------- .../biz/oamendapply/OaMendApplyService.java | 14 ++++---- 3 files changed, 13 insertions(+), 40 deletions(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java index 949d3a7894..3f635bcdef 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java @@ -21,4 +21,7 @@ public class OaFormDto { private String billNo; @ApiModelProperty("sid") private String sid; + + @ApiModelProperty("任务id") + private String taskId; } diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java index 23cdb01970..b2db13d559 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java +++ b/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 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;*/ } \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java index 534f14a87b..f58a993bb7 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java @@ -142,11 +142,11 @@ public class OaMendApplyService extends MybatisBaseService resultBean = oaFormService.saveOaForm(oaFormDto); + /*OaFormDto oaFormDto = new OaFormDto(); + BeanUtil.copyProperties(dto, oaFormDto);*/ + dto.setBillNo("BKSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); if (!resultBean.getSuccess()) { return rb; @@ -262,8 +262,9 @@ public class OaMendApplyService extends MybatisBaseService Date: Tue, 14 Jan 2025 11:56:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E3=80=81=E9=99=84=E4=BB=B6=E3=80=81=E5=85=B3=E8=81=94=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java index 3f635bcdef..b278072f7d 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java +++ b/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("组织机构全路径") @@ -22,6 +23,7 @@ public class OaFormDto { @ApiModelProperty("sid") private String sid; + //流程提交时赋值 @ApiModelProperty("任务id") private String taskId; }