From cfc4570454e76dec17b4b246ff1c2e1951b0c2b0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 8 Apr 2022 14:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=B7=E6=A0=BC=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E9=A1=B5=E9=9D=A2=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=81=E9=85=8D=E7=BD=AE=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2=E4=BF=9D=E5=AD=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractQuery.java | 4 +-- .../api/commoncontract/CommonContractVo.java | 31 +++---------------- .../commoncontract/CommonContractService.java | 4 +-- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java index 319ede07e2..053a14ada9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractQuery.java @@ -26,8 +26,8 @@ public class CommonContractQuery implements Query { @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("合同类型") - private String contractType; + @ApiModelProperty("合同类型key") + private String contractTypeKey; @ApiModelProperty("甲方名称") private String partyA; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java index b3d626061c..5a64eae5e5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java @@ -34,39 +34,18 @@ public class CommonContractVo implements Vo { private String sid; @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("合同类型key") - private String contractTypeKey; - @ApiModelProperty("合同类型") - private String contractType; - @ApiModelProperty("客户sid") - private String customerSid; - @ApiModelProperty("业务员sid") - private String staffSid; - @ApiModelProperty("业务员") + @ApiModelProperty("经办人") private String staffName; - @ApiModelProperty("部门sid") - private String orgSid; - @ApiModelProperty("业务表sid") - private String busSid; - @ApiModelProperty("甲方名称") + @ApiModelProperty("甲方名称") private String partyA; - @ApiModelProperty("乙方名称") + @ApiModelProperty("乙方名称") private String partyB; - @ApiModelProperty("其他方名称") - private String partyC; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") - @ApiModelProperty("签订日期") - private Date createDate; - @ApiModelProperty("签订地点") - private String address; - @ApiModelProperty("订金") - private BigDecimal deposit; @ApiModelProperty("合同金额") private String contractAmount; @ApiModelProperty("合同附件") private String appdixUrl; - @ApiModelProperty("备注") - private String remarks; + @ApiModelProperty("现场签署图片附件") + private String sceneSignUrl; @ApiModelProperty("节点状态") private String nodeState; @ApiModelProperty("附件文件") diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 83e130c2d3..00822b5242 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -95,8 +95,8 @@ public class CommonContractService extends MybatisBaseService