需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -97,6 +97,7 @@ public class OrderBaseLogic {
         if (zfireParamBean.getParamValue("a.order_status") instanceof String) {
             String paramValue = (String) zfireParamBean.getParamValue("a.order_status");
             if (StringUtils.equals(paramValue, OrderBaseStatusEnum.YCD.getKey()) || StringUtils.equals(paramValue, OrderBaseStatusEnum.DYY.getKey())
+                    || StringUtils.equals(paramValue, OrderBaseStatusEnum.DJD.getKey())
                     || StringUtils.equals(paramValue, "PJSQZ") || StringUtils.equals(paramValue, "PJYDH") || StringUtils.equals(paramValue, "PJYQX")) {
                 zfireParamBean.removeParam("a.order_status");
 

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -325,9 +325,9 @@
           <if test="ex.orderSmallType != null and ex.orderSmallType !=''">
               and a.order_small_type = #{ex.orderSmallType}
           </if>
-        <if test="ex.orderStatus != null and ex.orderStatus.key !='YCD'.toString() and ex.orderStatus.key !='DYY'.toString() and ex.orderStatus.key !='PJSQZ'.toString() and ex.orderStatus.key !='PJYDH'.toString() and ex.orderStatus.key !='PJYQX'.toString()">
+      <!--  <if test="ex.orderStatus != null and ex.orderStatus.key !='YCD'.toString() and ex.orderStatus.key !='DYY'.toString() and ex.orderStatus.key !='PJSQZ'.toString() and ex.orderStatus.key !='PJYDH'.toString() and ex.orderStatus.key !='PJYQX'.toString()">
             and a.order_status = #{ex.orderStatus.key}
-        </if>
+        </if>-->
         <if test="ex.orderStatus != null and ex.orderStatus.key =='YCD'.toString()">
             and a.is_exception =1 and a.order_status NOT IN ('YWG','YWGO','YJS')
         </if>
@@ -336,6 +336,9 @@
             'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
             )
         </if>
+        <if test="ex.orderStatus != null and ex.orderStatus.key =='DJD'.toString()">
+            and a.is_meet =0 or a.order_status  IN ('DJD')
+        </if>
         <if test="ex.partsApplyStatus != null and ex.partsApplyStatus =='PJSQZ'.toString()">
             and a.id in(select order_base_id from websit_parts_apply where `status` = 'ING')
         </if>