Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/constants/enums/dict/ser/AnnualAuditOrderEnum.java

@@ -10,11 +10,11 @@ import lombok.Getter;
 @DictEnum(key = "annualAuditOrderStatus", desc = "年检代办订单状态")
 public enum AnnualAuditOrderEnum implements IBaseEnum {
 
-    UNPAID("101","待支付",0,1),
+    UNPAID("1","待支付",0,1),
 
-    AWAIT_ANNUAL("102","待年检",0,1),
+    AWAIT_ANNUAL("2","待年检",0,1),
 
-    FINISHED("103","订单完成",0,1);
+    FINISHED("3","订单完成",0,1);
 
     // 编号
     private final String code;

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -209,9 +209,6 @@
         RIGHT JOIN ins_area_company iac ON iac.orderno = io.orderno
         WHERE
         iac.orderstatus in (1,2,3)
-        <if test="quTeamNumDto.deptId != null and quTeamNumDto.deptId != ''">
-            and io.deptid = #{quTeamNumDto.deptId}
-        </if>
         <if test="quTeamNumDto.createTimeStart != null">
             and io.createtime &gt;= #{quTeamNumDto.createTimeStart}
         </if>
@@ -293,9 +290,6 @@
         RIGHT JOIN ins_area_company iac ON iac.orderno = io.orderno
         WHERE
         iac.orderstatus in (1,2,3)
-        <if test="quTeamNumDto.deptId != null and quTeamNumDto.deptId != ''">
-            and io.deptid = #{quTeamNumDto.deptId}
-        </if>
         <if test="quTeamNumDto.createTimeStart != null">
             and io.createtime &gt;= #{quTeamNumDto.createTimeStart}
         </if>