优化

platform-dao/src/main/java/com/platform/dao/mapper/store/OutStoreFormMapper.java

@@ -23,6 +23,8 @@ import java.util.List;
 @Component
 public interface OutStoreFormMapper extends MyMapper<OutStoreForm> {
 
+    List<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto);
+
     List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto);
 
     List<OutStoreFormVO> getOutStoreForm(OutStoreFormDTO dto);

platform-dao/src/main/java/com/platform/dao/vo/query/store/InStoreFormVO.java

@@ -25,6 +25,21 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class InStoreFormVO extends BaseVO implements Serializable {
+
+    private String typeId;
+    private String no;
+    private String ggxh;
+    private String brand;
+    private Double initialValue;
+    private String unit;
+    private Integer currentStock;
+    private Integer maxStock;
+    private Integer minStock;
+    private Integer level;
+    private String producerId;
+    private Integer yt;
+
+
     private Integer totalNum;
 
 

platform-dao/src/main/java/com/platform/dao/vo/query/store/OutStoreFormVO.java

@@ -25,7 +25,21 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreFormVO extends BaseVO implements Serializable {
+    private String typeId;
+    private String no;
+    private String ggxh;
     private String brand;
+    private Double initialValue;
+    private String unit;
+    private Integer currentStock;
+    private Integer maxStock;
+    private Integer minStock;
+    private Integer level;
+    private String producerId;
+    private Integer yt;
+
+    private Integer totalNum;
+//    private String brand;
     private Integer outNum;
     private String spareId;
 

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

@@ -115,9 +115,16 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.store.InStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.InStoreFormVO">
-        select instoreform.*, store.name storeName
+        select instoreform.*, store.name storeName,
+        info.type_id,info.no,info.name,info.ggxh,info.brand,
+        info.initial_value,info.unit,sum(if(spareStore.num is null,0,spareStore.num)) currentStock,
+        info.max_stock,info.min_stock,info.level,info.producer_id,
+        info.yt
         from t_in_store_form as instoreform
         left join t_store store on store.id = instoreform.store_id
+        left join t_spare_part_info info on info.id = instoreform.spare_id
+        left join t_spare_store spareStore on
+        spareStore.spare_id = instoreform.spare_id
         <where>
             <include refid="List_Condition"/>
             <if test="useCompany != null and useCompany != ''">
@@ -223,6 +230,17 @@
             left join t_in_store_form form on info.id = form.spare_id
             left join t_spare_store spareStore on spareStore.spare_id = info.id
             left join t_store store on store.id = spareStore.store_id
+            <where>
+                <if test="storeId!=null and storeId!=''">
+                    store.id = #{storeId}
+                </if>
+                <if test="searchTimeStart!=null and searchTimeStart!=''">
+                    form.created_time <![CDATA[>=]]> #{searchTimeStart}
+                </if>
+                <if test="searchTimeEnd!=null and searchTimeEnd!=''">
+                    form.created_time <![CDATA[<=]]> #{searchTimeEnd}
+                </if>
+            </where>
             group by info.id
 
     </select>

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

@@ -95,10 +95,16 @@
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.store.OutStoreFormDTO"
             resultType="com.platform.dao.vo.query.store.OutStoreFormVO">
-        select outstoreform.*, store.name storeName,info.name as spareName
+        select outstoreform.*, store.name storeName,info.name as spareName,
+        info.type_id,info.no,info.name,info.ggxh,info.brand,
+        info.initial_value,info.unit,sum(if(spareStore.num is null,0,spareStore.num)) currentStock,
+        info.max_stock,info.min_stock,info.level,info.producer_id,
+        info.yt
         from t_out_store_form as outstoreform
         left join t_store store on store.id = outstoreform.store_id
         left join t_spare_part_info info on outstoreform.spare_id = info.id
+        left join t_spare_store spareStore on
+        spareStore.spare_id = outstoreform.spare_id
         <where>
             <include refid="List_Condition"/>
             <if test="useCompany != null and useCompany != ''">
@@ -162,4 +168,25 @@
         </where>
         GROUP BY spare_id
     </select>
+
+    <select id="getOutStoreFormCollect" resultType="com.platform.dao.vo.query.store.OutStoreFormVO"
+            parameterType="com.platform.dao.dto.store.OutStoreFormDTO">
+        select info.*,if(sum(form.in_num is null),0,form.in_num) totalNum,if(sum(form.in_num is null),0,form.in_num)*info.initial_value as totalPrice  from t_spare_part_info info
+        left join t_out_store_form form on info.id = form.spare_id
+        left join t_spare_store spareStore on spareStore.spare_id = info.id
+        left join t_store store on store.id = spareStore.store_id
+        <where>
+            <if test="storeId!=null and storeId!=''">
+                store.id = #{storeId}
+            </if>
+            <if test="searchTimeStart!=null and searchTimeStart!=''">
+                form.created_time <![CDATA[>=]]> #{searchTimeStart}
+            </if>
+            <if test="searchTimeEnd!=null and searchTimeEnd!=''">
+                form.created_time <![CDATA[<=]]> #{searchTimeEnd}
+            </if>
+        </where>
+        group by info.id
+
+    </select>
 </mapper>

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

@@ -152,7 +152,7 @@
                store.name storeName,
                spareinfo.name spareName, spareinfo.no, spareinfo.ggxh, spareinfo.init_no,
                spareinfo.unit, spareinfo.image,spareinfo.type_id,spareinfo.brand,
-               spareinfo.initial_value,SUM(spareStore.num) currentStock,
+               spareinfo.initial_value,SUM(if(spareStore.num) is null,0,spareStore.num) currentStock,
                spareinfo.max_stock,spareinfo.min_stock,
                spareinfo.level,spareinfo.producer_id,spareinfo.yt,
                spareType.name spareTypeName
@@ -212,6 +212,7 @@
                 and store.user_id = #{userId}
             </if>
         </where>
+        group by spareinfo.id
     </select>
     <select id="selectDetail" parameterType="com.platform.dao.dto.store.SpareStoreDTO"
             resultType="com.platform.dao.vo.query.store.SpareStoreVO">

platform-rest/src/main/java/com/platform/rest/controller/store/OutStoreFormController.java

@@ -203,4 +203,10 @@ public class OutStoreFormController {
     ExcelUtil.exportResponseDict(response, ExportOutStoreSpareNumVO.class, list, "月备件出库数量统计表");
   }
 
+  @GetMapping("/getOutStoreFormCollect")
+  public R<AbstractPageResultBean<OutStoreFormVO>> getOutStoreFormCollect(OutStoreFormDTO outStoreFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    AbstractPageResultBean<OutStoreFormVO> vo = outStoreFormService.getOutStoreFormCollect(outStoreFormDTO, pageNum, pageSize);
+    return new R(vo);
+  }
+
 }

platform-service/src/main/java/com/platform/service/store/OutStoreFormService.java

@@ -27,6 +27,8 @@ import java.util.List;
  */
 public interface OutStoreFormService extends IBaseService<OutStoreForm, OutStoreFormDTO> {
 
+    AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto,Integer pageSize,Integer pageNum);
+
     List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto, Integer year, Integer month);
 
     List<OutStoreFormReportVO> getOutStoreFormReport(OutStoreFormDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -61,6 +61,12 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
     private SparePickDetailMapper sparePickDetailMapper;
 
 
+    @Override
+    public AbstractPageResultBean<OutStoreFormVO> getOutStoreFormCollect(OutStoreFormDTO dto, Integer pageSize, Integer pageNum) {
+        PageHelper.startPage(pageNum,pageSize);
+        return new MyPage(mapper.getOutStoreFormCollect(dto));
+    }
+
     @Override
     public List<ExportOutStoreSpareNumVO> getOutStoreSpareNum(OutStoreFormDTO dto, Integer searchYear, Integer month) {
         LocalDateTime searchStartTime = null;