出单量及费用统计 报表调整

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

@@ -110,4 +110,18 @@ public class SysDeptController extends BaseController {
         logger.info(sysDept.toString());
         return HttpResult.ok(sysDept);
     }
+
+
+    @ApiOperation(value = "获取机构树(不包含团队  dept_type=C)")
+    @GetMapping(value = "/findCompanyTree")
+    public HttpResult<List<SysDept>> findCompanyTree() {
+        SysUser user = getUser();
+        String deptId = user.getDeptId();
+        return HttpResult.ok(sysDeptService.findCompanyTree(deptId));
+    }
+    @ApiOperation(value = "根据传入机构，查询归属所有团队")
+    @GetMapping(value = "/findTeamList")
+    public HttpResult findTeamList(String deptId) {
+        return HttpResult.ok(sysDeptService.findTeamList(deptId));
+    }
 }

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

@@ -829,4 +829,10 @@ public class SysUserController extends BaseController {
         return HttpResult.ok();
     }
 
+
+    @ApiOperation(value = "根据传入机构，查询所有人员")
+    @GetMapping(value = "/findUserList")
+    public HttpResult findUserList(String deptId) {
+        return HttpResult.ok(sysUserService.findUserList(deptId));
+    }
 }

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

@@ -59,6 +59,20 @@ public interface SysDeptService extends IService<SysDept> {
      */
     List<SysDept> getUserList(String deptId);
 
+    /**
+     * 获取机构树(不包含团队  dept_type=C)
+     * @param deptId
+     * @return
+     */
+    public List<SysDept> findCompanyTree(String deptId);
+
+    /**
+     * 根据传入机构，查询归属所有团队
+     * @param deptId
+     * @return
+     */
+    public List<SysDept> findTeamList(String deptId);
+
 }
 
 

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

@@ -114,6 +114,13 @@ public interface SysUserService extends IService<SysUser> {
     public List<SysUser> findAllAgentRoleUser(String userId,String roleId);
 
     public int getDeptLevel(SysUser2Vo sysUser2Vo);
+
+    /**
+     * 根据机构代码，查询所有人员
+     * @param deptId
+     * @return
+     */
+    public List<SysUser> findUserList(String deptId);
 }
 
 

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

@@ -222,6 +222,38 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         return recordList;
     }
 
+
+    /**
+     * 获取机构树(不包含团队  dept_type=C)
+     */
+    @Override
+    public List<SysDept> findCompanyTree(String deptId) {
+        SysDept sysDept = getById(deptId);
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysDept::getDelFlag, 0);
+        lqw.likeRight(SysDept::getId, deptId);
+        lqw.and((wrapper)->{wrapper.eq(SysDept::getDeptType,'C').or().eq(SysDept::getId,'9');});
+        List<SysDept> sysDeptList = list(lqw);
+        Map<String, List<SysDept>> map = sysDeptList.stream().collect(Collectors.groupingBy(SysDept::getParentId));
+        sysDeptList.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
+        return map.get(sysDept.getParentId());
+    }
+
+    /**
+     * 根据传入机构，查询归属所有团队
+     */
+    @Override
+    public List<SysDept> findTeamList(String deptId) {
+        SysDept sysDept = getById(deptId);
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysDept::getDelFlag, 0);
+        lqw.likeRight(SysDept::getId, deptId);
+        lqw.eq(SysDept::getDeptType,'D');
+        lqw.apply(" exists (SELECT 1 FROM  `sys_dept` b WHERE sys_dept.parent_id = b.`id` AND b.`comlevel`='5') ");
+        List<SysDept> sysDeptList = list(lqw);
+        return sysDeptList;
+    }
+
 }
 
 

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

@@ -670,6 +670,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return level;
     }
+
+    /**
+     * 根据机构代码，查询所有人员
+     * @param deptId
+     * @return
+     */
+    @Override
+    public List<SysUser> findUserList(String deptId) {
+        LambdaQueryWrapper<SysUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysUser::getStatus, "1");
+        lqw.eq(SysUser::getDeptId,deptId);
+        List<SysUser> lst = list(lqw);
+        return lst;
+    }
 }
 
 

src/main/java/com/ydtech/modules/report/dao/ReportInsurancePolicyMapper.java

@@ -16,11 +16,11 @@ import java.util.List;
 public interface ReportInsurancePolicyMapper extends BaseMapper<ReportInsurancePolicy> {
 
 
-    Page<OrderVolumeAndCostStatisticsResVo> queryOrderAndCostData(@Param("page") Page page, @Param("portReqVo") StatisticsReportReqVo reqVo);
+    Page<OrderVolumeAndCostStatisticsResVo> queryOrderAndCostData(@Param("page") Page page, @Param("reportReqVo") StatisticsReportReqVo reqVo);
 
-    List<OrderVolumeAndCostStatisticsResVo> queryOrderAndCostData(@Param("portReqVo")StatisticsReportReqVo reqVo);
+    List<OrderVolumeAndCostStatisticsResVo> queryOrderAndCostData(@Param("reportReqVo")StatisticsReportReqVo reqVo);
 
-    Long queryOrderAndCostDataCount(@Param("portReqVo") StatisticsReportReqVo reqVo);
+    Long queryOrderAndCostDataCount(@Param("reportReqVo") StatisticsReportReqVo reqVo);
 
 
 }

src/main/java/com/ydtech/modules/report/model/vo/OrderVolumeAndCostStatisticsResVo.java

@@ -39,7 +39,7 @@ public class OrderVolumeAndCostStatisticsResVo {
     /**
      * 总保费
      */
-    @TableField(value = "sumpremium")
+    @TableField(value = "sumremium")
     private BigDecimal sumpremium;
     /**
      * 总费用
@@ -57,5 +57,13 @@ public class OrderVolumeAndCostStatisticsResVo {
     @TableField(value = "other_costs_premiums")
     private BigDecimal otherCostsPremiums;
 
+    /**
+     * 机构Id
+     */
+    private String institutionId;
+    /**
+     * 团队Id
+     */
+    private String deptId;
 
 }

src/main/java/com/ydtech/modules/report/service/impl/ReportServiceImpl.java

@@ -7,6 +7,12 @@ import com.github.pagehelper.PageHelper;
 import com.ydtech.aop.exception.DescribeException;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.dao.SysDeptMapper;
+import com.ydtech.modules.admin.dao.SysUserMapper;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.service.SysDeptService;
+import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.ins.utils.ExcelStyleLeftUtil;
 import com.ydtech.modules.ins.utils.ExcelStyleUtil;
 import com.ydtech.modules.ins.utils.ExcelUtils2;
@@ -67,6 +73,10 @@ public class ReportServiceImpl implements ReportService {
     private ReportAgentBalanceSheetMapper reportAgentBalanceSheetMapper;
     @Autowired
     private ReportInsurancePolicyMapper reportInsurancePolicyMapper;
+    @Autowired
+    private SysDeptService sysDeptService;
+    @Autowired
+    private SysUserService sysUserService;
 
     /**
      * 保险专业中介机构基本情况表导入
@@ -932,6 +942,21 @@ public class ReportServiceImpl implements ReportService {
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         Page<OrderVolumeAndCostStatisticsResVo> orderVolumeAndCostStatisticsResVoPage = reportInsurancePolicyMapper.queryOrderAndCostData(page,
                 reqVo);
+        orderVolumeAndCostStatisticsResVoPage.getRecords().stream().forEach(item->{
+            item.setInstitutionId(reqVo.getDeptId());
+            SysDept sysDept1=sysDeptService.getById(reqVo.getDeptId());
+            item.setInstitution(sysDept1.getName());
+            if(StringUtils.isNotEmpty(reqVo.getTeamCode())){
+                item.setDeptId(reqVo.getTeamCode());
+                SysDept sysDept2=sysDeptService.getById(reqVo.getTeamCode());
+                item.setDeptname(sysDept2.getName());
+            }
+            if(StringUtils.isNotEmpty(reqVo.getUserId())){
+                SysUser sysUser=sysUserService.getById(reqVo.getUserId());
+                item.setUsername(sysUser.getName());
+            }
+        });
+
         Long total = reportInsurancePolicyMapper.queryOrderAndCostDataCount(reqVo);
         orderVolumeAndCostStatisticsResVoPage.setTotal(total);
         return new BasePageResult<>(reqVo.getPageNum(), reqVo.getPageSize(),

src/main/resources/mapper/modules/report/ReportInsurancePolicyMapper.xml

@@ -44,9 +44,9 @@
         <result property="institution" column="institution" jdbcType="VARCHAR"/>
         <result property="deptname" column="deptname" jdbcType="VARCHAR"/>
         <result property="username" column="username" jdbcType="VARCHAR"/>
-        <result property="riskName" column="riskName" jdbcType="VARCHAR"/>
+        <result property="riskName" column="risk_name" jdbcType="VARCHAR"/>
         <result property="policyCount" column="policy_count" jdbcType="DECIMAL"/>
-        <result property="sumPremium" column="sumPremium" jdbcType="DECIMAL"/>
+        <result property="sumPremium" column="sumremium" jdbcType="DECIMAL"/>
         <result property="sumCostsPremiums" column="sum_costs_premiums" jdbcType="DECIMAL"/>
         <result property="superviseCostsPremiums" column="supervise_costs_premiums" jdbcType="DECIMAL"/>
         <result property="otherCostsPremiums" column="other_costs_premiums" jdbcType="DECIMAL"/>
@@ -58,9 +58,9 @@
         ''institution,
         ''deptname,
         ''username,
-        p.`risk_name`,
+        p.`risk_name` risk_name,
         count(1) policy_count,
-        SUM(p.`sumpremium`) sumprmium,
+        SUM(p.`sumpremium`) sumpremium,
         SUM(p.`supervise_costs_premiums`) supervise_costs_premiums,
         SUM(p.`other_costs_premiums`) other_costs_premiums,
         SUM(p.`sum_costs_premiums`) sum_costs_premiums