Explorar el Código

添加设备 信息同步到字典表

liyuanyuan %!s(int64=3) %!d(string=hace) años
padre
commit
881a40ba73

+ 12 - 6
RMYY_CallCenter_Api.Dal/T_IntegratedScheduling_Base.cs

@@ -64,9 +64,9 @@ namespace RMYY_CallCenter_Api.DAL
64 64
 		{
65 65
 			StringBuilder strSql=new StringBuilder();
66 66
 			strSql.Append("insert into T_IntegratedScheduling_Base(");
67
-			strSql.Append("F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId)");
67
+			strSql.Append("F_WorkOrderCode,F_WorkOrderCategory,F_Content,F_Applicant,F_ApplicationDept,F_Phone,F_Location,F_ToPlace,F_WorkOrderState,F_DealMan,F_DealDept,F_ReplayCount,F_RemindCount,F_CallId,F_CallRecordId,F_AssignTime,F_AssignUser,F_Endtime,F_Deadline,F_UpdateTime,F_CreateTime,F_CreateUser,F_CreateUserDept,F_File,F_IsDelete,F_LeaveRecordId,F_CFNum)");
68 68
 			strSql.Append(" values (");
69
-			strSql.Append("@F_WorkOrderCode,@F_WorkOrderCategory,@F_Content,@F_Applicant,@F_ApplicationDept,@F_Phone,@F_Location,@F_ToPlace,@F_WorkOrderState,@F_DealMan,@F_DealDept,@F_ReplayCount,@F_RemindCount,@F_CallId,@F_CallRecordId,@F_AssignTime,@F_AssignUser,@F_Endtime,@F_Deadline,@F_UpdateTime,@F_CreateTime,@F_CreateUser,@F_CreateUserDept,@F_File,@F_IsDelete,@F_LeaveRecordId)");
69
+			strSql.Append("@F_WorkOrderCode,@F_WorkOrderCategory,@F_Content,@F_Applicant,@F_ApplicationDept,@F_Phone,@F_Location,@F_ToPlace,@F_WorkOrderState,@F_DealMan,@F_DealDept,@F_ReplayCount,@F_RemindCount,@F_CallId,@F_CallRecordId,@F_AssignTime,@F_AssignUser,@F_Endtime,@F_Deadline,@F_UpdateTime,@F_CreateTime,@F_CreateUser,@F_CreateUserDept,@F_File,@F_IsDelete,@F_LeaveRecordId,@F_CFNum)");
70 70
 			strSql.Append(";select @@IDENTITY");
71 71
 			SqlParameter[] parameters = {
72 72
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -95,7 +95,8 @@ namespace RMYY_CallCenter_Api.DAL
95 95
 					new SqlParameter("@F_File", SqlDbType.NVarChar,500),
96 96
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
97 97
                     
98
-                    new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4)
98
+                    new SqlParameter("@F_LeaveRecordId", SqlDbType.Int,4),
99
+                    new SqlParameter("@F_CFNum", SqlDbType.Int,4)
99 100
             };
100 101
 			parameters[0].Value = model.F_WorkOrderCode;
101 102
 			parameters[1].Value = model.F_WorkOrderCategory;
@@ -123,7 +124,7 @@ namespace RMYY_CallCenter_Api.DAL
123 124
 			parameters[23].Value = model.F_File;
124 125
 			parameters[24].Value = model.F_IsDelete;
125 126
             parameters[25].Value = model.F_LeaveRecordId;
126
-
127
+            parameters[26].Value = model.F_CFNum;
127 128
 
128 129
             object obj = DbHelperSQL.GetSingle(strSql.ToString(),parameters);
129 130
 			if (obj == null)
@@ -167,9 +168,12 @@ namespace RMYY_CallCenter_Api.DAL
167 168
 			strSql.Append("F_CreateUserDept=@F_CreateUserDept,");
168 169
 			strSql.Append("F_File=@F_File,");
169 170
 			strSql.Append("F_IsDelete=@F_IsDelete,");
170
-            strSql.Append("F_Score=@F_Score");
171
+            strSql.Append("F_Score=@F_Score,");
172
+            strSql.Append("F_CFNum=@F_CFNum");
171 173
             
172 174
 
175
+
176
+
173 177
             strSql.Append(" where F_WorkOrderId=@F_WorkOrderId");
174 178
 			SqlParameter[] parameters = {
175 179
 					new SqlParameter("@F_WorkOrderCode", SqlDbType.NVarChar,100),
@@ -198,6 +202,7 @@ namespace RMYY_CallCenter_Api.DAL
198 202
 					new SqlParameter("@F_File", SqlDbType.NVarChar,500),
199 203
 					new SqlParameter("@F_IsDelete", SqlDbType.Int,4),
200 204
                     new SqlParameter("@F_Score", SqlDbType.Int,4),
205
+                    new SqlParameter("@F_CFNum", SqlDbType.Int,4),
201 206
                     
202 207
 
203 208
                     new SqlParameter("@F_WorkOrderId", SqlDbType.Int,4)};
@@ -228,7 +233,8 @@ namespace RMYY_CallCenter_Api.DAL
228 233
 			parameters[24].Value = model.F_IsDelete;
229 234
 
230 235
             parameters[25].Value = model.F_Score;
231
-            parameters[26].Value = model.F_WorkOrderId;
236
+            parameters[26].Value = model.F_CFNum;
237
+            parameters[27].Value = model.F_WorkOrderId;
232 238
 
233 239
 			int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
234 240
 			if (rows > 0)

+ 8 - 2
RMYY_CallCenter_Api.Model/T_IntegratedScheduling_Base.cs

@@ -54,9 +54,15 @@ namespace RMYY_CallCenter_Api.Model
54 54
 		private int? _f_isdelete;
55 55
         private int? _f_leaverecordid;
56 56
         private int? _f_score;
57
-       
57
+        private int? _f_cfnum;
58 58
 
59
-     public int? F_Score
59
+        public int? F_CFNum
60
+        {
61
+            set { _f_cfnum = value; }
62
+            get { return _f_cfnum; }
63
+        }
64
+
65
+        public int? F_Score
60 66
         {
61 67
             set { _f_score = value; }
62 68
             get { return _f_score; }

+ 1 - 1
RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -481,7 +481,7 @@ namespace RMYY_CallCenter_Api
481 481
                 case MENUENUM.报修列表:
482 482
                     strArr = new List<string> { "待提交", "-", "待接单", "待完成", "已完成", "已完成", "已完成", "已接单" }; break;
483 483
                 case MENUENUM.调度工单列表:
484
-                    strArr = new List<string> { "待提交", "待指派", "待接单", "待完成", "已完成", "已完成" }; break;
484
+                    strArr = new List<string> { "待提交", "待指派", "待接单", "待完成", "待评价", "已完成" }; break;
485 485
                 default: break;
486 486
             }
487 487
             int index = typeIdArray.IndexOf(state);

+ 12 - 3
RMYY_CallCenter_Api/Controllers/EquipmentController.cs

@@ -65,9 +65,18 @@ namespace RMYY_CallCenter_Api.Controllers
65 65
             equipModel.F_EquipPrice = equipprice;
66 66
             equipModel.F_CreateTime = DateTime.Now;
67 67
             equipModel.F_CreateUser =User.F_UserCode;
68
-            if (equipbll.Add(equipModel)>0)
69
-           
70
-            return Success("设备添加成功");
68
+            if (equipbll.Add(equipModel) > 0)
69
+            {
70
+                Model.T_Sys_DictionaryValue dvmodel = new Model.T_Sys_DictionaryValue();
71
+                dvmodel.F_DictionaryFlag = "SBXX";
72
+                dvmodel.F_Name = equipname;
73
+                dvmodel.F_State = true;
74
+                dvmodel.F_Sort = 0;
75
+                Bll.T_Sys_DictionaryValue dvbll = new Bll.T_Sys_DictionaryValue();
76
+                dvbll.Add(dvmodel);
77
+                return Success("设备添加成功");
78
+            }
79
+
71 80
             else
72 81
                 return Error("设备添加失败");
73 82
         }

+ 120 - 4
RMYY_CallCenter_Api/Controllers/SchedulingController.cs

@@ -175,7 +175,7 @@ namespace RMYY_CallCenter_Api.Controllers
175 175
         /// </summary>
176 176
         /// <param name="input"></param>
177 177
         /// <returns></returns>
178
-        public ActionResult AddSchedulingWorkOrder(T_SchedulingBaseInput input, List<Model.T_IntegratedScheduling_Detail> detailists)
178
+        public ActionResult AddSchedulingWorkOrder(T_SchedulingBaseInput input, List<Model.T_IntegratedScheduling_Detail> detailists,int? cfnum)
179 179
         {
180 180
             if (string.IsNullOrEmpty(input.ApplicationDept))
181 181
             {
@@ -188,7 +188,7 @@ namespace RMYY_CallCenter_Api.Controllers
188 188
 
189 189
             Model.T_IntegratedScheduling_Base model = new Model.T_IntegratedScheduling_Base();
190 190
             model.F_Applicant = input.Applicant;
191
-
191
+            model.F_CFNum = cfnum;
192 192
 
193 193
             model.F_ApplicationDept = input.ApplicationDept.Trim();
194 194
             model.F_Phone = input.Phone;
@@ -660,8 +660,124 @@ namespace RMYY_CallCenter_Api.Controllers
660 660
         #endregion
661 661
 
662 662
         #region 申请人用的是我的工单页面 评价 撤回; 编辑(与综合保障中心共用的编辑接口)
663
-        //撤回(未指派的工单可撤回,工单状态“待提交”)
664
-        public ActionResult MyRetract(string workordercode)
663
+        //申请人列表  app
664
+        public ActionResult MySubmitList()
665
+        {
666
+                string sql = " and F_IsDelete=0 ";
667
+            // 待完成  0  已完成 1
668
+
669
+            string strpageindex = RequestString.GetQueryString("page");
670
+                int pageindex = 1;
671
+                string strpagesize = RequestString.GetQueryString("pagesize");
672
+                int pagesize = 10;
673
+                int listtype = RequestString.GetInt("listtype", 0);
674
+                int dept = RequestString.GetInt("dept", -1);
675
+
676
+                string strname = HttpUtility.UrlDecode(RequestString.GetQueryString("name"));
677
+                string strcategory = HttpUtility.UrlDecode(RequestString.GetQueryString("category"));
678
+                string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
679
+                string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
680
+                string strworkcode = HttpUtility.UrlDecode(RequestString.GetQueryString("workordercode"));
681
+
682
+
683
+                //当前登录人只能看到自己提交的工单
684
+
685
+                sql += " and F_Applicant='" + User.F_UserCode + "'";
686
+
687
+                #region 搜索条件
688
+                if (strpageindex.Trim() != "")
689
+                {
690
+                    pageindex = Convert.ToInt32(strpageindex);
691
+                }
692
+
693
+                if (strpagesize.Trim() != "")
694
+                {
695
+                    pagesize = Convert.ToInt32(strpagesize);
696
+                }
697
+                //if (strcategory.Trim() != "" && strcategory != "undefined")
698
+                //{
699
+                //    sql += " and F_WorkOrderCategory = '" + strcategory + "' ";
700
+                //}
701
+                //if (strname.Trim() != "" && strname != "undefined")
702
+                //{
703
+                //    sql += " and F_Applicant = '" + strname + "' ";
704
+                //}
705
+                //if (dept > -1)
706
+                //{
707
+                //    sql += " and F_ApplicationDept = '" + dept + "' ";
708
+                //}
709
+
710
+                //if (strworkcode.Trim() != "" && strworkcode != "undefined")
711
+                //{
712
+                //    sql += " and F_WorkOrderCode like'%" + strworkcode + "%'";
713
+                //}
714
+
715
+                //if (strstarttime.Trim() != "" && strstarttime != "undefined")
716
+                //{
717
+                //    if (strendtime.Trim() != "" && strendtime != "undefined")
718
+                //    {
719
+                //        sql += " and F_CreateTime  between   '" + strstarttime +
720
+                //                 "' AND  '" + strendtime + "'";
721
+                //    }
722
+                //    else
723
+                //    {
724
+                //        sql += " and F_CreateTime>='" + strstarttime + "' ";
725
+                //    }
726
+                //}
727
+                //else
728
+                //{
729
+                //    if (strendtime.Trim() != "" && strendtime != "undefined")
730
+                //    {
731
+                //        sql += " and F_CreateTime<='" + strendtime + "' ";
732
+                //    }
733
+                //}
734
+                #endregion
735
+
736
+                switch (listtype)
737
+                {
738
+
739
+                    case 0:
740
+                        sql += " and F_WorkOrderState <4";
741
+                        break;
742
+                    case 1:
743
+                        sql += " and  F_WorkOrderState = 4  ";
744
+                        break;
745
+
746
+                }
747
+                int recordCount = 0;
748
+                DataTable datatable = Bll.PagerBll.GetListPager
749
+                                                ("T_IntegratedScheduling_Base ",
750
+                                                  "F_WorkOrderId",
751
+                                                  "*, [dbo].[GetUserName](F_Applicant) Applicant ",
752
+                                                  sql,
753
+                                                  "order by F_WorkOrderId desc",
754
+                                                  pagesize,
755
+                                                  pageindex,
756
+                                                  true,
757
+                                                  out recordCount
758
+                                                );
759
+
760
+
761
+                datatable = WorkOrderBase.SetOtherField(datatable, MENUENUM.调度工单列表, User.F_RoleId, 2000);
762
+
763
+                var obj = new
764
+                {
765
+                    state = "success",
766
+                    message = "成功",
767
+                    rows = datatable,
768
+                    total = recordCount
769
+                };
770
+                return Content(obj.ToJson());
771
+
772
+
773
+
774
+            }
775
+
776
+
777
+
778
+
779
+            //撤回(未指派的工单可撤回,工单状态“待提交”)
780
+            public ActionResult MyRetract(string workordercode)
665 781
         {
666 782
 
667 783
             Model.T_IntegratedScheduling_Base model = baseBll.GetModel(workordercode);