purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善商品属性接口，支持新增、删除和查询

Browse Source
This commit is contained in:
季圣华
2022-08-30 00:40:48 +08:00
parent 52bd683c7b
commit 654a246d84
10 changed files with 31 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttribute.java
View File

@@ -3,8 +3,6 @@ package com.jsh.erp.datasource.entities;
public class MaterialAttribute {
private Long id;
private String attributeField;
private String attributeName;
private String attributeValue;
@@ -21,14 +19,6 @@ public class MaterialAttribute {
this.id = id;
}
public String getAttributeField() {
return attributeField;
}
public void setAttributeField(String attributeField) {
this.attributeField = attributeField == null ? null : attributeField.trim();
}
public String getAttributeName() {
return attributeName;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialAttributeExample.java
View File

@@ -164,76 +164,6 @@ public class MaterialAttributeExample {
return (Criteria) this;
}
public Criteria andAttributeFieldIsNull() {
addCriterion("attribute_field is null");
return (Criteria) this;
}
public Criteria andAttributeFieldIsNotNull() {
addCriterion("attribute_field is not null");
return (Criteria) this;
}
public Criteria andAttributeFieldEqualTo(String value) {
addCriterion("attribute_field =", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldNotEqualTo(String value) {
addCriterion("attribute_field <>", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldGreaterThan(String value) {
addCriterion("attribute_field >", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldGreaterThanOrEqualTo(String value) {
addCriterion("attribute_field >=", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldLessThan(String value) {
addCriterion("attribute_field <", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldLessThanOrEqualTo(String value) {
addCriterion("attribute_field <=", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldLike(String value) {
addCriterion("attribute_field like", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldNotLike(String value) {
addCriterion("attribute_field not like", value, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldIn(List<String> values) {
addCriterion("attribute_field in", values, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldNotIn(List<String> values) {
addCriterion("attribute_field not in", values, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldBetween(String value1, String value2) {
addCriterion("attribute_field between", value1, value2, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeFieldNotBetween(String value1, String value2) {
addCriterion("attribute_field not between", value1, value2, "attributeField");
return (Criteria) this;
}
public Criteria andAttributeNameIsNull() {
addCriterion("attribute_name is null");
return (Criteria) this;

2
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialAttributeMapperEx.java
View File

@@ -8,7 +8,7 @@ import java.util.List;
public interface MaterialAttributeMapperEx {
List<MaterialAttribute> selectByConditionMaterialAttribute(
@Param("attributeField") String attributeField,
@Param("attributeName") String attributeName,
@Param("offset") Integer offset,
@Param("rows") Integer rows);

4
jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeComponent.java
View File

@@ -31,8 +31,8 @@ public class MaterialAttributeComponent implements ICommonQuery {
private List<?> getMaterialList(Map<String, String> map) throws Exception{
String search = map.get(Constants.SEARCH);
String attributeField = StringUtil.getInfo(search, "attributeField");
return materialAttributeService.select(attributeField, QueryUtils.offset(map), QueryUtils.rows(map));
String attributeName = StringUtil.getInfo(search, "attributeName");
return materialAttributeService.select(attributeName, QueryUtils.offset(map), QueryUtils.rows(map));
}
@Override

25
jshERP-boot/src/main/java/com/jsh/erp/service/materialAttribute/MaterialAttributeService.java
View File

@@ -49,6 +49,7 @@ public class MaterialAttributeService {
public List<MaterialAttribute> getMaterialAttribute() throws Exception{
MaterialAttributeExample example = new MaterialAttributeExample();
example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
example.setOrderByClause("id desc");
List<MaterialAttribute> list=null;
try{
list=materialAttributeMapper.selectByExample(example);
@@ -58,31 +59,11 @@ public class MaterialAttributeService {
return list;
}
public List<MaterialAttribute> select(String attributeField, int offset, int rows)
public List<MaterialAttribute> select(String attributeName, int offset, int rows)
throws Exception{
String[] arr = {"manyColor","manySize","other1","other2","other3"};
Map<String, String> map = new HashMap<>();
map.put("manyColor", "多颜色");
map.put("manySize", "多尺寸");
map.put("other1", "自定义1");
map.put("other2", "自定义2");
map.put("other3", "自定义3");
List<MaterialAttribute> list = new ArrayList<>();
try{
List<MaterialAttribute> maList = materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeField, offset, rows);
for(String field: arr) {
MaterialAttribute materialAttribute = new MaterialAttribute();
materialAttribute.setAttributeField(field);
materialAttribute.setAttributeName(map.get(field));
for(MaterialAttribute ma: maList) {
if(field.equals(ma.getAttributeField())){
materialAttribute.setId(ma.getId());
materialAttribute.setAttributeName(ma.getAttributeName());
materialAttribute.setAttributeValue(ma.getAttributeValue());
}
}
list.add(materialAttribute);
}
list = materialAttributeMapperEx.selectByConditionMaterialAttribute(attributeName, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}