Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud

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<LocalDateTime>  disposeTimes;
 }

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;
+
     /**
      * 状态
      */

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;
+
 }

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<LocalDateTime> disposeTimes;
 
 }

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<LocalDateTime> createTimes;
+
 }

chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysUserMapper.xml

@@ -99,6 +99,11 @@
         <if test="listUser.phone != null and listUser.phone != ''">
             AND u.phone like concat('%', #{listUser.phone} , '%')
         </if>
+        <if test="listUser.createTimes != null">
+            <if test="listUser.createTimes.size() == 2">
+                AND u.create_time between #{listUser.createTimes[0]} and #{listUser.createTimes[1]}
+            </if>
+        </if>
         ${listUser.sqlParam.dataScope}
 
     </select>