Przeglądaj źródła

首页统计开发

anderx 2 lat temu
rodzic
commit
d61c272de4

+ 12 - 1
src/main/java/com/goafanti/admin/controller/AdminStatisticsController.java

@@ -70,7 +70,7 @@ public class AdminStatisticsController extends CertifyApiController {
 
 
 
 
     /**
     /**
-     * 咨询师首页信息
+     * 财务首页信息
      * @param startTime  开始时间
      * @param startTime  开始时间
      * @param endTime  结束时间
      * @param endTime  结束时间
      * @return
      * @return
@@ -83,4 +83,15 @@ public class AdminStatisticsController extends CertifyApiController {
 
 
     }
     }
 
 
+    /**
+     * 咨询首页折线图
+     * @return
+     */
+    @RequestMapping(value = "/finance/lists", method = RequestMethod.GET)
+    public Result financeLists() {
+        Result res =new Result();
+        res.data(adminStatisticsService.financeLists(TokenManager.getAdminId()));
+        return res;
+    }
+
 }
 }

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminStatisticsService.java

@@ -10,4 +10,6 @@ public interface AdminStatisticsService {
     Object consultantLists(String adminId);
     Object consultantLists(String adminId);
 
 
     Object financeInfo(String startTime, String endTime);
     Object financeInfo(String startTime, String endTime);
+
+    Object financeLists(String adminId);
 }
 }

+ 16 - 0
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -7,8 +7,10 @@ import com.goafanti.admin.bo.OutFinanceCount;
 import com.goafanti.admin.service.AdminStatisticsService;
 import com.goafanti.admin.service.AdminStatisticsService;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.FinanceCountMapper;
 import com.goafanti.common.dao.PublicReleaseMapper;
 import com.goafanti.common.dao.PublicReleaseMapper;
 import com.goafanti.common.model.AdminUserCount;
 import com.goafanti.common.model.AdminUserCount;
+import com.goafanti.common.model.FinanceCount;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,8 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
     private AdminMapper adminMapper;
     private AdminMapper adminMapper;
     @Autowired
     @Autowired
     private PublicReleaseMapper publicReleaseMapper;
     private PublicReleaseMapper publicReleaseMapper;
+    @Autowired
+    private FinanceCountMapper financeCountMapper;
 
 
 
 
     @Override
     @Override
@@ -211,6 +215,18 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
         return financeCount;
         return financeCount;
     }
     }
 
 
+    @Override
+    public Object financeLists(String aid) {
+        //获取当月的列表
+        Map<String,Object> map=new LinkedHashMap<>();
+        Days days = new Days();
+        List<String> thisMonth = getThisMonth(days);
+        List<FinanceCount> financeCounts = financeCountMapper.financeLists(aid, days.firstDay, days.endDay+"23:59:59");
+        publicReleaseMapper.selectByaidAndDate(aid, days.firstDay, days.endDay+"23:59:59");
+        map.put("dates",thisMonth);
+        return map;
+    }
+
 
 
     public  List<String> getThisMonth(Days days) {
     public  List<String> getThisMonth(Days days) {
         //获取三十天前的日期
         //获取三十天前的日期

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -204,4 +204,6 @@ public interface AdminMapper {
     OutFinanceCount selectFinanceChangeCount(String aid);
     OutFinanceCount selectFinanceChangeCount(String aid);
 
 
     BigDecimal selectFinanceReceivablesCount(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
     BigDecimal selectFinanceReceivablesCount(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+
 }
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/FinanceCountMapper.java

@@ -27,4 +27,6 @@ public interface FinanceCountMapper {
     FinanceCount selectByAidAndDates(@Param("aid") String aid, @Param("startTime") String startTime);
     FinanceCount selectByAidAndDates(@Param("aid") String aid, @Param("startTime") String startTime);
 
 
     void insetBatch(List<FinanceCount> addList);
     void insetBatch(List<FinanceCount> addList);
+
+    List<FinanceCount> financeLists(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }
 }

+ 3 - 1
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 package com.goafanti.common.dao;
 
 
+import com.goafanti.admin.bo.OutFinanceCount;
 import com.goafanti.common.model.OutPublicReleaseCount;
 import com.goafanti.common.model.OutPublicReleaseCount;
 import com.goafanti.common.model.PublicRelease;
 import com.goafanti.common.model.PublicRelease;
 import com.goafanti.weChat.bo.OutPublicRelease;
 import com.goafanti.weChat.bo.OutPublicRelease;
@@ -50,5 +51,6 @@ public interface PublicReleaseMapper {
 
 
     OutPublicReleaseAndDetails selectDtailsByFid(@Param("ufid")String ufid);
     OutPublicReleaseAndDetails selectDtailsByFid(@Param("ufid")String ufid);
 
 
-    Integer selectByaidAndDate(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    Integer selectCountByaidAndDate(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<OutFinanceCount> selectByaidAndDate(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }
 }

+ 1 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1446,4 +1446,5 @@
       and  c.finance_id = #{aid}
       and  c.finance_id = #{aid}
       and a.start_time  between #{startTime} and #{endTime}
       and a.start_time  between #{startTime} and #{endTime}
   </select>
   </select>
+
 </mapper>
 </mapper>

+ 7 - 1
src/main/java/com/goafanti/common/mapper/FinanceCountMapper.xml

@@ -262,9 +262,15 @@
     from finance_count
     from finance_count
     where aid = #{aid} and date_time = #{startTime}
     where aid = #{aid} and date_time = #{startTime}
   </select>
   </select>
+    <select id="financeLists" resultType="com.goafanti.common.model.FinanceCount">sultMap="BaseResultMap">
+  select
+  <include refid="Base_Column_List" />
+  from finance_count
+  where aid = #{aid} and date_time BETWEEN #{startTime} and #{endTime}
+   </select>
 
 
 
 
-  <insert id="insetBatch">
+    <insert id="insetBatch">
     insert into finance_count (aid, order_count, order_unaudited_count,
     insert into finance_count (aid, order_count, order_unaudited_count,
     expense_count, expense_unaudited_count, invoice_count,
     expense_count, expense_unaudited_count, invoice_count,
     invoice_unaudited_count, member_count, member_unaudited_count,
     invoice_unaudited_count, member_count, member_unaudited_count,

+ 9 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -863,7 +863,7 @@
     </if>
     </if>
   </update>
   </update>
 
 
-  <select id="selectByaidAndDate" resultType="java.lang.Integer">
+  <select id="selectCountByaidAndDate" resultType="java.lang.Integer">
     select ifnull(count(*),0)publicReleaseCount
     select ifnull(count(*),0)publicReleaseCount
     from (select aid
     from (select aid
           from public_release a left join public_release_details b on a.id=b.prid
           from public_release a left join public_release_details b on a.id=b.prid
@@ -871,4 +871,12 @@
             and a.release_start BETWEEN #{startTime} and #{endTime} )x
             and a.release_start BETWEEN #{startTime} and #{endTime} )x
     group by aid
     group by aid
   </select>
   </select>
+  <select id="selectByaidAndDate" resultType="com.goafanti.admin.bo.OutFinanceCount">
+    select aid,dates,sum(publicCount)publicCount
+    from (select aid,if(a.`type` in (0,1,2),1,0) publicCount,DATE_FORMAT(a.release_start , '%Y-%m-%d') dates
+          from public_release a left join public_release_details b on a.id=b.prid
+          where a.status=2 and a.aid= '060583e4-82a2-4f72-8141-ae44806844e7'
+            and a.release_start between '2023-01-01' and '2023-07-28 23:59:59')x
+    group by x.aid,x.dates
+  </select>
 </mapper>
 </mapper>