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

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -90,8 +90,8 @@ public class TokenInterceptor {
         notMatchList.add("/order/pingAnApi/payReturn");
 
         notMatchList.add("/sysSys/sysList");//登录2  去除验证
-        notMatchList.add("/pcWebsocket/*");//登录2  去除验证
-        notMatchList.add("/websocket/*");//登录2  去除验证
+        notMatchList.add("/pcWebsocket/*");//pcwebsocket
+        notMatchList.add("/websocket/*");//APPwebsocket
 
         return new SaInterceptor(handler -> {
             // 指定一条 match 规则

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

@@ -23,6 +23,9 @@ public class PcAddressInfoDto {
     @ApiModelProperty(value = "机构来源 全部：null 渠道：1 代理：2")
     private String source;
 
+    @ApiModelProperty(value = "在线状态(0:离线； 1：在线)")
+    private Integer status;
+
 
     @ApiModelProperty(value = "页数")
     private int pageNum;

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

@@ -22,4 +22,7 @@ public class SysGeographyPositionDto {
     @ApiModelProperty(value = "机构来源 全部：null 渠道：1 代理：2")
     private String source;
 
+    @ApiModelProperty(value = "在线状态(0:离线； 1：在线)")
+    private Integer status;
+
 }

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

@@ -21,4 +21,7 @@ public class SysPcAddressDto {
 
     @ApiModelProperty(value = "机构来源 全部：null 渠道：1 代理：2")
     private String source;
+
+    @ApiModelProperty(value = "在线状态(0:离线； 1：在线)")
+    private Integer status;
 }

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

@@ -59,6 +59,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
                 .in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getSource()), SysGeographyPosition::getSource, sysGeographyPositionDto.getSource())
+                .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus())
                 .orderByDesc(SysGeographyPosition::getCreateTime));
         if (list.size() == 0) return new SysGeographyPositionVo();
 
@@ -105,22 +106,27 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
-                .in(SysGeographyPosition::getSource, Arrays.asList("1", "2")));
+                .in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
+                .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
         Long channelNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>()
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
-                .eq(SysGeographyPosition::getSource, 1));
+                .eq(SysGeographyPosition::getSource, 1)
+                .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
         Long proxyNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>()
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
-                .eq(SysGeographyPosition::getSource, 2));
+                .eq(SysGeographyPosition::getSource, 2)
+                .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
         Long onlineNum = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>()
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getProvince()), SysGeographyPosition::getProvince, sysGeographyPositionDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
-                .in(SysGeographyPosition::getSource, Arrays.asList("1", "2")).eq(SysGeographyPosition::getStatus, 1));
+                .in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
+                .eq(sysGeographyPositionDto.getSource() == null, SysGeographyPosition::getStatus, 1)
+                .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
         sysPcAddressNumVo.setAllNum(all);
         sysPcAddressNumVo.setProxyNum(proxyNum);
         sysPcAddressNumVo.setChannelNum(channelNum);
@@ -139,7 +145,8 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getCity()), SysGeographyPosition::getCity, sysGeographyPositionDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getDistrict()), SysGeographyPosition::getDistrict, sysGeographyPositionDto.getDistrict())
                 .in(SysGeographyPosition::getSource, Arrays.asList("1", "2"))
-                .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getSource()), SysGeographyPosition::getSource, sysGeographyPositionDto.getSource()));
+                .eq(StringUtils.isNotEmpty(sysGeographyPositionDto.getSource()), SysGeographyPosition::getSource, sysGeographyPositionDto.getSource())
+                .eq(sysGeographyPositionDto.getSource() != null, SysGeographyPosition::getStatus, sysGeographyPositionDto.getStatus()));
 
         if (CollectionUtil.isEmpty(sysGeographyPositionList)) return regionInfoVos;
 

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

@@ -95,6 +95,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getDistrict()), SysPcAddress::getDistrict, sysPcAddressDto.getDistrict())
                 .in(SysPcAddress::getSource, Arrays.asList("1", "2"))
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getSource()), SysPcAddress::getSource, sysPcAddressDto.getSource())
+                .eq(sysPcAddressDto.getStatus()!=null, SysPcAddress::getStatus, sysPcAddressDto.getStatus())
                 .orderByDesc(SysPcAddress::getOperationTime));
 
         return sysPcAddresses;
@@ -119,23 +120,28 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getProvince()), SysPcAddress::getProvince, sysPcAddressDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getCity()), SysPcAddress::getCity, sysPcAddressDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getDistrict()), SysPcAddress::getDistrict, sysPcAddressDto.getDistrict())
-                .in(SysPcAddress::getSource, Arrays.asList("1", "2")));
+                .in(SysPcAddress::getSource, Arrays.asList("1", "2"))
+                .eq(sysPcAddressDto.getStatus()!=null, SysPcAddress::getStatus, sysPcAddressDto.getStatus()));
         Long channelNum = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>()
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getProvince()), SysPcAddress::getProvince, sysPcAddressDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getCity()), SysPcAddress::getCity, sysPcAddressDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getDistrict()), SysPcAddress::getDistrict, sysPcAddressDto.getDistrict())
-                .eq(SysPcAddress::getSource, 1));
+                .eq(SysPcAddress::getSource, 1)
+                .eq(sysPcAddressDto.getStatus()!=null, SysPcAddress::getStatus, sysPcAddressDto.getStatus()));
         Long proxyNum = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>()
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getProvince()), SysPcAddress::getProvince, sysPcAddressDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getCity()), SysPcAddress::getCity, sysPcAddressDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getDistrict()), SysPcAddress::getDistrict, sysPcAddressDto.getDistrict())
-                .eq(SysPcAddress::getSource, 2));
+                .eq(SysPcAddress::getSource, 2)
+                .eq(sysPcAddressDto.getStatus()!=null, SysPcAddress::getStatus, sysPcAddressDto.getStatus()));
 
         Long onlineNum = sysPcAddressMapper.selectCount(new LambdaQueryWrapper<SysPcAddress>()
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getProvince()), SysPcAddress::getProvince, sysPcAddressDto.getProvince())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getCity()), SysPcAddress::getCity, sysPcAddressDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getDistrict()), SysPcAddress::getDistrict, sysPcAddressDto.getDistrict())
-                .in(SysPcAddress::getSource, Arrays.asList("1", "2")).eq(SysPcAddress::getStatus, 1));
+                .in(SysPcAddress::getSource, Arrays.asList("1", "2"))
+                .eq(sysPcAddressDto.getStatus()==null,SysPcAddress::getStatus, 1)
+                .eq(sysPcAddressDto.getStatus()!=null, SysPcAddress::getStatus, sysPcAddressDto.getStatus()));
 
 
         sysPcAddressNumVo.setAllNum(all);
@@ -155,7 +161,8 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getCity()), SysPcAddress::getCity, sysPcAddressDto.getCity())
                 .eq(StringUtils.isNotEmpty(sysPcAddressDto.getDistrict()), SysPcAddress::getDistrict, sysPcAddressDto.getDistrict())
                 .in(SysPcAddress::getSource, Arrays.asList("1", "2"))
-                .eq(StringUtils.isNotEmpty(sysPcAddressDto.getSource()), SysPcAddress::getSource, sysPcAddressDto.getSource()));
+                .eq(StringUtils.isNotEmpty(sysPcAddressDto.getSource()), SysPcAddress::getSource, sysPcAddressDto.getSource())
+                .eq(sysPcAddressDto.getStatus()!=null, SysPcAddress::getStatus, sysPcAddressDto.getStatus()));
 
         if (CollectionUtil.isEmpty(sysPcAddresses)) return regionInfoVos;
 
@@ -192,6 +199,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
         wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getLat()), SysPcAddress::getLatitude, addressInfoDto.getLat());
         wrapper.in(SysPcAddress::getSource, Arrays.asList("1", "2"));
         wrapper.eq(StringUtils.isNotEmpty(addressInfoDto.getSource()), SysPcAddress::getSource, addressInfoDto.getSource());
+        wrapper.eq(addressInfoDto.getStatus()!=null, SysPcAddress::getStatus, addressInfoDto.getStatus());
         wrapper.orderByDesc(SysPcAddress::getOperationTime);
 
         Page<SysPcAddress> insOrdersPage = page(page, wrapper);

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

@@ -160,7 +160,7 @@ public class OrderQueryVo {
     private Integer leaderId;
 
     @ApiModelProperty("领导人名称")
-    private Integer leaderName;
+    private String leaderName;
 
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){

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

@@ -940,7 +940,7 @@
         <if test="vo.companyId!=null and  vo.companyId!= ''">
             AND iac.company_id =  #{vo.companyId}
         </if>
-
+         order by  iff.audittime  desc
     </sql>
     <select id="findMyInsuranceTGByUserId"
             resultType="com.ydtech.modules.admin.model.dto.ExportExpenditureTypeDetalsTGDto">

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

@@ -1018,10 +1018,10 @@
             </if>
 
             <if test="orderQueryVo.leaderId != null and orderQueryVo.leaderId != ''">
-                and u.leader_id = #{leaderId}
+                and u.leader_id = #{orderQueryVo.leaderId}
             </if>
             <if test="orderQueryVo.leaderName != null and orderQueryVo.leaderName != ''">
-                and u.leader_name = #{leaderName}
+                and u.leader_name = #{orderQueryVo.leaderName}
             </if>
 
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">
@@ -1156,10 +1156,10 @@
             </if>
 
             <if test="orderQueryVo.leaderId != null and orderQueryVo.leaderId != ''">
-                and u.leader_id = #{leaderId}
+                and u.leader_id = #{orderQueryVo.leaderId}
             </if>
             <if test="orderQueryVo.leaderName != null and orderQueryVo.leaderName != ''">
-                and u.leader_name = #{leaderName}
+                and u.leader_name = #{orderQueryVo.leaderName}
             </if>
 
             <if test="orderQueryVo.attachStartDateStr != null and orderQueryVo.attachEndDateStr != ''">