yl
2022-10-29 541f5ec7d947837f873435bea873e95c4b6cc95e
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -931,7 +931,7 @@
                        mn.flag = data.Rows[i]["FLAG"].ToString();
                        mn.children = new List<AnDnDateSub>();
                        //根据呼叫类型id查找绑定人员
                        sql = @"select U.usercode,U.username
                        sql = @"select U.usercode,U.username,U.rid
                                from TAnDon_Roul_ConFigUser A
                                inner join TUser U on A.usercode=U.usercode
                                where A.ando_cogfigid=@id";
@@ -942,6 +942,8 @@
                            for (int j = 0; j < data0.Rows.Count; j++)
                            {
                                AnDnDateSub sn = new AnDnDateSub();
                                sn.rid= data0.Rows[j]["RID"].ToString();//rid
                                sn.alias = data0.Rows[j]["RID"].ToString() + data0.Rows[j]["USERCODE"].ToString();  //别名
                                sn.usercode = data0.Rows[j]["USERCODE"].ToString();
                                sn.username = data0.Rows[j]["USERNAME"].ToString();
                                mn.children.Add(sn);
@@ -1037,6 +1039,7 @@
                                    eqp_code = eqpcode,
                                    type = code,
                                    resp_user = json[i].children[j].usercode,
                                    alias= json[i].children[j].alias,
                                    status = "N"
                                }
                            });
@@ -1044,7 +1047,7 @@
                    }
                }
                //极光推送
                //mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
                mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
@@ -1083,7 +1086,7 @@
            try
            {
                //获取对应设备及所属车间的安灯呼叫记录
                sql = @"select A.eqp_code,B.name as eqp_name,T.org_name,A.type as typecode,D.name as typename
                sql = @"select A.eqp_code,B.name as eqp_name,T.org_code as wksp_code,T.org_name as wksp_name,A.type as typecode,D.name as typename
                        from TAnDon_Task_Info A
                        left join  TEqpInfo B on A.eqp_code=B.code
                        left join  TOrganization T on B.wksp_code=T.org_code