1550076451 3 vuotta sitten
vanhempi
commit
93487e1187

+ 5 - 2
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -157,6 +157,9 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
157 157
                     sql += $" and datediff(day,F_CreateTime,'" + endtime + "')>=0";
158 158
                 if (state >= 0)
159 159
                 {
160
+                    if (state ==1)
161
+                        sql += $" and F_State in(2,4)";
162
+                    else 
160 163
                    sql += $" and F_State=" + state;
161 164
                 }
162 165
                 if (carname.Trim() != "" && carname != "undefined")
@@ -167,11 +170,11 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
167 170
               
168 171
                 if (User .F_RoleCode =="SJ")
169 172
                 {
170
-                    sql += $" and F_DriverCode = '{driverName}'";
173
+                    sql += $" and F_DriverCode = '{User .F_UserCode }'";
171 174
                 }
172 175
                 else if (User.F_RoleCode != "GLY")
173 176
                 {
174
-                    sql += $" and   F_CreateUser= '{driverName}'";
177
+                    sql += $" and   F_CreateUser= '{User.F_UserCode}'";
175 178
                 }
176 179
                 if (WorkOrderCode.Trim() != "" && WorkOrderCode != "undefined")
177 180
                     sql += $" and F_WorkOrderID like '%{WorkOrderCode}%'";