工单详情的领导批示分为领导批示和市长指示

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -638,6 +638,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int smalltype = RequestString.GetInt("smalltype", 0);
             int sourcearea = RequestString.GetInt("sourcearea", 0);
             int deptid = RequestString.GetInt("deptid", 0);
+            int issatisfie = RequestString.GetInt("issatisfie", -1);//0不满意 1满意
 
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
@@ -650,6 +651,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (strstate.Trim() != "" && strstate != "undefined")
                     {
                         sql += " and F_WorkState = '" + strstate.Trim() + "' ";
+                        if (strstate.Trim() == "7" && issatisfie != -1)
+                        {
+                            sql += "  and F_WorkOrderID in (select F_WorkOrderID from T_Bus_VisitResult where F_State=1 and F_IsDelete=0 ";
+                            sql += "  and F_IsSatisfie='" + issatisfie + "')";
+                        }
                     }
                     else
                     {
@@ -2840,7 +2846,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     string dbsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_DeptId) as DeptName "
                                     + "from T_Bus_RemindRecord where F_Type=1 and F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
                     string pssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
-                                    + "from T_Bus_SubmitSuper where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
+                                    + "from T_Bus_SubmitSuper where F_State=1 and F_IsDelete=0 and F_Type=1 and F_WorkOrderId ='" + strworkorderid + "'";
+                    string zssql = "select *,dbo.GetUserName(F_CreateUser) as UserName "
+                                    + "from T_Bus_SubmitSuper where F_State=1 and F_IsDelete=0 and F_Type=2 and F_WorkOrderId ='" + strworkorderid + "'";
                     string jbsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_MainDeptId) as DeptName,dbo.GetDeptNames(F_OtherDeptIds) as OtherDeptName "
                                     + "from T_Bus_AssignedInfo where F_State=1 and F_IsDelete=0 and F_WorkOrderId ='" + strworkorderid + "'";
                     string thsql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDeptName(F_CreateDeptId) as DeptName "
@@ -2893,6 +2901,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     #endregion
 
+                    #region 指示信息
+                    var zsdt = DbHelperSQL.Query(zssql).Tables[0];
+                    if (configfj != null)
+                    {
+                        zsdt = BindFileData(zsdt, configfj.F_ParamValue);
+                    }
+                    #endregion
+
                     #region 督办信息
                     var dbdt = DbHelperSQL.Query(dbsql).Tables[0];
                     if (configfj != null)
@@ -3027,6 +3043,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         data = dt,
                         jcdata = jcdt,
                         psdata = psdt,
+                        zsdata = zsdt,
                         dbdata = dbdt,
                         jbdata = jbdt,
                         thdata = thdt,