|
|
@@ -131,16 +131,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
131
|
131
|
{
|
|
132
|
132
|
if (zdpy>0)
|
|
133
|
133
|
{
|
|
134
|
|
- sql += "and datediff(day,F_CreateTime,getdate() )>15 and F_WorkState = 9 and F_CloseTime is not null " +
|
|
|
134
|
+ sql += " and datediff(day,F_CreateTime,getdate() )>15 and F_WorkState = 9 and F_CloseTime is not null " +
|
|
135
|
135
|
"and F_WorkOrderId not in (select WorkOrderId from PublicComment )";
|
|
136
|
136
|
}
|
|
137
|
137
|
else if (smpy > 0)
|
|
138
|
138
|
{
|
|
139
|
|
- sql += "and F_WorkOrderId in (select WorkOrderId from PublicComment ) ";
|
|
|
139
|
+ sql += " and F_WorkOrderId in (select WorkOrderId from PublicComment ) ";
|
|
140
|
140
|
}
|
|
141
|
141
|
else
|
|
142
|
142
|
{
|
|
143
|
|
- sql += "(and (datediff(day,F_CreateTime,getdate() )>15 and F_WorkState = 9 and F_CloseTime is not null) or F_WorkOrderId in (select WorkOrderId from PublicComment )) ";
|
|
|
143
|
+ sql += " and ((datediff(day,F_CreateTime,getdate() )>15 and F_WorkState = 9 and F_CloseTime is not null) or F_WorkOrderId in (select WorkOrderId from PublicComment )) ";
|
|
144
|
144
|
}
|
|
145
|
145
|
}
|
|
146
|
146
|
string ComTitle = HttpUtility.UrlDecode(RequestString.GetQueryString("ComTitle"));
|
|
|
@@ -240,8 +240,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
240
|
240
|
if (keyid != 0)
|
|
241
|
241
|
{
|
|
242
|
242
|
sqlwhere = " INNER JOIN[GetValueId]('"+ keyid + "') Value on a.F_Key = Value.F_ValueId";
|
|
243
|
|
- //sql += "and (F_Key IN( SELECT F_ValueId from [GetValueId]('"+ keyid + "'))" +
|
|
244
|
|
- // " or F_Key='" + keyid + "' )";
|
|
245
|
243
|
value= " INNER JOIN[GetValueId]('" + keyid + "') Value on wo.F_Key = Value.F_ValueId";
|
|
246
|
244
|
|
|
247
|
245
|
}
|
|
|
@@ -7234,12 +7232,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7234
|
7232
|
string workorderid = RequestString.GetFormString("workorderid");
|
|
7235
|
7233
|
Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
|
|
7236
|
7234
|
string result = RequestString.GetFormString("result");
|
|
|
7235
|
+ string flies = RequestString.GetFormString("flies");
|
|
7237
|
7236
|
var modelT_Bus_Feedback_Nexts= new BLL.T_Bus_Feedback_Next()
|
|
7238
|
7237
|
.GetModelList("F_WorkOrderId='" + workorderid + "' and F_IsDelete = 0 order by F_CreateTime desc");
|
|
7239
|
7238
|
if (modelT_Bus_Feedback_Nexts != null&& modelT_Bus_WorkOrder!=null && modelT_Bus_Feedback_Nexts.Count >0)
|
|
7240
|
7239
|
{
|
|
7241
|
7240
|
string message = modelT_Bus_Feedback_Nexts[0].F_Result;
|
|
7242
|
7241
|
modelT_Bus_Feedback_Nexts[0].F_Result = result;//反馈内容
|
|
|
7242
|
+ modelT_Bus_Feedback_Nexts[0].F_File = flies;
|
|
7243
|
7243
|
bool n = new BLL.T_Bus_Feedback_Next().Update(modelT_Bus_Feedback_Nexts[0]);
|
|
7244
|
7244
|
Model.T_Bus_Operation oper = new Model.T_Bus_Operation();
|
|
7245
|
7245
|
oper.F_WorkOrderId = workorderid;
|
|
|
@@ -14930,7 +14930,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
14930
|
14930
|
if(modelT_Bus_WorkOrder.F_IsRelease ==3)
|
|
14931
|
14931
|
return Error(modelT_Bus_WorkOrder.F_WorkOrderId +"工单已被设置为子工单不能设置为主工单");
|
|
14932
|
14932
|
string[] orderlist = subworkorderid.Split(',');
|
|
14933
|
|
- if (subworkorderid.Contains(subworkorderid))
|
|
|
14933
|
+ if (subworkorderid.Contains(workorderid))
|
|
14934
|
14934
|
{
|
|
14935
|
14935
|
return Error("主工单不能出现在子工单中");
|
|
14936
|
14936
|
}
|