ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Browse Source
This commit is contained in:
自带大佬气场
2021-07-06 10:32:21 +08:00
parent 39d3a83a02 f5bdc7e1ab
commit b440bc2489
7 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
View File

@@ -70,7 +70,7 @@ LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) ";
return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] {"Type", "Address", "HouseCode" });
return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] {"Type", "Address", "HouseCode","AreaCode"});
}
[HttpGet("/houseCode/detail")]

14
Api/Ewide.Core/Enum/QueryTypeEnum.cs
View File

@@ -53,6 +53,18 @@ namespace Ewide.Core
/// 不为空
/// </summary>
[Description("不为空")]
IsNotNull = 7
IsNotNull = 7,
/// <summary>
/// 开始于 LIKE Param%
/// </summary>
[Description("LIKE Param%")]
StartWith =8,
/// <summary>
/// 结合于 LIKE %Param
/// </summary>
[Description("LIKE %Param")]
EndWith = 9
}
}

10
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -2522,6 +2522,16 @@
不为空
</summary>
</member>
<member name="F:Ewide.Core.QueryTypeEnum.StartWith">
<summary>
开始于 LIKE Param%
</summary>
</member>
<member name="F:Ewide.Core.QueryTypeEnum.EndWith">
<summary>
结合于 LIKE %Param
</summary>
</member>
<member name="T:Ewide.Core.YesOrNot">
<summary>
菜单激活类型

4
Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs
View File

@@ -29,13 +29,15 @@ namespace Ewide.Core
{
get
{
return Type switch
return Type.ToLower() switch
{
"=" or "equal" => QueryTypeEnum.Equal,
"<" or "lessthan" => QueryTypeEnum.LessThan,
"<=" or "lessthanorequal" => QueryTypeEnum.LessThanOrEqual,
">" or "greaterthan" => QueryTypeEnum.GreaterThan,
">=" or "greaterthanorequal" => QueryTypeEnum.GreaterThanOrEqual,
"start" => QueryTypeEnum.StartWith,
"end" => QueryTypeEnum.EndWith,
_ => QueryTypeEnum.Like,
};
}

8
Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs
View File

@@ -64,7 +64,7 @@ namespace Ewide.Core.Extension.DataFilter.WebPage
var parameterName = "@" + searchInfo.Field + Guid.NewGuid().ToString("N");
//AddParameter(parameterName, elem);
sqlParameters.Add(parameterName, QueryTypeEnum.Like == searchInfo.QueryType ? "%" + elem + "%" : elem);
sqlParameters.Add(parameterName, QueryTypeEnum.Like == searchInfo.QueryType ? "%" + elem + "%" : QueryTypeEnum.StartWith == searchInfo.QueryType ? elem + "%" : QueryTypeEnum.EndWith == searchInfo.QueryType ? "%" + elem : elem);
whereList.Add(String.Format(sqlT, searchInfo.Field, GetSearchOperatorStr(searchInfo.QueryType), parameterName));
}
if (whereList.Count == 0) return String.Empty;
@@ -85,10 +85,10 @@ namespace Ewide.Core.Extension.DataFilter.WebPage
return "<";
case QueryTypeEnum.LessThanOrEqual:
return "<=";
case QueryTypeEnum.Like:
return " LIKE ";
default:
case QueryTypeEnum.Equal:
return "=";
default:
return "LIKE";
}
}

25
web-react/src/pages/business/house/code/index.jsx
View File

@@ -5,7 +5,7 @@ import {
Cascader,
Form,
Input,
InputNumber,
Tag,
Popconfirm,
message as Message,
Radio,
@@ -51,10 +51,15 @@ export default class index extends Component {
dataIndex: 'houseCode',
sorter: true,
width: 300,
render: (text, record) =>
`${record.areaName}-${record.roadName}-${record.commName}-${record.note}-${record.no
.toString()
.padStart(3, '0')}`,
render: (text, record) => (
<>
{`${record.areaName}-${record.roadName}-${record.commName}-${
record.note
}-${record.no.toString().padStart(3, '0')}`}
<br />
<Tag color="purple">{text}</Tag>
</>
),
},
{
title: '房屋性质及行业',
@@ -288,7 +293,10 @@ export default class index extends Component {
placeholder="请选择所在区域"
/>
</Form.Item>
<Form.Item label="编号" name="no">
<Form.Item label="房屋唯一编码" name="houseCode">
<Input autoComplete="off" placeholder="请输入房屋唯一编码" />
</Form.Item>
{/* <Form.Item label="编号" name="no">
<InputNumber
formatter={value => value && value.padStart(3, '0')}
max={999}
@@ -297,7 +305,7 @@ export default class index extends Component {
step={1}
placeholder="请输入房屋序号"
/>
</Form.Item>
</Form.Item> */}
<Form.Item label="房屋性质" name="type">
<Radio.Group buttonStyle="solid">
<Radio.Button value="">全部</Radio.Button>
@@ -326,9 +334,6 @@ export default class index extends Component {
<Form.Item label="地址" name="address">
<Input autoComplete="off" placeholder="请输入地址" />
</Form.Item>
<Form.Item label="房屋唯一编码" name="houseCode">
<Input autoComplete="off" placeholder="请输入房屋唯一编码" />
</Form.Item>
</Auth>
}
operator={

4
web-react/src/util/query/index.js
View File

@@ -103,5 +103,7 @@ export const QueryType = {
LessThan: '<',
LessThanOrEqual: '<=',
Like: 'LIKE',
Equal: '='
Equal: '=',
StartWith: 'STRAT',
EndWith: 'END'
}