1.订单列表

hmit-api/pom.xml

@@ -17,6 +17,24 @@
             <artifactId>hmit-common</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java

@@ -108,7 +108,9 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
     public PageData<PensionOrderDTO> getElderAllOrderOrByStatusPage(Map<String, Object> params, Long creator, Integer status) {
         IPage<PensionOrderEntity> page = getPage(params, Constant.CREATE_DATE, false);
         List<PensionOrderDTO> list = new ArrayList<>();
-        if (status != 6) {
+        if (null == status) {
+            list = pensionOrderDao.getElderAllOrderOrByStatusList(params, creator, status);
+        }else if (status != 6) {
             list = pensionOrderDao.getElderAllOrderOrByStatusList(params, creator, status);
         }else {
             List<PensionOrderDTO> list1 = pensionOrderDao.getElderAllOrderOrByStatusList(params, creator, 1);

hmit-common/src/main/java/io/hmit/common/constant/Constant.java

@@ -204,7 +204,7 @@ public interface Constant {
          */
         WAIT_EVALUATE(4,"待评价"),
         /**
-         * 已接单未派发
+         * 已接单未派发/待完成
          */
         HAND_OUT(5,"已接单未派发");