修改客户历史记录查询

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java

@@ -92,6 +92,16 @@ public class BasicdataClientEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "合同附件")
 	private String leaseAccessories;
+	/**
+	 * 文件名称
+	 */
+	@ApiModelProperty(value = "文件名称")
+	private String fileName;
+	/**
+	 * 是否控货
+	 */
+	@ApiModelProperty(value = "是否控货")
+	private Boolean cargoControl;
 	/**
 	 * 合同开始时间
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataHistoricalContractEntity.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -69,6 +70,13 @@ public class BasicdataHistoricalContractEntity extends TenantEntity {
 	@ApiModelProperty(value = "客户ID")
 	private String clientId;
 
+	/**
+	 * 客户名称
+	 */
+	@TableField(exist = false)
+	@ApiModelProperty(value = "客户名称")
+	private String clientName;
+
 	/**
 	 * 合同附件
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.xml

@@ -13,7 +13,8 @@
                  left join logpm_basicdata_client lbc on  lbc.id  = lbhc.client_id
         <where>
             lbhc.is_deleted = 0
-            <if test="param.clientId != null and param.clientId"> and lbc.client_name like concat('%',#{param.clientId},'%') </if>
+            <if test="param.clientName != null and param.clientName"> and lbc.client_name like concat('%',#{param.clientName},'%') </if>
+            <if test="param.clientId != null and param.clientId"> and lbhc.client_id = #{param.clientId} </if>
             <if test="param.contractStartTime != null ">and date_format (lbhc.contract_start_time,'%Y-%m-%d') <![CDATA[ >= ]]> date_format (#{param.contractStartTime},'%Y-%m-%d')  </if>
             <if test="param.contractEntTime != null ">and date_format (lbhc.contract_ent_time,'%Y-%m-%d') <![CDATA[ <= ]]> date_format (#{param.contractEntTime},'%Y-%m-%d')  </if>
         </where>