diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java index cc18ab4..bef2ced 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/query/ProjectQuery.java @@ -45,4 +45,8 @@ public class ProjectQuery extends CommonParam { */ @Condition(name = "project_effect") private Integer projectEffect; + + @Condition(name = "dispose_time", type = Condition.ConditionType.between) + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN) + private List disposeTimes; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/BankDispatchQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/BankDispatchQuery.java index d0cea17..728c56c 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/BankDispatchQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/dto/BankDispatchQuery.java @@ -18,6 +18,21 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class BankDispatchQuery extends CommonParam { + @Condition(name = "mer_id") + private String merId; + + @Condition(name = "mer_name", type = Condition.ConditionType.like) + private String merName; + + @Condition(name = "term_id") + private String termId; + + @Condition(name = "device_no") + private String deviceNo; + + @Condition(name = "order_status") + private String orderStatus; + /** * 状态 */ diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java index d488dcc..f98bebf 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/ReviewedQuery.java @@ -133,4 +133,10 @@ public class ReviewedQuery extends CommonParam { @Condition(name = "store_id", type = Condition.ConditionType.eq, tableName = "isr") private Long storeId; + @Condition(name = "terminal_source", type = Condition.ConditionType.eq, tableName = "itr") + private Integer terminalSource; + + @Condition(name = "terminal_status", type = Condition.ConditionType.eq, tableName = "itr") + private Integer terminalStatus; + } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java index 4d8cfc1..367f15d 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkDataQuery.java @@ -17,7 +17,7 @@ public class WrkDataQuery extends CommonParam { private String taskName; @Condition(name = "dept_id", tableName = "wi") private Long deptId; - @Condition(name = "dispose_time", tableName = "wi", type = Condition.ConditionType.in) + @Condition(name = "dispose_time", tableName = "wi", type = Condition.ConditionType.between) private List disposeTimes; } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListUserDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListUserDTO.java index 390910b..4fb89ca 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListUserDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListUserDTO.java @@ -4,6 +4,9 @@ import com.chushang.common.mybatis.page.CommonParam; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; +import java.util.List; + /** * by zhaowenyuan create 2022/5/20 17:57 */ @@ -20,4 +23,7 @@ public class ListUserDTO extends CommonParam { private Integer status; private String phone; + + private List createTimes; + } diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysUserMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysUserMapper.xml index 7453d26..184257a 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysUserMapper.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysUserMapper.xml @@ -99,6 +99,11 @@ AND u.phone like concat('%', #{listUser.phone} , '%') + + + AND u.create_time between #{listUser.createTimes[0]} and #{listUser.createTimes[1]} + + ${listUser.sqlParam.dataScope}