优化商品模糊匹配的功能
This commit is contained in:
@@ -482,26 +482,4 @@ public class MaterialController {
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品型号模糊匹配
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@GetMapping(value = "/getMaterialModelList")
|
||||
public JSONArray getMaterialModelList() throws Exception {
|
||||
JSONArray arr = new JSONArray();
|
||||
try {
|
||||
List<String> list = materialService.getMaterialModelList();
|
||||
for (String s : list) {
|
||||
JSONObject item = new JSONObject();
|
||||
item.put("value", s);
|
||||
item.put("text", s);
|
||||
arr.add(item);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,8 +77,6 @@ public interface MaterialMapperEx {
|
||||
|
||||
List<String> getMaterialNameList();
|
||||
|
||||
List<String> getMaterialModelList();
|
||||
|
||||
List<Material> findByOrder(@Param("name") String name,
|
||||
@Param("model") String model);
|
||||
}
|
||||
|
||||
@@ -730,8 +730,4 @@ public class MaterialService {
|
||||
public List<String> getMaterialNameList() {
|
||||
return materialMapperEx.getMaterialNameList();
|
||||
}
|
||||
|
||||
public List<String> getMaterialModelList() {
|
||||
return materialMapperEx.getMaterialModelList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,13 +259,6 @@
|
||||
order by m.name asc
|
||||
</select>
|
||||
|
||||
<select id="getMaterialModelList" resultType="java.lang.String">
|
||||
select m.Model from jsh_material m
|
||||
where m.Model is not null and m.Model !='' and ifnull(m.delete_Flag,'0') !='1'
|
||||
group by m.Model
|
||||
order by m.Model asc
|
||||
</select>
|
||||
|
||||
<select id="findByOrder" resultType="com.jsh.erp.datasource.entities.Material">
|
||||
select m.*
|
||||
FROM jsh_material m
|
||||
|
||||
Reference in New Issue
Block a user