优化

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

@@ -22,6 +22,8 @@ import java.util.List;
  */
 @Component
 public interface InStoreFormMapper extends MyMapper<InStoreForm> {
+    List<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto);
+
     List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto);
     List<InStoreFormVO> getInStoreForm(InStoreFormDTO dto);
 

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

@@ -25,6 +25,9 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class InStoreFormVO extends BaseVO implements Serializable {
+    private Integer totalNum;
+
+
     private Integer inNum;
     private String spareName;
 

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

@@ -24,6 +24,25 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SpareStoreVO extends BaseVO implements Serializable {
+    private Integer currentStock;
+
+
+
+    private Integer level;
+
+    private String producerId;
+
+    private Integer yt;
+
+    private String remark;
+
+    private String brand;
+
+    private Double initialValue;
+
+    private String typeId;
+
+
 
     /**
      * 预警状态：1：待处理，2询价中，3采购中，0正常
@@ -116,10 +135,7 @@ public class SpareStoreVO extends BaseVO implements Serializable {
      * 是否删除:  -1-已删除  0-正常
      */
     private Integer delFlag;
-    /**
-     * 备注
-     */
-    private String remark;
+
     /**
      * 创建人
      */

platform-dao/src/main/resources/mapper/sqarepartmanage/SparePartInfoMapper.xml

@@ -214,6 +214,7 @@ warn_status,forecast_status,
 
     <select id="selectSpareInfoList" resultType="com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO">
         select spare.id as spareId, spare.no, spare.unite_no, spare.name, spare.type_id, spare.level,
+        spare.brand,SUM(spareStore.num) currentStock,spare.max_stock,spare.min_stock,spare.remark,
         spare.initial_value, spare.producer_id,
         spare.unit,
         spare.unit_bz,spare.warn_status, spare.forecast_status,

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

@@ -216,4 +216,14 @@
          </where>
          GROUP BY spare_id
     </select>
+
+    <select id="getInStoreFormCollect" resultType="com.platform.dao.vo.query.store.InStoreFormVO"
+            parameterType="com.platform.dao.dto.store.InStoreFormDTO">
+            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_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
+            group by info.id
+
+    </select>
 </mapper>

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

@@ -151,7 +151,10 @@
         select sparestore.*, convert((sparestore.price * sparestore.num), decimal(10,2)) as totalPrice,
                store.name storeName,
                spareinfo.name spareName, spareinfo.no, spareinfo.ggxh, spareinfo.init_no,
-               spareinfo.unit, spareinfo.image,
+               spareinfo.unit, spareinfo.image,spareinfo.type_id,spareinfo.brand,
+               spareinfo.initial_value,SUM(spareStore.num) currentStock,
+               spareinfo.max_stock,spareinfo.min_stock,
+               spareinfo.level,spareinfo.producer_id,spareinfo.yt,
                spareType.name spareTypeName
         from t_spare_store as sparestore
         left join t_store store on store.id = sparestore.store_id

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

@@ -210,4 +210,12 @@ public class InStoreFormController {
     ExcelUtil.exportResponseDict(response, ExportInStoreSpareNumVO.class, list, "月备件入库数量统计表");
   }
 
+  @GetMapping("/getInStoreFormCollect")
+  public R<AbstractPageResultBean<InStoreFormVO>> getInStoreFormCollect(InStoreFormDTO inStoreFormDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    AbstractPageResultBean<InStoreFormVO> vo = inStoreFormService.getInStoreFormCollect(inStoreFormDTO, pageNum, pageSize);
+    return new R<>(vo);
+  }
+
+
+
 }

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

@@ -31,6 +31,8 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 public interface InStoreFormService extends IBaseService<InStoreForm, InStoreFormDTO> {
+    AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto,Integer pageSize,Integer pageNum);
+
     List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer year,Integer month);
 
     List<InStoreFormReportVO> getInStoreFormReport(InStoreFormDTO dto, Integer year, LocalDate startMonth, LocalDate endMonth);

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

@@ -237,6 +237,12 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     }
 
 
+    @Override
+    public AbstractPageResultBean<InStoreFormVO> getInStoreFormCollect(InStoreFormDTO dto, Integer pageSize, Integer pageNum) {
+        PageHelper.startPage(pageNum,pageSize);
+        return new MyPage<>(mapper.getInStoreFormCollect(dto));
+    }
+
     @Override
     public List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer searchYear,Integer month) {
         LocalDateTime searchStartTime = null;