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

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

@@ -595,13 +595,6 @@ public class SysUserController extends BaseController {
         SysUser sysUser = sysUserService.getById(userId);
         if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_2.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_3.getCode());
-            Integer type = sysUser.getType();
-            Integer level = sysUser.getLevel();
-            if (type != 0) {
-                if (level == null || level != 1) {
-                    sysUserService.sendMsgPantner(sysUser.getMobile());
-                }
-            }
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_4.getCode())) {
             sysUser.setStatus(UserWorkStatus.UWS_5.getCode());
         } else if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_6.getCode())) {
@@ -611,6 +604,16 @@ public class SysUserController extends BaseController {
         SysUserTrack sysUserTrack = new SysUserTrack(sysUser);
         sysUserTrack.setApproveMess(reason);
         sysUserTrackService.save(sysUserTrack);
+        Integer type = sysUser.getType();
+        Integer level = sysUser.getLevel();
+        if (type != 0) {
+            if (level == null || level != 1) {
+                //合伙人、负责人、团队长只有在入司驳回发信息
+                if (Objects.equals(sysUser.getStatus(), UserWorkStatus.UWS_3.getCode())) {
+                    sysUserService.sendMsgPantner(sysUser.getMobile());
+                }
+            }
+        }
 
         return HttpResult.ok(sysUserService.updateById(sysUser));
 

src/main/java/com/ydtech/modules/admin/dao/SysPremiumDetailsMapper.java

@@ -21,4 +21,6 @@ public interface SysPremiumDetailsMapper extends BaseMapper<SysPremiumDetails> {
     IPage<AgencyUserInsAreaVo> queryInsAreaPageById(Page page,@Param("dto") AgencyUserInsAreaDto agencyUserInsAreaDto);
 
     List<Map<String, Object>> queryInfoPage(@Param("userId") String userId,  @Param("dto") CommissionInfoDto commissionInfoDto);
+
+    Page<Map<String, Object>> queryInfoPages(Page page,  @Param("dto") CommissionInfoDto commissionInfoDto);
 }

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

@@ -20,6 +20,8 @@ public class CommissionInfoDto {
     @ApiModelProperty(value = "每页条数")
     private int pageSize;
 
+    private String userId;
+
 //    @ApiModelProperty(value = "贡献等级：1、2、3、4、5")
 //    private int type;
 

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

@@ -779,8 +779,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     }
 
     @Override
-    public AppPartnerNumVo
-    getHomePage(Integer type) {
+    public AppPartnerNumVo getHomePage(Integer type) {
         AppPartnerNumVo appPartnerNumVo = new AppPartnerNumVo();
         //合伙人：1 ；工作室管理员：2
         String userId = BaseController.getUserId();
@@ -1395,15 +1394,18 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         List<SysPremiumDetailsVo> list = new ArrayList<>();
         String userId = BaseController.getUserId();
         int pageNum = commissionInfoDto.getPageNum();
+        Page page = new Page(commissionInfoDto.getPageNum(), commissionInfoDto.getPageSize());
+        commissionInfoDto.setUserId(userId);
         //int offset = (page - 1) * size;
+        Page<Map<String, Object>> stringObjectList = sysPremiumDetailsMapper.queryInfoPages(page, commissionInfoDto);
         commissionInfoDto.setPageNum( (commissionInfoDto.getPageNum() -1) * commissionInfoDto.getPageSize());
 
-        List<Map<String, Object>> stringObjectList = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
+        List<Map<String, Object>> stringObjectInfo = sysPremiumDetailsMapper.queryInfoPage(userId, commissionInfoDto);
 
-        if (CollectionUtil.isEmpty(stringObjectList)) return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), 0L, 0L,
+        if (CollectionUtil.isEmpty(stringObjectInfo)) return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), 0L, 0L,
                 list);
         Map<String, List<SysPremiumDetails>> listMap = new HashMap<>();
-        for (Map<String, Object> stringObjectMap : stringObjectList) {
+        for (Map<String, Object> stringObjectMap : stringObjectInfo) {
             String companyId = (String) stringObjectMap.get("companyId");
             Object json = stringObjectMap.get("sysPremiumDetails");
             String s ="["+ json.toString()+"]";
@@ -1472,9 +1474,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             list.add(sysPremiumDetailsVo);
         }
 
-//        List<SysPremiumDetailsVo> collect = list.stream().limit(page.getSize()).collect(Collectors.toList());
-        long l = (list.size()+pageNum-1)/commissionInfoDto.getPageSize();
-        return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), list.size(), l,
+//        long l = (list.size()+pageNum-1)/commissionInfoDto.getPageSize();
+        return new BasePageResult<>(pageNum, commissionInfoDto.getPageSize(), stringObjectList.getTotal(), page.getPages(),
                 list);
     }
 

src/main/resources/mapper/modules/admin/SysPremiumDetailsMapper.xml

@@ -97,6 +97,52 @@
             company_id ASC
         LIMIT #{dto.pageSize} OFFSET #{dto.pageNum};
     </select>
+    <select id="queryInfoPages" resultType="java.util.Map">
+        SELECT
+        company_id as companyId,
+        GROUP_CONCAT(
+        CONCAT(
+        '{"id":', id,
+        ',"orderno":"', orderno,
+        '","companyId":"', company_id,
+        '","userId":"', user_id,
+        '","userName":"', user_name,
+        '","issuerId":"', issuer_id,
+        '","issuerName":"', issuer_name,
+        '","jqpremium":', jqpremium,
+        ',"sypremium":', sypremium,
+        ',"jypremium":', jypremium,
+        ',"sumpremium":', sumpremium,
+        ',"proportional":"', proportional,
+        '","extractFee":', extract_fee,
+        ',"status":', status,
+        ',"createTime":"', DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s'),
+        '","type":', type,
+        ',"industrySector":', industry_sector,
+        ',"licenseno":"', licenseno,
+        '","source":', source,
+        '}'
+        )
+        ) AS sysPremiumDetails
+        FROM
+        sys_premium_details
+        <where>
+            status = 1
+            <if test="dto.userId !=null and dto.userId !=''">
+                and user_id = #{dto.userId}
+            </if>
+            <if test="dto.industrySector != 0 ">
+                and industry_sector = #{dto.industrySector}
+            </if>
+            <if test="dto.beginTime != null and dto.beginTime != '' and dto.endTime != null and dto.endTime != ''">
+                and (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') between DATE_FORMAT( #{dto.beginTime}, '%Y-%m-%d %H:%i:%s') and DATE_FORMAT( #{dto.endTime}, '%Y-%m-%d %H:%i:%s'))
+            </if>
+        </where>
+        GROUP BY
+        company_id
+        ORDER BY
+        company_id ASC
+    </select>
 
 
 </mapper>