Merge remote-tracking branch 'origin/test' into test

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

@@ -102,16 +102,15 @@ public class SysChannelCostController extends BaseController {
         List<SysChannelCostExcelReadHead> heads = null;
         AssertionUtils.isFail(StringUtils.isBlank(voucherNumber),"结算凭证不能为空！");
         try {
-            heads = ExcelEasypoiUtils.importExcel(multipartFile, SysChannelCostExcelReadHead.class, 0, 1, 1);
+            heads = ExcelEasypoiUtils.importExcel(multipartFile, SysChannelCostExcelReadHead.class, 1, 1, 1);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
         if (CollectionUtils.isEmpty(heads)) {
             return HttpResult.error("导入数据为空");
         }
-        String taskId = String.valueOf(new SnowFlakeUtil().nextId());
         sysChannelCostService.importSettle(heads,voucherNumber);
-        return HttpResult.ok(taskId);
+        return HttpResult.ok();
 
     }
 }

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

@@ -66,7 +66,7 @@ public class SysChannelGroupCrotroller extends BaseController {
     }
 
     @GetMapping("/queryInfo/{id}")
-    @ApiOperation(value = "渠道费用选中分页列表")
+    @ApiOperation(value = "渠道费用选中列表")
     public HttpResult<List<SysChannelGroup>> queryInfo(@PathVariable Long id) {
         List<SysChannelGroup> result = sysChannelGroupService.getProductList(id);
         return HttpResult.ok(result);

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

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.config.MasterPasswordConfig;
 import com.ydtech.constants.sys.SysPasswordEnum;
@@ -101,9 +102,25 @@ public class SysDeptController extends BaseController {
             List<SysDept> list = sysDeptService.findTree(null,null);
             deptAll.addAll(list);
         }
+        // 递归组装前端需要的数据
+        for (SysDept sysDept : deptAll) {
+            sysDept.setName(sysDept.getName() + "--" + sysDept.getId());
+            showEdit(sysDept);
+        }
         return HttpResult.ok(deptAll);
     }
 
+    public void showEdit(SysDept sysDept) {
+        if (ObjectUtils.isNotEmpty(sysDept.getChildren())) {
+            List<SysDept> childrenList = sysDept.getChildren();
+            if (CollUtil.isNotEmpty(childrenList)){
+                for (SysDept dept : childrenList) {
+                    dept.setName(dept.getName() + "--" + dept.getId());
+                    showEdit(dept);
+                }
+            }
+        }
+    }
     //    @PreAuthorize("hasAuthority('sys:dept:edit')")
     @PostMapping(value = "/edit")
     public HttpResult edit(@RequestBody SysDept record) {

src/main/java/com/ydtech/modules/admin/model/po/SysChannelGroup.java

@@ -105,6 +105,6 @@ public class SysChannelGroup implements Serializable {
     private String costsDescription;
 
     @TableField(exist = false)
-    private String productName;
+    private String agreementName;
 
 }

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -257,52 +258,68 @@ public class SysChannelCostServiceImpl extends ServiceImpl<SysChannelCostMapper,
         heads.forEach(head -> {
             LambdaQueryWrapper<SysChannelCost> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(SysChannelCost::getStatus,1)
+                    .eq(SysChannelCost::getSettleStatus,0)
                     .eq(!StringUtils.isBlank(head.getUserId()),SysChannelCost::getUserId,head.getUserId())
-                    .eq(!StringUtils.isBlank(head.getUserName()),SysChannelCost::getUserName,head.getUserName())
-                    .eq(!StringUtils.isBlank(head.getLicenseNo()),SysChannelCost::getLicenseNo,head.getLicenseNo());
+                    .eq(!StringUtils.isBlank(head.getUserName()),SysChannelCost::getUserName,head.getUserName());
             List<SysChannelCost> costList = list(wrapper);
-            costList.stream()
-                    .filter(cost ->
-                        !cost.getJqPolicyNo().equals(head.getJqPolicyNo()))
-                    .filter(cost ->
-                        !cost.getSyPolicyNo().equals(head.getSyPolicyNo()))
-                    .filter(cost ->
-                            !cost.getNoPolicyNo().equals(head.getNoPolicyNo()))
-                    .filter(cost ->
-                            !cost.getJqPremium().equals(head.getJqPremium()))
-                    .filter(cost ->
-                            !cost.getSyPremium().equals(head.getSyPremium()))
-                    .filter(cost ->
-                            !cost.getJyPremium().equals(head.getJyPremium()))
-                    .filter(cost ->
-                            !cost.getTaxAmount().equals(head.getTaxAmount()))
-                    .filter(cost ->
-                            !cost.getJqCostsProportion().equals(head.getJqCostsProportion()))
-                    .filter(cost ->
-                            !cost.getSyCostsProportion().equals(head.getSyCostsProportion()))
-                    .filter(cost ->
-                            !cost.getNoCostsProportion().equals(head.getNoCostsProportion()))
-                    .filter(cost ->
-                            !cost.getTotalPremium().equals(head.getTotalPremium()))
-                    .forEach(cost ->{
-                        // 查询子订单
-                        List<String> orderNos = costList.stream().map(SysChannelCost::getOrderNo).collect(Collectors.toList());
-                        LambdaQueryWrapper<InsAreaCompany> orderWrapper = new LambdaQueryWrapper<>();
-                        orderWrapper.select(InsAreaCompany::getId,InsAreaCompany::getSigningTime,InsAreaCompany::getPayDate)
-                                .eq(InsAreaCompany::getId, cost.getOrderNo());
-                        InsAreaCompany insAreaCompany = insAreaCompanyService.getOne(orderWrapper);
-                        LambdaUpdateWrapper<SysChannelCost> costWrapper = new LambdaUpdateWrapper<>();
-                        costWrapper.eq(SysChannelCost::getId,cost.getId())
-                        .set(SysChannelCost::getSettleStatus,1)
-                        .set(SysChannelCost::getVoucherNumber,voucherNumber)
-                        .set(SysChannelCost::getSigningTime,insAreaCompany.getSigningTime())
-                        .set(SysChannelCost::getPayDate,insAreaCompany.getPayDate())
-                        .set(SysChannelCost::getUpdateBy,BaseController.getUser().getName())
-                        .set(SysChannelCost::getUpdateTime,LocalDateTime.now());
-                        this.baseMapper.update(cost, costWrapper);
-                    });
+            if (CollUtil.isNotEmpty(costList)) {
+                for (SysChannelCost sysChannelCost : costList) {
+                    sysChannelCost.setJqPolicyNo(StrUtil.nullToEmpty(sysChannelCost.getJqPolicyNo()));
+                    sysChannelCost.setSyPolicyNo(StrUtil.nullToEmpty(sysChannelCost.getSyPolicyNo()));
+                    sysChannelCost.setNoPolicyNo(StrUtil.nullToEmpty(sysChannelCost.getNoPolicyNo()));
+                    sysChannelCost.setJqPremium(Objects.isNull(sysChannelCost.getJqPremium()) ? new BigDecimal(0) : sysChannelCost.getJqPremium());
+                    sysChannelCost.setSyPremium(Objects.isNull(sysChannelCost.getSyPremium()) ? new BigDecimal(0) : sysChannelCost.getSyPremium());
+                    sysChannelCost.setJyPremium(Objects.isNull(sysChannelCost.getJyPremium()) ? new BigDecimal(0) : sysChannelCost.getJyPremium());
+                    sysChannelCost.setTaxAmount(Objects.isNull(sysChannelCost.getTaxAmount()) ? new BigDecimal(0) : sysChannelCost.getTaxAmount());
+                    sysChannelCost.setJqCostsProportion(StringUtils.isBlank(sysChannelCost.getJqCostsProportion()) ? "0" : sysChannelCost.getJqCostsProportion());
+                    sysChannelCost.setSyCostsProportion(StringUtils.isBlank(sysChannelCost.getSyCostsProportion()) ? "0" : sysChannelCost.getSyCostsProportion());
+                    sysChannelCost.setNoCostsProportion(StringUtils.isBlank(sysChannelCost.getNoCostsProportion()) ? "0" : sysChannelCost.getNoCostsProportion());
+                    sysChannelCost.setTotalPremium(Objects.isNull(sysChannelCost.getTotalPremium()) ? new BigDecimal(0) : sysChannelCost.getTotalPremium());
+
+
+                    if (!sysChannelCost.getJqPolicyNo().equals(StrUtil.nullToEmpty(head.getJqPolicyNo()))
+                            || !sysChannelCost.getSyPolicyNo().equals(StrUtil.nullToEmpty(head.getSyPolicyNo()))
+                            || !sysChannelCost.getNoPolicyNo().equals(StrUtil.nullToEmpty(head.getNoPolicyNo()))
+                            || sysChannelCost.getJqPremium().compareTo(head.getJqPremium()) != 0
+                            || sysChannelCost.getSyPremium().compareTo(head.getSyPremium()) != 0
+                            || sysChannelCost.getJyPremium().compareTo(head.getJyPremium()) != 0
+                            || sysChannelCost.getTaxAmount().compareTo(head.getTaxAmount()) != 0
+                            || sysChannelCost.getTotalPremium().compareTo(head.getTotalPremium()) != 0
+                            || !sysChannelCost.getJqCostsProportion().equals(head.getJqCostsProportion())
+                            || !sysChannelCost.getSyCostsProportion().equals(head.getSyCostsProportion())
+                            || !sysChannelCost.getNoCostsProportion().equals(head.getNoCostsProportion())
+                            || !sysChannelCost.getLicenseNo().equals(head.getLicenseNo())
+                    ){
+                        continue;
+                    }
+
+                    // 查询子订单
+                    List<String> orderNos = costList.stream().map(SysChannelCost::getOrderNo).collect(Collectors.toList());
+                    LambdaQueryWrapper<InsAreaCompany> orderWrapper = new LambdaQueryWrapper<>();
+                    orderWrapper.select(InsAreaCompany::getId,InsAreaCompany::getSigningTime,InsAreaCompany::getPayDate)
+                            .eq(InsAreaCompany::getId, sysChannelCost.getOrderNo());
+                    InsAreaCompany insAreaCompany = insAreaCompanyService.getOne(orderWrapper);
+                    LambdaUpdateWrapper<SysChannelCost> costWrapper = new LambdaUpdateWrapper<>();
+                    costWrapper.eq(SysChannelCost::getId,sysChannelCost.getId())
+                            .set(SysChannelCost::getSettleStatus,1)
+                            .set(SysChannelCost::getVoucherNumber,voucherNumber)
+                            .set(!Objects.isNull(insAreaCompany.getSigningTime()),SysChannelCost::getSigningTime,insAreaCompany.getSigningTime())
+                            .set(!Objects.isNull(insAreaCompany.getPayDate()),SysChannelCost::getPayDate,insAreaCompany.getPayDate())
+                            .set(SysChannelCost::getUpdateBy,BaseController.getUser().getName())
+                            .set(SysChannelCost::getUpdateTime,LocalDateTime.now());
+                    this.baseMapper.update(sysChannelCost, costWrapper);
+                }
+            }
         });
     }
+
+    public static void main(String[] args) {
+        BigDecimal a = new BigDecimal("10");
+        BigDecimal b = new BigDecimal("10.00");
+        if(a.compareTo(b) == -1){
+            System.out.println(1);
+        }
+    }
 }
 
 

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

@@ -525,12 +525,6 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));
 
-        if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId())){
-            List<String> userIds=this.getNextLevel(taskStatisticsVo.getTreeUserId());
-            if(!userIds.isEmpty()){
-                taskStatisticsVo.setUserIds(userIds);
-            }
-        }
 
         if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeType())){
             if(StringUtils.isNotEmpty(taskStatisticsVo.getTreeUserId()) && "2".equals(taskStatisticsVo.getTreeType())){

src/main/java/com/ydtech/modules/admin/utils/KztGetDeptUtils.java

@@ -3,6 +3,8 @@ package com.ydtech.modules.admin.utils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydtech.modules.admin.dao.KztDataPermissionMapper;
 import com.ydtech.modules.admin.dao.SysUserDeptRelationshipMapper;
+import com.ydtech.modules.admin.dao.SysUserMapper;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.KztDataPermission;
 import com.ydtech.modules.admin.model.po.SysUserDeptRelationship;
 import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Component;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -79,8 +82,11 @@ public class KztGetDeptUtils {
             ApplicationContext applicationContext = SpringContextUtil.getApplicationContext();
             EsmUserReferrerService dataPermissionMapper = applicationContext.getBean(EsmUserReferrerService.class);
 
+//            List<SysUser> ids = new ArrayList<>();
+//            List<String> userList = dataPermissionMapper.getUpUser(userId,ids); // 假设此方法直接返回用户列表
+
             List<String> ids = new ArrayList<>();
-            List<String> userList = dataPermissionMapper.getUpUser(userId,ids); // 假设此方法直接返回用户列表
+            List<String> userList = this.getUserTreeHx(userId, ids);
             userList.add(userId);  //添加本人
             if (!userList.isEmpty()) {
                 resultDto.setIds(userList);
@@ -89,4 +95,20 @@ public class KztGetDeptUtils {
         }
         return resultDto;
     }
+
+    private List<String> getUserTreeHx(String userId, List<String> ids) {
+        ApplicationContext applicationContext = SpringContextUtil.getApplicationContext();
+        SysUserMapper sysUserMapper = applicationContext.getBean(SysUserMapper.class);
+        sysUserMapper.selectUserById(userId);
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("leaderId", userId);
+        List<SysUser> sysUsers = sysUserMapper.selectByParams(params);
+        if (!sysUsers.isEmpty()) {
+            ids.addAll(sysUsers.stream().map(SysUser::getId).collect(Collectors.toList()));
+        }
+        for (SysUser sysUser : sysUsers) {
+            this.getUserTreeHx(sysUser.getId(), ids);
+        }
+        return ids;
+    }
 }

src/main/java/com/ydtech/modules/fee/service/impl/CostsCalServiceImpl.java

@@ -244,14 +244,36 @@ public class CostsCalServiceImpl implements CostsCalcService {
 
     @Override
     public SubOrderExportFeeVo getExportFee(InsFeeOrderNew insFeeOrderNew) {
+
         SubOrderExportFeeVo subOrderExportFeeVo = new SubOrderExportFeeVo();
-        subOrderExportFeeVo.setJqExportCosts(insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums()));
-        subOrderExportFeeVo.setSyExportCosts(insFeeOrderNew.getSyExportSuperviseCostsPremiums().add(insFeeOrderNew.getSyExportOtherCostsPremiums()));
-        subOrderExportFeeVo.setNoExportCosts(insFeeOrderNew.getNoExportSuperviseCostsPremiums().add(insFeeOrderNew.getNoExportOtherCostsPremiums()));
-        subOrderExportFeeVo.setJqExportRadio(insFeeOrderNew.getJqCostsExportProportion().add(insFeeOrderNew.getJqExportOtherCostsProportion()));
-        subOrderExportFeeVo.setSyExportRadio(insFeeOrderNew.getSyCostsExportProportion().add(insFeeOrderNew.getSyExportOtherCostsProportion()));
-        subOrderExportFeeVo.setNoExportRadio(insFeeOrderNew.getNoCostsExportProportion().add(insFeeOrderNew.getNoExportOtherCostsProportion()));
+        if(!Objects.isNull(insFeeOrderNew)) {
+            if (insFeeOrderNew.getJqExportSuperviseCostsPremiums() == null) {
+                insFeeOrderNew.setJqExportSuperviseCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getJqExportOtherCostsPremiums() == null) {
+                insFeeOrderNew.setJqExportOtherCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getSyExportSuperviseCostsPremiums() == null) {
+                insFeeOrderNew.setSyExportSuperviseCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getSyExportOtherCostsPremiums() == null) {
+                insFeeOrderNew.setSyExportOtherCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getNoExportSuperviseCostsPremiums() == null) {
+                insFeeOrderNew.setNoExportSuperviseCostsPremiums(BigDecimal.ZERO);
+            }
+            if (insFeeOrderNew.getNoExportOtherCostsPremiums() == null) {
+                insFeeOrderNew.setNoExportOtherCostsPremiums(BigDecimal.ZERO);
+            }
+            subOrderExportFeeVo.setJqExportCosts(insFeeOrderNew.getJqExportSuperviseCostsPremiums().add(insFeeOrderNew.getJqExportOtherCostsPremiums()));
+            subOrderExportFeeVo.setSyExportCosts(insFeeOrderNew.getSyExportSuperviseCostsPremiums().add(insFeeOrderNew.getSyExportOtherCostsPremiums()));
+            subOrderExportFeeVo.setNoExportCosts(insFeeOrderNew.getNoExportSuperviseCostsPremiums().add(insFeeOrderNew.getNoExportOtherCostsPremiums()));
+            subOrderExportFeeVo.setJqExportRadio(insFeeOrderNew.getJqCostsExportProportion().add(insFeeOrderNew.getJqExportOtherCostsProportion()));
+            subOrderExportFeeVo.setSyExportRadio(insFeeOrderNew.getSyCostsExportProportion().add(insFeeOrderNew.getSyExportOtherCostsProportion()));
+            subOrderExportFeeVo.setNoExportRadio(insFeeOrderNew.getNoCostsExportProportion().add(insFeeOrderNew.getNoExportOtherCostsProportion()));
 
-        return subOrderExportFeeVo;
+            return subOrderExportFeeVo;
+        }
+        return new SubOrderExportFeeVo();
     }
 }

src/main/java/com/ydtech/modules/ins/model/vo/CarInfoVo.java

@@ -57,7 +57,7 @@ public class CarInfoVo {
     @ApiModelProperty(value = "车架号")
     private String frameNo;
 
-    @NotNull(message = "车牌好不能为空")
+//    @NotNull(message = "车牌号不能为空")
     @ApiModelProperty(value = "车牌")
     private String licenseNo;
 

src/main/java/com/ydtech/modules/ins/model/vo/RiskInfoVo.java

@@ -37,10 +37,10 @@ public class RiskInfoVo {
 
     public void expirationTime() {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime dateTime = LocalDateTime.parse(endDate, formatter);
+        LocalDateTime dateTime = LocalDateTime.parse(startDate, formatter);
         LocalDateTime now = LocalDateTime.now();
         int i = now.compareTo(dateTime);
-        if (i > 0) {
+        if (i < 0) {
             long days = Duration.between(now, dateTime).toDays();
             this.expirationDay = String.valueOf(days);
         }else {

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

@@ -189,16 +189,18 @@ public class InsOrdersController extends BaseController {
             insAreaCompanyHistoryVo.setUserName(insOrders.getUsername());
             insAreaCompanyHistoryVo.setUserId(insOrders.getUserid());
             InsFeeOrderNew insFeeOrderNew = insFeeOrderNewMap.get(a.getId());
-            SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
-            insAreaCompanyHistoryVo.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
-            insAreaCompanyHistoryVo.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
-            insAreaCompanyHistoryVo.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
-            insAreaCompanyHistoryVo.setJqExportRadio(subOrderExportFeeVo.getJqExportRadio());
-            insAreaCompanyHistoryVo.setSyExportRadio(subOrderExportFeeVo.getSyExportRadio());
-            insAreaCompanyHistoryVo.setNoExportRadio(subOrderExportFeeVo.getNoExportRadio());
-            insAreaCompanyHistoryVo.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
-                    .add(subOrderExportFeeVo.getSyExportCosts())
-                    .add(subOrderExportFeeVo.getNoExportCosts()));
+            if (!ObjectUtils.isEmpty(insFeeOrderNew)){
+                SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
+                insAreaCompanyHistoryVo.setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
+                insAreaCompanyHistoryVo.setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
+                insAreaCompanyHistoryVo.setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+                insAreaCompanyHistoryVo.setJqExportRadio(subOrderExportFeeVo.getJqExportRadio());
+                insAreaCompanyHistoryVo.setSyExportRadio(subOrderExportFeeVo.getSyExportRadio());
+                insAreaCompanyHistoryVo.setNoExportRadio(subOrderExportFeeVo.getNoExportRadio());
+                insAreaCompanyHistoryVo.setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                        .add(subOrderExportFeeVo.getSyExportCosts())
+                        .add(subOrderExportFeeVo.getNoExportCosts()));
+            }
             // 设置评分信息
             insAreaCompanyHistoryVo.setRatingInformation();
             return insAreaCompanyHistoryVo;

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

@@ -64,6 +64,7 @@ public class QrCodeController {
             String qrCodeUrl = "";
             //是否是太平洋保险 大家财险
             if ("TPIC1000000".equals(insAreaCompany.getCompanyId()) || "DJPC1000000".equals(insAreaCompany.getCompanyId())
+                    || ("CHAC1000000").equals(insAreaCompany.getCompanyId())
                     || ("HTIC1000000".equals(insAreaCompany.getCompanyId()) && PtlApiType.PTL_API_2.getCode() == insAreaCompany.getApiType())) {
                 qrCodeUrl = insAreaCompany.getPaymentLink();
             } else {

src/main/java/com/ydtech/modules/order/entity/vo/SubOrderExportFeeVo.java

@@ -28,4 +28,13 @@ public class SubOrderExportFeeVo {
 
     @ApiModelProperty("非车出口比例")
     private BigDecimal noExportRadio;
+
+    public SubOrderExportFeeVo(){
+        this.jqExportCosts = BigDecimal.ZERO;
+        this.syExportCosts = BigDecimal.ZERO;
+        this.noExportCosts = BigDecimal.ZERO;
+        this.jqExportRadio = BigDecimal.ZERO;
+        this.syExportRadio = BigDecimal.ZERO;
+        this.noExportRadio = BigDecimal.ZERO;
+    }
 }

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

@@ -338,6 +338,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         InsOrders insOrders1 = baseMapper.selectById(quoteInfoVo.getOrderNo());
 
+        // 代课录单操作
+        Integer entryStatus = Optional.ofNullable(insOrders1)
+                .map(InsOrders::getEntryStatus)
+                .orElse(null);
+
+        if (ObjectUtils.isEmpty(entryStatus)) {
+            insOrders.setUpEntryStatus(daikeFlag);
+        } else {
+            insOrders.setEntryStatus(insOrders1.getEntryStatus());
+        }
+
         // 2.1 查看是否有订单   如果存在订单 则更新订单后 直接返回
         //一个月内的订单
         LocalDateTime now = LocalDateTime.now();
@@ -347,6 +358,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .eq(InsOrders::getProductid,quoteInfoVo.getProductId())
                 .eq(InsOrders::getLicenseno,quoteInfoVo.getCarInfo().getLicenseNo())
                 .eq(InsOrders::getUserid,quoteInfoVo.getUserId())
+                .eq(InsOrders::getEntryStatus,insOrders.getEntryStatus())
                 .ge(InsOrders::getCreatetime, oneMonthAgo)
                 .le(InsOrders::getCreatetime, now));
 
@@ -363,16 +375,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             return newOrders;
         }
 
-        // 代课录单操作
-        Integer entryStatus = Optional.ofNullable(insOrders1)
-                .map(InsOrders::getEntryStatus)
-                .orElse(null);
 
-        if (ObjectUtils.isEmpty(entryStatus)) {
-            insOrders.setUpEntryStatus(daikeFlag);
-        } else {
-            insOrders.setEntryStatus(insOrders1.getEntryStatus());
-        }
 
         //需要赋值代录单人ID
         if (ObjectUtils.isEmpty(insOrders1)) {

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

@@ -24,9 +24,9 @@
     </sql>
     <select id="getProductList" resultType="com.ydtech.modules.admin.model.po.SysChannelGroup">
         SELECT
-        a.id,
+        b.id,
         b.costs_description as costsDescription,
-        b.product_name as productName
+        c.agreement_name as agreementName
         FROM sys_channel_cost_relation AS a
         LEFT JOIN ptl_agreement_product_costs_new AS b on a.cost_id = b.id
         LEFT JOIN ptl_agreement as c on b.agreement_id = c.id

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

@@ -1240,7 +1240,7 @@
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "closeRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( iac.orderstatus ) AS "contributionRate",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) / COUNT( iac.orderstatus ) AS "quotationRate",
-        COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder"
+        COUNT( CASE WHEN ifa.auditstatus = 1 THEN 1 END ) AS "auditOrder"
         FROM
         ins_area_company iac
         LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
@@ -2275,14 +2275,14 @@
         pa.partner_companies_id,
         pa.insurance_company AS "insuranceCompanyName",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS qutationCount,
-        COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCount,
+        COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) AS underwritingCountRate,
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) AS qutationInsureCount,
         COUNT( CASE WHEN iac.orderstatus = 4 THEN 1 END ) AS underwritingReturn,
         COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "passingRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) AS "closeRate",
         COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) / COUNT( iac.orderstatus ) AS "contributionRate",
         COUNT( CASE WHEN iac.orderstatus = 0 THEN 1 END ) / COUNT( iac.orderstatus ) AS "quotationRate",
-        COUNT( CASE WHEN ifa.auditstatus = 0 THEN 1 END ) AS "auditOrder"
+        COUNT( CASE WHEN ifa.auditstatus = 1 THEN 1 END ) AS "auditOrder"
         FROM
         ins_area_company iac
         LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id