添加用户关联的协议表添加用户名称，工号、保险公司检索查询

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

@@ -26,7 +26,7 @@ public interface SysUserLinkPtlAgreementMapper extends BaseMapper<SysUserLinkPtl
      *  @Date: 2024/4/15 15:32
      *  @Description: 分页
      */
-    Page<SysUserLinkPtlAgreementDto> queryPage(@Param("page") Page<SysUserLinkPtlAgreementDto> page, @Param("vo") SysUserLinkPtlAgreementVo sysUserLinkPtlAgreementVo);
+    Page<SysUserLinkPtlAgreementDto> queryPage(@Param("page") Page<SysUserLinkPtlAgreementDto> page, @Param("vo") SysUserLinkPtlAgreementVo sysUserLinkPtlAgreementVo, @Param("ids") List<String> ids);
     /**
      *  @version
      *  @author: hxl

src/main/java/com/ydtech/modules/admin/model/vo/SysUserLinkPtlAgreementVo.java

@@ -22,11 +22,14 @@ public class SysUserLinkPtlAgreementVo extends BasePageVO {
     private String userId;
 
     /***
-     * 协议ID
+     * 后线用户名称
      */
-    @ApiModelProperty("协议ID")
-    private Long ptlAgreementId;
+    @ApiModelProperty("后线用户名称")
+    private String userName;
 
-    @ApiModelProperty("ID")
-    private Long  id;
+    /***
+     * 保险公司ID
+     */
+    @ApiModelProperty("保险公司ID")
+    private String partnerCompaniesId;
 }

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

@@ -12,6 +12,7 @@ import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementAddVo;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementVo;
 import com.ydtech.modules.admin.service.SysUserLinkPtlAgreementService;
+import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
@@ -41,6 +42,9 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
     @Autowired
     private PtlAgreementService ptlAgreementService;
 
+    @Autowired
+    private EsmInsCompanyService esmInsCompanyService;
+
 
     /**
      *  @version
@@ -52,7 +56,9 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
     public BasePageResult<SysUserLinkPtlAgreementDto> queryPage(SysUserLinkPtlAgreementVo sysUserLinkPtlAgreementVo) {
         Page<SysUserLinkPtlAgreementDto> page = new Page<>(sysUserLinkPtlAgreementVo.getPageNum(),
                 sysUserLinkPtlAgreementVo.getPageSize());
-        Page<SysUserLinkPtlAgreementDto> sysUserLinkPtlAgreementDtoBasePageResult = sysUserLinkPtlAgreementMapper.queryPage(page, sysUserLinkPtlAgreementVo);
+        // 获取供应商本级id 及其 下级id
+        List<String> lowerId = esmInsCompanyService.getByLowerId(sysUserLinkPtlAgreementVo.getPartnerCompaniesId());
+        Page<SysUserLinkPtlAgreementDto> sysUserLinkPtlAgreementDtoBasePageResult = sysUserLinkPtlAgreementMapper.queryPage(page, sysUserLinkPtlAgreementVo,lowerId);
         return  new BasePageResult<>(sysUserLinkPtlAgreementVo.getPageNum(), page.getSize(), sysUserLinkPtlAgreementDtoBasePageResult.getTotal(), page.getPages(),
                 sysUserLinkPtlAgreementDtoBasePageResult.getRecords());
     }

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -217,6 +217,12 @@ public class PtlAgreement implements Serializable {
     @TableField(exist = false)
     private String flag;
 
+    /***
+     * 保险公司名称
+     */
+    @TableField(exist = false)
+    private String partnerCompaniesName;
+
     public void generateTheProtocolCode() {
         AssertionUtils.isFail(StringUtils.isNullOrEmpty(this.getPartnerCompaniesId()), "请检查合作保险公司是否选择");
         String string = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);

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

@@ -4,9 +4,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ydtech.modules.admin.dao.SysUserLinkPtlAgreementMapper">
     <sql id="Base_Column_List">
-            link.id as id,
+        link.id as id,
             user.id as "sysUser.id",
             user.name as "sysUser.name",
+            t2.id AS "sysUser.deptId",
+            t2.`name` AS "sysUser.deptName",
             agree.id as  "ptlAgreement.id",
             agree.companies_type as  "ptlAgreement.companiesType",
             agree.agreement_type as  "ptlAgreement.agreementType",
@@ -30,7 +32,8 @@
             agree.audit_content  as  "ptlAgreement.auditContent",
             agree.audit_status  as  "ptlAgreement.auditStatus",
             agree.serial_number	  as  "ptlAgreement.serialNumber",
-            agree.underwriting_description	 as  "ptlAgreement.underwritingDescription"
+            agree.underwriting_description	 as  "ptlAgreement.underwritingDescription",
+			com.name as 	"ptlAgreement.partnerCompaniesName"
     </sql>
 
     <select id="queryPage"  resultType="com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto">
@@ -39,15 +42,25 @@
         FROM
         sys_user_link_pl_agreement link
         LEFT JOIN sys_user USER ON link.user_id = USER.id
+        LEFT JOIN sys_dept t2 ON USER.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
         LEFT JOIN ptl_agreement agree ON link.ptl_agreement_id = agree.id
+        left join esm_ins_company com on com.id = agree.partner_companies_id
         <where>
             <if test="vo.userId != null and vo.userId != ''">
                 and  link.user_id =  #{vo.userId}
             </if>
-            <if test="vo.ptlAgreementId != null">
-                and link.ptl_agreement_id = #{vo.ptlAgreementId}
+            <if test="vo.userName != null and vo.userName != ''">
+                and  USER.name  like CONCAT('%', #{vo.userName}, '%')
+            </if>
+            <if test="ids != null and ids.size>0">
+                and  agree.partner_companies_id in
+                <foreach collection="ids" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
+        order by agree.agreement_code
     </select>
 
     <delete id="deleteByUserId">
@@ -61,7 +74,10 @@
         FROM
         sys_user_link_pl_agreement link
         LEFT JOIN sys_user USER ON link.user_id = USER.id
+        LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
         LEFT JOIN ptl_agreement agree ON link.ptl_agreement_id = agree.id
+        left join esm_ins_company com on link.id = agree.partner_companies_id
         <where>
             <if test="userId != null and userId != ''">
                 and  link.user_id =  #{userId}