'新加修改质保书地址'

pom.xml

@@ -111,11 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<<<<<<< Updated upstream
                         <param>RMS_MATERIAL_STEEL</param><!--运力-->
-=======
-                        <param>TMSTRUCK_SMS_RUSULT</param><!--运力-->
->>>>>>> Stashed changes
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/RmsMaterialSteelController.java

@@ -84,8 +84,11 @@ public class RmsMaterialSteelController extends BaseRESTfulController {
             // 得到炉号
             int index = originName.indexOf(".");
             String materialFurnaceNumber = originName.substring(0, index);
+            Map<String,Object> map = new HashMap<>();
+            map.put("materialFurnaceNumber",materialFurnaceNumber);
+            map.put("conclusionUrl",realPath);
             // 修改钢材质检结果
-            Integer code = rmsMaterialSteelService.updateMaterialQuality(materialFurnaceNumber);
+            Integer code = rmsMaterialSteelService.updateMaterialQuality(map);
         } catch (IOException e) {
             //返回异常
             result.put("status","error");

src/main/java/com/steerinfo/dil/mapper/RmsMaterialSteelMapper.java

@@ -13,5 +13,5 @@ public interface RmsMaterialSteelMapper extends IBaseMapper<RmsMaterialSteel, Bi
     Map<String, Object> getMaterialFurnaceNumber();
 
     // 修改相应炉号的钢材质检结果
-    Integer updateMaterialQuality(String materialFurnaceNumber);
+    Integer updateMaterialQuality(Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/model/RmsMaterialSteel.java

@@ -98,6 +98,12 @@ public class RmsMaterialSteel implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资唯一编码（一件钢材的唯一标识）",required=false)
     private String materialOnlyCode;
 
+    /**
+     * 钢材质保书存储地址(CONCLUSION_URL,VARCHAR,200)
+     */
+    @ApiModelProperty(value="钢材质保书存储地址",required=false)
+    private String conclusionUrl;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -230,6 +236,14 @@ public class RmsMaterialSteel implements IBasePO<BigDecimal> {
         this.materialOnlyCode = materialOnlyCode == null ? null : materialOnlyCode.trim();
     }
 
+    public String getConclusionUrl() {
+        return conclusionUrl;
+    }
+
+    public void setConclusionUrl(String conclusionUrl) {
+        this.conclusionUrl = conclusionUrl == null ? null : conclusionUrl.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -251,6 +265,7 @@ public class RmsMaterialSteel implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
         sb.append(", materialOnlyCode=").append(materialOnlyCode);
+        sb.append(", conclusionUrl=").append(conclusionUrl);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/service/IRmsMaterialSteelService.java

@@ -1,9 +1,5 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.dil.model.RmsMaterialSteel;
-import java.util.Date;
-import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -29,8 +25,8 @@ public interface IRmsMaterialSteelService {
 
     /**
      * 修改相应炉号的钢材质检结果
-     * @param materialFurnaceNumber
+     * @param map
      * @return
      */
-    Integer updateMaterialQuality(String materialFurnaceNumber);
+    Integer updateMaterialQuality(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialSteelServiceImpl.java

@@ -37,11 +37,11 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
 
     /**
      * 修改相应炉号的钢材质检结果
-     * @param materialFurnaceNumber
+     * @param map
      * @return
      */
     @Override
-    public Integer updateMaterialQuality(String materialFurnaceNumber) {
-        return rmsMaterialSteelMapper.updateMaterialQuality(materialFurnaceNumber);
+    public Integer updateMaterialQuality(Map<String, Object> map) {
+        return rmsMaterialSteelMapper.updateMaterialQuality(map);
     }
 }

src/main/resources/com/steerinfo/dil/mapper/RmsMaterialSteelMapper.xml

@@ -17,17 +17,19 @@
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
         <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
         <result column="MATERIAL_ONLY_CODE" jdbcType="VARCHAR" property="materialOnlyCode"/>
+        <result column="CONCLUSION_URL" jdbcType="VARCHAR" property="conclusionUrl"/>
     </resultMap>
     <sql id="columns">
         MATERIAL_STEEL_ID, MATERIAL_ID, MATERIAL_FURNACE_NUMBER, MATERIAL_COUNT, MATERIAL_SINGLE_BUNDLE_WEIGHT,
-    MATERIAL_THEORETICAL_WEIGHT, MATERIAL_PRODUCTION_DATE, MATERIAL_QUALIFIED, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, MATERIAL_ONLY_CODE
+    MATERIAL_THEORETICAL_WEIGHT, MATERIAL_PRODUCTION_DATE, MATERIAL_QUALIFIED, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, MATERIAL_ONLY_CODE,
+    CONCLUSION_URL
     </sql>
     <sql id="columns_alias">
         t.MATERIAL_STEEL_ID, t.MATERIAL_ID, t.MATERIAL_FURNACE_NUMBER, t.MATERIAL_COUNT,
-    t.MATERIAL_SINGLE_BUNDLE_WEIGHT, t.MATERIAL_THEORETICAL_WEIGHT, t.MATERIAL_PRODUCTION_DATE, 
-    t.MATERIAL_QUALIFIED, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED, t.MATERIAL_ONLY_CODE
+    t.MATERIAL_SINGLE_BUNDLE_WEIGHT, t.MATERIAL_THEORETICAL_WEIGHT, t.MATERIAL_PRODUCTION_DATE,
+    t.MATERIAL_QUALIFIED, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.MATERIAL_ONLY_CODE, t.CONCLUSION_URL
     </sql>
     <sql id="select">
         SELECT
@@ -86,6 +88,9 @@
             <if test="materialOnlyCode != null and materialOnlyCode != ''">
                 and MATERIAL_ONLY_CODE = #{materialOnlyCode}
             </if>
+            <if test="conclusionUrl != null and conclusionUrl != ''">
+                and CONCLUSION_URL = #{conclusionUrl}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -135,6 +140,9 @@
             <if test="materialOnlyCode != null and materialOnlyCode != ''">
                 and MATERIAL_ONLY_CODE LIKE '%${materialOnlyCode}%'
             </if>
+            <if test="conclusionUrl != null and conclusionUrl != ''">
+                and CONCLUSION_URL LIKE '%${conclusionUrl}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -187,6 +195,9 @@
         <if test="materialOnlyCode != null and materialOnlyCode != ''">
             or MATERIAL_ONLY_CODE = #{materialOnlyCode}
         </if>
+        <if test="conclusionUrl != null and conclusionUrl != ''">
+            or CONCLUSION_URL = #{conclusionUrl}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterialSteel">
         insert into RMS_MATERIAL_STEEL (MATERIAL_STEEL_ID, MATERIAL_ID, MATERIAL_FURNACE_NUMBER,
@@ -194,7 +205,7 @@
                                         MATERIAL_THEORETICAL_WEIGHT, MATERIAL_PRODUCTION_DATE,
                                         MATERIAL_QUALIFIED, INSERT_USERNAME, INSERT_TIME,
                                         UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-                                        DELETED, MATERIAL_ONLY_CODE)
+                                        DELETED, MATERIAL_ONLY_CODE, CONCLUSION_URL)
         values (#{materialSteelId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
                 #{materialFurnaceNumber,jdbcType=VARCHAR},
                 #{materialCount,jdbcType=DECIMAL}, #{materialSingleBundleWeight,jdbcType=DECIMAL},
@@ -203,7 +214,7 @@
                 #{insertTime,jdbcType=TIMESTAMP},
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR},
-                #{deleted,jdbcType=DECIMAL}, #{materialOnlyCode,jdbcType=VARCHAR})
+                #{deleted,jdbcType=DECIMAL}, #{materialOnlyCode,jdbcType=VARCHAR}, #{conclusionUrl,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterialSteel">
         insert into RMS_MATERIAL_STEEL
@@ -253,6 +264,9 @@
             <if test="materialOnlyCode != null">
                 MATERIAL_ONLY_CODE,
             </if>
+            <if test="conclusionUrl != null">
+                CONCLUSION_URL,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialSteelId != null">
@@ -300,6 +314,9 @@
             <if test="materialOnlyCode != null">
                 #{materialOnlyCode,jdbcType=VARCHAR},
             </if>
+            <if test="conclusionUrl != null">
+                #{conclusionUrl,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsMaterialSteel">
@@ -317,7 +334,8 @@
             UPDATE_TIME                   = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK          = #{insertUpdateRemark,jdbcType=VARCHAR},
             DELETED                       = #{deleted,jdbcType=DECIMAL},
-            MATERIAL_ONLY_CODE            = #{materialOnlyCode,jdbcType=VARCHAR}
+            MATERIAL_ONLY_CODE            = #{materialOnlyCode,jdbcType=VARCHAR},
+            CONCLUSION_URL                = #{conclusionUrl,jdbcType=VARCHAR}
         where MATERIAL_STEEL_ID = #{materialSteelId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterialSteel">
@@ -365,6 +383,9 @@
             <if test="materialOnlyCode != null">
                 MATERIAL_ONLY_CODE = #{materialOnlyCode,jdbcType=VARCHAR},
             </if>
+            <if test="conclusionUrl != null">
+                CONCLUSION_URL = #{conclusionUrl,jdbcType=VARCHAR},
+            </if>
         </set>
         where MATERIAL_STEEL_ID = #{materialSteelId,jdbcType=DECIMAL}
     </update>
@@ -389,7 +410,8 @@
         MATERIAL_QUALIFIED, INSERT_USERNAME,
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
-        DELETED, MATERIAL_ONLY_CODE)
+        DELETED, MATERIAL_ONLY_CODE, CONCLUSION_URL
+        )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.materialSteelId,jdbcType=DECIMAL},
@@ -399,7 +421,9 @@
         #{item.materialQualified,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.deleted,jdbcType=DECIMAL}, #{item.materialOnlyCode,jdbcType=VARCHAR} from dual
+        #{item.deleted,jdbcType=DECIMAL}, #{item.materialOnlyCode,jdbcType=VARCHAR},
+        #{item.conclusionUrl,jdbcType=VARCHAR}
+        from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -465,6 +489,10 @@
         <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_STEEL_ID" close="end">
             when #{item.materialSteelId,jdbcType=DECIMAL} then #{item.materialOnlyCode,jdbcType=VARCHAR}
         </foreach>
+        ,CONCLUSION_URL=
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_STEEL_ID" close="end">
+            when #{item.materialSteelId,jdbcType=DECIMAL} then #{item.conclusionUrl,jdbcType=VARCHAR}
+        </foreach>
         where MATERIAL_STEEL_ID in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.materialSteelId,jdbcType=DECIMAL}
@@ -487,10 +515,10 @@
         WHERE RMS.MATERIAL_QUALIFIED IS NULL
     </select>
 
-    <update id="updateMaterialQuality" parameterType="java.lang.String">
-        update RMS_MATERIAL_STEEL
-        SET MATERIAL_QUALIFIED = 3
+    <update id="updateMaterialQuality" parameterType="java.util.Map">
+        UPDATE RMS_MATERIAL_STEEL
+        SET MATERIAL_QUALIFIED = 3,
+            CONCLUSION_URL     = #{conclusionUrl}
         WHERE MATERIAL_FURNACE_NUMBER = #{materialFurnaceNumber}
     </update>
-
 </mapper>