优化

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportInStoreSpareNumVO.java

@@ -33,7 +33,7 @@ public class ExportInStoreSpareNumVO implements Serializable {
    * 入库数量
    */
   @Excel(name = "入库数量", orderNum = "3")
-  private BigDecimal num;
+  private BigDecimal inNum;
 
 
 

platform-dao/src/main/java/com/platform/dao/vo/export/store/ExportOutStoreSpareNumVO.java

@@ -31,8 +31,8 @@ public class ExportOutStoreSpareNumVO implements Serializable {
     /**
    * 入库数量
    */
-  @Excel(name = "入库数量", orderNum = "3")
-  private BigDecimal num;
+  @Excel(name = "出库数量", orderNum = "3")
+  private BigDecimal outNum;
 
 
 

platform-dao/src/main/resources/mapper/store/InStoreFormMapper.xml

@@ -136,6 +136,7 @@
                 and instoreform.created_time <![CDATA[<=]]>#{searchTimeEnd}
             </if>
         </where>
+        GROUP BY instoreform.spare_id
     </select>
 
     <select id="selectDetailList" resultType="com.platform.dao.vo.query.store.InStoreDetailVO">
@@ -204,13 +205,13 @@
 
     <select id="getInStoreSpareNum" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
     resultType="com.platform.dao.vo.export.store.ExportInStoreSpareNumVO">
-        SELECT info.name as spareName, SUM(in_num) inNum FROM t_in_store_form form LEFT JOIN t_spare_part_info info ON info.id=form.spare_id
+        SELECT info.name as spareName,info.id as spareId , if(SUM(in_num) is null,0,in_num) inNum FROM t_in_store_form form right JOIN t_spare_part_info info ON info.id=form.spare_id
          <where>
              <if test="searchTimeStart!=null">
-                 and inform.created_time <![CDATA[>=]]> #{searchTimeStart}
+                 and form.created_time <![CDATA[>=]]> #{searchTimeStart}
              </if>
              <if test="searchTimeEnd!=null">
-                 and inform.created_time <![CDATA[<=]]> #{searchTimeEnd}
+                 and form.created_time <![CDATA[<=]]> #{searchTimeEnd}
              </if>
          </where>
          GROUP BY spare_id

platform-dao/src/main/resources/mapper/store/OutStoreFormMapper.xml

@@ -117,6 +117,7 @@
                 and outstoreform.created_time <![CDATA[<=]]> #{searchTimeEnd}
             </if>
         </where>
+        group by outstoreform.spare_id
     </select>
 
     <select id="selectDetailList" resultType="com.platform.dao.vo.query.store.OutStoreDetailVO">
@@ -150,13 +151,13 @@
 
     <select id="getOutStoreSpareNum" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.export.store.ExportOutStoreSpareNumVO">
-        SELECT info.name as spareName, SUM(in_num) inNum FROM t_out_store_form form LEFT JOIN t_spare_part_info info ON info.id=form.spare_id
+        SELECT info.name as spareName,info.id as spareId, if(SUM(out_num) is null,0,out_num) outNum FROM t_out_store_form form right JOIN t_spare_part_info info ON info.id=form.spare_id
         <where>
             <if test="searchTimeStart!=null">
-                and inform.created_time <![CDATA[>=]]> #{searchTimeStart}
+                and form.created_time <![CDATA[>=]]> #{searchTimeStart}
             </if>
             <if test="searchTimeEnd!=null">
-                and inform.created_time <![CDATA[<=]]> #{searchTimeEnd}
+                and form.created_time <![CDATA[<=]]> #{searchTimeEnd}
             </if>
         </where>
         GROUP BY spare_id