common/src/main/java/com/jpsoft/employment/modules/base/dao/WorkOrderDAO.java

@@ -26,6 +26,8 @@ public interface WorkOrderDAO {
 
 	List<WorkOrder> searchMobile(Map<String, Object> searchParams, List<Sort> sortList);
 
+	List<WorkOrder> searchMobile2(Map<String, Object> searchParams, List<Sort> sortList);
+
 	List<WorkOrder> search(Map<String, Object> searchParams, List<Sort> sortList);
 
 	Map countByCustomerId(@Param("searchParams") Map<String, Object> searchParams);

common/src/main/java/com/jpsoft/employment/modules/base/service/WorkOrderService.java

@@ -24,6 +24,7 @@ public interface WorkOrderService {
 	WorkOrderAllDataDTO getDtoList(WorkOrder workOrder);
 	Page<WorkOrder> pageSearchMobile(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	Page<WorkOrder> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
+	Page<WorkOrder> pageSearchMobile2(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	Map countByCustomerId(Map<String, Object> searchParams);
 	Integer countByTechnicianId(Map<String, Object> searchParams);
 

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.java

@@ -583,6 +583,15 @@ public class WorkOrderServiceImpl implements WorkOrderService {
         return page;
     }
 
+    @Override
+    public Page<WorkOrder> pageSearchMobile2(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
+        Page<WorkOrder> page = PageHelper.startPage(pageNumber, pageSize, count).doSelectPage(() -> {
+            workOrderDAO.searchMobile2(searchParams, sortList);
+        });
+
+        return page;
+    }
+
 
     @Override
     public Map countByCustomerId(Map<String, Object> searchParams) {

common/src/main/resources/mapper/base/WorkOrder.xml

@@ -258,7 +258,37 @@
 			${sort.name} ${sort.order}
 		</foreach>
 	</select>
-
+	<select id="searchMobile2" parameterType="hashmap" resultMap="WorkOrderMap">
+		<![CDATA[
+			select a.* from base_work_order a
+			left join base_receive_require b
+			on a.id_ = b.work_order_id
+		]]>
+		<where>
+			a.del_flag = false
+			<if test="searchParams.status != null">
+				<if test="searchParams.status == 1">
+					and ((a.technician_id = #{searchParams.technicianId} and b.order_model = '1')
+					or b.order_model = '2')
+				</if>
+				<if test="searchParams.status != 1">
+					and a.status_ = #{searchParams.status}
+					<if test="searchParams.technicianId != null">
+						and a.technician_id = #{searchParams.technicianId}
+					</if>
+				</if>
+			</if>
+			<if test="searchParams.key != null">
+				and (a.title_ like #{searchParams.key} or a.address_ like #{searchParams.key})
+			</if>
+			<if test="searchParams.date != null">
+				and a.create_time = #{searchParams.date}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 	<select id="searchMobile" parameterType="hashmap" resultMap="WorkOrderMap">
 		<![CDATA[
 			select * from base_work_order

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java

@@ -140,7 +140,7 @@ public class WorkOrderApiController {
             @ApiImplicitParam(name = "date", paramType = "query", required = false, value = "日期（yyyy-MM-dd）"),
     })
     public MessageResult<Map> list(
-            String status, String key, String technicianId, String date,
+            String status, String key, String technicianId, String date,String token,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize){
         MessageResult<Map> msgResult = new MessageResult<>();
@@ -148,7 +148,7 @@ public class WorkOrderApiController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
         if (StringUtils.isNotEmpty(status)) {
             searchParams.put("status",status);
@@ -166,7 +166,7 @@ public class WorkOrderApiController {
             searchParams.put("date",date+"%");
         }
 
-        Page<WorkOrder> page = workOrderService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<WorkOrder> page = workOrderService.pageSearchMobile2(searchParams,pageIndex,pageSize,true,sortList);
         for(WorkOrder workOrder : page.getResult()) {
             String statusName = dataDictionaryService.findNameByCatalogNameAndValue("工单状态",workOrder.getStatus());
             workOrder.setStatusName(statusName);