修改后线人员关联协议页面接口联调处理,处理协议标识flag

 /***
     * 添加是否回显的标志
     */
    @TableField(exist = false)
    private String flag;

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

@@ -750,9 +750,9 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation(value = "获取客服人员列表数据")
     @PostMapping(value = "/getCustomerUsers")
-    public HttpResult getCustomerUsers() {
+    public HttpResult getCustomerUsers(@RequestBody SysUserVOExt sysUserVOExt) {
         try{
-            List<SysUserBaseVO> userList = sysUserService.getCustomerUsers();
+            List<SysUserBaseVO> userList = sysUserService.getCustomerUsers(sysUserVOExt);
             return HttpResult.ok(userList);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());

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

@@ -5,6 +5,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementAddVo;
+import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementIdsVo;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementVo;
 import com.ydtech.modules.admin.service.SysUserLinkPtlAgreementService;
 import com.ydtech.modules.base.controller.BaseController;
@@ -59,13 +60,12 @@ public class SysUserLinkPtlAgreementController extends BaseController {
 
     @PostMapping("delete")
     @ApiOperation("后线人员关联协议删除")
-    @ApiImplicitParam(name = "ids", value = "关联协议ids数组", required = true)
-    public HttpResult<Object> delete(@RequestParam("ids")  List<Long> ids) {
-        if(ids==null || ids.size()==0){
+    public HttpResult<Object> delete(@RequestBody SysUserLinkPtlAgreementIdsVo idsVo) {
+        if(idsVo.getIds()==null || idsVo.getIds().size()==0){
             return HttpResult.error("后线人员关联ids不能为空");
         }
         try{
-            sysUserLinkPtlAgreementService.deleteByIds(ids);
+            sysUserLinkPtlAgreementService.deleteByIds(idsVo.getIds());
             return HttpResult.ok("删除成功");
         }catch (Exception e){
             return HttpResult.error("删除失败"+e.getMessage());
@@ -74,9 +74,10 @@ public class SysUserLinkPtlAgreementController extends BaseController {
 
     @GetMapping("findUserList")
     @ApiOperation("查询所有的后线人员列表")
-    public HttpResult<Object> findUserList() {
+    @ApiImplicitParam(name = "userId", value = "后线人员工号", required = false)
+    public HttpResult<Object> findUserList(String userId) {
         try{
-            List<SysUserBaseVO> list= sysUserLinkPtlAgreementService.findUserList();
+            List<SysUserBaseVO> list= sysUserLinkPtlAgreementService.findUserList(userId);
             return HttpResult.ok(list);
         }catch (Exception e){
             return HttpResult.error("操作失败"+e.getMessage());
@@ -102,13 +103,14 @@ public class SysUserLinkPtlAgreementController extends BaseController {
     @GetMapping("/findPtlAgreementListByUserId/{userId}")
     @ApiOperation(value = "后线人员关联协议列表")
     @ApiImplicitParam(name = "userId", value = "后线人员id", required = true)
-    public HttpResult<List<SysUserLinkPtlAgreementDto>> findPtlAgreementListByUserId(@PathVariable("userId") String userId) {
+    public HttpResult<List<PtlAgreement>> findPtlAgreementListByUserId(@PathVariable("userId") String userId) {
         if(userId==null || "".equals(userId)) {
             return HttpResult.error("后线人员id不能为空");
         }
         try{
-            List<SysUserLinkPtlAgreementDto> result = sysUserLinkPtlAgreementService.findPtlAgreementListByUserId(userId);
-            return HttpResult.ok(result);
+            //List<SysUserLinkPtlAgreementDto> result = sysUserLinkPtlAgreementService.findPtlAgreementListByUserId(userId);
+            List<PtlAgreement> list= sysUserLinkPtlAgreementService.findAllPtlAgreementListByUserId(userId);
+            return HttpResult.ok(list);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());
         }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto;
 import com.ydtech.modules.admin.model.po.SysUserLinkPtlAgreement;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementVo;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,4 +41,11 @@ public interface SysUserLinkPtlAgreementMapper extends BaseMapper<SysUserLinkPtl
      *  @Description: 通过后线人员id查询关联的协议列表
      */
     List<SysUserLinkPtlAgreementDto> findPtlAgreementListByUserId(@Param("userId") String userId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/4/19 9:56
+     *  @Description:创建后线人员绑定的协议回显
+     */
+    List<PtlAgreement> findAllPtlAgreementListByUserId(@Param("userId") String userId);
 }

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

@@ -176,11 +176,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *  @Date: 2024/4/15 17:51
      *  @Description: 添加查询后线人员
      */
-    @Select(" SELECT  t1.id AS userId,t1.NAME AS NAME,t1.mobile AS mobile,t1.`status` AS `status`,t2.id AS deptId,t2.`name` AS deptName,sd2.id AS pDeptId,sd2.`name` AS pDeptName  " +
+    String findQXUserSql=" SELECT  t1.id AS userId,t1.NAME AS NAME,t1.mobile AS mobile,t1.`status` AS `status`,t2.id AS deptId,t2.`name` AS deptName,sd2.id AS pDeptId,sd2.`name` AS pDeptName  " +
             " FROM sys_user t1 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id " +
-             " WHERE t1.`status` = 1 AND t1.id not LIKE '%M%'")
-
-    List<SysUserBaseVO> findQXUserList();
+             " WHERE t1.`status` = 1 AND t1.id not LIKE '%M%' "+
+              "<if test='userId!=\"\" and userId!=null '>" +
+                      "   AND t1.id=#{userId} " +
+               "</if> ";
+    @Select({"<script>",findQXUserSql,"</script>"})
+    List<SysUserBaseVO> findQXUserList(@Param("userId") String userId);
     /**
      *  @version
      *  @author: hxl
@@ -216,10 +219,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      *  @Date: 2024/4/18 16:15
      *  @Description: 获取客服人员数据
      */
-    @Select(" SELECT  t1.id AS userId,t1.NAME AS NAME,t1.mobile AS mobile,t1.`status` AS `status`,t2.id AS deptId,t2.`name` AS deptName,sd2.id AS pDeptId,sd2.`name` AS pDeptName  " +
-            " FROM sys_user t1 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id " +
-            " WHERE t1.`status` = 1 AND t1.id not LIKE '%M%'")
-    List<SysUserBaseVO> getCustomerUsers();
+    List<SysUserBaseVO> getCustomerUsers(@Param("user") SysUserVOExt sysUserVOExt);
 }
 
 

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

@@ -0,0 +1,24 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/4/15 14:55
+ *  @Description: 通过ids查询数据
+ */
+@Data
+@ApiModel
+public class SysUserLinkPtlAgreementIdsVo implements Serializable {
+    /***
+     * 用户ID
+     */
+    @ApiModelProperty("关联协议ids")
+    private List<Long> ids;
+}

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

@@ -41,7 +41,7 @@ public interface SysUserLinkPtlAgreementService extends IService<SysUserLinkPtlA
      *  @Date: 2024/4/15 17:27
      *  @Description: 查询所有的后线人员表
      */
-    List<SysUserBaseVO> findUserList();
+    List<SysUserBaseVO> findUserList(String userId);
     /**
      *  @version
      *  @author: hxl
@@ -56,4 +56,11 @@ public interface SysUserLinkPtlAgreementService extends IService<SysUserLinkPtlA
      *  @Description: 查询后线人员关联的协议列表
      */
     List<SysUserLinkPtlAgreementDto> findPtlAgreementListByUserId(String userId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/4/19 9:55
+     *  @Description: 创建后线人员绑定的协议数据
+     */
+    List<PtlAgreement> findAllPtlAgreementListByUserId(String userId);
 }

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

@@ -146,7 +146,7 @@ public interface SysUserService extends IService<SysUser> {
      *  @Date: 2024/4/18 16:14
      *  @Description: 获取客服人员列表数据
      */
-    List<SysUserBaseVO> getCustomerUsers();
+    List<SysUserBaseVO> getCustomerUsers(SysUserVOExt sysUserVOExt);
 }
 
 

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

@@ -87,6 +87,7 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
     public void deleteByIds(List<Long> ids) {
         sysUserLinkPtlAgreementMapper.deleteBatchIds(ids);
     }
+
     /**
      *  @version
      *  @author: hxl
@@ -94,8 +95,8 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
      *  @Description: 查询所有的后线人员
      */
     @Override
-    public List<SysUserBaseVO> findUserList() {
-        return sysUserMapper.findQXUserList();
+    public List<SysUserBaseVO> findUserList(String userId) {
+        return sysUserMapper.findQXUserList(userId);
     }
     /**
      *  @version
@@ -119,4 +120,19 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
     public List<SysUserLinkPtlAgreementDto> findPtlAgreementListByUserId(String userId) {
         return  sysUserLinkPtlAgreementMapper.findPtlAgreementListByUserId(userId);
     }
+
+    @Override
+    public List<PtlAgreement> findAllPtlAgreementListByUserId(String userId) {
+        List<PtlAgreement> list = sysUserLinkPtlAgreementMapper.findAllPtlAgreementListByUserId(userId);
+        if(list!=null && list.size()>0){
+            for (PtlAgreement ptlAgreement : list) {
+                if("1".equals(ptlAgreement.getFlag())){
+                    ptlAgreement.setFlag("true");
+                }else{
+                    ptlAgreement.setFlag("false");
+                }
+            }
+        }
+        return  list;
+    }
 }

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

@@ -998,8 +998,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      *  @Description: 获取客服人员列表数据
      */
     @Override
-    public List<SysUserBaseVO> getCustomerUsers() {
-        return super.baseMapper.getCustomerUsers();
+    public List<SysUserBaseVO> getCustomerUsers(SysUserVOExt sysUserVOExt) {
+        return super.baseMapper.getCustomerUsers(sysUserVOExt);
     }
 
 }

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

@@ -205,6 +205,12 @@ public class PtlAgreement implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+    /***
+     * 添加是否回显的标志
+     */
+    @TableField(exist = false)
+    private String flag;
+
     public void generateTheProtocolCode() {
         AssertionUtils.isFail(StringUtils.isNullOrEmpty(this.getPartnerCompaniesId()), "请检查合作保险公司是否选择");
         String string = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -27,13 +27,10 @@ import com.ydtech.modules.protocol.entity.po.*;
 import com.ydtech.modules.protocol.entity.vo.*;
 import com.ydtech.modules.protocol.service.*;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
-import com.ydtech.modules.protocols.service.PtlAgreementProductCostsNewService;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -624,7 +621,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
      */
     public List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement){
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PtlAgreement::getValidStatus,"1");
+        wrapper.eq(PtlAgreement::getAuditStatus,"1");
         List<PtlAgreement> list = proxyObject.list(wrapper);
         return list;
     }

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

@@ -7,7 +7,7 @@
             link.id as id,
             user.id as "sysUser.id",
             user.name as "sysUser.name",
-            agree.companies_type as  "ptlAgreement.id",
+            agree.id as  "ptlAgreement.id",
             agree.companies_type as  "ptlAgreement.companiesType",
             agree.agreement_type as  "ptlAgreement.agreementType",
             agree.agreement_code as  "ptlAgreement.agreementCode",
@@ -68,4 +68,22 @@
             </if>
         </where>
     </select>
+
+    <select id="findAllPtlAgreementListByUserId"  resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">
+        SELECT
+            pl.*,
+            (
+                SELECT
+                    count(0)
+                FROM
+                    sys_user_link_pl_agreement link
+                WHERE
+                    link.user_id = #{userId}
+                  AND link.ptl_agreement_id = pl.id
+            )  as flag
+        FROM
+            ptl_agreement pl
+        WHERE
+            audit_type =1
+    </select>
 </mapper>

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

@@ -475,4 +475,37 @@
             </if>
         </if>
     </select>
+
+    <select id="getCustomerUsers" resultType="com.ydtech.modules.admin.model.vo.SysUserBaseVO">
+        SELECT
+        t1.id AS userId,
+        t1.NAME AS NAME,
+        t1.mobile AS mobile,
+        t1.`status` AS `status`,
+        t2.id AS deptId,
+        t2.`name` AS deptName,
+        sd2.id AS pDeptId,
+        sd2.`name` AS pDeptName
+        FROM
+        sys_user t1
+        LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
+        WHERE
+        t1.`status` = 1
+        AND t1.id NOT LIKE '%M%'
+        <if test='user !=null  '>
+            <if test='user.name !=null and user.name!="" '>
+                and t1.name = #{user.name}
+            </if>
+            <if test='user.userId !=null and user.userId!="" '>
+                and t1.id = #{user.userId}
+            </if>
+            <if test='user.mobile !=null and user.mobile!=""  '>
+                and t1.mobile = #{user.mobile}
+            </if>
+            <if test='user.identity !=null and user.identity!=""  '>
+                and t1.identity = #{user.identity}
+            </if>
+        </if>
+    </select>
 </mapper>

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

@@ -822,9 +822,6 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="orderQueryVo.userId != null and orderQueryVo.userId != ''">
-                and io.userid = #{orderQueryVo.userId}
-            </if>
         </where>
         order by io.createtime desc
     </select>
@@ -877,9 +874,6 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="orderQueryVo.userId != null and orderQueryVo.userId != ''">
-                and io.userid = #{orderQueryVo.userId}
-            </if>
         </where>
         ) as s
     </select>