duhongyu hace 5 meses
padre
commit
63cb52b186

+ 3 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -45,9 +45,9 @@
45 45
   <!--应用的access_token-->
46 46
   <add key="WeiBoAccessToken" value="2.00VbCStC01bkzx7bc0709d60OZTfkC" />
47 47
   <!-- ================== 5:Redis配置 ================== -->
48
-  <add key="Redis_Server" value="192.168.8.20"/>
48
+  <add key="Redis_Server" value="192.168.1.200"/>
49 49
   <add key="Redis_Port" value="6379"/>
50
-  <add key="Redis_Defaultdatabase" value="5"/>
50
+  <add key="Redis_Defaultdatabase" value="8"/>
51 51
   <!-- ================== 6:商丘市政务服务网和12345系统对接接口-添加工单 ================== -->
52 52
   <add key="SecurityCode" value="shangqiu12345%#@6" />
53 53
   <add key="ReplyInfoUrl" value="http://wszw.shangqiu.gov.cn/dzjcRest/saveReplyInfo.do" />
@@ -86,7 +86,7 @@
86 86
   <!--首页报表刷新间隔,格式例如30000*60,务必将格式填写一致-->
87 87
   <add key="indextime" value="30000*60" />
88 88
   <add key="messageTime" value="60000" />
89
-  <add key="AuthDate" value="2029-12-12" />
89
+  <add key="AuthDate" value="2026-12-12" />
90 90
   <add key="AuthDateDays" value="5" />
91 91
   <add key="thirdUrl" value="http://61.52.211.251:8082/oa/" />
92 92
   <add key="fileExtension" value=".png、.jpg、.gif、.doc、.docx、.xls、.xlsx、.pdf、.mp3、.mp4、.wav" />

+ 37 - 9
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -1091,7 +1091,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
1091 1091
                 sort = "ORDER BY F_LimitTime ASC,F_Id desc";
1092 1092
             else if (timesort == 1)
1093 1093
                 sort = "ORDER BY F_CreateTime DESC";
1094
-            string cols = "F_OldWorkOrderId,F_LimitTime,F_Level,F_WorkOrderId,F_Scanning,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,IsExport,F_Files,F_WorkRemarks,requirementFinishDay";
1094
+            string cols = "F_OldWorkOrderId,F_LimitTime,F_Level,F_WorkOrderId,F_Scanning,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,IsExport,F_Files,F_WorkRemarks,requirementFinishDay";
1095 1095
             #region 导出
1096 1096
             if (isdc > 0)
1097 1097
             {
@@ -1561,7 +1561,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
1561 1561
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
1562 1562
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
1563 1563
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
1564
-            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks,requirementFinishDay";
1564
+            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName,bo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks,requirementFinishDay";
1565 1565
             if (isdc > 0)
1566 1566
             {
1567 1567
                 var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Bus_WorkOrder WITH(NOLOCK) where 1=1 " + sql).Tables[0];
@@ -2675,8 +2675,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
2675 2675
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
2676 2676
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
2677 2677
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
2678
-            string cols = "F_OldWorkOrderId,F_Level,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks,requirementFinishDay,F_LimitTime";
2679
-            string colst = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
2678
+            string cols = "F_OldWorkOrderId,F_Level,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName,F_Files,F_WorkRemarks,requirementFinishDay,F_LimitTime";
2679
+            string colst = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName";
2680 2680
             if (isdc > 0)
2681 2681
             {
2682 2682
                 var top = ""; 
@@ -4632,7 +4632,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
4632 4632
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetOverState(F_WorkOrderId) as OverState,"
4633 4633
             //    + "dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName ,dbo.GetLimitTime(F_WorkOrderId) as LimitTime";
4634 4634
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName";
4635
-            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks";
4635
+            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName";
4636 4636
             if (isdc > 0)
4637 4637
             {
4638 4638
                 var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Bus_WorkOrder WITH(NOLOCK) where 1=1 " + sql).Tables[0];
@@ -5634,7 +5634,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
5634 5634
             }
5635 5635
 
5636 5636
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName ";
5637
-            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks";
5637
+            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName";
5638 5638
             if (isdc > 0)
5639 5639
             {
5640 5640
                 var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Bus_WorkOrder WITH(NOLOCK) where 1=1 " + sql).Tables[0];
@@ -5936,7 +5936,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
5936 5936
 
5937 5937
             //string cols = "*,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,"
5938 5938
             //        + "dbo.GetDictionaryName(F_InfoSource) as SourceName ";
5939
-            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks";
5939
+            string cols = "F_OldWorkOrderId,F_WorkOrderId,F_ComTitle,F_WorkState,F_MainDeptId,F_OtherDeptIds,F_DealTime,F_LeaveRecordId,F_CallRecordId,F_IsResult,F_IsProtect,F_IsReturn,F_CreateTime,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName,dbo.GetDictionaryName(F_InfoSource) as SourceName,F_Files,F_WorkRemarks,dbo.GetDictionaryName(F_InfoConBigType) as InfoConBigTypeName";
5940 5940
             if (isdc > 0)
5941 5941
             {
5942 5942
                 var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Bus_WorkOrder WITH(NOLOCK) where 1=1 " + sql).Tables[0];
@@ -7804,6 +7804,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
7804 7804
                         else
7805 7805
                         {
7806 7806
                             modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(userModel.F_UserCode);
7807
+                            var information = DbHelperSQL.GetSingle( "select dbo.GetDictionaryNames('" + infoproperty + "')");
7808
+                            if (information!=null&& information.ToString()=="敏感")
7809
+                            {
7810
+                                modelT_Bus_WorkOrder.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId + "-敏感";
7811
+                            }
7812
+
7807 7813
                         }
7808 7814
 
7809 7815
                     }
@@ -7834,6 +7840,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
7834 7840
                         else
7835 7841
                         {
7836 7842
                             modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderIDPF(userModel.F_UserCode);
7843
+                            var information = DbHelperSQL.GetSingle("select dbo.GetDictionaryNames('" + infoproperty + "')");
7844
+                            if (information != null && information.ToString() == "敏感")
7845
+                            {
7846
+                                modelT_Bus_WorkOrder.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId + "-敏感";
7847
+                            }
7837 7848
                         }
7838 7849
                         modelT_Bus_WorkOrder.F_RelatedWorkOrder = relatedworkorder; //频发工单创建时关联的工单号
7839 7850
 
@@ -8192,7 +8203,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
8192 8203
                     #region 保存工单信息
8193 8204
                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
8194 8205
                     modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(userModel.F_UserCode);
8195
-
8206
+                   
8196 8207
                     modelT_Bus_WorkOrder.F_InfoSource = source;//信息来源
8197 8208
 
8198 8209
                     modelT_Bus_WorkOrder.F_InfoType = type;//信息类别
@@ -14809,6 +14820,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
14809 14820
                                     modelT_Bus_WorkOrder.F_OtherDeptIds = "";
14810 14821
                                     modelT_Bus_WorkOrder.F_DealDeptId = null;
14811 14822
                                     modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);
14823
+                                    if (modelT_Bus_WorkOrder.F_InfoConBigType!=null&& modelT_Bus_WorkOrder.F_InfoConBigType>0)
14824
+                                    {
14825
+                                        var information = DbHelperSQL.GetSingle("select dbo.GetDictionaryNames('" + modelT_Bus_WorkOrder.F_InfoConBigType + "')");
14826
+                                        if (information != null && information.ToString() == "敏感")
14827
+                                        {
14828
+                                            modelT_Bus_WorkOrder.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId + "-敏感";
14829
+                                        }
14830
+                                    }
14812 14831
                                     modelT_Bus_WorkOrder.F_MainWorkOrderId =  roadworkid;
14813 14832
                                     modelT_Bus_WorkOrder.F_Files = "";
14814 14833
 
@@ -15093,6 +15112,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
15093 15112
                                     #region 新增工单
15094 15113
                                    var  modelT_Bus_WorkOrder1 = modelT_Bus_WorkOrder;
15095 15114
                                     modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);
15115
+                                    if (modelT_Bus_WorkOrder1.F_InfoConBigType != null && modelT_Bus_WorkOrder1.F_InfoConBigType > 0)
15116
+                                    {
15117
+                                        var information = DbHelperSQL.GetSingle("select dbo.GetDictionaryNames('" + modelT_Bus_WorkOrder1.F_InfoConBigType + "')");
15118
+                                        if (information != null && information.ToString() == "敏感")
15119
+                                        {
15120
+                                            modelT_Bus_WorkOrder1.F_WorkOrderId = modelT_Bus_WorkOrder1.F_WorkOrderId + "-敏感";
15121
+                                        }
15122
+                                    }
15096 15123
                                     Model.T_Bus_AssignedInfo newmodelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
15097 15124
                                     newmodelT_Bus_AssignedInfo.F_WorkOrderId = modelT_Bus_WorkOrder1.F_WorkOrderId;
15098 15125
                                     newmodelT_Bus_AssignedInfo.F_LimitTime = limittime;//办理时限
@@ -17514,7 +17541,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
17514 17541
 
17515 17542
 
17516 17543
             DataTable dt = new DataTable();
17517
-            dt = DbHelperSQL.Query("select * from T_Bus_WorkOrder where F_WorkState=1 and F_IsDelete=0  " +
17544
+            dt = DbHelperSQL.Query("select * from T_Bus_WorkOrder where F_WorkState=1 and F_IsDelete=0 " +
17545
+                " and F_WorkOrderType=1 and dbo.GetDictionaryName(F_InfoConBigType)='敏感' " +
17518 17546
        "and datediff(day , F_CreateTime , getdate())>'" +3 + "' and F_SendMsgDay =0   ").Tables[0];
17519 17547
 
17520 17548
             DataTable userdt = DbHelperSQL.Query(" select F_usercode from t_sys_useraccount where F_rolecode='ZXLD'").Tables[0];