FEDApi.git - Gitblit

			@@ -673,7 +673,7 @@
			}
			if (checkdescr != "" && checkdescr != null)
			{
			search += "and A.description=@checkdescr ";
			search += "and A.description like '%'+@checkdescr+'%' ";
			dynamicParams.Add("@checkdescr", checkdescr);
			}
			if (isqrcode != "" && isqrcode != null)
			@@ -862,7 +862,7 @@
			}
			if (maidescr != "" && maidescr != null)
			{
			search += "and A.description=@maidescr ";
			search += "and A.description like '%'+@maidescr+'%' ";
			dynamicParams.Add("@maidescr", maidescr);
			}
			if (isqrcode != "" && isqrcode != null)
			@@ -907,7 +907,7 @@
			if (operType == "Add")
			{
			var sql = @"insert into TEqpmai_Item(code,name,description,isscan,lm_user,lm_date)
			values(@maiitemcode,@maiitemname,@checkitemdescr,@isqrcode,@usercode,@CreateDate)";
			values(@maiitemcode,@maiitemname,@maiitemdescr,@isqrcode,@usercode,@CreateDate)";
			dynamicParams.Add("@maiitemcode", maiitemcode);
			dynamicParams.Add("@maiitemname", maiitemname);
			dynamicParams.Add("@maiitemdescr", maiitemdescr);
			@@ -1034,17 +1034,17 @@
			{
			if (checkstandcode != "" && checkstandcode != null)
			{
			search += "and code like '%'+@checkstandcode+'%' ";
			search += "and A.code like '%'+@checkstandcode+'%' ";
			dynamicParams.Add("@checkstandcode", checkstandcode);
			}
			if (checkstandname != "" && checkstandname != null)
			{
			search += "and name like '%'+@checkstandname+'%' ";
			search += "and A.name like '%'+@checkstandname+'%' ";
			dynamicParams.Add("@checkstandname", checkstandname);
			}
			if (checkcontr != "" && checkcontr != null)
			{
			search += "and iscontr=@checkcontr ";
			search += "and A.iscontr=@checkcontr ";
			dynamicParams.Add("@checkcontr", checkcontr);
			}
			if (search == "")
			@@ -1054,8 +1054,10 @@
			//search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select id,code,name,description,iscontr,is_checkeqp,lm_user,lm_date
			from TEqpchk_Main where is_delete<>'1' " + search;
			var sql = @"select A.id,A.code,A.name,A.description,A.iscontr,A.is_checkeqp,U.username as lm_user,A.lm_date
			from TEqpchk_Main A
			left join TUser U on A.lm_user=U.usercode
			where A.is_delete<>'1' " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			@@ -1470,17 +1472,17 @@
			{
			if (repairstandcode != "" && repairstandcode != null)
			{
			search += "and code like '%'+@repairstandcode+'%' ";
			search += "and A.code like '%'+@repairstandcode+'%' ";
			dynamicParams.Add("@repairstandcode", repairstandcode);
			}
			if (repairstandname != "" && repairstandname != null)
			{
			search += "and name like '%'+@repairstandname+'%' ";
			search += "and A.name like '%'+@repairstandname+'%' ";
			dynamicParams.Add("@repairstandname", repairstandname);
			}
			if (repairstanddescr != "" && repairstanddescr != null)
			{
			search += "and description like '%'+@repairstanddescr+'%' ";
			search += "and A.description like '%'+@repairstanddescr+'%' ";
			dynamicParams.Add("@repairstanddescr", repairstanddescr);
			}

			@@ -1491,8 +1493,10 @@
			//search = search.Substring(3);//截取索引2后面的字符
			// --------------查询指定数据--------------
			var total = 0; //总条数
			var sql = @"select id,code,name,description,is_repaireqp,main_cycle,lm_user,lm_date
			from TEqpmai_Main where is_delete<>'1' " + search;
			var sql = @"select A.id,A.code,A.name,A.description,A.is_repaireqp,A.main_cycle,U.username as lm_user,A.lm_date
			from TEqpmai_Main A
			left join TUser U on A.lm_user=U.usercode
			where A.is_delete<>'1' " + search;
			var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
			mes.code = "200";
			mes.Message = "查询成功!";
			@@ -1542,7 +1546,7 @@
			try
			{
			//获取设备保养标准信息
			sql = @"select code,name,description
			sql = @"select code,name,description,main_cycle
			from TEqpmai_Main
			where code=@repairstand_code and is_delete<>'1'";
			dynamicParams.Add("@repairstand_code", repairstand_code);
			@@ -1564,7 +1568,7 @@
			return mes;
			}
			//根据设备保养标准编码获取关联的保养项目信息
			sql = @"select B.code,B.name,A.chkdesc,A.isscan,A.cycle from TEqpmai_Deta A
			sql = @"select B.code,B.name,A.chk_desc,A.isscan,A.cycle from TEqpmai_Deta A
			left join TEqpmai_Item B on A.code=B.code
			where A.eapmai_code=@repairstand_code order by A.seq asc";
			dynamicParams.Add("@repairstand_code", rout.code);
			@@ -1597,7 +1601,7 @@
			if (opertype == "Add")
			{
			//新增设备保养标准主表
			sql = @"insert into TEqpmai_Main(code,name,description,main_cycle,lm_user,lm_date) values(@code,@name,@descr,@lm_user,@lm_date)";
			sql = @"insert into TEqpmai_Main(code,name,description,main_cycle,lm_user,lm_date) values(@code,@name,@descr,@main_cycle,@lm_user,@lm_date)";
			list.Add(new { str = sql, parm = new { code = json.code, name = json.name, descr = json.description,main_cycle=json.repaircycle, lm_user = username, lm_date = DateTime.Now.ToString() } });
			for (int i = 0; i < json.Data.Rows.Count; i++)
			{