配置价格维护页面详情查询接口、配置价格维护页面保存接口

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("合同类型")
+	@ApiModelProperty("合同类型key")
-    private String contractType;
+    private String contractTypeKey;
     
 	@ApiModelProperty("甲方名称")
     private String partyA;

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")
+    @ApiModelProperty("经办人")
-    private String contractTypeKey;
-	@ApiModelProperty("合同类型")
-    private String contractType;
-	@ApiModelProperty("客户sid")
-    private String customerSid;
-	@ApiModelProperty("业务员sid")
-    private String staffSid;
-    @ApiModelProperty("业务员")
     private String staffName;
-	@ApiModelProperty("部门sid")
+    @ApiModelProperty("甲方名称")
-    private String orgSid;
-	@ApiModelProperty("业务表sid")
-    private String busSid;
-	@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("备注")
+    @ApiModelProperty("现场签署图片附件")
-    private String remarks;
+    private String sceneSignUrl;
     @ApiModelProperty("节点状态")
     private String nodeState;
     @ApiModelProperty("附件文件")

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<CommonContractMapp
             qw.eq("contractNo", query.getContractNo());
         }
 
-        if (StringUtils.isNotBlank(query.getContractType())) {
+        if (StringUtils.isNotBlank(query.getContractTypeKey())) {
-            qw.eq("contractType", query.getContractType());
+            qw.eq("contractTypeKey", query.getContractTypeKey());
         }