修改对接代课录单的bug问题

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(@RequestBody SysUserVOExt sysUserVOExt) {
+    public HttpResult getCustomerUsers() {
         try{
-            List<SysUserBaseVO> userList = sysUserService.getCustomerUsers(sysUserVOExt);
+            List<SysUserBaseVO> userList = sysUserService.getCustomerUsers();
             return HttpResult.ok(userList);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());

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(SysUserVOExt sysUserVOExt);
+    List<SysUserBaseVO> getCustomerUsers();
 }
 
 

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

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

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -228,7 +228,7 @@ public class InsOrdersController extends BaseController {
             return HttpResult.error("待客录单人员id不能为空");
         }
         try{
-            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_1.getCode());
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_2.getCode());
             return HttpResult.ok("success", quoteResult);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());
@@ -250,7 +250,7 @@ public class InsOrdersController extends BaseController {
         //   return HttpResult.error("订单状态不能为空");
         // }
         try{
-            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_1.getCode());
+            BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrderByLinkType(orderQueryVo,OrderLinkTypeConstants.ORDER_LINK_TYPE_CONSTANTS_3.getCode());
             return HttpResult.ok("success", quoteResult);
         }catch (Exception e){
             return HttpResult.error("查询失败"+e.getMessage());

src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -387,6 +387,18 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "operator_name")
     private String operatorName;
 
+    /**
+     *  新操作人
+     */
+    @TableField(value = "new_operator_id")
+    private String newOperatorId;
+
+    /**
+     *  新操作人
+     */
+    @TableField(value = "new_operator_name")
+    private String newOperatorName;
+
     public InsAreaCompany(QuoteRespVo quoteRespVo, PtlAgreementAttribution ptlAgreementAttribution) {
         this.id = IdGenerate.nextId();
         this.orderno = quoteRespVo.getOrderno();

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -786,6 +786,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public BasePageResult<InsOrders> queryPageOrderByLinkType(OrderQueryVo orderQueryVo, int type) {
+
+        //orderQueryVo.setUserId("admin");
         Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         List<String> agentUserIds =new ArrayList<>();
@@ -815,10 +817,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         Long total=0l;
         Page<InsOrders> orderVoPage=new Page<>();
         //注释逻辑给前台返回数据
-        //if((agentUserIds!=null && agentUserIds.size()>0) || (agreeIds!=null && agreeIds.size()>0)){
+        if((agentUserIds!=null && agentUserIds.size()>0) || (agreeIds!=null && agreeIds.size()>0)){
             orderVoPage= baseMapper.queryPageOrderByLinkType(page, orderQueryVo,agentUserIds,agreeIds);
             total = baseMapper.queryPageOrderByLinkTypeCount(orderQueryVo,agentUserIds,agreeIds);
-        //}
+        }
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -155,6 +155,15 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
     @Override
     @Transactional
     public HttpResult forwardingSubOrders(TaskForwardingVo taskForwardingVo,SysUser sysUser) {
+        if(StringUtils.isEmpty(taskForwardingVo.getOrderNo()) ){
+            throw  new SystemException("参数错误，主订单号orderNo不能为空！！");
+        }
+        if(StringUtils.isEmpty(taskForwardingVo.getSubOrderId()) ){
+            throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
+        }
+        if(StringUtils.isEmpty(taskForwardingVo.getAuditId())){
+            throw  new SystemException("参数错误，受理人号auditId不能为空！！");
+        }
         SysUser sysUserNew = sysUserService.getById(taskForwardingVo.getAuditId());
         InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(taskForwardingVo.getSubOrderId());
@@ -169,9 +178,11 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         //插入轨迹表
         InsOrderSetUserHis  his=new InsOrderSetUserHis(insOrders.getOrderno(), insOrders.getQuoteno(), sysUser.getId(), taskForwardingVo.getAuditId(), new Date(), sysUser.getId(),taskForwardingVo.getSubOrderId(),sysUserNew.getName()+"转发给"+sysUser.getName()+"的任务",sysUser.getName(),sysUserNew.getName());
         insOrderSetUserHisService.addOrUpdate(his);
-        insAreaCompany.setOperatorId(taskForwardingVo.getAuditId());
+        insAreaCompany.setOperatorId(sysUser.getId());
         insAreaCompany.setOperatorTime(new Date());
-        insAreaCompany.setOperatorName(sysUserNew.getName());
+        insAreaCompany.setOperatorName(sysUser.getName());
+        insAreaCompany.setNewOperatorId(taskForwardingVo.getAuditId());
+        insAreaCompany.setNewOperatorName(sysUserNew.getName());
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok("保存成功");
     }
@@ -185,6 +196,12 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
     @Override
     @Transactional
     public HttpResult recover(TaskForwardingVo taskForwardingVo,SysUser sysUser) {
+        if(StringUtils.isEmpty(taskForwardingVo.getOrderNo()) ){
+            throw  new SystemException("参数错误，主订单号orderNo不能为空！！");
+        }
+        if(StringUtils.isEmpty(taskForwardingVo.getSubOrderId()) ){
+            throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
+        }
         InsOrders insOrders = insOrdersService.existOrder(taskForwardingVo.getOrderNo());
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(taskForwardingVo.getSubOrderId());
         if(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(insAreaCompany.getOrderstatus()) ){
@@ -192,7 +209,9 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         }
         //查询最新数据的
         InsOrderSetUserHis one = insOrderSetUserHisService.getOneBySubOrderId(taskForwardingVo.getSubOrderId());
-        if(one!=null && !one.getOldOperatorId().equals(sysUser.getId())){
+        if(one==null){
+            throw  new SystemException("该订单没有做转发操作无法收回");
+        }else if(one!=null && !one.getOldOperatorId().equals(sysUser.getId())){
             throw  new SystemException("该订单的回收人为"+one.getOldOperatorName());
         }
         //插入轨迹表
@@ -201,6 +220,8 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         insAreaCompany.setOperatorId(null);
         insAreaCompany.setOperatorTime(new Date());
         insAreaCompany.setOperatorName(null);
+        insAreaCompany.setNewOperatorId(null);
+        insAreaCompany.setNewOperatorName(null);
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok("保存成功");
     }

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

@@ -3,7 +3,6 @@ package com.ydtech.modules.protocol.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.config.DictEnumConfig;
 import com.ydtech.constants.enums.dict.DictionaryData;
@@ -702,7 +701,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
      */
     public List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement){
         LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(PtlAgreement::getAuditStatus,"1");
+       // wrapper.eq(PtlAgreement::getAuditStatus,"1");
         List<PtlAgreement> list = proxyObject.list(wrapper);
         return list;
     }

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

@@ -83,7 +83,5 @@
             )  as flag
         FROM
             ptl_agreement pl
-        WHERE
-            audit_type =1
     </select>
 </mapper>

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

@@ -785,7 +785,7 @@
         left JOIN
              ins_orders io  on iac.orderno = io.orderno
         <where>
-             (iac.operator_id is null or  iac.operator_id =#{orderQueryVo.userId})
+             ( (iac.operator_id is null or iac.operator_id ='') or iac.new_operator_id =#{orderQueryVo.userId} or   iac.operator_id =#{orderQueryVo.userId})
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
@@ -837,7 +837,7 @@
             left JOIN
         ins_orders io  on iac.orderno = io.orderno
         <where>
-            (iac.operator_id is null or  iac.operator_id =#{orderQueryVo.userId})
+            ( (iac.operator_id is null or iac.operator_id ='') or iac.new_operator_id =#{orderQueryVo.userId} or   iac.operator_id =#{orderQueryVo.userId})
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>