Merge branch 'dev-reset-0914' into dev

src/main/java/com/uas/ps/inquiry/dao/PurcInquiryItemDao.java

@@ -90,6 +90,18 @@ public interface PurcInquiryItemDao extends JpaSpecificationExecutor<PurcInquiry
     @Query(value = "select count(1) from (select 1 from purc$puinquiryitems where id_enuu = :enuu and id_useruu = :useruu and id_date between :starttime and :endtime group by id_inbrand, id_cmpcode) a", nativeQuery = true)
     Integer sumPersonalPublish(@Param("enuu") Long enuu, @Param("useruu") Long useruu, @Param("starttime") Date starttime, @Param("endtime") Date endtime);
 
+    /**
+     * 查询个人账号 不同型号发布询价数量统计
+     *
+     * @param useruu    用户uu
+     * @param starttime 开始时间
+     * @param endtime   结束时间
+     * @return 查询结果
+     */
+    @Query(value = "select count(1) from (select 1 from purc$puinquiryitems where id_enuu is null and id_useruu = :useruu and id_date between :starttime and :endtime group by id_inbrand, id_cmpcode) a", nativeQuery = true)
+    Integer sumPersonalPublishWithoutEnuu(@Param("useruu") Long useruu, @Param("starttime") Date starttime, @Param("endtime") Date endtime);
+
+
     /**
      * 查询企业不同型号发布询价数量统计
      *

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1815,7 +1815,11 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
     @Override
     public ModelMap sumPersonalPublish(Long enuu, Long useruu, Long starttime, Long endtime) {
         ModelMap map = new ModelMap();
-        map.put("count", purcInquiryItemDao.sumPersonalPublish(enuu, useruu, new Date(starttime), new Date(endtime)));
+        if (null == enuu) {
+            map.put("count", purcInquiryItemDao.sumPersonalPublishWithoutEnuu(useruu, new Date(starttime), new Date(endtime)));
+        } else {
+            map.put("count", purcInquiryItemDao.sumPersonalPublish(enuu, useruu, new Date(starttime), new Date(endtime)));
+        }
         return map;
     }