Ver Fonte

提交首页查询bug修改

hxl13994548489 há 2 anos atrás
pai
commit
37c3425efd

+ 7 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -1429,6 +1429,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
      */
     @Override
     public MySumAmountDto findMyAmount(MySumAmountQueryDto mySumAmountQueryDto) {
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(mySumAmountQueryDto.getStartDate())){
+            mySumAmountQueryDto.setStartDate(mySumAmountQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(mySumAmountQueryDto.getEndDate())){
+            mySumAmountQueryDto.setEndDate(mySumAmountQueryDto.getEndDate()+" 23:59:59");
+        }
         //查询预收和实收的总金额
         mySumAmountQueryDto.setAuditstatus("0");
         BigDecimal ysAmount= insFeeOrderNewService.findMyAmountYSOrSSCXAmount(mySumAmountQueryDto);

+ 4 - 4
src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -1102,7 +1102,7 @@
           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.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
          </if>
     </select>
     <select id="findMyAmountYSOrSSTGAmount" resultType="java.math.BigDecimal">
@@ -1121,7 +1121,7 @@
                   AND a.first_level_user_id =  #{vo.userId}
                   and iff.auditstatus = #{vo.auditstatus}
                   <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                        AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                        AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                   </if>
                 UNION
                 SELECT
@@ -1135,7 +1135,7 @@
                   AND a.three_level_user_id = #{vo.userId}
                   and iff.auditstatus = #{vo.auditstatus}
                 <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                    AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                    AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                 </if>
                 UNION
                 SELECT
@@ -1149,7 +1149,7 @@
                   AND a.two_level_user_id = #{vo.userId}
                   and iff.auditstatus = #{vo.auditstatus}
                  <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                    AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                    AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                   </if>
             ) AS fee