Merge remote-tracking branch 'origin/master'

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -758,6 +758,9 @@ public class QcServiceImpl implements QcService {
         // 先删除
         qcMapper.delTemplateItem(data);
         // 新增
+//        for (QcTemplateData qcTemplateData : data.getItemList()) {
+//            qcMapper.saveItemDetailed(qcTemplateData);
+//        }
         qcMapper.saveItemDetailed(data.getItemList());
     }
 

src/main/resources/mapper/pms/QcMapper.xml

@@ -645,11 +645,10 @@
         (site, bu_no, template_id, ItemNo, default_value, max_value, min_value)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue,jdbcType=DECIMAL}, #{item.minValue,jdbcType=DECIMAL})
+            (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue}, #{item.minValue})
         </foreach>
     </insert>
 
-
     <!-- 查询项目明细 -->
     <select id="selectItem" resultType="QcTemplateData">
         SELECT ItemNo,