生产配方管理-修改-二级组成-修改操作步骤bug

op-modules/op-technology/src/main/java/com/op/technology/domain/ProRecipe.java

@@ -227,5 +227,4 @@ public class ProRecipe extends BaseEntity {
                 .append("version",getVersion())
                 .toString();
     }
-
 }

op-modules/op-technology/src/main/java/com/op/technology/domain/ProRecipeContent.java

@@ -54,6 +54,12 @@ public class ProRecipeContent extends BaseEntity
     /** 预留字段4 */
     private Long attr4;
 
+    //新增四个字段
+    private String dosage;
+    private String unit;
+    private String controlParameters;
+    private String safeDosage;
+
     public void setContentId(String contentId)
     {
         this.contentId = contentId;
@@ -154,6 +160,38 @@ public class ProRecipeContent extends BaseEntity
         return attr4;
     }
 
+    public String getDosage() {
+        return dosage;
+    }
+
+    public void setDosage(String dosage) {
+        this.dosage = dosage;
+    }
+
+    public String getSafeDosage() {
+        return safeDosage;
+    }
+
+    public void setsafeDosage(String safeDosage) {
+        this.safeDosage = safeDosage;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getControlParameters() {
+        return controlParameters;
+    }
+
+    public void setControlParameters(String controlParameters) {
+        this.controlParameters = controlParameters;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -173,6 +211,10 @@ public class ProRecipeContent extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("dosage",getDosage())
+            .append("unit",getUnit())
+            .append("controlParameters",getControlParameters())
+            .append("safeDosage",getSafeDosage())
             .toString();
     }
 }

op-modules/op-technology/src/main/resources/mapper/technology/ProRecipeContentMapper.xml

@@ -21,12 +21,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <!--新增-->
+        <result property="dosage"    column="dosage"    />
+        <result property="unit"    column="unit"    />
+        <result property="safeDosage"    column="safe_dosage"    />
+        <result property="controlParameters"    column="control_parameters"    />
     </resultMap>
 
     <sql id="selectProRecipeContentVo">
         select content_id, recipe_id, order_num, content_text, device, material,
                doc_url, remark, attr1, attr2, attr3, attr4, create_by,
-               create_time, update_by, update_time
+               create_time, update_by, update_time,dosage,unit,safe_dosage,control_parameters
         from pro_recipe_content
     </sql>
 
@@ -67,6 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            --新增
+            <if test="dosage != null">create_by,</if>
+            <if test="safeDosage != null">safe_dosage,</if>
+            <if test="unit != null">unit,</if>
+            <if test="controlParameters != null">control_parameters,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{contentId},
@@ -85,6 +95,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            -- 新增
+            <if test="dosage != null">#{dosage},</if>
+            <if test="safeDosage != null">#{safeDosage},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="controlParameters != null">#{controlParameters},</if>
          </trim>
     </insert>
 
@@ -106,6 +121,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+--             新增
+            <if test="dosage != null">dosage = #{dosage},</if>
+            <if test="safeDosage != null">safe_dosage = #{safeDosage},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="controlParameters != null">control_parameters = #{controlParameters},</if>
         </trim>
         where content_id = #{contentId}
     </update>