优化diamante

java110-db/src/main/resources/mapper/store/ResourceStoreServiceDaoImplMapper.xml

@@ -282,9 +282,7 @@
         <if test="shId !=null and shId != ''">
             and t.sh_id= #{shId}
         </if>
-        <if test="shType !=null and shType != ''">
-            and sh.sh_type= #{shType}
-        </if>
+
         <if test="shObjId !=null and shObjId != ''">
             and sh.sh_obj_id= #{shObjId}
         </if>
@@ -475,9 +473,6 @@
                 #{item}
             </foreach>
         </if>
-        <if test="shType !=null and shType != ''">
-            and sh.sh_type= #{shType}
-        </if>
         <if test="averagePrice != null and averagePrice != ''">
             and t.average_price = #{averagePrice}
         </if>
@@ -574,9 +569,6 @@
         <if test="shId !=null and shId != ''">
             and t.sh_id= #{shId}
         </if>
-        <if test="shType !=null and shType != ''">
-            and sh.sh_type= #{shType}
-        </if>
         <if test="shObjId !=null and shObjId != ''">
             and sh.sh_obj_id= #{shObjId}
         </if>

java110-db/src/main/resources/mapper/store/ResourceStoreTimesV1ServiceDaoImplMapper.xml

@@ -27,7 +27,7 @@
         rs.sh_id,rs.sh_id shId,sh.sh_name shName,rs.average_price,rs.average_price
         averagePrice,rss.spec_name rssName,rs.mini_unit_code,rs.mini_unit_code miniUnitCode,rs.mini_stock,rs.mini_stock
         miniStock,rs.mini_unit_stock,rs.mini_unit_stock miniUnitStock,td.name unitCodeName,td1.name
-        miniUnitCodeName,sh.sh_type shType,rs.parent_rst_id parentRstId,rs.rst_id rstId,rst1.name parentRstName,rst.name
+        miniUnitCodeName,rs.parent_rst_id parentRstId,rs.rst_id rstId,rst1.name parentRstName,rst.name
         rstName,
         rs.is_fixed,rs.is_fixed isFixed,td2.name isFixedName
         from resource_store_times t