1.处理驳回订单公司公司填充错误

2.处理订单审核处理取上级用户id ---OperatorCode
3.处理待审核和已审核页面数据数据显示，当为渠道团队长时按机构查询，其他情况按用户id查询

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

@@ -37,4 +37,7 @@ public class MySumAmountQueryDto {
    // @ApiModelProperty(value = "预收 0 实收 1")
     private String auditstatus;
 
+
+    private String deptId;
+
 }

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

@@ -11,11 +11,13 @@ import com.ydtech.modules.admin.constants.MoneyAttrConstants;
 import com.ydtech.modules.admin.constants.WithdrawTypeConstants;
 import com.ydtech.modules.admin.dao.SysUserAccountMapper;
 import com.ydtech.modules.admin.dao.SysUserMapper;
+import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.po.*;
 import com.ydtech.modules.admin.model.vo.SubOrder;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.admin.utils.SliceUpDateUtil;
 import com.ydtech.modules.base.controller.BaseController;
@@ -91,6 +93,9 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Autowired
     private InsUploadFilesMapper insUploadFilesMapper;
 
+    @Autowired
+    private SysDeptService sysDeptService;
+
     @Override
     @Transactional
     public void addOrUpdate(SysUserAccount sysUserAccount) {
@@ -1446,6 +1451,17 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if(StringUtils.isNotBlank(mySumAmountQueryDto.getEndDate())){
             mySumAmountQueryDto.setEndDate(mySumAmountQueryDto.getEndDate()+" 23:59:59");
         }
+        String userId = mySumAmountQueryDto.getUserId();
+        //添加预收明细 如果是渠道团队长查询管理下级的出单员
+        SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(userId);
+        SysUser user = sysUserService.getById(userId);
+        SysDept dept = sysDeptService.getById(user.getDeptId());
+        String deptId="";
+        //出单员是19 且是渠道的话，给渠道团队长
+        if ("21".equals(sysUserBaseVO.getRoleId()) && "1".equals(dept.getManagementSource())) {
+            deptId = dept.getId();
+            mySumAmountQueryDto.setDeptId(deptId);
+        }
         //查询预收和实收的总金额
         mySumAmountQueryDto.setAuditstatus("0");
         BigDecimal ysAmount= insFeeOrderNewService.findMyAmountYSOrSSCXAmount(mySumAmountQueryDto);

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -4,9 +4,9 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
 import com.ydtech.constants.enums.dict.ins.InsFeeAuditDistributionStatusEnum;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysDeptAccount;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
@@ -51,9 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -158,12 +156,16 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 //判断当前用户是否是出单员，如果是直接给团队长结算   角色id为19为出单员
                 String userId = "";
                 SysUserBaseVO sysUserBaseVO = sysUserService.selectUserById(order.getUserid());
-                if ("19".equals(sysUserBaseVO.getRoleId())) {
-                    //查找该机构的团队长
-                    userId = sysUserService.findTDZUserIdByDeptId(sysUserBaseVO.getDeptId());
-                    if (userId == null || "".equals(userId)) {
-                        throw new SystemException("出单员" + sysUserBaseVO.getName() + "所在机构缺少团队长，请设置！！！");
-                    }
+                SysUser user = sysUserService.getById(order.getUserid());
+                SysDept dept = sysDeptService.getById(user.getDeptId());
+                //出单员是19 且是渠道的话，给渠道团队长
+                if ("19".equals(sysUserBaseVO.getRoleId()) && "1".equals(dept.getManagementSource())) {
+                    //查找该出单员的的团队长
+                    //找到上级
+                    userId = user.getOperatorCode();
+                    //if (userId == null || "".equals(userId)) {
+                    //    throw new SystemException("出单员" + sysUserBaseVO.getName() + "所在机构缺少团队长，请设置！！！");
+                    //}
 
                 } else {
                     userId = order.getUserid();

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

@@ -741,8 +741,8 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         //更新创建时间
         insOrders.setCreatetime(LocalDateTime.now());
         // 更新保险公司名称 和险种信息
-        insOrders.setInsCompany(ptlAgreement.getInsuranceCompanyId());
-        insOrders.setCompanyId(ptlAgreement.getInsuranceCompany());
+        insOrders.setInsCompany(ptlAgreement.getInsuranceCompany());
+        insOrders.setCompanyId(ptlAgreement.getInsuranceCompanyId());
         //通过主订单的信息判断 更新险种信息
         List<RiskInfoVo> risks = insOrdersEditingVo.getRisk() == null ? new JSONArray().toJavaList(RiskInfoVo.class) :
                 insOrdersEditingVo.getRisk().toJavaList(RiskInfoVo.class);

src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -1106,13 +1106,22 @@
             ins_fee_audit iff
                 LEFT JOIN ins_fee_order_new a ON a.ins_order_no = iff.ins_order_no
                 LEFT JOIN ins_area_company iac ON iac.id = a.ins_order_no
+                left join ins_orders  io  on iac.orderno =io.orderno
         WHERE
             iac.orderstatus = '3'
           and iff.auditstatus=#{vo.auditstatus}
-          AND a.user_id =  #{vo.userId}
+
           <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
                 AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
          </if>
+        <choose>
+            <when test="vo.deptId!=null and  vo.deptId!= '' ">
+                and  io.deptid  like "${vo.deptId}%"
+            </when>
+            <otherwise>
+                AND a.user_id =  #{vo.userId}
+            </otherwise>
+        </choose>
     </select>
     <select id="findMyAmountYSOrSSTGAmount" resultType="java.math.BigDecimal">
         SELECT