jzkai 1 vecka sedan
förälder
incheckning
a767768fb4

+ 3 - 0
common/src/main/resources/mapper/base/WorkOrder.xml

@@ -247,6 +247,9 @@
 			<if test="searchParams.technicianId != null">
 				and technician_id = #{searchParams.technicianId}
 			</if>
+			<if test="searchParams.isAppoint == false">
+				and technician_id is null
+			</if>
 			<if test="searchParams.date != null">
 				and create_time like #{searchParams.date}
 			</if>

+ 0 - 1
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java

@@ -326,7 +326,6 @@ public class TechnicianApiController {
             technicianInfo.setIsVerified(false);
             technicianInfo.setUpdateBy(subject);
             technicianInfo.setUpdateTime(new Date());
-            technicianInfo.setIsVerified(false);
 
             int affectCount = technicianInfoService.update(technicianInfo);
 

+ 3 - 0
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java

@@ -152,6 +152,9 @@ public class WorkOrderApiController {
 
         if (StringUtils.isNotEmpty(status)) {
             searchParams.put("status",status);
+            if(status.equals("1")) {
+                searchParams.put("isAppoint",false);
+            }
         }
         if (StringUtils.isNotEmpty(technicianId)) {
             searchParams.put("technicianId",technicianId);