修改查询条件bug修改

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

@@ -1178,6 +1178,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Page<ExportExpenditureTypeDetalsDto> page = new Page<>(myInsuranceQueryDto.getPageNum(),
                 myInsuranceQueryDto.getPageSize());
         List<String> userList = getStrings(myInsuranceQueryDto);
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getStartDate())){
+            myInsuranceQueryDto.setStartDate(myInsuranceQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getEndDate())){
+            myInsuranceQueryDto.setEndDate(myInsuranceQueryDto.getEndDate()+" 23:59:59");
+        }
         Page<ExportExpenditureTypeDetalsDto> pageList=insFeeOrderNewService.findMyInsuranceByUserId(page,myInsuranceQueryDto,userList);
 
         BasePageResult<ExportExpenditureTypeDetalsDto> result = new BasePageResult<>(myInsuranceQueryDto.getPageNum(), myInsuranceQueryDto.getPageSize(), pageList.getTotal(),
@@ -1215,6 +1222,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     public BasePageResult<ExportExpenditureTypeDetalsTGDto> findMyInsuranceTGByUserId(MyInsuranceTgQueryDto myInsuranceTgQueryDto) {
         Page<ExportExpenditureTypeDetalsTGDto> page = new Page<>(myInsuranceTgQueryDto.getPageNum(),
                 myInsuranceTgQueryDto.getPageSize());
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getStartDate())){
+            myInsuranceTgQueryDto.setStartDate(myInsuranceTgQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getEndDate())){
+            myInsuranceTgQueryDto.setEndDate(myInsuranceTgQueryDto.getEndDate()+" 23:59:59");
+        }
         Page<ExportExpenditureTypeDetalsTGDto> pageList=insFeeOrderNewService.findMyInsuranceTGByUserId(page,myInsuranceTgQueryDto);
         BasePageResult<ExportExpenditureTypeDetalsTGDto> result = new BasePageResult<>(myInsuranceTgQueryDto.getPageNum(), myInsuranceTgQueryDto.getPageSize(), pageList.getTotal(),
                 pageList.getPages()
@@ -1230,6 +1244,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public List<ExportExpenditureTypeDetalsDto> exportMyInsuranceByUserId(MyInsuranceQueryDto myInsuranceQueryDto) {
         List<String> userList = getStrings(myInsuranceQueryDto);
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getStartDate())){
+            myInsuranceQueryDto.setStartDate(myInsuranceQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getEndDate())){
+            myInsuranceQueryDto.setEndDate(myInsuranceQueryDto.getEndDate()+" 23:59:59");
+        }
         return insFeeOrderNewService.exportMyInsuranceByUserId(myInsuranceQueryDto,userList);
     }
     /**
@@ -1240,6 +1261,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
      */
     @Override
     public List<ExportExpenditureTypeDetalsTGDto> exportMyInsuranceTGByUserId(MyInsuranceTgQueryDto myInsuranceTgQueryDto) {
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getStartDate())){
+            myInsuranceTgQueryDto.setStartDate(myInsuranceTgQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getEndDate())){
+            myInsuranceTgQueryDto.setEndDate(myInsuranceTgQueryDto.getEndDate()+" 23:59:59");
+        }
         return insFeeOrderNewService.exportMyInsuranceTGByUserId(myInsuranceTgQueryDto);
     }
     /**

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

@@ -988,7 +988,7 @@
             AND  o.userid =  #{vo.userDLId}
         </if>
         <if test="vo.userDLName!=null and  vo.userDLName!= ''">
-            AND  o.username=  #{vo.orderNo}
+            AND  o.username=  #{vo.userDLName}
         </if>
         <if test="vo.licenseNo!=null and  vo.licenseNo!= ''">
             AND o.licenseno =  #{vo.licenseNo}
@@ -1030,7 +1030,7 @@
             AND  o.userid =  #{vo.userDLId}
         </if>
         <if test="vo.userDLName!=null and  vo.userDLName!= ''">
-            AND  o.username=  #{vo.orderNo}
+            AND  o.username=  #{vo.userDLName}
         </if>
         <if test="vo.licenseNo!=null and  vo.licenseNo!= ''">
             AND o.licenseno =  #{vo.licenseNo}
@@ -1071,7 +1071,7 @@
             AND  o.userid =  #{vo.userDLId}
         </if>
         <if test="vo.userDLName!=null and  vo.userDLName!= ''">
-            AND  o.username=  #{vo.orderNo}
+            AND  o.username=  #{vo.userDLName}
         </if>
         <if test="vo.licenseNo!=null and  vo.licenseNo!= ''">
             AND o.licenseno =  #{vo.licenseNo}