优化排班

java110-bean/src/main/java/com/java110/dto/scheduleClassesStaff/ScheduleClassesStaffDto.java

@@ -34,6 +34,8 @@ public class ScheduleClassesStaffDto extends PageDto implements Serializable {
 
     private String curDate;
 
+    private String orgId;
+
     List<ScheduleClassesDayDto> days;
 
     List<ScheduleClassesTimeDto> times;
@@ -164,4 +166,12 @@ public class ScheduleClassesStaffDto extends PageDto implements Serializable {
     public void setTimes(List<ScheduleClassesTimeDto> times) {
         this.times = times;
     }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
 }

java110-db/src/main/resources/mapper/common/WorkflowStepServiceDaoImplMapper.xml

@@ -111,7 +111,7 @@
         <if test="seq !=null and seq != ''">
             and t.seq= #{seq}
         </if>
-        order by t.create_time desc
+        order by t.seq
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

java110-db/src/main/resources/mapper/store/ScheduleClassesStaffV1ServiceDaoImplMapper.xml

@@ -21,7 +21,13 @@
         storeId,t.scs_id,t.scs_id scsId,t.schedule_id,t.schedule_id scheduleId,t.staff_id,t.staff_id staffId,
         t.create_time createTime
         from schedule_classes_staff t
+        <if test="orgId !=null and orgId != ''">
+            left join u_org_staff_rel osr on t.staff_id = osr.staff_id and osr.status_cd = '0'
+        </if>
         where 1 =1
+        <if test="orgId !=null and orgId != ''">
+            and osr.org_id = #{orgId}
+        </if>
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>
@@ -80,7 +86,13 @@
     <select id="queryScheduleClassesStaffsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from schedule_classes_staff t
+        <if test="orgId !=null and orgId != ''">
+            left join u_org_staff_rel osr on t.staff_id = osr.staff_id and osr.status_cd = '0'
+        </if>
         where 1 =1
+        <if test="orgId !=null and orgId != ''">
+            and osr.org_id = #{orgId}
+        </if>
         <if test="staffName !=null and staffName != ''">
             and t.staff_name= #{staffName}
         </if>

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/StaffMonthScheduleClassesCmd.java

@@ -84,6 +84,7 @@ public class StaffMonthScheduleClassesCmd extends Cmd {
         scheduleClassesStaffDto.setPage(reqJson.getIntValue("page"));
         scheduleClassesStaffDto.setRow(reqJson.getIntValue("row"));
         scheduleClassesStaffDto.setStoreId(storeId);
+        scheduleClassesStaffDto.setOrgId(reqJson.getString("orgId"));
 
         int count = scheduleClassesStaffV1InnerServiceSMOImpl.queryScheduleClassesStaffsCount(scheduleClassesStaffDto);