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

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

@@ -4,6 +4,7 @@ package com.ydtech.modules.admin.controller;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementQueryDto;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementAddVo;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementIdsVo;
@@ -15,6 +16,7 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -133,4 +135,23 @@ public class SysUserLinkPtlAgreementController extends BaseController {
             return HttpResult.error("查询错误"+e.getMessage());
         }
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/2 11:20
+     *  @Description:  后线人员关联协议列表+分页
+     */
+    @PostMapping("/findPtlAgreementPageListByUserId")
+    @ApiOperation(value = "后线人员关联协议列表+分页")
+    public HttpResult<BasePageResult<PtlAgreement>> findPtlAgreementPageListByUserId(@RequestBody SysUserLinkPtlAgreementQueryDto sysUserLinkPtlAgreementQueryDto) {
+        if(StringUtils.isBlank(sysUserLinkPtlAgreementQueryDto.getUserId())) {
+            return HttpResult.error("后线人员id不能为空");
+        }
+        try{
+            BasePageResult<PtlAgreement> result= sysUserLinkPtlAgreementService.findPtlAgreementPageListByUserId(sysUserLinkPtlAgreementQueryDto);
+            return HttpResult.ok(result);
+        }catch (Exception e){
+            return HttpResult.error("查询失败"+e.getMessage());
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementQueryDto;
 import com.ydtech.modules.admin.model.po.SysUserLinkPtlAgreement;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementVo;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
@@ -48,4 +49,11 @@ public interface SysUserLinkPtlAgreementMapper extends BaseMapper<SysUserLinkPtl
      *  @Description:创建后线人员绑定的协议回显
      */
     List<PtlAgreement> findAllPtlAgreementListByUserId(@Param("userId") String userId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/2 14:53
+     *  @Description:  查询后现人员绑定的协议
+     */
+    Page<PtlAgreement> findPtlAgreementListByUserIdPage(@Param("page") Page<PtlAgreement> page, @Param("vo") SysUserLinkPtlAgreementQueryDto sysUserLinkPtlAgreementQueryDto);
 }

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

@@ -0,0 +1,24 @@
+package com.ydtech.modules.admin.model.dto;
+
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/2 11:16
+ *  @Description:  分页查询分页数据
+ */
+@Data
+@ApiModel
+public class SysUserLinkPtlAgreementQueryDto extends PageRequest {
+
+    @ApiModelProperty("后线人员id")
+    private String  userId;
+
+
+    @ApiModelProperty("保险公司Id")
+    private String  companyId;
+}

src/main/java/com/ydtech/modules/admin/model/report/opetationData/BusinessDataDto.java

@@ -0,0 +1,40 @@
+package com.ydtech.modules.admin.model.report.opetationData;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/7/1 11:59
+ *  @Description: 运营查询数据
+ */
+@Data
+@ApiModel("运营查询数据")
+public class BusinessDataDto {
+
+    /***
+     * 内部机构id
+     */
+    @ApiModelProperty("内部机构id")
+    private String deptId;
+
+    /***
+     * 开始时间
+     */
+    @ApiModelProperty("开始时间")
+    private String startDate;
+
+    /***
+     *  结束时间
+     */
+    @ApiModelProperty("endData")
+    private String endData;
+
+    /***
+     *  用户id
+     */
+    @ApiModelProperty("userId")
+    private String userId;
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementQueryDto;
 import com.ydtech.modules.admin.model.po.SysUserLinkPtlAgreement;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementAddVo;
@@ -71,4 +72,11 @@ public interface SysUserLinkPtlAgreementService extends IService<SysUserLinkPtlA
      *  @Description: 查询后线人员+分页
      */
     BasePageResult<SysUserBaseVO> findUserListByPage(SysUserDto sysUserDto);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/2 11:25
+     *  @Description:  分页查询数据
+     */
+    BasePageResult<PtlAgreement> findPtlAgreementPageListByUserId(SysUserLinkPtlAgreementQueryDto sysUserLinkPtlAgreementQueryDto);
 }

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

@@ -7,6 +7,7 @@ import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
+import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementQueryDto;
 import com.ydtech.modules.admin.model.po.SysUserLinkPtlAgreement;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementAddVo;
@@ -156,4 +157,31 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
         return  new BasePageResult<>(sysUserDto.getPageNum(), page.getSize(), userPageResult.getTotal(), page.getPages(),
                 userPageResult.getRecords());
     }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/7/2 11:28
+     *  @Description: 通过用户id查询的关联的协议列表+分页
+     */
+    @Override
+    public BasePageResult<PtlAgreement> findPtlAgreementPageListByUserId(SysUserLinkPtlAgreementQueryDto sysUserLinkPtlAgreementQueryDto) {
+        Page<PtlAgreement> page = new Page<>(sysUserLinkPtlAgreementQueryDto.getPageNum(),
+                sysUserLinkPtlAgreementQueryDto.getPageSize());
+        Page<PtlAgreement> userPageResult = sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserIdPage(page, sysUserLinkPtlAgreementQueryDto);
+        List<PtlAgreement> records = userPageResult.getRecords();
+        List<PtlAgreement> newList =new ArrayList<>();
+        if(records!=null && records.size()>0){
+            for (PtlAgreement ptlAgreement : records) {
+                if("1".equals(ptlAgreement.getFlag())){
+                    ptlAgreement.setFlag("true");
+                }else{
+                    ptlAgreement.setFlag("false");
+                }
+                newList.add(ptlAgreement);
+            }
+        }
+        userPageResult.setRecords(newList);
+        return  new BasePageResult<>(sysUserLinkPtlAgreementQueryDto.getPageNum(), page.getSize(), userPageResult.getTotal(), page.getPages(),
+                userPageResult.getRecords());
+    }
 }

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

@@ -61,6 +61,7 @@
         left join sys_user su on su.id =a.user_id
         left join sys_dept sd on sd.id =su.dept_id
         left join sys_user_bank_card bc on bc.bank_number =a.bank_number
+        and bc.user_id =a.user_id
         left join sys_user su2 on su2.id = a.auditing_user_id
         <where>
             <if test="sysAmountAuditingVo.auditingStatus !=null  and sysAmountAuditingVo.auditingStatus != ''">
@@ -124,6 +125,7 @@
         left join sys_user su on su.id =a.user_id
         left join sys_dept sd on sd.id =su.dept_id
         left join sys_user_bank_card bc on bc.bank_number =a.bank_number
+        and bc.user_id =a.user_id
         left join sys_user su2 on su2.id = a.auditing_user_id
         <where>
             <if test="auditingStatus !=null  and auditingStatus != ''">
@@ -201,6 +203,7 @@
         a.create_time as "createTime"
         from sys_amount_auditing a
         left join sys_user_bank_card bc on bc.bank_number =a.bank_number
+        and bc.user_id =a.user_id
         left join sys_user su2 on su2.id = a.auditing_user_id
         <where>
             <if test="myIncomeAndExpensesQueryDto.userId !=null  and myIncomeAndExpensesQueryDto.userId != ''">

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

@@ -79,8 +79,7 @@
                 LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
                 AND sd.del_flag = '0'
         WHERE
-            t3.role_id = 20
-           AND sd.management_source = 2
+           sd.management_source = 2
             <if test="areaCodes != null and areaCodes.size>0" >
                 AND (
                 <foreach collection="areaCodes" item="item" open=" instr( " separator="||" close=") ">

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

@@ -104,4 +104,28 @@
             ptl_agreement pl
         order by agreement_code
     </select>
+    <select id="findPtlAgreementListByUserIdPage"
+            resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">
+            SELECT
+            pl.*,
+            (
+            SELECT
+            count(0)
+            FROM
+            sys_user_link_pl_agreement link
+            WHERE
+            link.user_id = #{vo.userId}
+            AND link.ptl_agreement_id = pl.id
+            )  as flag
+            FROM
+            ptl_agreement pl
+            <where>
+                <if test='vo.companyId !=null and vo.companyId!="" '>
+                    and pl.insurance_company_id  = #{vo.companyId}
+                </if>
+            </where>
+          ORDER BY
+          flag DESC,
+          pl.agreement_code
+    </select>
 </mapper>