代码更新

代码/MadRunFabirc.Model/EquipmentApi.Model/Wo_Repair_Base.cs

@@ -36,7 +36,7 @@ namespace MadRunFabric.Model
         public int channel { get; set; } = 1;
 
         /// <summary>
-        /// 工单状态:0创建工单，1已转派（转派或者抢单），2已处理，3已评价，7挂起，8已取消，9已完成
+        /// 工单状态:0创建工单，1已转派（转派或者抢单），2已处理，3已评价，7挂起，8已取消，9已超时
         /// </summary>
         public int wostate { get; set; } = 0;
 
@@ -262,9 +262,9 @@ namespace MadRunFabric.Model
         /// 选择维修时效说明
         /// </summary>
         public string wxdemodes { get; set; }
-        ///// <summary>
-        ///// 超时了多久
-        ///// </summary>
-        //public string wxtimecenter { get; set; }
+        /// <summary>
+        /// 超时了多久
+        /// </summary>
+        public string wxtimecenter { get; set; }
     }
 }

代码/MadRunFabirc.Model/TestUserTypeApi/CallComeDeptorPeo.cs

@@ -20,5 +20,9 @@ namespace MadRunFabric.Model.TestUserTypeApi
         /// 科室负责人
         /// </summary>
         public string  peoplename { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string usercode { get; set; }
     }
 }

代码/MadRunFabirc.Model/TestUserTypeApi/CallComeTpwode.cs

@@ -29,6 +29,10 @@ namespace MadRunFabric.Model.TestUserTypeApi
         /// </summary>
         public string  phoneinfo { get; set; }
         /// <summary>
+        /// 投诉类别
+        /// </summary>
+        public string centerinfotype { get; set; }
+        /// <summary>
         /// 咨询、反馈内容
         /// </summary>
         public string centerinfo { get; set; }
@@ -41,12 +45,24 @@ namespace MadRunFabric.Model.TestUserTypeApi
         /// </summary>
         public string  jspeople { get; set; }
         /// <summary>
+        /// 接收人工号
+        /// </summary>
+        public string jspeopleusercode { get; set; }
+        /// <summary>
         /// 备注
         /// </summary>
         public string  memoinfo { get; set; }
         /// <summary>
+        /// 处理结果
+        /// </summary>
+        public string resultmassage { get; set; }
+        /// <summary>
         /// 创建时间
         /// </summary>
         public DateTime? createdate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createusercode { get; set; }
     }
 }

代码/MadRunFabirc.Model/TestUserTypeApi/yyjlinfolist.cs

@@ -15,24 +15,82 @@ namespace MadRunFabric.Model.TestUserTypeApi
         [Key]
         [BsonRepresentation(MongoDB.Bson.BsonType.ObjectId)]
         public string    id          { get; set; }
-        public string    hospitalId  {get;set;}      //医院编号      > 41754799-2</hospitalId>
-        public string    cardNo      {get;set;}      //预约诊号      ></cardNo>
-        public string    userIdCard  {get;set;}      //身份证号      >41022119901010271X</userIdCard>
-        public string    userInsurNO {get;set;}      //医保卡号          >01057552</userInsurNO>
-        public string    userName    {get;set;}      //患者姓名      >刘圣涛</userName>
-        public string    userGender  {get;set;}      //患者性别      >F</userGender>
-        public string    userMobile  {get;set;}      //患者手机号      >18066668888</userMobile>
-        public string    userAddress { get; set; }   //家庭住址      >
-        public string    orderId     {get;set;}//     订单号
-        public string    deptid      {get;set;}//     科室编码
-        public string  deptname { get; set; }//科室名称
-        public string    doctorId    {get;set;}//     医生编码
-        public string  docorname { get; set; }//医生姓名
-        public string    regDate     {get;set;}//     预约日期
-        public string    timeFlag    {get;set;}//     预约时段
-        public string orderTime  {get;set;}//      下单时间
-        public string    orderstate { get; set; }//订单状态 //0成功1 失败
-        public string orderIdHIS { get; set; }//his的订单号用来取消预约
+        /// <summary>
+        /// 医院编号
+        /// </summary>
+        public string    hospitalId  {get;set;}      //      > 41754799-2</hospitalId>
+        /// <summary>
+        /// 预约诊号
+        /// </summary>
+        public string    cardNo      {get;set;}      //      ></cardNo>
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        public string    userIdCard  {get;set;}      //      >41022119901010271X</userIdCard>
+        /// <summary>
+        /// 医保卡号
+        /// </summary>
+        public string    userInsurNO {get;set;}      //          >01057552</userInsurNO>
+        /// <summary>
+        /// 患者姓名
+        /// </summary>
+        public string    userName    {get;set;}      //      >刘圣涛</userName>
+        /// <summary>
+        /// 患者性别
+        /// </summary>
+        public string    userGender  {get;set;}      //      >F</userGender>
+        /// <summary>
+        /// 患者手机号
+        /// </summary>
+        public string    userMobile  {get;set;}      //      >18066668888</userMobile>
+        /// <summary>
+        /// 家庭住址
+        /// </summary>
+        public string    userAddress { get; set; }   //      >
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string    orderId     {get;set;}
+        /// <summary>
+        /// 科室编码
+        /// </summary>
+        public string    deptid      {get;set;}
+        /// <summary>
+        /// 科室名称
+        /// </summary>
+        public string  deptname { get; set; }
+        /// <summary>
+        /// 医生编码
+        /// </summary>
+        public string    doctorId    {get;set;}
+        /// <summary>
+        /// 医生姓名
+        /// </summary>
+        public string  docorname { get; set; }
+        /// <summary>
+        /// 预约日期
+        /// </summary>
+        public string    regDate     {get;set;}
+        /// <summary>
+        /// 预约时段
+        /// </summary>
+        public string    timeFlag    {get;set;}
+        /// <summary>
+        /// 下单时间
+        /// </summary>
+        public string orderTime  {get;set;}
+        /// <summary>
+        /// 订单状态 //0成功1 失败
+        /// </summary>
+        public string    orderstate { get; set; }
+        /// <summary>
+        /// his的订单号用来取消预约
+        /// </summary>
+        public string orderIdHIS { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createuser { get; set; }
         /// <summary>
         /// 是否删除
         /// </summary>

代码/MadRunFabric.EquipmentApi/EquipmentApi.IRepositories/IWo_Repair_BaseRepository.cs

@@ -54,8 +54,7 @@ namespace EquipmentApi.IRepositories
          string replace, string systemid, string equipmentid, string usercode, string stime, string etime, string channel, string Jwocode, string Pwcode, int state, int score, int wxstate,
          string nowusercode, UserAccountInfoModel userinfo,
          //string nowrolecode,
-         int pageindex, int pagesize, out int recordcount,
-         out int totalcount, out int wzpcount, out int yjdcount, out int dpjcount, out int ygqcount, out int ywjcount, out int yqxcount);
+         int pageindex, int pagesize);
 
         IEnumerable<object> GetListsByPagerolebz(string phone, string wocode, string province, string city, string projectid, string protypeid, string buildid, string floorid,
          string replace, string systemid, string equipmentid, string usercode, string stime, string etime, int state, int wxstate,

代码/MadRunFabric.EquipmentApi/EquipmentApi.Repositories/Wo_Repair_BaseRepository.cs

@@ -424,6 +424,7 @@ namespace EquipmentApi.Repositories
                             repairbase.tobztimes,
                             repairbase.wxtimeid,
                             repairbase.wxdemodes,
+                            repairbase.wxtimecenter,
                             wxtimecentername = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().wxcenter : "",//维修时效信息
                             wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
 
@@ -636,6 +637,7 @@ namespace EquipmentApi.Repositories
                             postlist = userinfolis.postlist,
                             repairbase.wxtimeid,
                             repairbase.wxdemodes,
+                            repairbase.wxtimecenter,
                             wxtimecentername = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().wxcenter : "",//维修时效信息
                             wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
                     };
@@ -870,6 +872,7 @@ namespace EquipmentApi.Repositories
                         repairbase.tobztimes,
                         repairbase.wxtimeid,
                         repairbase.wxdemodes,
+                        repairbase.wxtimecenter,
                         wxtimecentername = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().wxcenter : "",//维修时效信息
                         wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
                 };
@@ -1049,8 +1052,7 @@ namespace EquipmentApi.Repositories
        string replace, string systemid, string equipmentid, string usercode, string stime, string etime, string channel, string Jwocode,string Pwcode, int state, int score, int wxstate,
        string nowusercode, UserAccountInfoModel userinfo,
        //string nowrolecode,
-       int pageindex, int pagesize, out int recordcount,
-       out int totalcount, out int wzpcount, out int yjdcount, out int dpjcount, out int ygqcount, out int ywjcount, out int yqxcount)
+       int pageindex, int pagesize)
         {
             if (userinfo.role_code == "HFB" || userinfo.role_code == "XTWH")
             {
@@ -1059,67 +1061,32 @@ namespace EquipmentApi.Repositories
                 var query =
                     from repairbase in _collection.AsQueryable()
                     join proje in _collection_pro_project_info.AsQueryable() on repairbase.projectid equals proje.id into projeDefa
-                    join sysprovinces in _collection_sys_provinces.AsQueryable() on repairbase.province equals sysprovinces.provincecode into sys_provincesDefa
-                    join syscity in _collection_sys_city.AsQueryable() on repairbase.city equals syscity.citycode into sys_cityDefa
                     join wxtimelis in _collection_ewxwpstime.AsQueryable() on repairbase.wxtimeid equals wxtimelis.id into wxtimelisDefa
                     where repairbase.isdelete == 0
                     orderby repairbase.createtime descending
                     select new
                     {
-                        repairbase.id,
+                        
+                        repairbase.wostate,
                         repairbase.wocode,
-                        repairbase.projectid,
-                        projectname = projeDefa.Count() > 0 ? projeDefa.First().project_name : null,
-                        repairbase.protypeid,
-                        //protypename = dic_protypeDefa.Count() > 0 ? dic_protypeDefa.First().name : null,
-                        repairbase.faulttypeid,
-                        //faulttypename = dic_faulttypeDefa.Count() > 0 ? dic_faulttypeDefa.First().name : null,
-                        repairbase.systemid,
-                        //systemname = dic_systemDefa.Count() > 0 ? dic_systemDefa.First().name : null,
-                        repairbase.equipmentid,
-                        //equipmentname = dic_equDefa.Count() > 0 ? dic_equDefa.First().equipment_name : null,
                         repairbase.channel,
-                        provincecode = repairbase.province,
-                        province = sys_provincesDefa.Count() > 0 ? sys_provincesDefa.First().provincename : null,
-                        citycode = repairbase.city,
-                        city = sys_cityDefa.Count() > 0 ? sys_cityDefa.First().cityname : null,
-                        repairbase.buildid,
-                        //buildname = bldDefa.Count() > 0 ? bldDefa.First().buildname : null,
-                        repairbase.floorid,
-                        //floorname = flrDefa.Count() > 0 ? flrDefa.First().floorname : null,
+                        projectname = projeDefa.Count() > 0 ? projeDefa.First().project_name : null,
                         repairbase.repairreplace,
                         repairbase.repairoom,
                         repairbase.repairtime,
-                        repairbase.contactway,
-                        repairbase.repairman,
-                        repairbase.faultdescripe,
-                        repairbase.faultpic,
-                        repairbase.appointtime,
-                        repairbase.wostate,
                         repairbase.createtime,
-                        repairbase.createuser,
+                        repairbase.repairman,
                         repairbase.createusername,
-                        repairbase.touser,
+                        repairbase.contactway,
+                        repairbase.faultdescripe,
+                        repairbase.Pwcode,
+                        repairbase.Jwocode,
+                        repairbase.tobztimes,
                         repairbase.tousername,
                         repairbase.totime,
-                        repairbase.totype,
-                        repairbase.dealuser,
-                        repairbase.dealusername,
                         repairbase.dealtime,
-                        repairbase.ismaterials,
-                        repairbase.materials,
-                        repairbase.islosematerials,
-                        repairbase.losematerials,
-                        repairbase.hanguptime,
-                        repairbase.arrivetime,
-                        repairbase.evaluatetime,
-                        repairbase.canceltime,
-                        repairbase.score,
-                        repairbase.Jwocode,
-                        repairbase.Pwcode,
                         repairbase.CLpeoplefrom,
-                        repairbase.tobztimes,
-                        repairbase.wxtimeid,
+                        repairbase.wxtimecenter,
                         wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
                     };
                 #endregion
@@ -1130,33 +1097,14 @@ namespace EquipmentApi.Repositories
                             || it.Jwocode.Contains(phone) || it.createusername.Contains(phone)
                             || it.repairman.Contains(phone) || it.faultdescripe.Contains(phone)
                             || it.CLpeoplefrom.Contains(phone)
-                            || it.touser.Contains(usercode)
-                            || it.dealuser.Contains(usercode)
                             );
                 if (!string.IsNullOrEmpty(Pwcode))
                     query = query.Where(it => it.Pwcode == Pwcode);
                 if (!string.IsNullOrEmpty(wocode))
                     query = query.Where(it => it.wocode.Contains(wocode));
-                if (!string.IsNullOrEmpty(province))
-                    query = query.Where(it => it.provincecode == province);
-                if (!string.IsNullOrEmpty(city))
-                    query = query.Where(it => it.citycode == city);
-                if (!string.IsNullOrEmpty(projectid))
-                    query = query.Where(it => it.projectid == projectid);
-                if (!string.IsNullOrEmpty(protypeid))
-                    query = query.Where(it => it.protypeid == protypeid);
-                if (!string.IsNullOrEmpty(buildid))
-                    query = query.Where(it => it.buildid == buildid);
-                if (!string.IsNullOrEmpty(floorid))
-                    query = query.Where(it => it.floorid == floorid);
+               
                 if (!string.IsNullOrEmpty(replace))
                     query = query.Where(it => it.repairreplace.Contains(replace) || it.repairoom.Contains(replace));
-                if (!string.IsNullOrEmpty(systemid))
-                    query = query.Where(it => it.systemid == systemid);
-                if (!string.IsNullOrEmpty(equipmentid))
-                    query = query.Where(it => it.equipmentid == equipmentid);
-                if (!string.IsNullOrEmpty(channel))
-                    query = query.Where(it => it.channel == Convert.ToInt32(channel));
                 if (!string.IsNullOrEmpty(Jwocode))
                     query = query.Where(it => it.Jwocode == Jwocode);
                 #region 时间搜索
@@ -1164,41 +1112,7 @@ namespace EquipmentApi.Repositories
                     query = query.Where(it => it.createtime >= Convert.ToDateTime(stime + " 00:00:00"));
                 if (!string.IsNullOrEmpty(etime))
                     query = query.Where(it => it.createtime <= Convert.ToDateTime(etime + " 23:59:59"));
-                if (score != 0)
-                {
-                    //等于1时获取分数为1和2的数据 不满意数据
-                    if (score == 1)
-                    {
-                        query = query.Where(it => it.score == 1 || it.score == 2);
-                    }
-                    //获取基本满意数据
-                    else if (score == 3)
-                    {
-                        query = query.Where(it => it.score == 3);
-                    }
-                    //获取4和5分数的数据 满意数据
-                    else
-                    {
-                        query = query.Where(it => it.score == 4 || it.score == 5);
-                    }
-                }
-
-                if (userinfo.type == 2)//查看自己创建的工单
-                {
-                    query = query.Where(it => it.createuser == userinfo.usercode);
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(usercode)) query = query.Where(it => (it.touser.Contains(usercode) || it.dealuser.Contains(usercode)));
-                }
-
-                wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create);
-                yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign);
-                dpjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.deal);
-                ygqcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.hangup);
-                ywjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.evaluate);
-                yqxcount = query.Count(p => p.Pwcode != null && p.Pwcode != "");
-
+                
 
                 if (state != -1)
                 {
@@ -1216,7 +1130,6 @@ namespace EquipmentApi.Repositories
                         case (int)EnumWorkOrderState.assign: query = query.OrderByDescending(p => p.totime); break;
                         case (int)EnumWorkOrderState.deal: query = query.OrderByDescending(p => p.dealtime); break;
                         //case (int)EnumWorkOrderState.evaluate: query = query.OrderBy(p => p.evaluatetime); break;
-                        case (int)EnumWorkOrderState.hangup: query = query.OrderByDescending(p => p.hanguptime); break;
                             //case (int)EnumWorkOrderState.cancle: query = query.OrderBy(p => p.canceltime); break;
                     }
                 }
@@ -1236,15 +1149,11 @@ namespace EquipmentApi.Repositories
                         case (int)EnumWorkOrderState.assign: query = query.OrderByDescending(p => p.totime); break;
                         case (int)EnumWorkOrderState.deal: query = query.OrderByDescending(p => p.dealtime); break;
                         //case (int)EnumWorkOrderState.evaluate: query = query.OrderBy(p => p.evaluatetime); break;
-                        case (int)EnumWorkOrderState.hangup: query = query.OrderByDescending(p => p.hanguptime); break;
                             //case (int)EnumWorkOrderState.cancle: query = query.OrderBy(p => p.canceltime); break;
                     }
                 }
                 #endregion
                 #endregion
-                recordcount = query.Count();
-                //总数
-                totalcount = query.Count();
                 var list1 = query.ToList();
                 return list1;
                 #endregion
@@ -1268,63 +1177,26 @@ namespace EquipmentApi.Repositories
                         orderby repairbase.createtime descending
                         select new
                         {
-                            repairbase.id,
+                            repairbase.wostate,
                             repairbase.wocode,
-                            repairbase.projectid,
-                            projectname = projeDefa.Count() > 0 ? projeDefa.First().project_name : null,
-                            repairbase.protypeid,
-                            //protypename = dic_protypeDefa.Count() > 0 ? dic_protypeDefa.First().name : null,
-                            repairbase.faulttypeid,
-                            //faulttypename = dic_faulttypeDefa.Count() > 0 ? dic_faulttypeDefa.First().name : null,
-                            repairbase.systemid,
-                            //systemname = dic_systemDefa.Count() > 0 ? dic_systemDefa.First().name : null,
-                            repairbase.equipmentid,
-                            //equipmentname = dic_equDefa.Count() > 0 ? dic_equDefa.First().equipment_name : null,
                             repairbase.channel,
-                            provincecode = repairbase.province,
-                            province = sys_provincesDefa.Count() > 0 ? sys_provincesDefa.First().provincename : null,
-                            citycode = repairbase.city,
-                            city = sys_cityDefa.Count() > 0 ? sys_cityDefa.First().cityname : null,
-                            repairbase.buildid,
-                            //buildname = bldDefa.Count() > 0 ? bldDefa.First().buildname : null,
-                            repairbase.floorid,
-                            //floorname = flrDefa.Count() > 0 ? flrDefa.First().floorname : null,
+                            projectname = projeDefa.Count() > 0 ? projeDefa.First().project_name : null,
                             repairbase.repairreplace,
                             repairbase.repairoom,
                             repairbase.repairtime,
-                            repairbase.contactway,
-                            repairbase.repairman,
-                            repairbase.faultdescripe,
-                            repairbase.faultpic,
-                            repairbase.appointtime,
-                            repairbase.wostate,
                             repairbase.createtime,
-                            repairbase.createuser,
+                            repairbase.repairman,
                             repairbase.createusername,
-                            repairbase.touser,
+                            repairbase.contactway,
+                            repairbase.faultdescripe,
+                            repairbase.Pwcode,
+                            repairbase.Jwocode,
+                            repairbase.tobztimes,
                             repairbase.tousername,
                             repairbase.totime,
-                            repairbase.totype,
-                            repairbase.dealuser,
-                            repairbase.dealusername,
                             repairbase.dealtime,
-                            repairbase.ismaterials,
-                            repairbase.materials,
-                            repairbase.islosematerials,
-                            repairbase.losematerials,
-                            repairbase.hanguptime,
-                            repairbase.arrivetime,
-                            repairbase.evaluatetime,
-                            repairbase.canceltime,
-                            repairbase.score,
-                            repairbase.Jwocode,
-                            repairbase.Pwcode,
                             repairbase.CLpeoplefrom,
-                            repairbase.tobztimes,
-                            remark = userinfolis.remark,//备注护士长
-                            temid = userinfolis.team_id,
-                            postlist = userinfolis.postlist,
-                            repairbase.wxtimeid,
+                            repairbase.wxtimecenter,
                             wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
                         };
                     #endregion
@@ -1335,27 +1207,10 @@ namespace EquipmentApi.Repositories
                                 || it.Jwocode.Contains(phone) || it.createusername.Contains(phone)
                                 || it.repairman.Contains(phone) || it.faultdescripe.Contains(phone)
                                 || it.CLpeoplefrom.Contains(phone)
-                                || it.touser.Contains(usercode)
-                                || it.dealuser.Contains(usercode)
                                 );
                     if (!string.IsNullOrEmpty(Pwcode))
                         query = query.Where(it => it.Pwcode == Pwcode);
-                    if (!string.IsNullOrEmpty(province))
-                        query = query.Where(it => it.provincecode == province);
-                    if (!string.IsNullOrEmpty(city))
-                        query = query.Where(it => it.citycode == city);
-                    if (!string.IsNullOrEmpty(projectid))
-                        query = query.Where(it => it.projectid == projectid);
-                    if (!string.IsNullOrEmpty(protypeid))
-                        query = query.Where(it => it.protypeid == protypeid);
-                    if (!string.IsNullOrEmpty(buildid))
-                        query = query.Where(it => it.buildid == buildid);
-                    if (!string.IsNullOrEmpty(floorid))
-                        query = query.Where(it => it.floorid == floorid);
-                    if (!string.IsNullOrEmpty(systemid))
-                        query = query.Where(it => it.systemid == systemid);
-                    if (!string.IsNullOrEmpty(equipmentid))
-                        query = query.Where(it => it.equipmentid == equipmentid);
+                   
                     if (!string.IsNullOrEmpty(channel))
                         query = query.Where(it => it.channel == Convert.ToInt32(channel));
                     #region 时间搜索
@@ -1363,62 +1218,9 @@ namespace EquipmentApi.Repositories
                         query = query.Where(it => it.createtime >= Convert.ToDateTime(stime + " 00:00:00"));
                     if (!string.IsNullOrEmpty(etime))
                         query = query.Where(it => it.createtime <= Convert.ToDateTime(etime + " 23:59:59"));
-                    if (score != 0)
-                    {
-                        //等于1时获取分数为1和2的数据 不满意数据
-                        if (score == 1)
-                        {
-                            query = query.Where(it => it.score == 1 || it.score == 2);
-                        }
-                        //获取基本满意数据
-                        else if (score == 3)
-                        {
-                            query = query.Where(it => it.score == 3);
-                        }
-                        //获取4和5分数的数据 满意数据
-                        else
-                        {
-                            query = query.Where(it => it.score == 4 || it.score == 5);
-                        }
-                    }
-
-                    if (userinfo.role_name.Contains("班") || userinfo.role_name == "默认角色")
-                    {
-
-                        if (userinfo.remark == "组长")
-                        {
-                            wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create && (p.postlist == userinfo.postlist || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                            yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign && (p.postlist == userinfo.postlist || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//
-                            dpjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.deal && (p.postlist == userinfo.postlist || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//
-                            ygqcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.hangup && (p.postlist == userinfo.postlist || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//
-                            ywjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.evaluate && (p.postlist == userinfo.postlist | p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//|| 
-                            yqxcount = query.Count(p => (p.Pwcode != null && p.Pwcode != "") && (p.postlist == userinfo.postlist || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//|| 
-
-                        }
-                        else
-                        {
-                            wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                            yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                            dpjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.deal && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                            ygqcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.hangup && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                            ywjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.evaluate && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                            yqxcount = query.Count(p => (p.Pwcode != null && p.Pwcode != "") && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-
-                        }
-
-
-                    }
-                    else
-                    {
-                        wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create);
-                        yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign);
-                        dpjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.deal);
-                        ygqcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.hangup);
-                        ywjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.evaluate);
-                        yqxcount = query.Count(p => p.Pwcode != null && p.Pwcode != "");
-                    }
-
+                   
 
+                   
 
                     if (state != -1)
                     {
@@ -1432,18 +1234,18 @@ namespace EquipmentApi.Repositories
                         }
                         if (userinfo.role_name.Contains("班") || userinfo.role_name == "默认角色")
                         {
-                            if (userinfo.remark == "组长")
-                            {
-                                query = query.Where(it => it.repairman.Contains(userinfo.usercode) || it.repairman == userinfo.username || it.postlist == userinfo.postlist);// 
+                            //if (userinfo.remark == "组长")
+                            //{
+                            //    query = query.Where(it => it.repairman.Contains(userinfo.usercode) || it.repairman == userinfo.username || it.postlist == userinfo.postlist);// 
 
-                            }
-                            else
-                            {
+                            //}
+                            //else
+                            //{
                                 if (!string.IsNullOrEmpty(userinfo.username))
                                 {
                                     query = query.Where(it => it.createusername == userinfo.username || it.tousername[0] == userinfo.username || it.repairman == userinfo.username || it.repairman.Contains(userinfo.usercode));
                                 }
-                            }
+                            //}
 
 
                         }
@@ -1452,7 +1254,6 @@ namespace EquipmentApi.Repositories
                             case (int)EnumWorkOrderState.assign: query = query.OrderByDescending(p => p.totime); break;
                             case (int)EnumWorkOrderState.deal: query = query.OrderByDescending(p => p.dealtime); break;
                             //case (int)EnumWorkOrderState.evaluate: query = query.OrderBy(p => p.evaluatetime); break;
-                            case (int)EnumWorkOrderState.hangup: query = query.OrderByDescending(p => p.hanguptime); break;
                                 //case (int)EnumWorkOrderState.cancle: query = query.OrderBy(p => p.canceltime); break;
                         }
                     }
@@ -1461,28 +1262,25 @@ namespace EquipmentApi.Repositories
                         //query = query.Where(it => it.wostate==0|| it.wostate == 1||it.wostate == 2|| it.wostate == 3|| it.wostate == 7|| it.wostate == 9);
                         if (userinfo.role_name.Contains("班") || userinfo.role_name == "默认角色")
                         {
-                            if (userinfo.remark == "组长")
-                            {
-                                query = query.Where(it => it.postlist == userinfo.postlist || it.repairman == userinfo.username || it.repairman.Contains(userinfo.usercode));//  
+                            //if (userinfo.remark == "组长")
+                            //{
+                            //    query = query.Where(it => it.postlist == userinfo.postlist || it.repairman == userinfo.username || it.repairman.Contains(userinfo.usercode));//  
 
-                            }
-                            else
-                            {
+                            //}
+                            //else
+                            //{
                                 if (!string.IsNullOrEmpty(userinfo.username))
                                 {
                                     query = query.Where(it => it.createusername == userinfo.username || it.tousername[0] == userinfo.username || it.repairman == userinfo.username || it.repairman.Contains(userinfo.usercode));
                                 }
-                            }
+                            //}
                         }
                         query = query.OrderByDescending(p => p.totime);
                     }
 
                     #endregion
                     #endregion
-                    recordcount = query.Count();
-                    //总数
-                    totalcount = query.Count();
-                    
+                   
                     var list1 = query.ToList();
                     return list1;
                     #endregion
@@ -1502,62 +1300,28 @@ namespace EquipmentApi.Repositories
                         orderby repairbase.createtime descending
                         select new
                         {
-                            repairbase.id,
+                            repairbase.wostate,
                             repairbase.wocode,
-                            repairbase.projectid,
+                            repairbase.channel,
                             projectname = projeDefa.Count() > 0 ? projeDefa.First().project_name : null,
-                            repairbase.protypeid,
-                        //protypename = dic_protypeDefa.Count() > 0 ? dic_protypeDefa.First().name : null,
-                        repairbase.faulttypeid,
-                        //faulttypename = dic_faulttypeDefa.Count() > 0 ? dic_faulttypeDefa.First().name : null,
-                        repairbase.systemid,
-                        //systemname = dic_systemDefa.Count() > 0 ? dic_systemDefa.First().name : null,
-                        repairbase.equipmentid,
-                        //equipmentname = dic_equDefa.Count() > 0 ? dic_equDefa.First().equipment_name : null,
-                        repairbase.channel,
-                            provincecode = repairbase.province,
-                            province = sys_provincesDefa.Count() > 0 ? sys_provincesDefa.First().provincename : null,
-                            citycode = repairbase.city,
-                            city = sys_cityDefa.Count() > 0 ? sys_cityDefa.First().cityname : null,
-                            repairbase.buildid,
-                        //buildname = bldDefa.Count() > 0 ? bldDefa.First().buildname : null,
-                        repairbase.floorid,
-                        //floorname = flrDefa.Count() > 0 ? flrDefa.First().floorname : null,
-                        repairbase.repairreplace,
+                            repairbase.repairreplace,
                             repairbase.repairoom,
                             repairbase.repairtime,
-                            repairbase.contactway,
-                            repairbase.repairman,
-                            repairbase.faultdescripe,
-                            repairbase.faultpic,
-                            repairbase.appointtime,
-                            repairbase.wostate,
                             repairbase.createtime,
-                            repairbase.createuser,
+                            repairbase.repairman,
                             repairbase.createusername,
-                            repairbase.touser,
+                            repairbase.contactway,
+                            repairbase.faultdescripe,
+                            repairbase.Pwcode,
+                            repairbase.Jwocode,
+                            repairbase.tobztimes,
                             repairbase.tousername,
                             repairbase.totime,
-                            repairbase.totype,
-                            repairbase.dealuser,
-                            repairbase.dealusername,
                             repairbase.dealtime,
-                            repairbase.ismaterials,
-                            repairbase.materials,
-                            repairbase.islosematerials,
-                            repairbase.losematerials,
-                            repairbase.hanguptime,
-                            repairbase.arrivetime,
-                            repairbase.evaluatetime,
-                            repairbase.canceltime,
-                            repairbase.score,
-                            repairbase.Jwocode,
-                            repairbase.Pwcode,
                             repairbase.CLpeoplefrom,
-                            repairbase.tobztimes,
-                            repairbase.wxtimeid,
+                            repairbase.wxtimecenter,
                             wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
-                    };
+                        };
                     #endregion
                     #region 查询条件
                     if (!string.IsNullOrEmpty(phone))
@@ -1566,31 +1330,12 @@ namespace EquipmentApi.Repositories
                                 || it.Jwocode.Contains(phone) || it.createusername.Contains(phone)
                                 || it.repairman.Contains(phone) || it.faultdescripe.Contains(phone)
                                 || it.CLpeoplefrom.Contains(phone)
-                                || it.touser.Contains(usercode)
-                                || it.dealuser.Contains(usercode)
                                 );
                     if (!string.IsNullOrEmpty(Pwcode))
                         query = query.Where(it => it.Pwcode == Pwcode);
                     if (!string.IsNullOrEmpty(wocode))
                         query = query.Where(it => it.wocode.Contains(wocode));
-                    if (!string.IsNullOrEmpty(province))
-                        query = query.Where(it => it.provincecode == province);
-                    if (!string.IsNullOrEmpty(city))
-                        query = query.Where(it => it.citycode == city);
-                    if (!string.IsNullOrEmpty(projectid))
-                        query = query.Where(it => it.projectid == projectid);
-                    if (!string.IsNullOrEmpty(protypeid))
-                        query = query.Where(it => it.protypeid == protypeid);
-                    if (!string.IsNullOrEmpty(buildid))
-                        query = query.Where(it => it.buildid == buildid);
-                    if (!string.IsNullOrEmpty(floorid))
-                        query = query.Where(it => it.floorid == floorid);
-                    if (!string.IsNullOrEmpty(replace))
-                        query = query.Where(it => it.repairreplace.Contains(replace) || it.repairoom.Contains(replace));
-                    if (!string.IsNullOrEmpty(systemid))
-                        query = query.Where(it => it.systemid == systemid);
-                    if (!string.IsNullOrEmpty(equipmentid))
-                        query = query.Where(it => it.equipmentid == equipmentid);
+                 
                     if (!string.IsNullOrEmpty(channel))
                         query = query.Where(it => it.channel == Convert.ToInt32(channel));
                     if (!string.IsNullOrEmpty(Jwocode))
@@ -1600,58 +1345,10 @@ namespace EquipmentApi.Repositories
                         query = query.Where(it => it.createtime >= Convert.ToDateTime(stime + " 00:00:00"));
                     if (!string.IsNullOrEmpty(etime))
                         query = query.Where(it => it.createtime <= Convert.ToDateTime(etime + " 23:59:59"));
-                    if (score != 0)
-                    {
-                        //等于1时获取分数为1和2的数据 不满意数据
-                        if (score == 1)
-                        {
-                            query = query.Where(it => it.score == 1 || it.score == 2);
-                        }
-                        //获取基本满意数据
-                        else if (score == 3)
-                        {
-                            query = query.Where(it => it.score == 3);
-                        }
-                        //获取4和5分数的数据 满意数据
-                        else
-                        {
-                            query = query.Where(it => it.score == 4 || it.score == 5);
-                        }
-                    }
-
-                    if (userinfo.type == 2)//查看自己创建的工单
-                    {
-                        query = query.Where(it => it.createuser == userinfo.usercode);
-                    }
-                    else
-                    {
-                        if (!string.IsNullOrEmpty(usercode)) query = query.Where(it => (it.touser.Contains(usercode) || it.dealuser.Contains(usercode)));
-                    }
-                    if (userinfo.role_name.Contains("班") || userinfo.role_name == "默认角色")
-                    {
-
-
-                        wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                        yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                        dpjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.deal && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                        ygqcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.hangup && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                        ywjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.evaluate && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-                        yqxcount = query.Count(p => (p.Pwcode != null && p.Pwcode != "") && (p.createusername == userinfo.username || p.tousername[0] == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));
-
-
-                    }
-                    else
-                    {
-                        wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create);
-                        yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign);
-                        dpjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.deal);
-                        ygqcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.hangup);
-                        ywjcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.evaluate);
-                        yqxcount = query.Count(p => p.Pwcode != null && p.Pwcode != "");
-                    }
-
-
+                  
 
+                   
+                   
                     if (state != -1)
                     {
                         if (state == 8)
@@ -1679,7 +1376,6 @@ namespace EquipmentApi.Repositories
                             case (int)EnumWorkOrderState.assign: query = query.OrderByDescending(p => p.totime); break;
                             case (int)EnumWorkOrderState.deal: query = query.OrderByDescending(p => p.dealtime); break;
                             //case (int)EnumWorkOrderState.evaluate: query = query.OrderBy(p => p.evaluatetime); break;
-                            case (int)EnumWorkOrderState.hangup: query = query.OrderByDescending(p => p.hanguptime); break;
                                 //case (int)EnumWorkOrderState.cancle: query = query.OrderBy(p => p.canceltime); break;
                         }
                     }
@@ -1710,15 +1406,12 @@ namespace EquipmentApi.Repositories
                             case (int)EnumWorkOrderState.assign: query = query.OrderByDescending(p => p.totime); break;
                             case (int)EnumWorkOrderState.deal: query = query.OrderByDescending(p => p.dealtime); break;
                             //case (int)EnumWorkOrderState.evaluate: query = query.OrderBy(p => p.evaluatetime); break;
-                            case (int)EnumWorkOrderState.hangup: query = query.OrderByDescending(p => p.hanguptime); break;
                                 //case (int)EnumWorkOrderState.cancle: query = query.OrderBy(p => p.canceltime); break;
                         }
                     }
                     #endregion
                     #endregion
-                    recordcount = query.Count();
-                    //总数
-                    totalcount = query.Count();
+                  
                    
                     var list1 = query.ToList();
                     return list1;

代码/MadRunFabric.EquipmentApi/EquipmentApi/Model/Dto/ExcelWo_Repair_Base.cs

@@ -34,15 +34,15 @@ namespace EquipmentApi.Model.Dto
         /// <summary>
         /// //报修时间
         /// </summary>
-        public string repairtime     {get;set;}
+        public string createtime { get;set;}
         /// <summary>
         /// 报修人
         /// </summary>
-        public string bxddcenter { get; set; }
+        public string repairman { get; set; }
         /// <summary>
         /// 创建人
         /// </summary>
-        public string createuser { get; set; }
+        public string createusername { get; set; }
         /// <summary>
         /// //联系方式
         /// </summary>
@@ -59,33 +59,34 @@ namespace EquipmentApi.Model.Dto
         ///  //接单班组  
         /// </summary>
         public string Jwocode        {get;set;}
-        ///// <summary>
-        /////  //接单人 
-        ///// </summary>
-        //public string formatterToUser{get;set;}
         /// <summary>
         ///  //接单时间  
         /// </summary>
-        public string tobztimes      {get;set;}
+        public DateTime? tobztimes      {get;set;}
         /// <summary>
-        ///   //处理时间 
+        /// 接单人姓名
         /// </summary>
-        public string dealtime       {get;set;}
+        public List<string> tousername { get; set; }
+
+        /// <summary>
+        /// 接单时间
+        /// </summary>
+        public DateTime? totime { get; set; }
+        /// <summary>
+        /// 处理时间
+        /// </summary>
+        public DateTime? dealtime { get; set; }
+        /// <summary>
+        /// 处理人来源
+        /// </summary>
+        public string CLpeoplefrom { get; set; }
+        /// <summary>
+        /// 超时了多久
+        /// </summary>
+        public string wxtimecenter { get; set; }
         /// <summary>
-        /// //来源
+        /// 维修时效
         /// </summary>
-        public string CLpeoplefrom   {get;set;}
-        ///// <summary>
-        /////  //满意度   
-        ///// </summary>
-        //public string score          {get;set;}
-        ///// <summary>
-        /////  //超时时长 
-        ///// </summary>
-        //public string cdealtime       {get;set;}
-        ///// <summary>
-        ///// ///维修时效  
-        ///// </summary>
-        //public string wxtimeleths { get; set; }
+        public string wxtimeleths { get; set; }
     }
 }

代码/MadRunFabric.EquipmentApi/EquipmentApi/Model/Dto/ExcelWo_Repair_Bases.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace EquipmentApi.Model.Dto
+{
+    public class ExcelWo_Repair_Bases
+    {
+
+        /// <summary>
+        /// //工单状态
+        /// </summary>
+        public string wostate { get; set; }
+        /// <summary>
+        /// //工单编号
+        /// </summary>
+        public string wocode { get; set; }
+        /// <summary>
+        /// //渠道来源
+        /// </summary>
+        public string channel { get; set; }
+        /// <summary>
+        /// //项目名称
+        /// </summary>
+        public string projectname { get; set; }
+        /// <summary>
+        /// //报修科室
+        /// </summary>
+        public string repairreplace { get; set; }
+        /// <summary>
+        /// //报修地点
+        /// </summary>
+        public string repairoom { get; set; }
+        /// <summary>
+        /// //报修时间
+        /// </summary>
+        public string createtime { get; set; }
+        /// <summary>
+        /// 报修人
+        /// </summary>
+        public string repairman { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string createusername { get; set; }
+        /// <summary>
+        /// //联系方式
+        /// </summary>
+        public string contactway { get; set; }
+        /// <summary>
+        /// //设备名称
+        /// </summary>
+        public string faultdescripe { get; set; }
+        /// <summary>
+        /// //原接单班组
+        /// </summary>
+        public string Pwcode { get; set; }
+        /// <summary>
+        ///  //接单班组  
+        /// </summary>
+        public string Jwocode { get; set; }
+        /// <summary>
+        ///  //接单时间  
+        /// </summary>
+        public string tobztimes { get; set; }
+        /// <summary>
+        /// 接单人姓名
+        /// </summary>
+        public string tousername { get; set; }
+
+        /// <summary>
+        /// 接单时间
+        /// </summary>
+        public string totime { get; set; }
+        /// <summary>
+        /// 处理时间
+        /// </summary>
+        public string dealtime { get; set; }
+        /// <summary>
+        /// 处理人来源
+        /// </summary>
+        public string CLpeoplefrom { get; set; }
+        /// <summary>
+        /// 超时了多久
+        /// </summary>
+        public string wxtimecenter { get; set; }
+        /// <summary>
+        /// 维修时效
+        /// </summary>
+        public string wxtimeleths { get; set; }
+    }
+}

代码/MadRunFabric.EquipmentApi/EquipmentApi/Model/Dto/excelcswocodelist.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace EquipmentApi.Model.Dto
+{
+    public class excelcswocodelist
+    {
+
+        /// <summary>
+        /// 工单状态:0创建工单，1已转派（转派或者抢单），2已处理，3已评价，7挂起，8已取消，9已完成
+        /// </summary>
+        public string  wostate { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+        public string wocode { get; set; } 
+        /// <summary>
+        /// 渠道来源 1表示PC 2表示安卓 3表示IOS 4表示微信
+        /// </summary>
+        public string  channel { get; set; }
+
+        /// <summary>
+        /// 报修科室
+        /// </summary>
+        public string repairreplace { get; set; } 
+        /// <summary>
+        /// 报修地点
+        /// </summary>
+        public string repairoom { get; set; } 
+        /// <summary>
+        /// 报修时间
+        /// </summary>
+        public string  repairtime { get; set; }
+
+        /// <summary>
+        /// 报修人
+        /// </summary>
+        public string repairman { get; set; } 
+        /// <summary>
+        /// 联系方式
+        /// </summary>
+        public string contactway { get; set; }
+
+        /// <summary>
+        /// 故障说明 设备名称
+        /// </summary>
+        public string faultdescripe { get; set; }
+        /// <summary>
+        /// 原接单班组
+        /// </summary>
+        public string Pwcode { get; set; }
+        /// <summary>
+        /// 接单班组科室
+        /// </summary>
+        public string Jwocode { get; set; }
+        /// <summary>
+        /// 接单人姓名
+        /// </summary>
+        public string  tousername { get; set; }
+
+        /// <summary>
+        /// 接单时间
+        /// </summary>
+        public string  totime { get; set; }
+        /// <summary>
+        /// 处理时间
+        /// </summary>
+        public string  dealtime { get; set; }
+        /// <summary>
+        /// 处理人来源
+        /// </summary>
+        public string CLpeoplefrom { get; set; }
+        /// <summary>
+        /// 超时了多久
+        /// </summary>
+        public string wxtimecenter { get; set; }
+        /// <summary>
+        /// 维修时效
+        /// </summary>
+        public string  wxtimeleths { get; set; }
+    }
+}

代码/MadRunFabric.SignTokenApi/SignTokenApi/Controllers/UserAccountController.cs

@@ -318,7 +318,7 @@ namespace SignTokenApi.Controllers
             {
                 model.certificate = new List<FileBaseModel>();
             }
-            if (input.postlist != null&&input.postlist[0]!=null)
+            if (input.postlist != null)
             {
                 model.postlist = input.postlist;
             }

代码/MadRunFabric.SignTokenApi/SignTokenApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -7,6 +7,7 @@
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <_PublishTargetUrl>E:\项目1\医院\后端发布\SignTokenApi</_PublishTargetUrl>
+    <History>True|2021-12-24T03:37:05.0120322Z;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="Api.SignToken.dll">

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Model/Dto/Onlineservertypein.cs

@@ -6,8 +6,8 @@ namespace TestUserTypeApi.Model.Dto
 {
   public   class Onlineservertypein
     {
+        public string zxusercoude { get; set; }
         public int yyghcount { get; set; }
-        public string  zxusercoude { get; set; }
         public int Tjcount   { get; set; }
         public int Zpcount   { get; set; }
         public int bqdhcount { get; set; }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi.Repositories/HzsfMassagesRepository.cs

@@ -239,7 +239,7 @@ namespace TestUserTypeApi.Repositories
             var bxstages = new List<IPipelineStageDefinition>();
             if (!string.IsNullOrEmpty(start) && !string.IsNullOrEmpty(endt))
             {
-                bxstages.Add(new JsonPipelineStageDefinition<HzsfMassages, BsonDocument>("{$match:{$and:[{CY_DATE:{$gte:new Date('" + start + "')}},{CY_DATE:{$lte:new Date('" + endt + "')}},{iszyormz:'住院患者'}]}}"));
+                bxstages.Add(new JsonPipelineStageDefinition<HzsfMassages, BsonDocument>("{$match:{$and:[{CY_DATE:{$gte:new Date('" + start + "')}},{CY_DATE:{$lte:new Date('" + endt + "')}},{iszyormz:'住院患者'}]}}"));//,{statesissuccess:'成功'}
             }
             else
             {

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Controllers/TestUserTypeController.cs

@@ -2061,80 +2061,152 @@ namespace TestUserTypeApi.Controllers
         /// 获取要进行聊天的客服人员工号 
         /// </summary>
         /// <returns></returns>
+        //[HttpGet("getzxuserinfo")]
+        //public async Task<IActionResult> GetZxUserinfo(string fromuserid)
+        //{
+        //    string usercode = "";
+        //    //先判断是否为新客户 已经有过客服人员
+        //    var fromlist = await _ImsgonlineRepository.Get(p => p.fromuserid == fromuserid);
+        //    if (fromlist.Count() != 0)
+        //    {
+        //        var firstusercode= fromlist.FirstOrDefault().touserid;
+        //        var userlistow = await _IFpzxinfosRepository.Get(p => p.usercode == firstusercode);
+        //        foreach (var items in userlistow)
+        //        {
+        //            if (items.loginstate == 1)
+        //            {
+        //                usercode = firstusercode;
+        //            }
+        //            else
+        //            {
+        //                List<Model.UserZxChatlist> list = new List<UserZxChatlist>();
+        //                //先分组获取数量
+
+        //                //获取所有坐席人员名单
+        //                //var userlist = await _sys_user_accountRepository.Get(p => p.seat_flag == true);//seat_flag
+        //                //获取安排坐席人员表中的坐席信息
+        //                var userlist = await _IFpzxinfosRepository.Get(p => p.loginstate == 1);
+
+        //                //再获取坐席服务的人数进行排序返回人少的 
+        //                foreach (var item in userlist)
+        //                {
+        //                    Model.UserZxChatlist model = new UserZxChatlist();
+        //                    // 再根据用户编号获取数量
+        //                    var kflist = _ImsgonlineRepository.getkfcountz(item.usercode);
+        //                    model.usercode = item.usercode;
+        //                    model.chatcount = kflist.Count();
+        //                    list.Add(model);
+        //                }
+        //                var info = list.OrderBy(p => p.chatcount).FirstOrDefault();
+        //                if (info != null)
+        //                {
+        //                    usercode = info.usercode;
+        //                }
+        //            }
+        //        }
+               
+
+        //    }
+        //    else
+        //    {
+        //        List<Model.UserZxChatlist> list = new List<UserZxChatlist>();
+        //        //先分组获取数量
+
+        //        //获取所有坐席人员名单
+        //        //var userlist = await _sys_user_accountRepository.Get(p => p.seat_flag == true);//seat_flag
+        //        //获取安排坐席人员表中的坐席信息
+        //        var userlist = await _IFpzxinfosRepository.Get(p => p.loginstate == 1);
+
+        //        //再获取坐席服务的人数进行排序返回人少的 
+        //        foreach (var item in userlist)
+        //        {
+        //            Model.UserZxChatlist model = new UserZxChatlist();
+        //            // 再根据用户编号获取数量
+        //            var kflist = _ImsgonlineRepository.getkfcountz(item.usercode);
+        //            model.usercode = item.usercode;
+        //            model.chatcount = kflist.Count();
+        //            list.Add(model);
+        //        }
+        //        var info = list.OrderBy(p => p.chatcount).FirstOrDefault();
+        //        if (info != null)
+        //        {
+        //            usercode = info.usercode;
+        //        }
+        //    }
+          
+            
+        //    return Success("成功", usercode);
+        //}
         [HttpGet("getzxuserinfo")]
-        public async Task<IActionResult> GetZxUserinfo(string fromuserid)
+        public async Task<IActionResult> GetZxUserinfotest()
         {
-            string usercode = "";
-            //先判断是否为新客户 已经有过客服人员
-            var fromlist = await _ImsgonlineRepository.Get(p => p.fromuserid == fromuserid);
-            if (fromlist.Count() != 0)
+            var usercode = "";
+            string nowtime = DateTime.Now.ToString("yyyy-MM-dd");
+            DateTime stime =Convert.ToDateTime(nowtime + " 00:00:00");
+            DateTime etime = Convert.ToDateTime(nowtime + " 23:59:59");
+
+            List<ChatInglist> clist = new List<ChatInglist>();
+
+            ///存储坐席服务人数信息
+            List<Model.UserZxChatlist> cclist = new List<UserZxChatlist>();
+            //先分组获取数量
+
+            //获取所有坐席人员名单
+            //var userlist = await _sys_user_accountRepository.Get(p => p.seat_flag == true);//seat_flag
+            //获取安排坐席人员表中的坐席信息
+            var userlist = await _IFpzxinfosRepository.Get(p => p.loginstate == 1);
+            //再获取坐席服务的人数进行排序返回人少的 
+            foreach (var item in userlist)
             {
-                var firstusercode= fromlist.FirstOrDefault().touserid;
-                var userlistow = await _IFpzxinfosRepository.Get(p => p.usercode == firstusercode);
-                foreach (var items in userlistow)
+                //根据用户编号获取聊天记录信息提取出跟几个人聊过天 获取到当前坐席的服务人数
+                var serverlist = await _ImsgonlineRepository.Get(p=>p.touserid==item.usercode&&p.createtime>=stime&&p.createtime<=etime);
+                /////将item object类型转换成wo_repair_base类型方便调用
+                //var worepairbase = ConvertObject<Model.Dto.T_Msg_Chat>(serverlist);
+                if (serverlist.Count()==0)
                 {
-                    if (items.loginstate == 1)
+                    //判断是否有了 有的改数量加一 没有的数量为一
+                    var ifhavelist = cclist.Where(p => p.usercode == item.usercode).ToList();
+                    if (ifhavelist.Count > 0)
                     {
-                        usercode = firstusercode;
+                        var a = cclist.Where(p => p.usercode == item.usercode).FirstOrDefault();
+                        a.chatcount += 1;
                     }
                     else
                     {
-                        List<Model.UserZxChatlist> list = new List<UserZxChatlist>();
-                        //先分组获取数量
-
-                        //获取所有坐席人员名单
-                        //var userlist = await _sys_user_accountRepository.Get(p => p.seat_flag == true);//seat_flag
-                        //获取安排坐席人员表中的坐席信息
-                        var userlist = await _IFpzxinfosRepository.Get(p => p.loginstate == 1);
-
-                        //再获取坐席服务的人数进行排序返回人少的 
-                        foreach (var item in userlist)
+                        UserZxChatlist ccmodel = new UserZxChatlist();
+                        ccmodel.usercode = item.usercode;
+                        ccmodel.chatcount = 0;
+                        cclist.Add(ccmodel);
+                    }
+                }
+                else
+                {
+                    foreach (var items in serverlist)
+                    {
+                        //判断是否有了 有的改数量加一 没有的数量为一
+                        var ifhavelist = cclist.Where(p => p.usercode == items.touserid).ToList();
+                        if (ifhavelist.Count > 0)
                         {
-                            Model.UserZxChatlist model = new UserZxChatlist();
-                            // 再根据用户编号获取数量
-                            var kflist = _ImsgonlineRepository.getkfcountz(item.usercode);
-                            model.usercode = item.usercode;
-                            model.chatcount = kflist.Count();
-                            list.Add(model);
+                            var a = cclist.Where(p => p.usercode == items.touserid).FirstOrDefault();
+                            a.chatcount += 1;
                         }
-                        var info = list.OrderBy(p => p.chatcount).FirstOrDefault();
-                        if (info != null)
+                        else
                         {
-                            usercode = info.usercode;
+                            UserZxChatlist ccmodel = new UserZxChatlist();
+                            ccmodel.usercode = items.touserid;
+                            ccmodel.chatcount = 1;
+                            cclist.Add(ccmodel);
                         }
                     }
                 }
                
-
+                
             }
-            else
+            var info = cclist.OrderBy(p => p.chatcount).FirstOrDefault();
+            if (info != null)
             {
-                List<Model.UserZxChatlist> list = new List<UserZxChatlist>();
-                //先分组获取数量
-
-                //获取所有坐席人员名单
-                //var userlist = await _sys_user_accountRepository.Get(p => p.seat_flag == true);//seat_flag
-                //获取安排坐席人员表中的坐席信息
-                var userlist = await _IFpzxinfosRepository.Get(p => p.loginstate == 1);
-
-                //再获取坐席服务的人数进行排序返回人少的 
-                foreach (var item in userlist)
-                {
-                    Model.UserZxChatlist model = new UserZxChatlist();
-                    // 再根据用户编号获取数量
-                    var kflist = _ImsgonlineRepository.getkfcountz(item.usercode);
-                    model.usercode = item.usercode;
-                    model.chatcount = kflist.Count();
-                    list.Add(model);
-                }
-                var info = list.OrderBy(p => p.chatcount).FirstOrDefault();
-                if (info != null)
-                {
-                    usercode = info.usercode;
-                }
+                usercode = info.usercode;
             }
-          
-            
             return Success("成功", usercode);
         }
         /// <summary>
@@ -2148,12 +2220,32 @@ namespace TestUserTypeApi.Controllers
         public async Task<IActionResult> AddOnlinesertype(string zxusercode, string fwusercode, string fwtype)
         {
             var typemodel = await _IOnlineserTypeRepository.GetSingle(p => p.Zxusercode == zxusercode && p.Fwusercode == fwusercode);
-
-            if (typemodel.createtime == DateTime.Now)
+            if (typemodel != null)
             {
-                return Success("成功");
+                //if (typemodel.createtime == DateTime.Now || typemodel.Fwtype != "" || typemodel.Fwtype != null)
+                //{
+                    return Success("成功", "1");
+                //}
+                //else
+                //{
+                //    OnlineserType model = new OnlineserType();
+                //    model.Zxusercode = zxusercode;//当前登录坐席
+                //    model.Fwusercode = fwusercode;//服务人工号
+                //    model.Fwtype = fwtype;//服务类型
+                //    model.createtime = DateTime.Now;
+                //    var a = await _IOnlineserTypeRepository.Add(model);
+                //    if (a)
+                //    {
+                //        return Success("成功");
+                //    }
+                //    else
+                //    {
+                //        return Error("失败");
+                //    }
+                //}
             }
-            else {
+            else
+            {
                 OnlineserType model = new OnlineserType();
                 model.Zxusercode = zxusercode;//当前登录坐席
                 model.Fwusercode = fwusercode;//服务人工号
@@ -2192,7 +2284,8 @@ namespace TestUserTypeApi.Controllers
                 var sbsjcount =await _IOnlineserTypeRepository.Count(p => p.Zxusercode == zxusercode && p.Fwtype == "上班时间" && p.createtime >= DateTime.Parse(stime.Trim() + " 00:00:00") && p.createtime <= DateTime.Parse(etime.Trim() + " 23:59:59"));
                 var ybcount   =await _IOnlineserTypeRepository.Count(p => p.Zxusercode == zxusercode && p.Fwtype == "医保" && p.createtime >= DateTime.Parse(stime.Trim() + " 00:00:00") && p.createtime <= DateTime.Parse(etime.Trim() + " 23:59:59"));
                 var wnrhcount =await _IOnlineserTypeRepository.Count(p => p.Zxusercode == zxusercode && p.Fwtype == "无内容" && p.createtime >= DateTime.Parse(stime.Trim() + " 00:00:00") && p.createtime <= DateTime.Parse(etime.Trim() + " 23:59:59"));
-                var allcount  =await _IOnlineserTypeRepository.Count(p => p.Zxusercode == zxusercode && p.createtime >= DateTime.Parse(stime.Trim() + " 00:00:00") && p.createtime <= DateTime.Parse(etime.Trim() + " 23:59:59"));
+                //var allcount  =await _IOnlineserTypeRepository.Count(p => p.Zxusercode == zxusercode && p.createtime >= DateTime.Parse(stime.Trim() + " 00:00:00") && p.createtime <= DateTime.Parse(etime.Trim() + " 23:59:59"));
+                var  allcount = Convert.ToInt32(yyghcount) + Convert.ToInt32(Tjcount) + Convert.ToInt32(Zpcount) + Convert.ToInt32(bqdhcount) + Convert.ToInt32(xgymcount) + Convert.ToInt32(sbsjcount) + Convert.ToInt32(ybcount) + Convert.ToInt32(wnrhcount);
                 Model.Dto.Onlineservertypein model = new Model.Dto.Onlineservertypein();
                 model.yyghcount =Convert.ToInt32(yyghcount);
                 model.zxusercoude = zxusercode;
@@ -2241,7 +2334,7 @@ namespace TestUserTypeApi.Controllers
         [HttpGet("upfpzxinfos")]
         public async Task<IActionResult> upFpzxinfos(Model.Fpzxinfosdto tps)
         {
-            var tp = await _IFpzxinfosRepository.GetSingle(p => p.id == tps.id);
+            var tp = await _IFpzxinfosRepository.GetSingle(p => p.id == tps.id);//.GetSingle(p => p.usercode == tps.usercode);
             if (tp != null)
             {
                 tp.usercode = tps.usercode;
@@ -11632,11 +11725,15 @@ namespace TestUserTypeApi.Controllers
             tp.deptname = tps.deptname;//科室名称
             tp.coustomname = tps.coustomname;//客户姓名
             tp.phoneinfo = tps.phoneinfo;//联系电话
+            tp.centerinfotype = tps.centerinfotype;//投诉类型
             tp.centerinfo = tps.centerinfo;//咨询内容/反馈内容
             tp.jsdeptname = tps.jsdeptname;//接收部门名称
             tp.jspeople = tps.jspeople;//接收人名称
+            tp.jspeopleusercode = tps.jspeopleusercode;//接收人工号
             tp.memoinfo = tps.memoinfo;//备注
+            tp.resultmassage = tps.resultmassage;//处理结果
             tp.createdate = DateTime.Now;//创建时间
+            tp.createusercode = tps.createusercode;
             var a = _ICallComeTpwodeRepository.AddRetID(tp);
 
             if (a.Result != null || a.Result != "")
@@ -11662,10 +11759,13 @@ namespace TestUserTypeApi.Controllers
             tp.deptname = tps.deptname;//科室名称
             tp.coustomname = tps.coustomname;//客户姓名
             tp.phoneinfo = tps.phoneinfo;//联系电话
+            tp.centerinfotype = tps.centerinfotype;//投诉类型
             tp.centerinfo = tps.centerinfo;//咨询内容/反馈内容
             tp.jsdeptname = tps.jsdeptname;//接收部门名称
             tp.jspeople = tps.jspeople;//接收人名称
+            tp.jspeopleusercode = tps.jspeopleusercode;//接收人工号
             tp.memoinfo = tps.memoinfo;//备注
+            tp.resultmassage = tps.resultmassage;//处理结果
             var a = _ICallComeTpwodeRepository.Update(tp);
 
             if (a.Result)
@@ -11714,43 +11814,116 @@ namespace TestUserTypeApi.Controllers
         /// <param name="PageSize"></param>
         /// <returns></returns>
         [HttpGet("getcallcometpwode")]
-        public async Task<IActionResult> GetCallComeTpwode(int PageIndex, int PageSize,string phonemodel,string deptname,string stime ,string etime ,int wodetype=0)
+        public async Task<IActionResult> GetCallComeTpwode(int PageIndex, int PageSize,string phonemodel,string deptname,string centerinfo,string stime ,string etime ,string usercode,int wodetype=0)
         {
-            //排序字段
-            var sql = "p => p.wodetype == wodetype";
-           
-           
-            //排序字段
-            var sort = Builders<CallComeTpwode>.Sort.Descending("createdate");
-            //根据条件查询集合
-            var listApp = new List<FilterDefinition<CallComeTpwode>>();
-            listApp.Add(Builders<CallComeTpwode>.Filter.Eq("wodetype", wodetype));
-            
-            if (!string.IsNullOrEmpty(phonemodel))
-            {
-                listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.phoneinfo == phonemodel));
-            }
-            if (!string.IsNullOrEmpty(stime) && !string.IsNullOrEmpty(etime))
+            var usercodelist = _sys_user_accountRepository.GetUseralllistin(usercode).ToList();
+            string rolename = "";
+            if (usercodelist.Count() > 0)
             {
-                stime = stime.Trim() + " 00:00:00";
-                etime = etime.Trim() + " 23:59:59";
-                listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.createdate >= DateTime.Parse(stime) && p.createdate <= DateTime.Parse(etime)));
-               
-            }
-            var filter = Builders<CallComeTpwode>.Filter.And(listApp);
+                foreach (var items in usercodelist)
+                {
+                    //将object转化为类对象
+                    var userinfomodel = JsonHelper.JsonToEntity<UserAccountInfoModel>(items.ToJson());
+                    if (userinfomodel != null)
+                    {
+                        rolename = userinfomodel.role_name;
+                        break;
+                    }
 
-            var list = await _ICallComeTpwodeRepository.GetByPage(filter, PageIndex, PageSize, sort);
-            var count = await _ICallComeTpwodeRepository.CountAsync(filter);   //获取总数
-            var listmodel = new List<CallComeTpwode>();
+                }
+                if (rolename == "回访办"|| rolename == "系统维护"|| rolename == "超级管理")
+                {
+                    //排序字段
+                    var sort = Builders<CallComeTpwode>.Sort.Descending("createdate");
+                    //根据条件查询集合
+                    var listApp = new List<FilterDefinition<CallComeTpwode>>();
+                    listApp.Add(Builders<CallComeTpwode>.Filter.Eq("wodetype", wodetype));
 
-            var obj = new
-            {
-                 rows = list,
-                total = count,
-            };
+                    if (!string.IsNullOrEmpty(phonemodel))
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.phoneinfo.Contains(phonemodel)));
+                    }
+                    if (!string.IsNullOrEmpty(deptname))
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.deptname == deptname));
+                    }
+                    if (!string.IsNullOrEmpty(centerinfo))
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.centerinfo.Contains(centerinfo)));
+                    }
+                    if (!string.IsNullOrEmpty(stime) && !string.IsNullOrEmpty(etime))
+                    {
+                        stime = stime.Trim() + " 00:00:00";
+                        etime = etime.Trim() + " 23:59:59";
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.createdate >= DateTime.Parse(stime) && p.createdate <= DateTime.Parse(etime)));
+
+                    }
+                    var filter = Builders<CallComeTpwode>.Filter.And(listApp);
+
+                    var list = await _ICallComeTpwodeRepository.GetByPage(filter, PageIndex, PageSize, sort);
+                    var count = await _ICallComeTpwodeRepository.CountAsync(filter);   //获取总数
+                    var listmodel = new List<CallComeTpwode>();
+
+                    var obj = new
+                    {
+                        rows = list,
+                        total = count,
+                    };
+
+
+                    return Success("成功", obj);
+                }
+                else
+                {
+                    //排序字段
+                    var sort = Builders<CallComeTpwode>.Sort.Descending("createdate");
+                    //根据条件查询集合
+                    var listApp = new List<FilterDefinition<CallComeTpwode>>();
+                    listApp.Add(Builders<CallComeTpwode>.Filter.Eq("wodetype", wodetype));
+
+                    if (!string.IsNullOrEmpty(phonemodel))
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.phoneinfo.Contains(phonemodel)));
+                    }
+                    if (!string.IsNullOrEmpty(deptname))
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.deptname == deptname));
+                    }
+                    if (!string.IsNullOrEmpty(centerinfo))
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.centerinfo.Contains(centerinfo)));
+                    }
+                    if (!string.IsNullOrEmpty(stime) && !string.IsNullOrEmpty(etime))
+                    {
+                        stime = stime.Trim() + " 00:00:00";
+                        etime = etime.Trim() + " 23:59:59";
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Where(p => p.createdate >= DateTime.Parse(stime) && p.createdate <= DateTime.Parse(etime)));
+
+                    }
+                    if (wodetype == 1)
+                    {
+                        listApp.Add(Builders<CallComeTpwode>.Filter.Eq("jspeopleusercode", usercode));
+                    }
+                    var filter = Builders<CallComeTpwode>.Filter.And(listApp);
+
+                    var list = await _ICallComeTpwodeRepository.GetByPage(filter, PageIndex, PageSize, sort);
+                    var count = await _ICallComeTpwodeRepository.CountAsync(filter);   //获取总数
+                    var listmodel = new List<CallComeTpwode>();
+
+                    var obj = new
+                    {
+                        rows = list,
+                        total = count,
+                    };
+
+
+                    return Success("成功", obj);
+                }
+            }
+            else {
+                return Success("成功");
+            }
            
-          
-            return Success("成功", obj);
         }
         #endregion
         #region 科室及负责人信息维护
@@ -11766,6 +11939,7 @@ namespace TestUserTypeApi.Controllers
             CallComeDeptorPeo tp = new CallComeDeptorPeo();
             tp.deptname = tps.deptname;//科室名称
             tp.peoplename = tps.peoplename;//负责人姓名
+            tp.usercode = tps.usercode;//负责人工号
 
             var a = _ICallComeDeptorPeoRepository.AddRetID(tp);
 
@@ -11790,6 +11964,7 @@ namespace TestUserTypeApi.Controllers
             CallComeDeptorPeo tp = await _ICallComeDeptorPeoRepository.GetSingle(p => p.id == tps.id);
             tp.deptname = tps.deptname;//科室名称
             tp.peoplename = tps.peoplename;//负责人姓名
+            tp.usercode = tps.usercode;//负责人工号
             var a = _ICallComeDeptorPeoRepository.Update(tp);
 
             if (a.Result)
@@ -12211,5 +12386,69 @@ namespace TestUserTypeApi.Controllers
             return Success("成功", model);
         }
         #endregion
+
+        /// <summary>
+        /// 将object对象转换为实体对象
+        /// </summary>
+        /// <typeparam name="T">实体对象类名</typeparam>
+        /// <param name="asObject">object对象</param>
+        /// <returns></returns>
+        private T ConvertObject<T>(object asObject) where T : new()
+        {
+            //创建实体对象实例
+            var t = Activator.CreateInstance<T>();
+            if (asObject != null)
+            {
+                Type type = asObject.GetType();
+                //遍历实体对象属性
+                foreach (var info in typeof(T).GetProperties())
+                {
+                    object obj = null;
+                    //取得object对象中此属性的值
+                    var val = type.GetProperty(info.Name)?.GetValue(asObject);
+                    if (val != null)
+                    {
+                        //非泛型
+                        if (!info.PropertyType.IsGenericType)
+                            obj = Convert.ChangeType(val, info.PropertyType);
+                        else//泛型Nullable<>
+                        {
+                            Type genericTypeDefinition = info.PropertyType.GetGenericTypeDefinition();
+                            if (genericTypeDefinition == typeof(Nullable<>))
+                            {
+                                obj = Convert.ChangeType(val, Nullable.GetUnderlyingType(info.PropertyType));
+                            }
+                            else
+                            {
+                                obj = Convert.ChangeType(val, info.PropertyType);
+                            }
+                        }
+                        info.SetValue(t, obj, null);
+                    }
+                }
+            }
+            return t;
+        }
+
+
+
+        [HttpGet("ceshishuju")]
+        public async Task<IActionResult> ceshishuju(string stime, string etime,int countsthes)
+        {
+            DateTime dt1 =  Convert.ToDateTime(etime);
+            DateTime dt2 =  Convert.ToDateTime(stime);
+
+            TimeSpan ts = dt1.Subtract(dt2);
+            double hours = ts.TotalHours;//24.0 
+            if ((hours - countsthes) > 0)
+            {
+                var a = hours - countsthes;
+                return Success("超时时长：", a.ToString("0.00"));
+            }
+            else
+            {
+                return Success("没超时");
+            }
+        }
     }
 }

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Model/getdocttimedetail/response.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TestUserTypeApi.Model.getdocttimedetail
+{
+    public class response
+    {
+        public string resultCode { get; set; }
+        public List<timeFlag> timeFlagDS { get; set; }
+    }
+}

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Model/timeFlag.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace TestUserTypeApi.Model
+{
+    public class timeFlag
+    {
+        public string startTime { get; set; } 
+        public string endTime { get; set; }
+        public string usedFlag { get; set; }
+    }
+}

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/Properties/launchSettings.json

@@ -1,13 +1,13 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
+{
   "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:55488",
       "sslPort": 0
     }
   },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
@@ -33,6 +33,7 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development_Base"
       },
+      "nativeDebugging": true,
       "applicationUrl": "http://localhost:28340/"
     },
     "PLCAutomationApi(Prod)": {

代码/MadRunFabric.TestUserTypeApi/TestUserTypeApi/TestUserTypeApi.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>