信息发布数据看板更新

csf-common/csf-common-model/src/main/java/com/mmc/csf/data/dto/ReleaseReportDTO.java

@@ -6,6 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * @Author LW
  * @date 2023/9/16 14:15
@@ -24,4 +26,6 @@ public class ReleaseReportDTO {
     private Integer postsReleaseCount;
     @ApiModelProperty(value = "话题发布数量")
     private Integer topicReleaseCount;
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal serviceOrderAmount;
 }

release-service/src/main/java/com/mmc/csf/release/controller/data/ReleaseReportController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 概要：
  */
 @Api(tags = "云享飞发数据看板")
-@RequestMapping("/release/report")
+@RequestMapping("/report")
 @RestController
 public class ReleaseReportController {
 
@@ -31,4 +31,6 @@ public class ReleaseReportController {
     public ResultBody<ReleaseReportDTO> getUserReportData() {
         return releaseReportService.getReleaseReportData();
     }
+
+
 }

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -215,4 +215,6 @@ public interface RequirementsDao {
 
     int getOrderReleaseCount();
 
+    BigDecimal getServiceOrderAmount();
+
 }

release-service/src/main/java/com/mmc/csf/release/service/data/impl/ReleaseReportServiceImpl.java

@@ -8,6 +8,7 @@ import com.mmc.csf.release.service.data.ReleaseReportService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 
 /**
  * @Author LW
@@ -35,6 +36,9 @@ public class ReleaseReportServiceImpl implements ReleaseReportService {
         releaseReportDTO.setTopicReleaseCount(gambitReleaseCount);
         // 信息发布总数
         releaseReportDTO.setReleaseCount(orderCount + dynamicCount + gambitReleaseCount);
+        // 获取订单金额
+        BigDecimal serviceOrderAmount = requirementsDao.getServiceOrderAmount();
+        releaseReportDTO.setServiceOrderAmount(serviceOrderAmount);
         return ResultBody.success(releaseReportDTO);
     }
 }

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -1524,5 +1524,13 @@
     <select id="getOrderReleaseCount" resultType="java.lang.Integer">
         select count(*)
         from requirements_info
+        where service_flow_id <![CDATA[<>]]> 7
+          and is_deleted = 0
+    </select>
+    <select id="getServiceOrderAmount" resultType="java.math.BigDecimal">
+        SELECT sum(ra.total_amount)
+        FROM requirements_info ri
+                 INNER JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
+        WHERE ri.service_flow_id <![CDATA[<>]]> 7
     </select>
 </mapper>

release-service/src/main/resources/not-check.yml

@@ -40,3 +40,4 @@ data-filter:
     - /release/requirements/appPublishList
     - /release/dynamic/recentNews
     - /release/curriculum/getCurriculumCount
+    - /release/report/getReleaseReportData