Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/AppReportController.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.controller;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.dto.AllpremiumDto;
 import com.ydtech.modules.admin.model.dto.EmployeeIncreaseReportAllDto;
 import com.ydtech.modules.admin.model.dto.PremiumReportAllDto;
 import com.ydtech.modules.admin.model.dto.RevenueReportAllDto;
@@ -13,10 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "app统计报表功能")
 @RestController
@@ -88,4 +86,17 @@ public class AppReportController {
             return HttpResult.error("查询失败"+e.getMessage());
         }
     }
+
+    @ApiOperation(value = "获取年度数据")
+    @GetMapping(value = "/getAllpremium")
+    public HttpResult<AllpremiumDto> getAllpremium(String year) {
+        if(StringUtils.isBlank(year)){
+            return HttpResult.error("年度year不能为空！！！");
+        }
+        try{
+            return HttpResult.ok(appReportService.getAllpremium(year));
+        }catch (Exception e){
+            return HttpResult.error("查询失败"+e.getMessage());
+        }
+    }
 }

src/main/java/com/ydtech/modules/admin/model/dto/AllpremiumDto.java

@@ -0,0 +1,25 @@
+package com.ydtech.modules.admin.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/7 15:13
+ *  @Description:
+ */
+@Data
+@ApiModel("年度数据")
+public class AllpremiumDto implements Serializable {
+
+    @ApiModelProperty(value = "年度签单保费")
+    private BigDecimal sumPremium;
+
+    @ApiModelProperty(value = "年度签单数")
+    private int sumCount;
+}

src/main/java/com/ydtech/modules/admin/service/AppReportService.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.service;
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.dto.AllpremiumDto;
 import com.ydtech.modules.admin.model.dto.EmployeeIncreaseReportAllDto;
 import com.ydtech.modules.admin.model.dto.PremiumReportAllDto;
 import com.ydtech.modules.admin.model.dto.RevenueReportAllDto;
@@ -35,4 +36,11 @@ public interface AppReportService {
      *  @Description: 收入报表统计
      */
     HttpResult<RevenueReportAllDto> revenueReport(ReportQueryVo reportQueryVo);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/7 15:16
+     *  @Description: 获取所有的签单数和签单金额
+     */
+    AllpremiumDto getAllpremium(String year);
 }

src/main/java/com/ydtech/modules/admin/service/impl/AppReportServiceImpl.java

@@ -302,4 +302,14 @@ public class AppReportServiceImpl implements AppReportService {
         }
         return null;
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/7 15:17
+     *  @Description:  查询签单数据
+     */
+    @Override
+    public AllpremiumDto getAllpremium(String year) {
+        return insAreaCompanyMapper.getAllpremium(year);
+    }
 }

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.model.dto.AllpremiumDto;
 import com.ydtech.modules.admin.model.dto.PremiumReportDto;
 import com.ydtech.modules.admin.model.vo.SubOrder;
 import com.ydtech.modules.order.entity.InsAreaCompany;
@@ -113,6 +114,13 @@ public interface InsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
      *  @Description: 保费报表统计
      */
     List<PremiumReportDto> premiumReportDay(HashMap<String,String> map);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/7 15:21
+     *  @Description: 查询总的签单数
+     */
+    AllpremiumDto getAllpremium(@Param("year") String year);
 }
 
 

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -581,6 +581,7 @@
         FROM
             ins_area_company iac
         WHERE
+            iac.orderstatus = 3  and
             iac.createtime >= #{beginTime}  and  iac.createtime <= #{endTime}
         GROUP BY CONCAT(YEAR(iac.createtime),'-',LPAD(MONTH(iac.createtime), 2, '0'))
     </select>
@@ -594,6 +595,7 @@
         FROM
             ins_area_company iac
         WHERE
+            iac.orderstatus = 3  and
             iac.createtime &gt;= #{beginTime}  and  iac.createtime &lt;= #{endTime}
         GROUP BY  CONCAT(YEAR(iac.createtime),'-',LPAD(MONTH(iac.createtime), 2, '0'),'-',LPAD(Day(iac.createtime), 2, '0'))
     </select>
@@ -608,7 +610,19 @@
         FROM
             ins_area_company iac
         WHERE
+            iac.orderstatus = 3  and
             iac.createtime &gt;= #{beginTime}  and  iac.createtime &lt;= #{endTime}
         GROUP BY   CONCAT(YEAR ( iac.createtime ),'-',LPAD( MONTH ( iac.createtime ), 2, '0' ),'-',LPAD( DAY ( iac.createtime ), 2, '0' ),' ',LPAD( HOUR ( iac.createtime ), 2, '0' ))
     </select>
+
+    <select id="getAllpremium" resultType="com.ydtech.modules.admin.model.dto.AllpremiumDto">
+        SELECT
+            ifnull(sum( sumpremium ),0) as sumPremium,
+            count( 0 ) as sumCount
+        FROM
+            ins_area_company
+        WHERE
+            orderstatus = 3
+                AND YEAR (createtime) = #{year}
+    </select>
 </mapper>