修改

MadRunFabric.EquipmentApi/EquipmentApi.IRepositories/IWo_Repair_BaseRepository.cs

@@ -43,7 +43,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,
+        int pageindex, int pagesize, int usehc, out int recordcount,
         out int totalcount, out int wzpcount, out int yjdcount, out int dpjcount, out int ygqcount, out int ywjcount, out int yqxcount);
         /// <summary>
         /// 获取返修工单信息

MadRunFabric.EquipmentApi/EquipmentApi.Repositories/Wo_Repair_BaseRepository.cs

@@ -351,10 +351,10 @@ 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,
+         int pageindex, int pagesize,int usehc, out int recordcount,
          out int totalcount, out int wzpcount, out int yjdcount, out int dpjcount, out int ygqcount, out int ywjcount, out int yqxcount)
         {
-            if (userinfo.role_code == "HFB" || userinfo.role_code == "XTWH")
+            if (userinfo.role_code == "HFB" || userinfo.role_code == "XTWH" || userinfo.role_code == "ZZ")
             {
                 #region 护士长权限
                
@@ -440,8 +440,8 @@ namespace EquipmentApi.Repositories
                                 || it.touser.Contains(usercode)
                                 || it.dealuser.Contains(usercode)
                                 );
-                    if (!string.IsNullOrEmpty(Pwcode))
-                        query = query.Where(it => it.Pwcode == Pwcode);
+                     if (!string.IsNullOrEmpty(Pwcode))
+                        query = query.Where(it => it.Jwocode == Pwcode);
                     if (!string.IsNullOrEmpty(wocode))
                         query = query.Where(it => it.wocode.Contains(wocode));
                     if (!string.IsNullOrEmpty(province))
@@ -466,8 +466,12 @@ namespace EquipmentApi.Repositories
                         query = query.Where(it => it.channel == Convert.ToInt32(channel));
                     if (!string.IsNullOrEmpty(Jwocode))
                         query = query.Where(it => it.Jwocode == Jwocode);
-                    #region 时间搜索
-                    if (!string.IsNullOrEmpty(stime))
+                if (usehc > -1)
+                {
+                    query = query.Where(it => it.ismaterials == usehc);
+                }
+                #region 时间搜索
+                if (!string.IsNullOrEmpty(stime))
                         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"));
@@ -637,7 +641,7 @@ namespace EquipmentApi.Repositories
                             postlist = userinfolis.postlist,
                             repairbase.wxtimeid,
                             repairbase.wxdemodes,
-                            repairbase.wxtimecenter,
+                            repairbase.wxtimecenter,                           
                             wxtimecentername = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().wxcenter : "",//维修时效信息
                             wxtimeleths = wxtimelisDefa.Count() > 0 ? wxtimelisDefa.First().timecount : 0,//维修时长
                     };
@@ -653,7 +657,7 @@ namespace EquipmentApi.Repositories
                                 || it.dealuser.Contains(usercode)
                                 );
                     if (!string.IsNullOrEmpty(Pwcode))
-                        query = query.Where(it => it.Pwcode == Pwcode);
+                        query = query.Where(it => it.Jwocode == Pwcode);
                     if (!string.IsNullOrEmpty(province))
                         query = query.Where(it => it.provincecode == province);
                     if (!string.IsNullOrEmpty(city))
@@ -672,6 +676,10 @@ namespace EquipmentApi.Repositories
                         query = query.Where(it => it.equipmentid == equipmentid);
                     if (!string.IsNullOrEmpty(channel))
                         query = query.Where(it => it.channel == Convert.ToInt32(channel));
+
+                    if (usehc > -1) {
+                        query = query.Where(it => it.ismaterials == usehc);
+                    }
                     #region 时间搜索
                     if (!string.IsNullOrEmpty(stime))
                         query = query.Where(it => it.createtime >= Convert.ToDateTime(stime + " 00:00:00"));
@@ -888,7 +896,7 @@ namespace EquipmentApi.Repositories
                             || it.dealuser.Contains(usercode)
                             );
                     if (!string.IsNullOrEmpty(Pwcode))
-                        query = query.Where(it => it.Pwcode == Pwcode);
+                        query = query.Where(it => it.Jwocode == Pwcode);
                     if (!string.IsNullOrEmpty(wocode))
                     query = query.Where(it => it.wocode.Contains(wocode));
                 if (!string.IsNullOrEmpty(province))
@@ -913,8 +921,12 @@ namespace EquipmentApi.Repositories
                     query = query.Where(it => it.channel == Convert.ToInt32(channel));
                 if (!string.IsNullOrEmpty(Jwocode))
                     query = query.Where(it => it.Jwocode == Jwocode);
-                #region 时间搜索
-                if (!string.IsNullOrEmpty(stime))
+                    if (usehc > -1)
+                    {
+                        query = query.Where(it => it.ismaterials == usehc);
+                    }
+                    #region 时间搜索
+                    if (!string.IsNullOrEmpty(stime))
                     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"));
@@ -947,7 +959,7 @@ namespace EquipmentApi.Repositories
                 }
                 if (userinfo.role_name.Contains("班") || userinfo.role_name == "默认角色")
                 {
-
+ 
                    
                         wzpcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.create && (p.createusername == userinfo.username  || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//|| p.tousername[0] == userinfo.username
                         yjdcount = query.Count(p => p.wostate == (int)EnumWorkOrderState.assign && (p.createusername == userinfo.username || p.repairman == userinfo.username || p.repairman.Contains(userinfo.usercode)));//|| p.tousername[0] == userinfo.username 

MadRunFabric.EquipmentApi/EquipmentApi/Controllers/workordermanage/WoRepairBaseController.cs

@@ -90,9 +90,9 @@ namespace EquipmentApi.Controllers.workordermanage
             _ISys_Role_InfoRepository = Sys_Role_InfoRepository;
             _IusercoldandclintidsRepository = usercoldandclintidsRepository;
             _wxwpstimeRepository = wxwpstimeRepository;
-            _Imate_dict_viewRepository = mate_dict_viewRepository; 
+            _Imate_dict_viewRepository = mate_dict_viewRepository;
         }
-        
+
         #region 工单分页获取接口
 
         /// <summary>
@@ -181,7 +181,7 @@ namespace EquipmentApi.Controllers.workordermanage
         [HttpGet("getlistbypage")]
         public IActionResult GetListByPageAsync(string phone, string wocode, string province, string city, string protypeid, string projectid,
             string buildid, string floorid, string replace, string systemid, string equipmentid, string usercode, string stime, string etime, string channel, string Jwocode, string Pwcode, int score,
-            int datetype = -1, int state = -1, int wxstate = -1, int pageindex = 1, int pagesize = 10)
+            int datetype = -1, int state = -1, int wxstate = -1, int pageindex = 1, int pagesize = 10,int usehc=-1)
         {
             string nowusercode =User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;//"8000";// "8000";//
             //var userstr = _signTokenService.GetUserInfoAsync(nowusercode).Result;
@@ -206,7 +206,7 @@ namespace EquipmentApi.Controllers.workordermanage
             int ywjcount = 0;
             int yqxcount = 0;
             var result = _wo_repair_baseRepository.GetListsByPageglhsz(phone, wocode, province, city, projectid, protypeid, buildid, floorid, replace,
-                systemid, equipmentid, usercode, stime, etime, channel, Jwocode,  Pwcode, state, score, wxstate, nowusercode, userinfo, pageindex, pagesize,
+                systemid, equipmentid, usercode, stime, etime, channel, Jwocode,  Pwcode, state, score, wxstate, nowusercode, userinfo, pageindex, pagesize, usehc,
                 out recordCount, out totalcount, out wzpcount, out yjdcount, out dpjcount, out ygqcount, out ywjcount, out yqxcount);
             
             List<Wo_Repair_Base> lists = new List<Wo_Repair_Base>();
@@ -6884,7 +6884,7 @@ namespace EquipmentApi.Controllers.workordermanage
             }
             if (string.IsNullOrWhiteSpace(input.repairreplace))
             {
-                return Error("请选择保修地点");
+                return Error("请选择报修地点");
             }
             if (string.IsNullOrWhiteSpace(input.repairman))
             {
@@ -7831,7 +7831,7 @@ namespace EquipmentApi.Controllers.workordermanage
                         modelmap.wocode = clmodel.wocode;
                         modelmap.wostate = clmodel.wostate;
                         modelmap.readby = assignman;
-                        modelmap.channelcode = 1;   //工单类型（枚举EnumOrderState） 维修工单 = 1, 保养工单 = 2, 运行工单 = 3, 超时工单 = 4
+                        modelmap.channelcode = 11;   //工单类型（枚举EnumOrderState） 维修工单 = 1, 保养工单 = 2, 运行工单 = 3, 超时工单 = 4
                         modelmap.isread = 0;
                         modelmap.isnotice = 0;
                         modelmap.readtime = DateTime.Now;
@@ -12335,7 +12335,7 @@ namespace EquipmentApi.Controllers.workordermanage
         public async Task<IActionResult> GetBxMessageList(int isread)
         {
             string nowusercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
-            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode == 1 && x.readby == nowusercode);
+            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode == 11 && x.readby == nowusercode);
 
             var list = new List<MessageListDto>();
             if (isread == 0)
@@ -12347,7 +12347,7 @@ namespace EquipmentApi.Controllers.workordermanage
                     {
                         id = item.id,
                         woid = item.woid,
-                        channelcode = 1,
+                        channelcode = 11,
                         wotype = 1,
                         wocode = item.wocode,
                         proname = "维修工单:" + item.wocode, // + " " + item.proname,
@@ -12371,8 +12371,8 @@ namespace EquipmentApi.Controllers.workordermanage
                     list.Add(new MessageListDto
                     {
                         id = item.id,
-                        woid = item.id,
-                        channelcode = 1,
+                        woid = item.woid,
+                        channelcode = 11,
                         wotype = 1,
                         wocode = item.wocode,
                         proname = "维修工单:" + item.wocode, // + " " + item.proname,
@@ -12406,7 +12406,7 @@ namespace EquipmentApi.Controllers.workordermanage
 
             string nowusercode = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
             //  string nowusercode="1003";
-            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode == 1 && x.readby == nowusercode && x.id == id);
+            var listmap = await _wo_order_user_maprepository.Get(x => x.channelcode ==11 && x.readby == nowusercode && x.id == id);
             if (listmap != null)
             {
                 var modelmap = listmap.FirstOrDefault();