diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java index 1a64a7c9bf..a1606f3bd0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java @@ -52,7 +52,7 @@ public class CommonContractDto implements Dto { @ApiModelProperty("其他方名称") private String partyC; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @ApiModelProperty("签订日期") private Date createDate; 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 8343d36537..7643089b45 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 @@ -1,16 +1,11 @@ package com.yxt.anrui.base.api.commoncontract; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -70,4 +65,12 @@ public class CommonContractVo implements Vo { private List commonAppendixVos; @ApiModelProperty("现场签署文件") private List sceneSignUrlList; + @ApiModelProperty("订金") + private String deposit; + @ApiModelProperty("签订日期") + private String createDate; + @ApiModelProperty("签订地点") + private String address; + @ApiModelProperty("备注") + private String remarks; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java index 4802d3155b..c81c699f0c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java @@ -120,6 +120,10 @@ public interface BaseDistributorMapper extends BaseMapper { List getDistributors(BaseDistributorsListQuery pagerQuery, @Param(Constants.WRAPPER) QueryWrapper qw); + BaseDistributor selectNameByOne(@Param("useOrgSid") String orgPath, @Param("name") String disName); + + BaseDistributor selectOneBy(@Param("useOrgSid") String useOrg, @Param("name") String disName, @Param("sid") String sid); + @Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0") BaseDistributorsListVo selByNameAndOrgSid(@Param("disName") String disName,@Param("createOrg") String createOrg); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml index 8751eb9a06..4a71dc4d62 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml @@ -197,4 +197,12 @@ select sid, disName, pDistributorName, registNum, contract, mobile from base_distributor ${ew.customSqlSegment} + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 33bd09441c..1da3f845b7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -717,6 +717,11 @@ public class BaseDistributorService extends MybatisBaseService resultBean = sysOrganizationFeign.fetchBySid(orgPath); if (resultBean.getSuccess()) { @@ -735,6 +740,11 @@ public class BaseDistributorService extends MybatisBaseService INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid, - createDate, address, deposit, contractAmount, remarks) + createDate, address, deposit, contractAmount, remarks) VALUES (UUID(), @@ -23,9 +23,28 @@ - - update crm_customer_temp set companyName = #{companyName} where sid = #{sid} - - - - update crm_customer_temp set e_mail = #{email} where sid = #{sid} - - - - update crm_customer_temp set remarks = #{remarks} where sid = #{sid} - - diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java index cfb659e6c7..33ecff6120 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java @@ -294,20 +294,5 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return crmCustomerTempService.saveFileCustomer(dto); } - @Override - public ResultBean updateCompany(String sid, String companyName) { - return crmCustomerTempService.updateCompany(sid,companyName); - } - - @Override - public ResultBean updateEmail(String sid, String email) { - return crmCustomerTempService.updateEmail(sid,email); - } - - @Override - public ResultBean updateRemarks(String sid, String remarks) { - return crmCustomerTempService.updateRemarks(sid,remarks); - } - } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index 1e5a4ff383..db50912502 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -762,9 +762,9 @@ public class CrmCustomerTempService extends MybatisBaseService