duhongyu лет назад: 5
Родитель
Сommit
a62977c146

+ 1 - 1
代码/System.Model/Sys/T_Sys_CallDutyNumber.cs

@@ -26,7 +26,7 @@ namespace System.Model
26 26
         /// <summary>
27 27
         /// 值班时间
28 28
         /// </summary>
29
-        public string F_ZBTime { get; set; }
29
+        public DateTime  F_ZBTime { get; set; }
30 30
         /// <summary>
31 31
         /// 备注
32 32
         /// </summary>

+ 1 - 1
代码/System.Model/Sys/V_CallDutyNumber.cs

@@ -26,7 +26,7 @@ namespace System.Model
26 26
         /// <summary>
27 27
         /// 值班时间
28 28
         /// </summary>
29
-        public string F_ZBTime { get; set; }
29
+        public DateTime ? F_ZBTime { get; set; }
30 30
         /// <summary>
31 31
         /// 备注
32 32
         /// </summary>

+ 2 - 2
代码/TVShoppingCallCenter_ZLJ/Controllers/System/DeptmentController.cs

@@ -156,7 +156,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
156 156
         /// <param name="input"></param>
157 157
         /// <returns></returns>
158 158
         [HttpPost("adddept")]
159
-        public async Task<IActionResult> AddDept(string deptname,int parentid=0,int sort=1,decimal targetmoney=0.00M)
159
+        public async Task<IActionResult> AddDept(string deptname,int islock, int parentid=0,int sort=1,decimal targetmoney=0.00M)
160 160
         {
161 161
             if (string.IsNullOrEmpty(deptname))
162 162
                 return Error("请输入部门名称");
@@ -175,7 +175,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
175 175
             entity_dept.F_Sort = sort;
176 176
             entity_dept.F_CreateOn = DateTime.Now.ToLocalTime();
177 177
             entity_dept.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
178
-            //entity_dept.F_Lock = islock;
178
+             entity_dept.F_Lock = islock;
179 179
             entity_dept.F_TargetMoney = targetmoney;
180 180
             var res = await _sys_departmentRepository.Add(entity_dept);
181 181
             if (res > 0)

+ 2 - 2
代码/TVShoppingCallCenter_ZLJ/Controllers/Traffic/SetDutyNumberController.cs

@@ -98,7 +98,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
98 98
             T_Sys_CallDutyNumber clmodel = new T_Sys_CallDutyNumber();
99 99
             clmodel.F_DutyNumber = input.dutynumber;
100 100
             clmodel.F_Groupid = input.groupid;
101
-            clmodel.F_ZBTime = input.dutytime;
101
+            clmodel.F_ZBTime = DateTime .Parse (  input.dutytime);
102 102
             clmodel.F_Remark = input.remark;
103 103
 
104 104
             clmodel.F_CreateBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value; //"8000";
@@ -141,7 +141,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
141 141
                 return Error("信息获取失败");
142 142
             clmodel.F_DutyNumber = input.dutynumber;
143 143
             clmodel.F_Groupid = input.groupid;
144
-            clmodel.F_ZBTime = input.dutytime;
144
+            clmodel.F_ZBTime = DateTime.Parse(input.dutytime);
145 145
             clmodel.F_Remark = input.remark;
146 146
 
147 147
             clmodel.F_LastModifyBy = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;

+ 20 - 4
代码/TVShoppingCallCenter_ZLJ/Controllers/Traffic/SetMobileDataController.cs

@@ -89,14 +89,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
89 89
         public async Task<IActionResult> Add(MobileDataInput input)
90 90
         {
91 91
             #region 验证
92
-            if (string.IsNullOrWhiteSpace(input.mobilenum))
92
+            if (string.IsNullOrEmpty(input.mobilenum))
93 93
             {
94 94
                 return Error("号段不能为空");
95 95
             }
96
-            if (string.IsNullOrWhiteSpace(input.zipcode))
96
+            if (string.IsNullOrEmpty(input.zipcode))
97 97
             {
98 98
                 return Error("区号不能为空");
99 99
             }
100
+            if (string.IsNullOrEmpty(input.citydes))
101
+            {
102
+                return Error("城市不能为空");
103
+            }
104
+            if (string.IsNullOrEmpty(input.carddes))
105
+            {
106
+                return Error("卡类型不能为空");
107
+            }
100 108
             if (await GetExistByCodeAsync(input.mobilenum, 0))
101 109
                 return Error("已存在此号段的记录,请重新输入!");
102 110
             #endregion
@@ -128,14 +136,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
128 136
             #region
129 137
             if (input.id <= 0)
130 138
                 return Error("请选择要编辑的数据");
131
-            if (string.IsNullOrWhiteSpace(input.mobilenum))
139
+            if (string.IsNullOrEmpty(input.mobilenum))
132 140
             {
133 141
                 return Error("号段不能为空");
134 142
             }
135
-            if (string.IsNullOrWhiteSpace(input.zipcode))
143
+            if (string.IsNullOrEmpty (input.zipcode))
136 144
             {
137 145
                 return Error("区号不能为空");
138 146
             }
147
+            if (string.IsNullOrEmpty(input.citydes))
148
+            {
149
+                return Error("城市不能为空");
150
+            }
151
+            if (string.IsNullOrEmpty(input.carddes))
152
+            {
153
+                return Error("卡类型不能为空");
154
+            }
139 155
             if (await GetExistByCodeAsync(input.mobilenum, input.id))
140 156
                 return Error("已存在此号段的记录,请重新输入!");
141 157
             #endregion

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Traffic/CallDutyNumberInput.cs

@@ -22,7 +22,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
22 22
         /// <summary>
23 23
         /// 值班时间
24 24
         /// </summary>
25
-        public string dutytime { get; set; }
25
+        public string  dutytime { get; set; }
26 26
         /// <summary>
27 27
         /// 备注
28 28
         /// </summary>