1 anno fa
parent
commit
803e871c97

+ 4 - 3
platform-dao/src/main/resources/mapper/longyanpurchaseorder/LongYanPurchaseOrderMapper.xml

@@ -97,14 +97,15 @@
     <select id="getPurchaseReport" resultType="com.platform.dao.vo.report.LongYanPurchaseOrderReportVO"
             parameterType="com.platform.dao.dto.longyanpurchaseorder.LongYanPurchaseOrderDTO">
         select type as purchaseType,count(1) as orderTotalNum,sum(total_num) as spareTotalNum
-        from t_long_yan_purchase_order order
+        from t_long_yan_purchase_order as orders
         <where>
             <if test="startTime!=null">
-                and order.created_time <![CDATA[>=]]> #{startTime}
+                and orders.created_time <![CDATA[>=]]> #{startTime}
             </if>
             <if test="endTime!=null">
-                and order.created_time <![CDATA[<=]]> #{endTime}
+                and orders.created_time <![CDATA[<=]]> #{endTime}
             </if>
         </where>
+        group by type
     </select>
 </mapper>

+ 9 - 7
platform-service/src/main/java/com/platform/service/longyanpurchaseorder/impl/LongYanPurchaseOrderServiceImpl.java

@@ -108,13 +108,15 @@ public class LongYanPurchaseOrderServiceImpl extends BaseServiceImpl<LongYanPurc
     @Override
     public List<LongYanPurchaseOrderReportVO> getPurchaseReport(LongYanPurchaseOrderDTO dto) {
         List<LongYanPurchaseOrderReportVO> list = mapper.getPurchaseReport(dto);
-        for (LongYanPurchaseOrderReportVO vo:list){
-            if (vo.getPurchaseType()==1){
-                vo.setPurchaseTypeName("计划采购");
-            }else if (vo.getPurchaseType()==2){
-                vo.setPurchaseTypeName("临时采购");
-            }else if (vo.getPurchaseType()==3){
-                vo.setPurchaseTypeName("紧急采购");
+        if (list.size()>0) {
+            for (LongYanPurchaseOrderReportVO vo : list) {
+                if (vo.getPurchaseType() == 1) {
+                    vo.setPurchaseTypeName("计划采购");
+                } else if (vo.getPurchaseType() == 2) {
+                    vo.setPurchaseTypeName("临时采购");
+                } else if (vo.getPurchaseType() == 3) {
+                    vo.setPurchaseTypeName("紧急采购");
+                }
             }
         }