修改私有应收bug 修改人员查询身份证信息的bug

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -273,6 +273,11 @@ public class QuoteVerificationAspect {
         BigDecimal jqFollowRatio = calculateFollowRatio(jqCostType, jqEntranceFeeRatio);
         BigDecimal syFollowRatio = calculateFollowRatio(syCostType, syEntranceFeeRatio);
         BigDecimal jyFollowRatio = calculateFollowRatio(jyCostType, jyEntranceFeeRatio);
+        // 设置跟单比例
+        insFeeOrders.setJqFollowRatio(jqFollowRatio);
+        insFeeOrders.setSyFollowRatio(syFollowRatio);
+        insFeeOrders.setJyFollowRatio(jyFollowRatio);
+
         // modify by lipf ,2026年6月17日15:30:54 是否除以1.06，不再根据平台协议还是私有协议进行判断，而是根据协议的是否含税来进行判断
         BigDecimal taxFactor = insOrdersService.obtainTaxRate(insOrders.getId());
         // 6. 统一处理各险种的费用计算（应收、应付、各类费用）

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -89,6 +89,9 @@
             <if test="param.receiveUser != null and param.receiveUser != ''">
                 and ifa.receive_user = #{param.receiveUser}
             </if>
+            <if test="param.receiveUser == null or param.receiveUser == ''">
+                and ifa.receive_user is null
+            </if>
             <if test="param.allTodoReceive != null and param.allTodoReceive == true">
                 and ifa.receive_user is null
             </if>

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -660,7 +660,13 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         // modify by lipf, 和查询调用同一个查询mapper，并且将分页参数进行调整 2026年6月9日10:03:13
         receivableQueryVo.setPages(1);
         receivableQueryVo.setSize(Integer.MAX_VALUE);
+
         Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
+        // 手续费
+        page.getRecords().forEach(item->{
+            item.setReceivableAmount(item.getSuperviseCostsPremiums());
+        });
+
         //return baseMapper.getReceivableList(receivableQueryVo);
         return page.getRecords();
     }
@@ -3288,7 +3294,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         dto.setDeptName(income.getDeptName());
         dto.setAgreementName(income.getAgreementName());
         dto.setLicenseNo(income.getLicenseNo());
-//        dto.setReceivableAmount(income.getReceivableAmount());
+        dto.setReceivableAmount(income.getReceivableAmount());
         dto.setProductName(income.getProductName());
         dto.setInsuredPerson(income.getInsuredPerson());
         dto.setJqPolicyNo(income.getJqPolicyNo());
@@ -3592,6 +3598,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
         receivableQueryVo.setPages(1);
         Page<InsPlyIncome> page = baseMapper.getReceivablePage(receivableQueryVo.getPage(), receivableQueryVo);
         List<InsPlyIncome> records = page.getRecords();
+        records.forEach(item->{
+            item.setReceivableAmount(item.getOtherCostsPremiums());
+        });
         List<ExportOtherExcelDto> exportOtherExcelDtos = new ArrayList<>();
         if(CollUtil.isNotEmpty(records)){
             exportOtherExcelDtos = records.stream().map(action->{
@@ -3607,6 +3616,8 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 case "3" -> dto.setEntryStatus("补录订单");
             }
         });
+
+
         EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), ExportOtherExcelDto.class, exportOtherExcelDtos, "车险跟单费应收");
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1051,7 +1051,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysUser == null) {
             throw new SystemException("该用户不存在");
         }
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
         sysUserJzgInfo.setMobile(sysUser.getMobile());
+        sysUserJzgInfo.setIdentity(sysUser.getIdentity());
+        if(Objects.nonNull(sysUser.getIdentityTimeStart())) {
+            sysUserJzgInfo.setIdentityTimeStart(sysUser.getIdentityTimeStart().format(formatter));
+        }
+        if(Objects.nonNull(sysUser.getIdentityTimeEnd())) {
+            sysUserJzgInfo.setIdentityTimeEnd(sysUser.getIdentityTimeEnd().format(formatter));
+        }
         SysDept dept = sysDeptService.getById(sysUserJzgInfo.getDeptId());
         if (!Objects.isNull(dept)) {
             sysUserJzgInfo.setDeptName(dept.getName());