zhoufan %!s(int64=7) %!d(string=hace) años
padre
commit
30e9d1d1d7

+ 3 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

134
             }
134
             }
135
             string where = " F_IsDelete=0 and datediff(day,F_CreateTime,'" + stime + "')<=0 "
135
             string where = " F_IsDelete=0 and datediff(day,F_CreateTime,'" + stime + "')<=0 "
136
                 + " and datediff(day,F_CreateTime,'" + etime + "')>=0 and F_SmallType=F_DictionaryValueId ";
136
                 + " and datediff(day,F_CreateTime,'" + etime + "')>=0 and F_SmallType=F_DictionaryValueId ";
137
+            string dicwhere = "";
137
             if (!string.IsNullOrEmpty(userModel.groupcode))
138
             if (!string.IsNullOrEmpty(userModel.groupcode))
138
             {
139
             {
139
                 where += " and F_GroupCode = '" + userModel.groupcode + "' ";
140
                 where += " and F_GroupCode = '" + userModel.groupcode + "' ";
141
+                dicwhere += " and F_GroupCode = '" + userModel.groupcode + "' ";
140
             }
142
             }
141
             string sql = " select F_Name TypeName,(select COUNT(1) from T_Bus_WorkOrder where " + where
143
             string sql = " select F_Name TypeName,(select COUNT(1) from T_Bus_WorkOrder where " + where
142
-                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='TSLX' and F_State=1 ";
144
+                + " ) Count from dbo.T_Sys_DictionaryValue where F_DictionaryFlag='TSLX' and F_State=1 "+ dicwhere;
143
 
145
 
144
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
146
             DataTable dt = DbHelperSQL.Query(sql).Tables[0];
145
 
147
 

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

274
             if (!string.IsNullOrEmpty(strworkorderid))
274
             if (!string.IsNullOrEmpty(strworkorderid))
275
             {
275
             {
276
                 string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,"
276
                 string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_Type) as TypeName,dbo.GetDictionaryName(F_SmallType) as SmallTypeName,"
277
-                    + "dbo.GetDictionaryName(F_Source) as SourceName  from T_Bus_WorkOrder where F_WorkOrderId ='" + strworkorderid + "'";
277
+                    + "dbo.GetDictionaryName(F_ProductType) as ProductTypeName,dbo.GetDictionaryName(F_Source) as SourceName  from T_Bus_WorkOrder where F_WorkOrderId ='" + strworkorderid + "'";
278
                 var dt = DbHelperSQL.Query(sql).Tables[0];
278
                 var dt = DbHelperSQL.Query(sql).Tables[0];
279
                 if (dt.Rows.Count > 0)
279
                 if (dt.Rows.Count > 0)
280
                 {
280
                 {