物料配置

pro-base/src/main/java/com/idea/buildManage/controller/MaterialManageController.java

@@ -0,0 +1,59 @@
+package com.idea.buildManage.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.dto.MaterialManageDto;
+import com.idea.buildManage.model.MaterialManage;
+import com.idea.buildManage.service.MaterialManageService;
+import com.rockstar.common.base.BaseController;
+import com.rockstar.common.domain.AjaxResult;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.TableSplitResult;
+import com.rockstar.frame.model.extend.Tablepar;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+@Controller
+@RequestMapping(value = "MaterialManageController")
+@Api(tags = "物料管理")
+public class MaterialManageController extends BaseController {
+
+    @Autowired
+    private MaterialManageService modelService;
+
+
+    @PostMapping(value = "bind", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public AjaxResult bind(MaterialManageDto model) {
+        int result = modelService.bindGroup(model);
+        return result(result);
+    }
+
+
+    @PostMapping(value = "listByModel", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object listByModel(Tablepar tablepar, MaterialManageDto model, DateTrans dt) {
+        PageInfo<MaterialManageDto> page = modelService.listByModel(tablepar, model, dt);
+        TableSplitResult<MaterialManageDto> result = new TableSplitResult<>(page.getPageNum(), page.getTotal(), page.getList());
+        return result;
+    }
+
+    /**
+     * 获取园区物料详情
+     *
+     * @param groupId
+     * @return
+     */
+    @PostMapping(value = "getByGroupId", produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public List<MaterialManage> getByGroupId(String groupId) {
+        return modelService.getByGroupId(groupId);
+    }
+
+
+}

pro-base/src/main/java/com/idea/buildManage/dto/MaterialManageDto.java

@@ -0,0 +1,21 @@
+package com.idea.buildManage.dto;
+
+import com.idea.buildManage.model.MaterialManage;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class MaterialManageDto extends MaterialManage {
+
+    private String materialJson;
+
+    private String groupName;
+
+    /**
+     * 适用园区类型
+     */
+    private String suitMaterialStr;
+
+}

pro-base/src/main/java/com/idea/buildManage/mapper/MaterialManageExtendMapper.java

@@ -0,0 +1,15 @@
+package com.idea.buildManage.mapper;
+
+import com.idea.buildManage.dto.MaterialManageDto;
+import com.idea.buildManage.model.MaterialManage;
+import com.idea.buildManage.model.MaterialManageExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface MaterialManageExtendMapper {
+
+    List<MaterialManageDto> listByModel(MaterialManage record);
+
+
+}

pro-base/src/main/java/com/idea/buildManage/mapper/MaterialManageMapper.java

@@ -0,0 +1,31 @@
+package com.idea.buildManage.mapper;
+
+import java.util.List;
+
+import com.idea.buildManage.model.MaterialManage;
+import com.idea.buildManage.model.MaterialManageExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface MaterialManageMapper {
+    long countByExample(MaterialManageExample example);
+
+    int deleteByExample(MaterialManageExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(MaterialManage record);
+
+    int insertSelective(MaterialManage record);
+
+    List<MaterialManage> selectByExample(MaterialManageExample example);
+
+    MaterialManage selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") MaterialManage record, @Param("example") MaterialManageExample example);
+
+    int updateByExample(@Param("record") MaterialManage record, @Param("example") MaterialManageExample example);
+
+    int updateByPrimaryKeySelective(MaterialManage record);
+
+    int updateByPrimaryKey(MaterialManage record);
+}

pro-base/src/main/java/com/idea/buildManage/model/MaterialManage.java

@@ -0,0 +1,88 @@
+package com.idea.buildManage.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class MaterialManage implements Serializable {
+    private String id;
+
+    private String groupId;
+
+    private String tax;
+
+    private String material;
+
+    private String createdId;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private String updatedId;
+
+    private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId == null ? null : groupId.trim();
+    }
+
+    public String getTax() {
+        return tax;
+    }
+
+    public void setTax(String tax) {
+        this.tax = tax == null ? null : tax.trim();
+    }
+
+    public String getMaterial() {
+        return material;
+    }
+
+    public void setMaterial(String material) {
+        this.material = material == null ? null : material.trim();
+    }
+
+    public String getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(String createdId) {
+        this.createdId = createdId == null ? null : createdId.trim();
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public String getUpdatedId() {
+        return updatedId;
+    }
+
+    public void setUpdatedId(String updatedId) {
+        this.updatedId = updatedId == null ? null : updatedId.trim();
+    }
+}

pro-base/src/main/java/com/idea/buildManage/model/MaterialManageExample.java

@@ -0,0 +1,741 @@
+package com.idea.buildManage.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MaterialManageExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public MaterialManageExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNull() {
+            addCriterion("group_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNotNull() {
+            addCriterion("group_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdEqualTo(String value) {
+            addCriterion("group_id =", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotEqualTo(String value) {
+            addCriterion("group_id <>", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThan(String value) {
+            addCriterion("group_id >", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThanOrEqualTo(String value) {
+            addCriterion("group_id >=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThan(String value) {
+            addCriterion("group_id <", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThanOrEqualTo(String value) {
+            addCriterion("group_id <=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLike(String value) {
+            addCriterion("group_id like", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotLike(String value) {
+            addCriterion("group_id not like", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIn(List<String> values) {
+            addCriterion("group_id in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotIn(List<String> values) {
+            addCriterion("group_id not in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdBetween(String value1, String value2) {
+            addCriterion("group_id between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotBetween(String value1, String value2) {
+            addCriterion("group_id not between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxIsNull() {
+            addCriterion("tax is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxIsNotNull() {
+            addCriterion("tax is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxEqualTo(String value) {
+            addCriterion("tax =", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxNotEqualTo(String value) {
+            addCriterion("tax <>", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxGreaterThan(String value) {
+            addCriterion("tax >", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxGreaterThanOrEqualTo(String value) {
+            addCriterion("tax >=", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxLessThan(String value) {
+            addCriterion("tax <", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxLessThanOrEqualTo(String value) {
+            addCriterion("tax <=", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxLike(String value) {
+            addCriterion("tax like", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxNotLike(String value) {
+            addCriterion("tax not like", value, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxIn(List<String> values) {
+            addCriterion("tax in", values, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxNotIn(List<String> values) {
+            addCriterion("tax not in", values, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBetween(String value1, String value2) {
+            addCriterion("tax between", value1, value2, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxNotBetween(String value1, String value2) {
+            addCriterion("tax not between", value1, value2, "tax");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialIsNull() {
+            addCriterion("material is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialIsNotNull() {
+            addCriterion("material is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialEqualTo(String value) {
+            addCriterion("material =", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialNotEqualTo(String value) {
+            addCriterion("material <>", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialGreaterThan(String value) {
+            addCriterion("material >", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialGreaterThanOrEqualTo(String value) {
+            addCriterion("material >=", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialLessThan(String value) {
+            addCriterion("material <", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialLessThanOrEqualTo(String value) {
+            addCriterion("material <=", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialLike(String value) {
+            addCriterion("material like", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialNotLike(String value) {
+            addCriterion("material not like", value, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialIn(List<String> values) {
+            addCriterion("material in", values, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialNotIn(List<String> values) {
+            addCriterion("material not in", values, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialBetween(String value1, String value2) {
+            addCriterion("material between", value1, value2, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaterialNotBetween(String value1, String value2) {
+            addCriterion("material not between", value1, value2, "material");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNull() {
+            addCriterion("created_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIsNotNull() {
+            addCriterion("created_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdEqualTo(String value) {
+            addCriterion("created_id =", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotEqualTo(String value) {
+            addCriterion("created_id <>", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThan(String value) {
+            addCriterion("created_id >", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("created_id >=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThan(String value) {
+            addCriterion("created_id <", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLessThanOrEqualTo(String value) {
+            addCriterion("created_id <=", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdLike(String value) {
+            addCriterion("created_id like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotLike(String value) {
+            addCriterion("created_id not like", value, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdIn(List<String> values) {
+            addCriterion("created_id in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotIn(List<String> values) {
+            addCriterion("created_id not in", values, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdBetween(String value1, String value2) {
+            addCriterion("created_id between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedIdNotBetween(String value1, String value2) {
+            addCriterion("created_id not between", value1, value2, "createdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNull() {
+            addCriterion("updated_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIsNotNull() {
+            addCriterion("updated_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdEqualTo(String value) {
+            addCriterion("updated_id =", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotEqualTo(String value) {
+            addCriterion("updated_id <>", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThan(String value) {
+            addCriterion("updated_id >", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdGreaterThanOrEqualTo(String value) {
+            addCriterion("updated_id >=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThan(String value) {
+            addCriterion("updated_id <", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLessThanOrEqualTo(String value) {
+            addCriterion("updated_id <=", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdLike(String value) {
+            addCriterion("updated_id like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotLike(String value) {
+            addCriterion("updated_id not like", value, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdIn(List<String> values) {
+            addCriterion("updated_id in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotIn(List<String> values) {
+            addCriterion("updated_id not in", values, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdBetween(String value1, String value2) {
+            addCriterion("updated_id between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedIdNotBetween(String value1, String value2) {
+            addCriterion("updated_id not between", value1, value2, "updatedId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

pro-base/src/main/java/com/idea/buildManage/service/MaterialManageService.java

@@ -0,0 +1,171 @@
+package com.idea.buildManage.service;
+
+import cn.hutool.core.util.IdUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.idea.buildManage.dto.MaterialManageDto;
+import com.idea.buildManage.mapper.MaterialManageExtendMapper;
+import com.idea.buildManage.mapper.MaterialManageMapper;
+import com.idea.buildManage.mapper.ParkInfoMapper;
+import com.idea.buildManage.model.MaterialManage;
+import com.idea.buildManage.model.MaterialManageExample;
+import com.idea.buildManage.model.ParkInfo;
+import com.idea.buildManage.model.ParkInfoExample;
+import com.idea.customerManagement.dto.CustomerManagementDto;
+import com.rockstar.common.base.BaseService;
+import com.rockstar.frame.model.extend.DateTrans;
+import com.rockstar.frame.model.extend.Tablepar;
+import com.rockstar.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class MaterialManageService implements BaseService<MaterialManage, MaterialManageExample> {
+
+    @Autowired
+    private MaterialManageMapper modelMapper;
+    @Autowired
+    private MaterialManageExtendMapper extendMapper;
+    @Autowired
+    private ParkInfoMapper parkInfoMapper;
+
+    @Override
+    public int deleteByPrimaryKey(String s) {
+        return modelMapper.deleteByPrimaryKey(s);
+    }
+
+    @Override
+    public int insertSelective(MaterialManage materialManage) {
+        materialManage.setId(IdUtil.simpleUUID());
+        return modelMapper.insertSelective(materialManage);
+    }
+
+    public int insertWithoutId(MaterialManage materialManage) {
+        return modelMapper.insertSelective(materialManage);
+    }
+
+    @Override
+    public MaterialManage selectByPrimaryKey(String s) {
+        return modelMapper.selectByPrimaryKey(s);
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(MaterialManage materialManage) {
+        return modelMapper.updateByPrimaryKeySelective(materialManage);
+    }
+
+    @Override
+    public int updateByExampleSelective(MaterialManage materialManage, MaterialManageExample materialManageExample) {
+        return modelMapper.updateByExampleSelective(materialManage, materialManageExample);
+    }
+
+    @Override
+    public int updateByExample(MaterialManage materialManage, MaterialManageExample materialManageExample) {
+        return modelMapper.updateByExample(materialManage, materialManageExample);
+    }
+
+    @Override
+    public List<MaterialManage> selectByExample(MaterialManageExample materialManageExample) {
+        return modelMapper.selectByExample(materialManageExample);
+    }
+
+    @Override
+    public long countByExample(MaterialManageExample materialManageExample) {
+        return modelMapper.countByExample(materialManageExample);
+    }
+
+    @Override
+    public int deleteByExample(MaterialManageExample materialManageExample) {
+        return modelMapper.deleteByExample(materialManageExample);
+    }
+
+    /**
+     * 绑定物料
+     * @param record
+     * @return
+     */
+    public int bindGroup(MaterialManageDto record){
+
+        //先删除
+        MaterialManageExample example = new MaterialManageExample();
+        example.createCriteria().andGroupIdEqualTo(record.getGroupId());
+        modelMapper.deleteByExample(example);
+        //再新增
+        List<MaterialManageDto> list = JSONObject.parseArray(record.getMaterialJson(), MaterialManageDto.class);
+        for (MaterialManageDto dto : list) {
+            MaterialManage materialManage = new MaterialManage();
+            materialManage.setId(IdUtil.simpleUUID());
+            materialManage.setGroupId(record.getGroupId());
+            materialManage.setTax(dto.getTax());
+            materialManage.setMaterial(dto.getMaterial());
+            modelMapper.insertSelective(materialManage);
+        }
+        return 1;
+    }
+
+    /**
+     * 分页查询
+     * @param tablepar
+     * @param model
+     * @param dt
+     * @return
+     */
+    public PageInfo<MaterialManageDto> listByModel(Tablepar tablepar, MaterialManageDto model, DateTrans dt) {
+
+        ArrayList<MaterialManageDto> list = new ArrayList<>();
+        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+        ParkInfoExample parkInfoExample = new ParkInfoExample();
+        List<ParkInfo> parkInfos = parkInfoMapper.selectByExample(parkInfoExample);
+        for(ParkInfo parkInfo : parkInfos){
+            MaterialManageDto materialManageDto = new MaterialManageDto();
+            materialManageDto.setGroupId(parkInfo.getGroupId());
+            materialManageDto.setGroupName(parkInfo.getGroupName());
+            MaterialManageExample example = new MaterialManageExample();
+            example.createCriteria().andGroupIdEqualTo(parkInfo.getGroupId());
+            List<MaterialManage> materialManages = modelMapper.selectByExample(example);
+
+            StringBuilder builder = new StringBuilder();
+            for(MaterialManage materialManage : materialManages){
+                BigDecimal multiply = new BigDecimal(materialManage.getTax()).multiply(new BigDecimal("100")).setScale(0, BigDecimal.ROUND_FLOOR);;
+                builder.append(materialManage.getMaterial())
+                        .append("(")
+                        .append(multiply)
+                        .append("%")
+                        .append(")")
+                        .append(",");
+            }
+            if (builder.length() > 1) {
+                builder.deleteCharAt(builder.length() - 1);
+            }
+            materialManageDto.setSuitMaterialStr(builder.toString());
+            list.add(materialManageDto);
+        }
+        PageInfo<MaterialManageDto> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 获取园区物料详情
+     * @param groupId
+     * @return
+     */
+    public List<MaterialManage> getByGroupId(String groupId){
+
+        MaterialManageExample example = new MaterialManageExample();
+        example.createCriteria().andGroupIdEqualTo(groupId);
+        List<MaterialManage> list = modelMapper.selectByExample(example);
+        return list;
+    }
+
+
+
+
+
+
+
+}

pro-base/src/main/resources/mybatis/buildManage/MaterialManageExtendMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.buildManage.mapper.MaterialManageExtendMapper">
+
+
+  <select id="listByModel" resultType="com.idea.buildManage.dto.MaterialManageDto">
+
+  </select>
+</mapper>

pro-base/src/main/resources/mybatis/buildManage/MaterialManageMapper.xml

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.idea.buildManage.mapper.MaterialManageMapper">
+  <resultMap id="BaseResultMap" type="com.idea.buildManage.model.MaterialManage">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="group_id" jdbcType="VARCHAR" property="groupId" />
+    <result column="tax" jdbcType="VARCHAR" property="tax" />
+    <result column="material" jdbcType="VARCHAR" property="material" />
+    <result column="created_id" jdbcType="VARCHAR" property="createdId" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="updated_id" jdbcType="VARCHAR" property="updatedId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, group_id, tax, material, created_id, created_at, updated_at, updated_id
+  </sql>
+  <select id="selectByExample" parameterType="com.idea.buildManage.model.MaterialManageExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from material_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from material_manage
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from material_manage
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.idea.buildManage.model.MaterialManageExample">
+    delete from material_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.idea.buildManage.model.MaterialManage">
+    insert into material_manage (id, group_id, tax, 
+      material, created_id, created_at, 
+      updated_at, updated_id)
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{tax,jdbcType=VARCHAR}, 
+      #{material,jdbcType=VARCHAR}, #{createdId,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{updatedId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.idea.buildManage.model.MaterialManage">
+    insert into material_manage
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="groupId != null">
+        group_id,
+      </if>
+      <if test="tax != null">
+        tax,
+      </if>
+      <if test="material != null">
+        material,
+      </if>
+      <if test="createdId != null">
+        created_id,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedId != null">
+        updated_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null">
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="tax != null">
+        #{tax,jdbcType=VARCHAR},
+      </if>
+      <if test="material != null">
+        #{material,jdbcType=VARCHAR},
+      </if>
+      <if test="createdId != null">
+        #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        #{updatedId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.idea.buildManage.model.MaterialManageExample" resultType="java.lang.Long">
+    select count(*) from material_manage
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update material_manage
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.groupId != null">
+        group_id = #{record.groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tax != null">
+        tax = #{record.tax,jdbcType=VARCHAR},
+      </if>
+      <if test="record.material != null">
+        material = #{record.material,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdId != null">
+        created_id = #{record.createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedId != null">
+        updated_id = #{record.updatedId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update material_manage
+    set id = #{record.id,jdbcType=VARCHAR},
+      group_id = #{record.groupId,jdbcType=VARCHAR},
+      tax = #{record.tax,jdbcType=VARCHAR},
+      material = #{record.material,jdbcType=VARCHAR},
+      created_id = #{record.createdId,jdbcType=VARCHAR},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      updated_id = #{record.updatedId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.idea.buildManage.model.MaterialManage">
+    update material_manage
+    <set>
+      <if test="groupId != null">
+        group_id = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="tax != null">
+        tax = #{tax,jdbcType=VARCHAR},
+      </if>
+      <if test="material != null">
+        material = #{material,jdbcType=VARCHAR},
+      </if>
+      <if test="createdId != null">
+        created_id = #{createdId,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedId != null">
+        updated_id = #{updatedId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.idea.buildManage.model.MaterialManage">
+    update material_manage
+    set group_id = #{groupId,jdbcType=VARCHAR},
+      tax = #{tax,jdbcType=VARCHAR},
+      material = #{material,jdbcType=VARCHAR},
+      created_id = #{createdId,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_id = #{updatedId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>