Commit 0f7bcd15 authored by 鲁鑫's avatar 鲁鑫

成本中心选择加上模糊查询

parent 442d4cce
package com.huigou.topsun.sap.costCenter.controller; package com.huigou.topsun.sap.costCenter.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.costCenter.application.CostCenterApplication; import com.huigou.topsun.sap.costCenter.application.CostCenterApplication;
...@@ -16,6 +17,7 @@ import com.huigou.uasp.bmp.opm.application.impl.MemEasySearcherImpl; ...@@ -16,6 +17,7 @@ import com.huigou.uasp.bmp.opm.application.impl.MemEasySearcherImpl;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.util.DateUtil; import com.huigou.util.DateUtil;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -24,6 +26,7 @@ import java.util.Arrays; ...@@ -24,6 +26,7 @@ import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* @Auther: xin.lu * @Auther: xin.lu
...@@ -170,13 +173,22 @@ public class CostCenterController extends CommonController { ...@@ -170,13 +173,22 @@ public class CostCenterController extends CommonController {
EasySearchParse easySearchParse = new EasySearchParse(); EasySearchParse easySearchParse = new EasySearchParse();
easySearchParse.setFields(fields); easySearchParse.setFields(fields);
easySearchParse.setWidth(400L); easySearchParse.setWidth(400L);
String ktext = sdo.getString("ktext"); String param = sdo.getString("paramValue");
CostCenterQueryRequest queryRequest = sdo.toQueryRequest(CostCenterQueryRequest.class); CostCenterQueryRequest queryRequest = sdo.toQueryRequest(CostCenterQueryRequest.class);
queryRequest.setKtext(ktext); //queryRequest.setKtext(param);
//queryRequest.setKostl(param);
queryRequest.setNowDate(new Date()); queryRequest.setNowDate(new Date());
Map<String, Object> map = costCenterApplication.slicedCostCenterList(queryRequest); Map<String, Object> map = costCenterApplication.slicedCostCenterList(queryRequest);
List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("Rows"); List<Map<String, String>> mapList = (List<Map<String, String>>) map.get("Rows");
MemEasySearcher<Map<String, Object>> memEasySearcher = new MemEasySearcherImpl<>(); if (CollectionUtil.isNotEmpty(mapList)){
if (StringUtil.isNotBlank(param)){//模糊条件过滤
mapList = mapList
.stream()
.filter(mapObj -> mapObj.values().stream().anyMatch(value->value.contains(param)))
.collect(Collectors.toList());
}
}
MemEasySearcher<Map<String, String>> memEasySearcher = new MemEasySearcherImpl<>();
Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null); Map<String, Object> model = memEasySearcher.search(mapList, easySearchParse, pageRequest, null);
return model; return model;
} }
......
...@@ -61,6 +61,15 @@ public class SapStockTransfers extends FlowBillAbstractEntity { ...@@ -61,6 +61,15 @@ public class SapStockTransfers extends FlowBillAbstractEntity {
@Column(name = "lifnr_name") @Column(name = "lifnr_name")
private String lifnrName; private String lifnrName;
/**
* 收货工厂
*/
@Column(name = "werks")
private String werks;
@Column(name = "werks_name")
private String werksName;
@Override @Override
protected String getCodeRuleId() { protected String getCodeRuleId() {
return "sapStockTransfers"; return "sapStockTransfers";
......
...@@ -57,15 +57,6 @@ public class SapStockTransfersItem extends AbstractEntity { ...@@ -57,15 +57,6 @@ public class SapStockTransfersItem extends AbstractEntity {
*/ */
@Column(name = "eeind") @Column(name = "eeind")
private Date eeind; private Date eeind;
/**
* 收货工厂
*/
@Column(name = "werks")
private String werks;
@Column(name = "werks_name")
private String werksName;
/** /**
* 库存地点 * 库存地点
*/ */
......
...@@ -15,12 +15,11 @@ ...@@ -15,12 +15,11 @@
select select
t.id, t.id,
t.ktext, t.ktext,
t.datbi,
t.datab,
t.kostl t.kostl
from sap_cost_center t where t.is_delete = 0 and t.is_enable = 1 from sap_cost_center t where t.is_delete = 0 and t.is_enable = 1
</sql-query> </sql-query>
<condition column="ktext" name="ktext" type="java.lang.String" symbol="like" alias="t"/> <condition column="ktext" name="ktext" type="java.lang.String" symbol="like" alias="t"/>
<condition column="kostl" name="kostl" type="java.lang.String" symbol="like" alias="t"/>
<condition column="datbi" name="nowDate" type="java.util.Date" symbol="&lt;=" alias="t"/> <condition column="datbi" name="nowDate" type="java.util.Date" symbol="&lt;=" alias="t"/>
<condition column="datab" name="nowDate" type="java.util.Date" symbol="&gt;=" alias="t"/> <condition column="datab" name="nowDate" type="java.util.Date" symbol="&gt;=" alias="t"/>
</query> </query>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment