代码提交
parent
b73970108c
commit
63b173201a
90154
sql/data.sql
90154
sql/data.sql
File diff suppressed because it is too large
Load Diff
|
|
@ -2,11 +2,11 @@ CREATE TABLE "FXKH_TXL"."ADDRESS_BOOK"
|
||||||
(
|
(
|
||||||
"ID" INTEGER IDENTITY(1, 1) NOT NULL,
|
"ID" INTEGER IDENTITY(1, 1) NOT NULL,
|
||||||
"NAME" VARCHAR(10) NOT NULL,
|
"NAME" VARCHAR(10) NOT NULL,
|
||||||
"PHONE" VARCHAR(11),
|
"PHONE" VARCHAR(15),
|
||||||
"TEL" VARCHAR(50),
|
"TEL" VARCHAR(50),
|
||||||
"FAXES" VARCHAR(50),
|
"FAXES" VARCHAR(50),
|
||||||
"ORGANIZATION" VARCHAR(50),
|
"ORGANIZATION" VARCHAR(50),
|
||||||
"POSITION" VARCHAR(50),
|
"POSITION" VARCHAR(200),
|
||||||
"COMMENTS" VARCHAR(200),
|
"COMMENTS" VARCHAR(200),
|
||||||
"URL" VARCHAR(200),
|
"URL" VARCHAR(200),
|
||||||
"ADCD" VARCHAR(50),
|
"ADCD" VARCHAR(50),
|
||||||
|
|
|
||||||
|
|
@ -24,4 +24,6 @@ public class AddressBootDto extends CommDto{
|
||||||
|
|
||||||
@ApiModelProperty(value = "登录用户id")
|
@ApiModelProperty(value = "登录用户id")
|
||||||
private String userId;
|
private String userId;
|
||||||
|
|
||||||
|
private String v;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import com.whdc.mapper.AddressBookMapper;
|
||||||
import com.whdc.model.dto.AddressBootDto;
|
import com.whdc.model.dto.AddressBootDto;
|
||||||
import com.whdc.model.entity.AddressBook;
|
import com.whdc.model.entity.AddressBook;
|
||||||
import com.whdc.model.vo.AddressBookVo;
|
import com.whdc.model.vo.AddressBookVo;
|
||||||
import com.whdc.model.vo.FcVo;
|
|
||||||
import com.whdc.service.IAddressBookService;
|
import com.whdc.service.IAddressBookService;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -32,13 +31,20 @@ public class AddressBookServiceImpl extends ServiceImpl<AddressBookMapper, Addre
|
||||||
|
|
||||||
String adcd = dto.getAdcd();
|
String adcd = dto.getAdcd();
|
||||||
Integer adlevel = dto.getAdlevel();
|
Integer adlevel = dto.getAdlevel();
|
||||||
if (StringUtils.isNotBlank(dto.getAdcd()) && Objects.nonNull(adlevel)) {
|
if (StringUtils.isNotBlank(adcd) && Objects.nonNull(adlevel)) {
|
||||||
|
|
||||||
dto.setAdcd( "LIKE " + likeAdcd(dto.getAdcd(), adlevel) + "%");
|
dto.setV("LIKE ");
|
||||||
|
dto.setAdcd(likeAdcd(adcd, adlevel) + "%");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if (StringUtils.isNotBlank(dto.getAdcd())) {
|
if (StringUtils.isNotBlank(adcd)) {
|
||||||
dto.setAdcd( "= " + dto.getAdcd());
|
if (adcd.length() < 15){
|
||||||
|
dto.setV("LIKE ");
|
||||||
|
dto.setAdcd(adcd + "%");
|
||||||
|
}else {
|
||||||
|
dto.setV("= ");
|
||||||
|
dto.setAdcd(adcd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
AND AB.NAME LIKE CONCAT('%', #{dto.name}, '%')
|
AND AB.NAME LIKE CONCAT('%', #{dto.name}, '%')
|
||||||
</if>
|
</if>
|
||||||
<if test="dto.adcd != null and dto.adcd != '' ">
|
<if test="dto.adcd != null and dto.adcd != '' ">
|
||||||
AND AB.ADCD #{dto.adcd}
|
AND AB.ADCD ${dto.v} #{dto.adcd}
|
||||||
</if>
|
</if>
|
||||||
<if test="dto.phone != null and dto.phone != '' ">
|
<if test="dto.phone != null and dto.phone != '' ">
|
||||||
AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%')
|
AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue