修改通俗计量方式

This commit is contained in:
huangdeliang
2021-02-03 17:28:45 +08:00
parent 2e3f53f2ea
commit a9cde613d9
3 changed files with 29 additions and 67 deletions

View File

@ -1,5 +1,6 @@
package com.stdiet.custom.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -11,6 +12,7 @@ import java.math.BigDecimal;
* @author wonder
* @date 2020-12-28
*/
@Data
public class SysDishesIngredient extends SysIngredient {
private Long ingredientId;
@ -21,68 +23,10 @@ public class SysDishesIngredient extends SysIngredient {
private BigDecimal cusWeight;
private Integer cusWei;
private BigDecimal weight;
private String remark;
@Override
public void setRemark(String remark) {
this.remark = remark;
}
@Override
public String getRemark() {
return remark;
}
public Long getIngredientId() {
return ingredientId;
}
public void setIngredientId(Long ingredientId) {
this.ingredientId = ingredientId;
}
public Long getDishesId() {
return dishesId;
}
public void setDishesId(Long dishesId) {
this.dishesId = dishesId;
}
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public BigDecimal getCusWeight() {
return cusWeight;
}
public void setCusWeight(BigDecimal cusWeight) {
this.cusWeight = cusWeight;
}
public Long getCusUnit() {
return cusUnit;
}
public void setCusUnit(Long cusUnit) {
this.cusUnit = cusUnit;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("ingredientId", getIngredientId())
.append("dishesId", getDishesId())
.append("weight", getWeight())
.append("cusWeight", getCusWeight())
.append("cusUnit", getCusUnit())
.toString();
}
}

View File

@ -28,6 +28,7 @@
<result property="rec" column="rec" />
<result property="notRec" column="not_rec" />
<result property="cusWeight" column="cus_weight" />
<result property="cusWei" column="cus_wei" />
<result property="cusUnit" column="cus_unit" />
<result property="weight" column="weight" />
</resultMap>
@ -48,7 +49,7 @@
<sql id="selectSysIngreditentsByIdVo">
SELECT * FROM(
SELECT ingredient_id AS id, ingredient_weight AS weight, cus_weight, cus_unit, remark
SELECT ingredient_id AS id, ingredient_weight AS weight, cus_weight, cus_wei, cus_unit, remark
FROM sys_dishes_ingredient
WHERE dishes_id = #{id}
) dishes
@ -148,9 +149,9 @@
</delete>
<insert id="bashInsertDishesIngredent">
insert into sys_dishes_ingredient(dishes_id, ingredient_id, ingredient_weight, cus_unit, cus_weight, remark) values
insert into sys_dishes_ingredient(dishes_id, ingredient_id, ingredient_weight, cus_unit, cus_wei, remark) values
<foreach collection="list" separator="," item="item" index="index">
(#{item.dishesId}, #{item.ingredientId}, #{item.weight}, #{item.cusUnit}, #{item.cusWeight}, #{item.remark})
(#{item.dishesId}, #{item.ingredientId}, #{item.weight}, #{item.cusUnit}, #{item.cusWei}, #{item.remark})
</foreach>
</insert>