Browse Source

edit:一张图

release-sy-v1.0.0
“lyd” 1 month ago
parent
commit
dd1bcad489
  1. 6
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java
  2. 2
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java
  3. 8
      shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java

6
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java

@ -41,7 +41,7 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper<SzCheckingProblemV
"<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " + "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " + "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" + "<if test='data.code != null and data.code != \"\"'>" +
"and dike_code = #{data.code} " + "and waga_code = #{data.code} " +
"</if>" + "</if>" +
"<if test='category != null'>" + "<if test='category != null'>" +
"and category = #{category.value} " + "and category = #{category.value} " +
@ -56,7 +56,7 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper<SzCheckingProblemV
"<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " + "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " + "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" + "<if test='data.code != null and data.code != \"\"'>" +
"and dike_code = #{data.code} " + "and waga_code = #{data.code} " +
"</if>" + "</if>" +
"<if test='category != null'>" + "<if test='category != null'>" +
"and category = #{category.value} " + "and category = #{category.value} " +
@ -71,7 +71,7 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper<SzCheckingProblemV
"<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " + "<if test='data.startTime != null'> and xm.create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " + "<if test='data.endTime != null'> and xm.create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" + "<if test='data.code != null and data.code != \"\"'>" +
"and dike_code = #{data.code} " + "and waga_code = #{data.code} " +
"</if>" + "</if>" +
"group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " +
"</script>") "</script>")

2
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java

@ -44,7 +44,7 @@ public interface SzCheckingRecordV2Mapper extends BaseMapper<SzCheckingRecord> {
"<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " + "<if test='data.startTime != null' > and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " + "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" + "<if test='data.code != null and data.code != \"\"'>" +
"and dike_code = #{data.code} " + "and waga_code = #{data.code} " +
"</if>" + "</if>" +
"<if test='category != null'>" + "<if test='category != null'>" +
"and category = #{category.value} " + "and category = #{category.value} " +

8
shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java

@ -3,7 +3,11 @@ package com.kms.yxgh.sz.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.yxgh.common.dto.*; import com.kms.yxgh.common.dto.ApprovalDetailDto;
import com.kms.yxgh.common.dto.ApprovalSearchDto;
import com.kms.yxgh.common.dto.CountDateDto;
import com.kms.yxgh.common.dto.CountDto;
import com.kms.yxgh.common.dto.ObjectStatisticQueDto;
import com.kms.yxgh.sz.domain.SzYhV2; import com.kms.yxgh.sz.domain.SzYhV2;
import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto; import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto;
import com.kms.yxgh.sz.dto.v2.SzYhApproveDto; import com.kms.yxgh.sz.dto.v2.SzYhApproveDto;
@ -45,7 +49,7 @@ public interface SzYhV2Mapper extends BaseMapper<SzYhV2> {
"<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " + "<if test='data.startTime != null'> and create_time &gt;= #{data.startTime} </if> " +
"<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " + "<if test='data.endTime != null'> and create_time &lt;= #{data.endTime} </if> " +
"<if test='data.code != null and data.code != \"\"'>" + "<if test='data.code != null and data.code != \"\"'>" +
"and dike_code = #{data.code} " + "and waga_code = #{data.code} " +
"</if>" + "</if>" +
"group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " +
"</script>") "</script>")

Loading…
Cancel
Save