仓库报表

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

@@ -157,13 +157,16 @@
     </select>
     <select id="getCurrentlyList"  parameterType="com.platform.dao.vo.query.store.InStoreFormVO"
             resultType="com.platform.dao.vo.query.store.InStoreDetailVO">
-        select * from t_in_store_detail
+        select * from t_in_store_detail left join
+        t_in_store_form
+        on t_in_store_form.id = t_in_store_detail.in_id
         <where>
+
             <if test="searchStartTime != null">
-                and created_time <![CDATA[ > ]]> #{searchStartTime}
+                and t_in_store_detail.created_time <![CDATA[ > ]]> #{searchStartTime}
             </if>
             <if test="searchEndTime != null">
-                and created_time <![CDATA[ < ]]> #{searchEndTime}
+                and t_in_store_detail.created_time <![CDATA[ < ]]> #{searchEndTime}
             </if>
             <if test="status != null">
                 and status = #{status}

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

@@ -160,12 +160,17 @@
             resultType="com.platform.dao.vo.query.store.OutStoreDetailVO"
     >
         select * from t_out_store_detail
+        left join
+        t_out_store_form
+        on
+        t_out_store_form.id = t_out_store_detail.out_id
         <where>
+
             <if test="searchStartTime != null">
-                and created_time <![CDATA[ > ]]> #{searchStartTime}
+                and t_out_store_detail.created_time <![CDATA[ > ]]> #{searchStartTime}
             </if>
             <if test="searchEndTime != null">
-                and created_time <![CDATA[ < ]]> #{searchEndTime}
+                and t_out_store_detail.created_time <![CDATA[ < ]]> #{searchEndTime}
             </if>
             <if test="status != null">
                 and status = #{status}

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

@@ -91,6 +91,8 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
         InStoreFormDTO queryDTO = new InStoreFormDTO();
         OutStoreFormDTO queryDTO2=new OutStoreFormDTO();
         queryDTO2.setSearchStartTime(searchStartTime);
+        queryDTO2.setStatus(InStoreStatusEnum.EXECUTING.getValue());
+        queryDTO.setStatus(OutStoreStatusEnum.EXECUTING.getValue());
         queryDTO.setSearchStartTime(searchStartTime);
         queryDTO.setSearchEndTime(searchEndTime);
         queryDTO2.setSearchEndTime(searchEndTime);
@@ -111,12 +113,14 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
                     tempTotalNum+=1;
                 }
             }
-
+            vo.setNum(new BigDecimal(tempTotalNum));
+            int tempTotalNum2=0;
             for(OutStoreDetailVO useVO: list2){
                 if(useVO.getCreatedTime().toLocalDate().isEqual(tempDate.toLocalDate())){
-                    tempTotalNum+=1;
+                    tempTotalNum2+=1;
                 }
             }
+            vo1.setNum(new BigDecimal(tempTotalNum2));
             result.add(vo);
             result2.add(vo1);
         }