From 0774d7f588c08b27791732714aa2abf426925a96 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 6 Feb 2026 10:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=8A=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/rm/unFinishWorkList.jsp     |   60 +-
 WebContent/static/js/bm/ip_utils.js           |    4 +-
 .../mybatis/index/IndexHomeDetailsMapper.xml  | 2121 +++++++++--------
 resources/mybatis/newInput/NewInputMapper.xml |   30 +-
 resources/mybatis/wf/TaskRecordMapper.xml     |   49 +
 .../controller/InputDetailsController.java    |    2 +-
 .../controller/NewInputController.java        |   38 +
 src/com/bonus/newInput/dao/NewInputDao.java   |    6 +
 .../service/NewInputQrcodeServiceImp.java     |    7 +
 .../newInput/service/NewInputService.java     |    5 +
 .../newInput/service/NewInputServiceImp.java  |   21 +-
 11 files changed, 1283 insertions(+), 1060 deletions(-)

diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp
index 8cdcce7..097949c 100644
--- a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp
+++ b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp
@@ -178,8 +178,28 @@
 				JY.Model.info("您没有选择任何内容!");
 				return;
 			}
-			console.log("selectedValues:", selectedValues);
-
+			
+			let pizhun=[];
+			let shenhe=[];
+			
+			for (var i = 0; i < selectedValues.length; i++) {
+				  	const item = selectedValues[i]; // 缓存当前元素，代码更简洁
+				    console.log('当前遍历元素：', item);
+				    // 核心：判断字符串是否包含「新购任务审核」，includes返回布尔值
+				    if (item.includes('新购任务审核')) {
+				    	shenhe.push(item); // 符合条件，推入xingo
+				    } else if (item.includes('新购任务批准')){
+				    	pizhun.push(item); // 不符合，推入shenhe
+				    }
+			}
+			 console.log('当前遍历元素：', pizhun);
+			 console.log('当前遍历元素：', shenhe);
+			if(shenhe.length>0){
+				aduitFunction(shenhe);
+			}
+			if(pizhun.length>0){
+				pizhunFunction(pizhun);
+			}
 			$.ajax({
 				type: 'POST',
 				url: bonuspath + '/backstage/rm/taskRecord/batchApproval',
@@ -196,6 +216,42 @@
 				}
 			});
 		});
+		//审核
+		function aduitFunction(shenhe){
+			console.log(shenhe)
+			$.ajax({
+				type: 'POST',
+				url: bonuspath + '/backstage/new/isExamines',
+				traditional: true,
+				data: { id: shenhe.join(",") },
+				success: function(data) {
+					dataNum++;
+				},
+				error: function(xhr) {
+					console.error("请求失败，状态码:", xhr.status);
+					console.error("响应内容:", xhr.responseText);
+				}
+			});
+		}
+		
+		function pizhunFunction(pizhun){
+			console.log(pizhun)
+			$.ajax({
+				type: 'POST',
+				url: bonuspath + '/backstage/new/isApprovals',
+				traditional: true,
+				data: { id: pizhun.join(",") },
+				success: function(data) {
+					
+				},
+				error: function(xhr) {
+					console.error("请求失败，状态码:", xhr.status);
+					console.error("响应内容:", xhr.responseText);
+				}
+			});
+			
+		}
+		
 
 		// 全选逻辑
 		$('#checkAll').on('click', function(e) {
diff --git a/WebContent/static/js/bm/ip_utils.js b/WebContent/static/js/bm/ip_utils.js
index 8481178..3f89f80 100644
--- a/WebContent/static/js/bm/ip_utils.js
+++ b/WebContent/static/js/bm/ip_utils.js
@@ -6,9 +6,9 @@ let AQGQJ_IP='http://10.1.0.142:1999';
 let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/';
 
 //车辆 后端请求IP
-let CAR_IP='http://192.168.0.38:21522';
+let CAR_IP='http://127.0.0.1:21522';
 //车辆 跳转页面IP
-let CAR_HTML_IP='http://192.168.0.38:8848/gz_car_ui/';
+let CAR_HTML_IP='http://127.0.0.1:8848/gz_car_ui/';
 
 
 // dev -生产
diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml
index ac409fd..03f7af0 100644
--- a/resources/mybatis/index/IndexHomeDetailsMapper.xml
+++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml
@@ -2,705 +2,705 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.bonus.index.dao.IndexHomeDetailsDao" >
 
-    <resultMap id="index" type="com.bonus.index.beans.IndexHomeDetailsBean">
+	<resultMap id="index" type="com.bonus.index.beans.IndexHomeDetailsBean">
 
 
-    </resultMap>
+	</resultMap>
 
 
 
-        <select id="getMaTypeDetails" parameterType="com.bonus.index.beans.IndexHomeDetailsBean" resultMap="index">
-			select * from (
-			SELECT
-			rs.typeId,
-			mat2.`NAME` maType,
-			mat1.`NAME` maName,
-			mat1.UNIT as maUnit,
-			SUM(rs.storageNum)+SUM(rs.inuseNum) +SUM(rs.repairNum) as maTotal,
-			SUM(rs.storageNum) storageNum,
-			SUM(rs.inuseNum) inuseNum,
-			SUM(rs.repairNum) repairNum,
-			SUM(rs.scrapNum) scrapNum,
-			SUM(rs.projectNum) projectNum,
-			SUM(rs.inuseCount) inuseCount,
-			SUM(rs.backCount) backCount,
-			SUM(rs.pyNum) as pyNum,
-			SUM(rs.pkNum)  as pkNum,
-			rs.isCount
-			FROM
-			(
-			SELECT
-			mat1.ID AS typeId,
-			mat1.NUM storageNum,
-			0 inuseNum,
-			0 repairNum,
-			0 scrapNum,
-			0 projectNum,
-			0 inuseCount,
-			0 backCount,
-			0 as pyNum,
-			0 as pkNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			mm_type mat1
-			LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-			WHERE
-			mat1.`LEVEL` = 4
-			AND mat1.IS_ACTIVE = '1'
-			GROUP BY
-			mat1.ID
-			UNION
+	<select id="getMaTypeDetails" parameterType="com.bonus.index.beans.IndexHomeDetailsBean" resultMap="index">
+		select * from (
+		SELECT
+		rs.typeId,
+		mat2.`NAME` maType,
+		mat1.`NAME` maName,
+		mat1.UNIT as maUnit,
+		SUM(rs.storageNum)+SUM(rs.inuseNum) +SUM(rs.repairNum) as maTotal,
+		SUM(rs.storageNum) storageNum,
+		SUM(rs.inuseNum) inuseNum,
+		SUM(rs.repairNum) repairNum,
+		SUM(rs.scrapNum) scrapNum,
+		SUM(rs.projectNum) projectNum,
+		SUM(rs.inuseCount) inuseCount,
+		SUM(rs.backCount) backCount,
+		SUM(rs.pyNum) as pyNum,
+		SUM(rs.pkNum)  as pkNum,
+		rs.isCount
+		FROM
+		(
+		SELECT
+		mat1.ID AS typeId,
+		mat1.NUM storageNum,
+		0 inuseNum,
+		0 repairNum,
+		0 scrapNum,
+		0 projectNum,
+		0 inuseCount,
+		0 backCount,
+		0 as pyNum,
+		0 as pkNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		mm_type mat1
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+		WHERE
+		mat1.`LEVEL` = 4
+		AND mat1.IS_ACTIVE = '1'
+		GROUP BY
+		mat1.ID
+		UNION
 
-			SELECT
-			typeId,
-			0 storageNum,
-			sum( leaseNum ) - SUM( backNum ) inuseNum,
-			0 repairNum,
-			0 scrapNum,
-			0 projectNum,
-			sum( leaseNum ) inuseCount,
-			SUM( backNum ) backCount,
-			0 as pyNum,
-			0 as pkNum,
-			isCount AS isCount
-			FROM
-			(
-			SELECT
-			mmt1.`NAME` AS pMachineName,
-			mmt.`NAME` AS machineName,
-			mt.`NAME` AS machineModel,
-			mt.ID AS typeId,
-			mt.BUY_PRICE AS buyPrice,
-			mt.UNIT,
-			SUM( wir.NUM ) AS leaseNum,
-			0 AS backNum,
-			mt.IS_COUNT AS isCount
-			FROM
-			wf_info_record wir
-			LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
-			LEFT JOIN wf_task_record wtr2 ON wtr.SUP_ID = wtr2.ID
-			LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
-			LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
-			LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
-			LEFT JOIN wf_collar_details wcd ON wcd.TASK_ID = wtr.SUP_ID
-			AND wcd.MODEL_ID = wir.MODEL_ID
-			WHERE
-			wir.TYPE = 2
-			AND wtr2.IS_ACTIVE = 1
-			AND wcd.IS_APPROVAL = 1
-			GROUP BY
-			mt.ID UNION
-			SELECT
-			mmt1.`NAME` AS pMachineName,
-			mmt.`NAME` AS machineName,
-			mt.`NAME` AS machineModel,
-			mt.ID AS typeId,
-			mt.BUY_PRICE AS buyPrice,
-			mt.UNIT,
-			0 AS leaseNum,
-			SUM( wir.NUM ) AS backNum,
-			mt.IS_COUNT AS isCount
-			FROM
-			wf_info_record wir
-			LEFT JOIN wf_return_material_details wrd ON wir.SUP_ID = wrd.ID
-			LEFT JOIN wf_task_record wtr ON wrd.TASK_ID = wtr.ID
-			LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
-			LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
-			LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
-			WHERE
-			wir.TYPE = 4
-			AND wtr.IS_ACTIVE = 1
-			GROUP BY
-			mt.ID
-			) a
-			GROUP BY
-			typeId
-			UNION
+		SELECT
+		typeId,
+		0 storageNum,
+		sum( leaseNum ) - SUM( backNum ) inuseNum,
+		0 repairNum,
+		0 scrapNum,
+		0 projectNum,
+		sum( leaseNum ) inuseCount,
+		SUM( backNum ) backCount,
+		0 as pyNum,
+		0 as pkNum,
+		isCount AS isCount
+		FROM
+		(
+		SELECT
+		mmt1.`NAME` AS pMachineName,
+		mmt.`NAME` AS machineName,
+		mt.`NAME` AS machineModel,
+		mt.ID AS typeId,
+		mt.BUY_PRICE AS buyPrice,
+		mt.UNIT,
+		SUM( wir.NUM ) AS leaseNum,
+		0 AS backNum,
+		mt.IS_COUNT AS isCount
+		FROM
+		wf_info_record wir
+		LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
+		LEFT JOIN wf_task_record wtr2 ON wtr.SUP_ID = wtr2.ID
+		LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
+		LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
+		LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
+		LEFT JOIN wf_collar_details wcd ON wcd.TASK_ID = wtr.SUP_ID
+		AND wcd.MODEL_ID = wir.MODEL_ID
+		WHERE
+		wir.TYPE = 2
+		AND wtr2.IS_ACTIVE = 1
+		AND wcd.IS_APPROVAL = 1
+		GROUP BY
+		mt.ID UNION
+		SELECT
+		mmt1.`NAME` AS pMachineName,
+		mmt.`NAME` AS machineName,
+		mt.`NAME` AS machineModel,
+		mt.ID AS typeId,
+		mt.BUY_PRICE AS buyPrice,
+		mt.UNIT,
+		0 AS leaseNum,
+		SUM( wir.NUM ) AS backNum,
+		mt.IS_COUNT AS isCount
+		FROM
+		wf_info_record wir
+		LEFT JOIN wf_return_material_details wrd ON wir.SUP_ID = wrd.ID
+		LEFT JOIN wf_task_record wtr ON wrd.TASK_ID = wtr.ID
+		LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
+		LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
+		LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
+		WHERE
+		wir.TYPE = 4
+		AND wtr.IS_ACTIVE = 1
+		GROUP BY
+		mt.ID
+		) a
+		GROUP BY
+		typeId
+		UNION
 
-			SELECT
-			typeId,
-			0 storageNum,
-			0 inuseNum,
-			SUM(repairNum) + SUM(checkNum) + SUM(waitInputNum) as repairNum,
-			0 scrapNum,
-			0 projectNum,
-			0 inuseCount,
-			0 backCount,
-			0 as pyNum,
-			0 as pkNum,
-			isCount
-			FROM
-			(
+		SELECT
+		typeId,
+		0 storageNum,
+		0 inuseNum,
+		SUM(repairNum) + SUM(checkNum) + SUM(waitInputNum) as repairNum,
+		0 scrapNum,
+		0 projectNum,
+		0 inuseCount,
+		0 backCount,
+		0 as pyNum,
+		0 as pkNum,
+		isCount
+		FROM
+		(
 
-			SELECT
-			mat1.ID AS typeId,
-			0 storageNum,
-			0 leaseNum,
-			SUM( wrd.REPAIR_NUM ) - SUM( wrd.ALREPAIR_NUM ) - SUM( SCRAP_NUM ) AS repairNum,
-			0 checkNum,
-			0 scrapNum,
-			0 loseNum,
-			0 waitInputNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			wf_repair_details wrd
-			LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
-			LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-			GROUP BY
-			wrd.MODEL_ID
-			UNION
-			SELECT
-			mat1.ID AS typeId,
-			0 storageNum,
-			0 leaseNum,
-			0 repairNum,
-			SUM( wrc.CHECK_NUM ) - SUM( wrc.ALCHECK_NUM ) AS checkNum,
-			0 scrapNum,
-			0 loseNum,
-			0 waitInputNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			wf_repair_check wrc
-			LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
-			LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-			GROUP BY
-			wrc.MODEL_ID
-			UNION
-			SELECT DISTINCT
-			mat1.ID AS typeId,
-			0 storageNum,
-			0 leaseNum,
-			0 repairNum,
-			0 checkNum,
-			0 AS scrapNum,
-			0 loseNum,
-			SUM(
-			IFNULL( PRE_PUT_NUM, 0 )) - sum(
-			IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			wf_put_storage_details wpd
-			LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
-			LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-			WHERE
-			wpd.IS_SURE = 0
-			GROUP BY
-			wpd.MODEL_ID
+		SELECT
+		mat1.ID AS typeId,
+		0 storageNum,
+		0 leaseNum,
+		SUM( wrd.REPAIR_NUM ) - SUM( wrd.ALREPAIR_NUM ) - SUM( SCRAP_NUM ) AS repairNum,
+		0 checkNum,
+		0 scrapNum,
+		0 loseNum,
+		0 waitInputNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		wf_repair_details wrd
+		LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+		GROUP BY
+		wrd.MODEL_ID
+		UNION
+		SELECT
+		mat1.ID AS typeId,
+		0 storageNum,
+		0 leaseNum,
+		0 repairNum,
+		SUM( wrc.CHECK_NUM ) - SUM( wrc.ALCHECK_NUM ) AS checkNum,
+		0 scrapNum,
+		0 loseNum,
+		0 waitInputNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		wf_repair_check wrc
+		LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+		GROUP BY
+		wrc.MODEL_ID
+		UNION
+		SELECT DISTINCT
+		mat1.ID AS typeId,
+		0 storageNum,
+		0 leaseNum,
+		0 repairNum,
+		0 checkNum,
+		0 AS scrapNum,
+		0 loseNum,
+		SUM(
+		IFNULL( PRE_PUT_NUM, 0 )) - sum(
+		IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		wf_put_storage_details wpd
+		LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+		WHERE
+		wpd.IS_SURE = 0
+		GROUP BY
+		wpd.MODEL_ID
 
-			) res
-			GROUP BY typeId
-			UNION
-			SELECT
-			mat1.ID AS typeId,
-			0 storageNum,
-			0 inuseNum,
-			0 as repairNum,
-			SUM( wsd.ALSCRAP_NUM ) AS scrapNum ,
-			0 projectNum,
-			0 inuseCount,
-			0 backCount,
-			0 as pyNum,
-			0 as pkNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			wf_scrap_details wsd
-			LEFT JOIN mm_type mat1 ON wsd.MODEL_ID = mat1.ID
-			LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-			WHERE
-			wsd.IS_SURE = 1
-			GROUP BY
-			wsd.MODEL_ID
-			UNION
+		) res
+		GROUP BY typeId
+		UNION
+		SELECT
+		mat1.ID AS typeId,
+		0 storageNum,
+		0 inuseNum,
+		0 as repairNum,
+		SUM( wsd.ALSCRAP_NUM ) AS scrapNum ,
+		0 projectNum,
+		0 inuseCount,
+		0 backCount,
+		0 as pyNum,
+		0 as pkNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		wf_scrap_details wsd
+		LEFT JOIN mm_type mat1 ON wsd.MODEL_ID = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+		WHERE
+		wsd.IS_SURE = 1
+		GROUP BY
+		wsd.MODEL_ID
+		UNION
 
-			SELECT
-			mps.type AS typeId,
-			0 storageNum,
-			0 inuseNum,
-			0 as repairNum,
-			0 AS scrapNum ,
-			COUNT(DISTINCT wla.PROJECT) as projectNum ,
-			0 inuseCount,
-			0 backCount,
-			0 as pyNum,
-			0 as pkNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			ma_type_project_storage mps
-			LEFT JOIN wf_lease_agreement wla on mps.agreement_id = wla.ID
-			LEFT JOIN mm_type mat1 ON mps.type = mat1.ID
-			WHERE mps.`status` = 1
-			GROUP BY mps.type
-			UNION
-			SELECT
-			typeId,
-			0 storageNum,
-			0 inuseNum,
-			0 as repairNum,
-			0 AS scrapNum ,
-			0 as projectNum ,
-			0 inuseCount,
-			0 backCount,
-			SUM(pyNum) as pyNum,
-			SUM(pkNum) as pkNum,
-			isCount
-			FROM
-			(
-			SELECT
-			mli.TYPE_ID as typeId,
-			mli.IS_PROFIT as type,
-			IF(mli.IS_PROFIT =1,SUM(mli.IN_NUMS),0) as pyNum,
-			IF(mli.IS_PROFIT =0,SUM(mli.IN_NUMS),0) as pkNum,
-			mat1.IS_COUNT AS isCount
-			FROM
-			ma_lib_inventroy mli
-			LEFT JOIN mm_type mat1 ON mli.TYPE_ID = mat1.ID
-			GROUP BY mli.TYPE_ID,mli.IS_PROFIT
-			) res
-			GROUP BY typeId
-			) rs
-			LEFT JOIN  mm_type mat1 ON rs.typeId = mat1.ID
-			LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			<where>
-				<if test="maName != null and maName != ''">
-					and mat1.`NAME` like concat ('%',#{maName},'%')
-				</if>
-				<if test="maType != null and maType != ''">
-					and mat2.`NAME` like concat ('%',#{maType},'%')
-				</if>
-				<if test="isCount != null and isCount != ''">
-					and rs.isCount = #{isCount}
-				</if>
-			</where>
-			GROUP BY rs.typeId
-			) a WHERE
-			typeId IN (
-			SELECT DISTINCT
-			mt.ID
-			FROM
-			mm_type mt
-			WHERE
-			mt.`LEVEL` = 4
-			AND mt.IS_ACTIVE = 1
-			)
+		SELECT
+		mps.type AS typeId,
+		0 storageNum,
+		0 inuseNum,
+		0 as repairNum,
+		0 AS scrapNum ,
+		COUNT(DISTINCT wla.PROJECT) as projectNum ,
+		0 inuseCount,
+		0 backCount,
+		0 as pyNum,
+		0 as pkNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		ma_type_project_storage mps
+		LEFT JOIN wf_lease_agreement wla on mps.agreement_id = wla.ID
+		LEFT JOIN mm_type mat1 ON mps.type = mat1.ID
+		WHERE mps.`status` = 1
+		GROUP BY mps.type
+		UNION
+		SELECT
+		typeId,
+		0 storageNum,
+		0 inuseNum,
+		0 as repairNum,
+		0 AS scrapNum ,
+		0 as projectNum ,
+		0 inuseCount,
+		0 backCount,
+		SUM(pyNum) as pyNum,
+		SUM(pkNum) as pkNum,
+		isCount
+		FROM
+		(
+		SELECT
+		mli.TYPE_ID as typeId,
+		mli.IS_PROFIT as type,
+		IF(mli.IS_PROFIT =1,SUM(mli.IN_NUMS),0) as pyNum,
+		IF(mli.IS_PROFIT =0,SUM(mli.IN_NUMS),0) as pkNum,
+		mat1.IS_COUNT AS isCount
+		FROM
+		ma_lib_inventroy mli
+		LEFT JOIN mm_type mat1 ON mli.TYPE_ID = mat1.ID
+		GROUP BY mli.TYPE_ID,mli.IS_PROFIT
+		) res
+		GROUP BY typeId
+		) rs
+		LEFT JOIN  mm_type mat1 ON rs.typeId = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		<where>
+			<if test="maName != null and maName != ''">
+				and mat1.`NAME` like concat ('%',#{maName},'%')
+			</if>
+			<if test="maType != null and maType != ''">
+				and mat2.`NAME` like concat ('%',#{maType},'%')
+			</if>
+			<if test="isCount != null and isCount != ''">
+				and rs.isCount = #{isCount}
+			</if>
+		</where>
+		GROUP BY rs.typeId
+		) a WHERE
+		typeId IN (
+		SELECT DISTINCT
+		mt.ID
+		FROM
+		mm_type mt
+		WHERE
+		mt.`LEVEL` = 4
+		AND mt.IS_ACTIVE = 1
+		)
 	</select>
 
 
-         <select id="getInStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-  			SELECT
+	<select id="getInStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
 			"修试后入库" as taskType,
 			wir.NUM as `content`,
 			pu.`NAME` as userName,
 			wir.TIME as currentDate
-			FROM
+		FROM
 			wf_info_record wir
-			LEFT JOIN wf_put_storage_details wps on wir.SUP_ID = wps.TASK_ID
-			LEFT JOIN pm_user pu on wps.CUSTOMER_SERVICE_REP = pu.ID
-			WHERE wir.TYPE = 3 and wps.IS_SURE = 1
-			and wir.model_id = #{typeId}
-			ORDER BY wir.TIME DESC
-			LIMIT 1
+				LEFT JOIN wf_put_storage_details wps on wir.SUP_ID = wps.TASK_ID
+				LEFT JOIN pm_user pu on wps.CUSTOMER_SERVICE_REP = pu.ID
+		WHERE wir.TYPE = 3 and wps.IS_SURE = 1
+		  and wir.model_id = #{typeId}
+		ORDER BY wir.TIME DESC
+		LIMIT 1
 	</select>
 
-          <select id="getNewStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-  		SELECT
-				"新购入库" as taskType,
-				wir.NUM as `content`,
-				wnd.CUSTOMER_SERVICE_REP,
-				pu.`NAME` as userName,
-				wir.TIME as currentDate
-				FROM
-				wf_info_record wir
+	<select id="getNewStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
+			"新购入库" as taskType,
+			wir.NUM as `content`,
+			wnd.CUSTOMER_SERVICE_REP,
+			pu.`NAME` as userName,
+			wir.TIME as currentDate
+		FROM
+			wf_info_record wir
 				LEFT JOIN wf_new_details wnd on wir.SUP_ID = wnd.TASK_ID
 				LEFT JOIN pm_user pu on wnd.CUSTOMER_SERVICE_REP = pu.ID
-				WHERE wir.TYPE = 5 and  wnd.IS_APPROVAL = 1
-					and wir.model_id = #{typeId}
-				ORDER BY wir.TIME DESC
-				LIMIT 1
+		WHERE wir.TYPE = 5 and  wnd.IS_APPROVAL = 1
+		  and wir.model_id = #{typeId}
+		ORDER BY wir.TIME DESC
+		LIMIT 1
 	</select>
 
-      <select id="getOutStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-  		SELECT
+	<select id="getOutStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
 			"领料出库" as taskType,
 			wir.NUM as `content`,
 			wot.OUT_PERSON,
 			pu.`NAME` as userName,
 			wir.TIME as currentDate
-			FROM
+		FROM
 			wf_info_record wir
-			LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_ID
-			LEFT JOIN pm_user pu on wot.OUT_PERSON = pu.ID
-			WHERE wir.TYPE =2 and  wot.IS_APPROVAL = 1
-			and wir.model_id = #{typeId}
-			ORDER BY wir.TIME DESC
-			LIMIT 1
+				LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_ID
+				LEFT JOIN pm_user pu on wot.OUT_PERSON = pu.ID
+		WHERE wir.TYPE =2 and  wot.IS_APPROVAL = 1
+		  and wir.model_id = #{typeId}
+		ORDER BY wir.TIME DESC
+		LIMIT 1
 	</select>
 
 
 
-           <select id="getBackStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-  		SELECT
+	<select id="getBackStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
 			wrd.ID,
 			"退料申请" as taskType,
 			wir.NUM as `content`,
 			wrd.OPERATOR as userName,
 			wir.TIME as currentDate
-			FROM
+		FROM
 			wf_return_material_details wrd
-			LEFT JOIN wf_info_record wir on wir.SUP_ID = wrd.ID
-			WHERE wrd.IS_APPROVAL = 1 AND wir.TYPE = 4
-				and wir.model_id = #{typeId}
-			ORDER BY wir.TIME DESC
-			LIMIT 1
+				LEFT JOIN wf_info_record wir on wir.SUP_ID = wrd.ID
+		WHERE wrd.IS_APPROVAL = 1 AND wir.TYPE = 4
+		  and wir.model_id = #{typeId}
+		ORDER BY wir.TIME DESC
+		LIMIT 1
 	</select>
 
-             <select id="getScrapStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-  		SELECT
+	<select id="getScrapStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
 			"机具报废" as taskType,
 			wsd.SCRAP_NUM as `content`,
 			pu.`NAME` as userName,
 			wsd.SCRAP_TIME as currentDate
-			FROM
+		FROM
 			wf_scrap_details wsd
-			 LEFT JOIN pm_user pu on wsd.SCRAP_PERSON = pu.ID
-			 WHERE wsd.IS_SURE = 1 and wsd.model_id = #{typeId}
-			 ORDER BY wsd.SCRAP_TIME DESC
-			LIMIT 1
+				LEFT JOIN pm_user pu on wsd.SCRAP_PERSON = pu.ID
+		WHERE wsd.IS_SURE = 1 and wsd.model_id = #{typeId}
+		ORDER BY wsd.SCRAP_TIME DESC
+		LIMIT 1
 	</select>
 
-             <select id="getPdStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-			SELECT
-			    wir.INVENTORY_TYPE as taskType,
-				wir.ID,
-				wir.INVENTORY_PERSON AS userName,
-				wir.INVENTORY_NUM as `content`,
-				wir.INVENTORY_TIME currentDate
-				FROM
-				wf_inventory_record wir
-				WHERE wir.INVENTORY_NUM > 0 AND wir.model_id = #{typeId}
-				 ORDER BY wir.INVENTORY_TIME DESC
-				LIMIT 1
+	<select id="getPdStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
+			wir.INVENTORY_TYPE as taskType,
+			wir.ID,
+			wir.INVENTORY_PERSON AS userName,
+			wir.INVENTORY_NUM as `content`,
+			wir.INVENTORY_TIME currentDate
+		FROM
+			wf_inventory_record wir
+		WHERE wir.INVENTORY_NUM > 0 AND wir.model_id = #{typeId}
+		ORDER BY wir.INVENTORY_TIME DESC
+		LIMIT 1
 	</select>
 
 
-       <select id="getMaUseInfo" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-			SELECT
-      		a.id as id,
-					pu.`NAME` as userName,
-					wmo.OUT_TIME as currentDate,
+	<select id="getMaUseInfo" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
+			a.id as id,
+			pu.`NAME` as userName,
+			wmo.OUT_TIME as currentDate,
 			projectName,
 			taskId,
 			SUM( leaseNum ) - SUM( backNum ) inuseNum
 		FROM
 			(
-			SELECT
-		   MAX(wte.ID ) AS taskId,
-				wla.PROJECT as id,
-				bp.`NAME` AS projectName,
-				wla.`CODE` AS agreementCode,
-				SUM( wir.NUM ) AS leaseNum,
-				"0" AS backNum,
-				wla.ID AS agreementId
-			FROM
-				wf_task_record wtr
-				LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
-				LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
+				SELECT
+					MAX(wte.ID ) AS taskId,
+					wla.PROJECT as id,
+					bp.`NAME` AS projectName,
+					wla.`CODE` AS agreementCode,
+					SUM( wir.NUM ) AS leaseNum,
+					"0" AS backNum,
+					wla.ID AS agreementId
+				FROM
+					wf_task_record wtr
+						LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
+						LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
 
-				LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
-				LEFT JOIN wf_task_record wte ON wtr.ID = wte.SUP_ID
-				LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
-			WHERE
-				wir.TYPE = 2 AND wir.model_id = #{typeId}
-				AND wtr.IS_ACTIVE = 1
-			GROUP BY
-				wla.ID
+						LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
+						LEFT JOIN wf_task_record wte ON wtr.ID = wte.SUP_ID
+						LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
+				WHERE
+					wir.TYPE = 2 AND wir.model_id = #{typeId}
+				  AND wtr.IS_ACTIVE = 1
+				GROUP BY
+					wla.ID
 
 
-				 UNION
-			SELECT
-			  0 AS taskId,
-				wla.PROJECT as id,
-				bp.`NAME` AS projectName,
-				wla.`CODE` AS agreementCode,
-				"0" AS leaseNum,
-				SUM( wir.NUM ) AS backNum,
-				wla.ID AS agreementId
-			FROM
-				wf_task_record wtr
-				LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
-				LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
+				UNION
+				SELECT
+					0 AS taskId,
+					wla.PROJECT as id,
+					bp.`NAME` AS projectName,
+					wla.`CODE` AS agreementCode,
+					"0" AS leaseNum,
+					SUM( wir.NUM ) AS backNum,
+					wla.ID AS agreementId
+				FROM
+					wf_task_record wtr
+						LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
+						LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
 
-				LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
-				LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
-				LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
-			WHERE
-				wir.TYPE = 4 AND wir.model_id = #{typeId}
-				AND wtr.IS_ACTIVE = 1
-			GROUP BY
-				wla.ID
+						LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
+						LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
+						LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
+				WHERE
+					wir.TYPE = 4 AND wir.model_id = #{typeId}
+				  AND wtr.IS_ACTIVE = 1
+				GROUP BY
+					wla.ID
 			) a
-			LEFT JOIN wf_ma_outstock wmo on a.taskId = wmo.TASK_ID
-			LEFT JOIN pm_user pu on wmo.OUT_PERSON = pu.ID
+				LEFT JOIN wf_ma_outstock wmo on a.taskId = wmo.TASK_ID
+				LEFT JOIN pm_user pu on wmo.OUT_PERSON = pu.ID
 		GROUP BY
 			a.projectName
 
 	</select>
 
-         <select id="getMaOutTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-			SELECT
-     	    wtr2.ID,
-			wtr2.NUMBER AS taskCode,
-			GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.num) as content ,
-			wot.OUT_PERSON,
-			pu.`NAME` as userName,
-			LEFT(wir.TIME,10) as currentDate,
-			wir.TIME as currentTime
-			FROM
-			wf_info_record wir
-			LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			LEFT JOIN wf_task_record wtr on wir.SUP_ID = wtr.ID
-			LEFT JOIN wf_task_record wtr2 on wtr.SUP_ID = wtr2.ID
-			LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_ID
-			LEFT JOIN pm_user pu on wot.OUT_PERSON = pu.ID
-			LEFT JOIN wf_agreement_task wat on wtr2.ID = wat.TASK_ID
-			LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
-			WHERE wir.TYPE =2 and  wot.IS_APPROVAL = 1
-
-			<if test="startTime != null and startTime != ''">
-			AND LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
-	       <if test="projectId != null and projectId  != ''">
-			and wla.project =#{projectId}
-	       </if>
-	GROUP BY  wtr2.ID
-	 ORDER BY LEFT(wir.TIME,10) DESC
-	</select>
-
-
-          <select id="getMaBackTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-			SELECT
-     		 wtr.ID,
-			wtr.NUMBER AS taskCode,
-			GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.num) as content ,
-      		wrd.OPERATOR as userName,
-			LEFT(wir.TIME,10) as currentDate,
-			wir.TIME as currentTime
-			FROM
-			wf_info_record wir
-			LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			LEFT JOIN wf_return_material_details wrd on wir.SUP_ID = wrd.ID
-			LEFT JOIN wf_task_record wtr on wrd.TASK_ID = wtr.ID
-				LEFT JOIN wf_agreement_task wat on wtr.ID = wat.TASK_ID
-			LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
-			WHERE wir.TYPE =4
-			<if test="startTime != null and startTime != ''">
-			AND LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
-	         <if test="projectId != null and projectId  != ''">
-			and wla.project =#{projectId}
-	       </if>
-	GROUP BY  wtr.ID
-	 ORDER BY LEFT(wir.TIME,10) DESC
-	</select>
-
-
-      <select id="getMaScrapTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+	<select id="getMaOutTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 		SELECT
-			 wsd.TASK_ID as id ,
-			 wtr.NUMBER as taskCode,
-			 pu.`NAME` as userName,
-			 GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wsd.SCRAP_NUM) as content ,
-		    LEFT(wsd.SCRAP_TIME,10) as currentDate,
-			wsd.SCRAP_TIME as currentTime
+		wtr2.ID,
+		wtr2.NUMBER AS taskCode,
+		GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.num) as content ,
+		wot.OUT_PERSON,
+		pu.`NAME` as userName,
+		LEFT(wir.TIME,10) as currentDate,
+		wir.TIME as currentTime
+		FROM
+		wf_info_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_task_record wtr on wir.SUP_ID = wtr.ID
+		LEFT JOIN wf_task_record wtr2 on wtr.SUP_ID = wtr2.ID
+		LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_ID
+		LEFT JOIN pm_user pu on wot.OUT_PERSON = pu.ID
+		LEFT JOIN wf_agreement_task wat on wtr2.ID = wat.TASK_ID
+		LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
+		WHERE wir.TYPE =2 and  wot.IS_APPROVAL = 1
 
-			FROM
-			wf_scrap_details wsd
-			LEFT JOIN mm_type mt on wsd.model_id = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			 LEFT JOIN wf_task_record wtr on wsd.TASK_ID = wtr.ID
-			 LEFT JOIN pm_user pu on wsd.SCRAP_PERSON = pu.ID
-			 WHERE wsd.IS_SURE = 1
-			 <if test="startTime != null and startTime != ''">
+		<if test="startTime != null and startTime != ''">
+			AND LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
+		</if>
+		<if test="projectId != null and projectId  != ''">
+			and wla.project =#{projectId}
+		</if>
+		GROUP BY  wtr2.ID
+		ORDER BY LEFT(wir.TIME,10) DESC
+	</select>
+
+
+	<select id="getMaBackTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
+		wtr.ID,
+		wtr.NUMBER AS taskCode,
+		GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.num) as content ,
+		wrd.OPERATOR as userName,
+		LEFT(wir.TIME,10) as currentDate,
+		wir.TIME as currentTime
+		FROM
+		wf_info_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_return_material_details wrd on wir.SUP_ID = wrd.ID
+		LEFT JOIN wf_task_record wtr on wrd.TASK_ID = wtr.ID
+		LEFT JOIN wf_agreement_task wat on wtr.ID = wat.TASK_ID
+		LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
+		WHERE wir.TYPE =4
+		<if test="startTime != null and startTime != ''">
+			AND LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
+		</if>
+		<if test="projectId != null and projectId  != ''">
+			and wla.project =#{projectId}
+		</if>
+		GROUP BY  wtr.ID
+		ORDER BY LEFT(wir.TIME,10) DESC
+	</select>
+
+
+	<select id="getMaScrapTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+		SELECT
+		wsd.TASK_ID as id ,
+		wtr.NUMBER as taskCode,
+		pu.`NAME` as userName,
+		GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wsd.SCRAP_NUM) as content ,
+		LEFT(wsd.SCRAP_TIME,10) as currentDate,
+		wsd.SCRAP_TIME as currentTime
+
+		FROM
+		wf_scrap_details wsd
+		LEFT JOIN mm_type mt on wsd.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_task_record wtr on wsd.TASK_ID = wtr.ID
+		LEFT JOIN pm_user pu on wsd.SCRAP_PERSON = pu.ID
+		WHERE wsd.IS_SURE = 1
+		<if test="startTime != null and startTime != ''">
 			AND  LEFT(wsd.SCRAP_TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
-			 GROUP BY  wsd.TASK_ID
-			 ORDER BY wsd.SCRAP_TIME DESC
+		</if>
+		GROUP BY  wsd.TASK_ID
+		ORDER BY wsd.SCRAP_TIME DESC
 	</select>
 
-       <select id="getMaPdTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+	<select id="getMaPdTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 		SELECT
-		        wir.ID,
-			    wir.INVENTORY_TYPE as taskType,
-				wir.INVENTORY_PERSON AS userName,
-				GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.INVENTORY_NUM) as content ,
-				   LEFT(wir.INVENTORY_TIME,10) as currentDate,
-			wir.INVENTORY_TIME as currentTime
-				FROM
-				wf_inventory_record wir
-				LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			    LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-				WHERE wir.INVENTORY_NUM > 0
-					 <if test="startTime != null and startTime != ''">
+		wir.ID,
+		wir.INVENTORY_TYPE as taskType,
+		wir.INVENTORY_PERSON AS userName,
+		GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.INVENTORY_NUM) as content ,
+		LEFT(wir.INVENTORY_TIME,10) as currentDate,
+		wir.INVENTORY_TIME as currentTime
+		FROM
+		wf_inventory_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		WHERE wir.INVENTORY_NUM > 0
+		<if test="startTime != null and startTime != ''">
 			AND  LEFT(wir.INVENTORY_TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
-				GROUP BY 	wir.ID
-				 ORDER BY wir.INVENTORY_TIME DESC
+		</if>
+		GROUP BY 	wir.ID
+		ORDER BY wir.INVENTORY_TIME DESC
 
 
 	</select>
 
 
-          <select id="getMaNewTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
+	<select id="getMaNewTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 		SELECT
-				wnd.TASK_ID AS id,
-				wnd.CUSTOMER_SERVICE_REP,
-				GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.NUM) as content ,
-				pu.`NAME` as userName,
-				LEFT(wir.TIME,10) as currentDate,
-				wir.TIME as currentTime
-				FROM
-				wf_info_record wir
-				LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			    LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-				LEFT JOIN wf_new_details wnd on wir.SUP_ID = wnd.TASK_ID
-				LEFT JOIN pm_user pu on wnd.CUSTOMER_SERVICE_REP = pu.ID
-				WHERE wir.TYPE = 5 and  wnd.IS_APPROVAL = 1
-				 <if test="startTime != null and startTime != ''">
+		wnd.TASK_ID AS id,
+		wnd.CUSTOMER_SERVICE_REP,
+		GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.NUM) as content ,
+		pu.`NAME` as userName,
+		LEFT(wir.TIME,10) as currentDate,
+		wir.TIME as currentTime
+		FROM
+		wf_info_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_new_details wnd on wir.SUP_ID = wnd.TASK_ID
+		LEFT JOIN pm_user pu on wnd.CUSTOMER_SERVICE_REP = pu.ID
+		WHERE wir.TYPE = 5 and  wnd.IS_APPROVAL = 1
+		<if test="startTime != null and startTime != ''">
 			AND  LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
-				GROUP BY wnd.TASK_ID
-				ORDER BY wir.TIME DESC
+		</if>
+		GROUP BY wnd.TASK_ID
+		ORDER BY wir.TIME DESC
 
 
 	</select>
 
-           <select id="getMaInTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
-			SELECT
-			 wps.TASK_ID as id ,
-			 IFNULL(wtr.NUMBER,"退料退回") as taskCode,
-			 pu.`NAME` as userName,
-			 GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.NUM) as content ,
-			 	LEFT(wir.TIME,10) as currentDate,
-			wir.TIME as currentTime
-			FROM
-			wf_info_record wir
-			LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			 LEFT JOIN wf_task_record wtr on wir.SUP_ID = wtr.ID
-			LEFT JOIN wf_put_storage_details wps on wir.SUP_ID = wps.TASK_ID
-			LEFT JOIN pm_user pu on wps.CUSTOMER_SERVICE_REP = pu.ID
-			WHERE wir.TYPE = 3 and wps.IS_SURE = 1
-			 <if test="startTime != null and startTime != ''">
-			AND  LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
-	       </if>
-	        GROUP BY wps.TASK_ID
-			ORDER BY wir.TIME DESC
-	</select>
-
-          <select id="getStorageWarn" parameterType="com.bonus.index.beans.IndexStorageWarnBean" resultType="com.bonus.index.beans.IndexStorageWarnBean">
-           SELECT
-				 mt.ID as id,
-				 mt2.`NAME` maType,
-				 mt.`NAME`  as maName,
-				 mt.UNIT as maUnit,
-				 mt.is_COUNT AS isCount,
-			     CAST(mt.NUM AS SIGNED) AS storageNum
-			FROM
-				mm_type mt
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			WHERE mt.`LEVEL` =4  and mt.IS_ACTIVE = 1
-			and mt.NUM = 0
-			<if test="maType != null and maType != ''">
-				and mt2.`NAME` like concat('%', #{maType}, '%')
-			</if>
-			<if test="maName != null and maName != ''">
-				and mt.`NAME` like concat('%', #{maName}, '%')
-			</if>
-	</select>
-
-
-          <select id="getCheckWarn" parameterType="com.bonus.index.beans.IndexCheckWarnBean" resultType="com.bonus.index.beans.IndexCheckWarnBean">
-
-	SELECT
-					mm.ID,
-					mt2.`NAME` as maType,
-					mt.`NAME` as maName,
-					mt.UNIT as maUnit,
-					mt.is_COUNT AS isCount,
-					mm.DEVICE_CODE as maCode,
-					mm.BATCH_STATUS as maStatus,
-					mm.THIS_CHECK_TIME as thisCheckTime,
-					mm.NEXT_CHECK_TIME as nextCheckTime,
-			         vs.agreementCode,
-			        vs.projectName,
-				    vs.companyName,
-					to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now()) AS days
-					FROM
-					mm_machines mm
-					LEFT JOIN mm_type mt on mm.TYPE = mt.ID
-					LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-
-	                LEFT JOIN v_mtp_status vs on mm.ID = vs.maId
-					WHERE 30>	to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now())
-					group by mm.ID
-
-
-	</select>
-
-              <select id="getInUseWarn" parameterType="com.bonus.index.beans.IndexInuseWarnBean" resultType="com.bonus.index.beans.IndexInuseWarnBean">
+	<select id="getMaInTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 		SELECT
-				 mt2.`NAME` AS maType,
-				 mt.`NAME` AS maName,
-				 mt.UNIT AS maUnit,
-				 COUNT( DISTINCT mm.ID ) AS inuseNum,
-				 MIN( filtered_mtp.start_date ) AS outTime,
-				 mt.IS_COUNT AS isCount,
-				DATEDIFF(
-					NOW(),
-				MIN( filtered_mtp.start_date )) AS days,
-				wla.`CODE` AS agreementCode,
-				bp.`NAME` AS projectName,
-				bc.`NAME` AS companyName
-			FROM
-				(
-				SELECT
-					ps.machine,
-					ps.agreement_id,
-					ps.start_date
-				FROM
-					ma_type_project_storage ps
-					INNER JOIN mm_machines mm ON ps.machine = mm.ID
-				WHERE
-					ps.`status` = 1
-				  	AND ps.`end_date` is null
-					AND mm.BATCH_STATUS = 6
-					AND DATEDIFF( NOW(), ps.start_date ) > 180
-				) AS filtered_mtp
-				INNER JOIN mm_machines mm ON filtered_mtp.machine = mm.ID
-				INNER JOIN mm_type mt ON mm.TYPE = mt.ID
-				LEFT JOIN mm_type mt2 ON mt.PARENT_ID = mt2.ID
-				LEFT JOIN wf_lease_agreement wla ON filtered_mtp.agreement_id = wla.ID
-				LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
-				LEFT JOIN bm_company bc ON bp.COMPANY_ID = bc.ID
-				where 1=1
-					<if test="maType != null and maType != ''">
-						and mt2.`NAME` like concat('%', #{maType}, '%')
-					</if>
-				  	<if test="maName != null and maName != ''">
-						and mt.`NAME` like concat('%', #{maName}, '%')
-					</if>
-				GROUP BY
-				  mt.ID,
-				  mt2.ID,
-				  wla.ID,
-				  bp.ID,
-				  bc.ID
+		wps.TASK_ID as id ,
+		IFNULL(wtr.NUMBER,"退料退回") as taskCode,
+		pu.`NAME` as userName,
+		GROUP_CONCAT(mt2.`NAME`,"-",mt.`NAME`,":",wir.NUM) as content ,
+		LEFT(wir.TIME,10) as currentDate,
+		wir.TIME as currentTime
+		FROM
+		wf_info_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_task_record wtr on wir.SUP_ID = wtr.ID
+		LEFT JOIN wf_put_storage_details wps on wir.SUP_ID = wps.TASK_ID
+		LEFT JOIN pm_user pu on wps.CUSTOMER_SERVICE_REP = pu.ID
+		WHERE wir.TYPE = 3 and wps.IS_SURE = 1
+		<if test="startTime != null and startTime != ''">
+			AND  LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
+		</if>
+		GROUP BY wps.TASK_ID
+		ORDER BY wir.TIME DESC
+	</select>
+
+	<select id="getStorageWarn" parameterType="com.bonus.index.beans.IndexStorageWarnBean" resultType="com.bonus.index.beans.IndexStorageWarnBean">
+		SELECT
+		mt.ID as id,
+		mt2.`NAME` maType,
+		mt.`NAME`  as maName,
+		mt.UNIT as maUnit,
+		mt.is_COUNT AS isCount,
+		CAST(mt.NUM AS SIGNED) AS storageNum
+		FROM
+		mm_type mt
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		WHERE mt.`LEVEL` =4  and mt.IS_ACTIVE = 1
+		and mt.NUM = 0
+		<if test="maType != null and maType != ''">
+			and mt2.`NAME` like concat('%', #{maType}, '%')
+		</if>
+		<if test="maName != null and maName != ''">
+			and mt.`NAME` like concat('%', #{maName}, '%')
+		</if>
+	</select>
+
+
+	<select id="getCheckWarn" parameterType="com.bonus.index.beans.IndexCheckWarnBean" resultType="com.bonus.index.beans.IndexCheckWarnBean">
+
+		SELECT
+			mm.ID,
+			mt2.`NAME` as maType,
+			mt.`NAME` as maName,
+			mt.UNIT as maUnit,
+			mt.is_COUNT AS isCount,
+			mm.DEVICE_CODE as maCode,
+			mm.BATCH_STATUS as maStatus,
+			mm.THIS_CHECK_TIME as thisCheckTime,
+			mm.NEXT_CHECK_TIME as nextCheckTime,
+			vs.agreementCode,
+			vs.projectName,
+			vs.companyName,
+			to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now()) AS days
+		FROM
+			mm_machines mm
+				LEFT JOIN mm_type mt on mm.TYPE = mt.ID
+				LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+
+				LEFT JOIN v_mtp_status vs on mm.ID = vs.maId
+		WHERE 30>	to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now())
+		group by mm.ID
+
+
+	</select>
+
+	<select id="getInUseWarn" parameterType="com.bonus.index.beans.IndexInuseWarnBean" resultType="com.bonus.index.beans.IndexInuseWarnBean">
+		SELECT
+		mt2.`NAME` AS maType,
+		mt.`NAME` AS maName,
+		mt.UNIT AS maUnit,
+		COUNT( DISTINCT mm.ID ) AS inuseNum,
+		MIN( filtered_mtp.start_date ) AS outTime,
+		mt.IS_COUNT AS isCount,
+		DATEDIFF(
+		NOW(),
+		MIN( filtered_mtp.start_date )) AS days,
+		wla.`CODE` AS agreementCode,
+		bp.`NAME` AS projectName,
+		bc.`NAME` AS companyName
+		FROM
+		(
+		SELECT
+		ps.machine,
+		ps.agreement_id,
+		ps.start_date
+		FROM
+		ma_type_project_storage ps
+		INNER JOIN mm_machines mm ON ps.machine = mm.ID
+		WHERE
+		ps.`status` = 1
+		AND ps.`end_date` is null
+		AND mm.BATCH_STATUS = 6
+		AND DATEDIFF( NOW(), ps.start_date ) > 180
+		) AS filtered_mtp
+		INNER JOIN mm_machines mm ON filtered_mtp.machine = mm.ID
+		INNER JOIN mm_type mt ON mm.TYPE = mt.ID
+		LEFT JOIN mm_type mt2 ON mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_lease_agreement wla ON filtered_mtp.agreement_id = wla.ID
+		LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
+		LEFT JOIN bm_company bc ON bp.COMPANY_ID = bc.ID
+		where 1=1
+		<if test="maType != null and maType != ''">
+			and mt2.`NAME` like concat('%', #{maType}, '%')
+		</if>
+		<if test="maName != null and maName != ''">
+			and mt.`NAME` like concat('%', #{maName}, '%')
+		</if>
+		GROUP BY
+		mt.ID,
+		mt2.ID,
+		wla.ID,
+		bp.ID,
+		bc.ID
 	</select>
 
 	<select id="getTotalChangeWarn" parameterType="com.bonus.index.beans.IndexTotalWarnBean" resultType="com.bonus.index.beans.IndexTotalWarnBean">
@@ -728,22 +728,22 @@
 			and mt2.`NAME` like concat('%', #{maType}, '%')
 		</if>
 		<if test="maName != null and maName != ''">
-				and mt.`NAME` like concat('%', #{maName}, '%')
+			and mt.`NAME` like concat('%', #{maName}, '%')
 		</if>
 		order by  t1.TIME desc
 	</select>
 
-         <select id="getTotalInfo" parameterType="com.bonus.index.beans.IndexTotalWarnBean" resultType="com.bonus.index.beans.IndexTotalWarnBean">
-				SELECT
-					typeId,
-					SUM(rs.storageNum) AS storageNum,
-					SUM(rs.repairNum) AS repairNum,
-					SUM(rs.inuseNum) AS inuseNum,
-					SUM(rs.storageNum) + SUM(rs.repairNum) + SUM(rs.inuseNum) as total
-					FROM
-(
+	<select id="getTotalInfo" parameterType="com.bonus.index.beans.IndexTotalWarnBean" resultType="com.bonus.index.beans.IndexTotalWarnBean">
+		SELECT
+			typeId,
+			SUM(rs.storageNum) AS storageNum,
+			SUM(rs.repairNum) AS repairNum,
+			SUM(rs.inuseNum) AS inuseNum,
+			SUM(rs.storageNum) + SUM(rs.repairNum) + SUM(rs.inuseNum) as total
+		FROM
+			(
 
-	SELECT
+				SELECT
 					mat1.ID AS typeId,
 					mat1.NUM storageNum,
 					0 inuseNum,
@@ -752,21 +752,21 @@
 					0 projectNum,
 					0 inuseCount,
 					0 backCount,
-		      0 as pyNum,
+					0 as pyNum,
 					0 as pkNum,
 					mat1.IS_COUNT AS isCount
 				FROM
 					mm_type mat1
-					LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+						LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+						LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 				WHERE
 					mat1.`LEVEL` = 4 and mat1.ID= #{typeId}
-					AND mat1.IS_ACTIVE = '1'
+				  AND mat1.IS_ACTIVE = '1'
 				GROUP BY
 					mat1.ID
-					UNION
+				UNION
 
-						SELECT
+				SELECT
 					typeId,
 					0 storageNum,
 					sum( leaseNum ) - SUM( backNum ) inuseNum,
@@ -780,138 +780,138 @@
 					isCount AS isCount
 				FROM
 					(
-					SELECT
-						mmt1.`NAME` AS pMachineName,
-						mmt.`NAME` AS machineName,
-						mt.`NAME` AS machineModel,
-						mt.ID AS typeId,
-						mt.BUY_PRICE AS buyPrice,
-						mt.UNIT,
-						SUM( wir.NUM ) AS leaseNum,
-						0 AS backNum,
-						mt.IS_COUNT AS isCount
-					FROM
-						wf_info_record wir
-						LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
-						LEFT JOIN wf_task_record wtr2 ON wtr.SUP_ID = wtr2.ID
-						LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
-						LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
-						LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
-						LEFT JOIN wf_collar_details wcd ON wcd.TASK_ID = wtr.SUP_ID
-						AND wcd.MODEL_ID = wir.MODEL_ID
-					WHERE
-						wir.TYPE = 2
-						AND wtr2.IS_ACTIVE = 1
-						AND wcd.IS_APPROVAL = 1
-						and mt.ID= #{typeId}
-					GROUP BY
-						mt.ID UNION
-					SELECT
-						mmt1.`NAME` AS pMachineName,
-						mmt.`NAME` AS machineName,
-						mt.`NAME` AS machineModel,
-						mt.ID AS typeId,
-						mt.BUY_PRICE AS buyPrice,
-						mt.UNIT,
-						0 AS leaseNum,
-						SUM( wir.NUM ) AS backNum,
-						mt.IS_COUNT AS isCount
-					FROM
-						wf_info_record wir
-						LEFT JOIN wf_return_material_details wrd ON wir.SUP_ID = wrd.ID
-						LEFT JOIN wf_task_record wtr ON wrd.TASK_ID = wtr.ID
-						LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
-						LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
-						LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
-					WHERE
-						wir.TYPE = 4 and mt.ID= #{typeId}
-						AND wtr.IS_ACTIVE = 1
-					GROUP BY
-						mt.ID
+						SELECT
+							mmt1.`NAME` AS pMachineName,
+							mmt.`NAME` AS machineName,
+							mt.`NAME` AS machineModel,
+							mt.ID AS typeId,
+							mt.BUY_PRICE AS buyPrice,
+							mt.UNIT,
+							SUM( wir.NUM ) AS leaseNum,
+							0 AS backNum,
+							mt.IS_COUNT AS isCount
+						FROM
+							wf_info_record wir
+								LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
+								LEFT JOIN wf_task_record wtr2 ON wtr.SUP_ID = wtr2.ID
+								LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
+								LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
+								LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
+								LEFT JOIN wf_collar_details wcd ON wcd.TASK_ID = wtr.SUP_ID
+								AND wcd.MODEL_ID = wir.MODEL_ID
+						WHERE
+							wir.TYPE = 2
+						  AND wtr2.IS_ACTIVE = 1
+						  AND wcd.IS_APPROVAL = 1
+						  and mt.ID= #{typeId}
+						GROUP BY
+							mt.ID UNION
+						SELECT
+							mmt1.`NAME` AS pMachineName,
+							mmt.`NAME` AS machineName,
+							mt.`NAME` AS machineModel,
+							mt.ID AS typeId,
+							mt.BUY_PRICE AS buyPrice,
+							mt.UNIT,
+							0 AS leaseNum,
+							SUM( wir.NUM ) AS backNum,
+							mt.IS_COUNT AS isCount
+						FROM
+							wf_info_record wir
+								LEFT JOIN wf_return_material_details wrd ON wir.SUP_ID = wrd.ID
+								LEFT JOIN wf_task_record wtr ON wrd.TASK_ID = wtr.ID
+								LEFT JOIN mm_type mt ON wir.MODEL_ID = mt.ID
+								LEFT JOIN mm_type mmt ON mt.PARENT_ID = mmt.ID
+								LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
+						WHERE
+							wir.TYPE = 4 and mt.ID= #{typeId}
+						  AND wtr.IS_ACTIVE = 1
+						GROUP BY
+							mt.ID
 					) a
 				GROUP BY
 					typeId
-					UNION
+				UNION
 
 				SELECT
-				  typeId,
+					typeId,
 					0 storageNum,
 					0 inuseNum,
 					SUM(repairNum) + SUM(checkNum) + SUM(waitInputNum) as repairNum,
 					0 scrapNum,
 					0 projectNum,
 					0 inuseCount,
-			   	0 backCount,
+					0 backCount,
 					0 as pyNum,
 					0 as pkNum,
-				  isCount
+					isCount
 				FROM
-				(
+					(
 
-					SELECT
-					mat1.ID AS typeId,
-					0 storageNum,
-					0 leaseNum,
-					SUM( wrd.REPAIR_NUM ) - SUM( wrd.ALREPAIR_NUM ) - SUM( SCRAP_NUM ) AS repairNum,
-					0 checkNum,
-					0 scrapNum,
-					0 loseNum,
-					0 waitInputNum,
-				mat1.IS_COUNT AS isCount
-				FROM
-					wf_repair_details wrd
-					LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
-					LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-					where  mat1.ID= #{typeId}
-				GROUP BY
-					wrd.MODEL_ID
-					UNION
-							SELECT
-					mat1.ID AS typeId,
-					0 storageNum,
-					0 leaseNum,
-					0 repairNum,
-					SUM( wrc.CHECK_NUM ) - SUM( wrc.ALCHECK_NUM ) AS checkNum,
-					0 scrapNum,
-					0 loseNum,
-					0 waitInputNum,
-					mat1.IS_COUNT AS isCount
-				FROM
-					wf_repair_check wrc
-					LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
-					LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+						SELECT
+							mat1.ID AS typeId,
+							0 storageNum,
+							0 leaseNum,
+							SUM( wrd.REPAIR_NUM ) - SUM( wrd.ALREPAIR_NUM ) - SUM( SCRAP_NUM ) AS repairNum,
+							0 checkNum,
+							0 scrapNum,
+							0 loseNum,
+							0 waitInputNum,
+							mat1.IS_COUNT AS isCount
+						FROM
+							wf_repair_details wrd
+								LEFT JOIN mm_type mat1 ON wrd.MODEL_ID = mat1.ID
+								LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+								LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 						where  mat1.ID= #{typeId}
-				GROUP BY
-					wrc.MODEL_ID
+						GROUP BY
+							wrd.MODEL_ID
 						UNION
-					SELECT DISTINCT
-					mat1.ID AS typeId,
-					0 storageNum,
-					0 leaseNum,
-					0 repairNum,
-					0 checkNum,
-					0 AS scrapNum,
-					0 loseNum,
-					SUM(
-						IFNULL( PRE_PUT_NUM, 0 )) - sum(
-					IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
-					mat1.IS_COUNT AS isCount
-				FROM
-					wf_put_storage_details wpd
-					LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
-					LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
-				WHERE
-					wpd.IS_SURE = 0 and  mat1.ID= #{typeId}
-				GROUP BY
-					wpd.MODEL_ID
+						SELECT
+							mat1.ID AS typeId,
+							0 storageNum,
+							0 leaseNum,
+							0 repairNum,
+							SUM( wrc.CHECK_NUM ) - SUM( wrc.ALCHECK_NUM ) AS checkNum,
+							0 scrapNum,
+							0 loseNum,
+							0 waitInputNum,
+							mat1.IS_COUNT AS isCount
+						FROM
+							wf_repair_check wrc
+								LEFT JOIN mm_type mat1 ON wrc.MODEL_ID = mat1.ID
+								LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+								LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+						where  mat1.ID= #{typeId}
+						GROUP BY
+							wrc.MODEL_ID
+						UNION
+						SELECT DISTINCT
+							mat1.ID AS typeId,
+							0 storageNum,
+							0 leaseNum,
+							0 repairNum,
+							0 checkNum,
+							0 AS scrapNum,
+							0 loseNum,
+							SUM(
+									IFNULL( PRE_PUT_NUM, 0 )) - sum(
+									IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
+							mat1.IS_COUNT AS isCount
+						FROM
+							wf_put_storage_details wpd
+								LEFT JOIN mm_type mat1 ON wpd.MODEL_ID = mat1.ID
+								LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+								LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
+						WHERE
+							wpd.IS_SURE = 0 and  mat1.ID= #{typeId}
+						GROUP BY
+							wpd.MODEL_ID
 
 					) res
-					GROUP BY typeId
+				GROUP BY typeId
 			) rs
-					GROUP BY typeId
+		GROUP BY typeId
 	</select>
 
 	<select id="getProjectDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
@@ -1123,128 +1123,128 @@
 		order by diffCount,subName desc
 	</select>
 
-           <select id="getProjectMaDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
-			SELECT
-				id as projectId,
-				typeId,
-				maType,
-				maName,
-				maUnit,
-				isCount,
-				projectName,
-				companyName,
-				SUM( leaseNum ) AS useCount,
-				SUM( backNum ) AS returnCount,
-				SUM( leaseNum ) - SUM( backNum ) diffCount ,
-				firstTime,
-				lastTime,
-				max(backTime) as backTime
-			FROM
-			(
-			SELECT
-				wla.PROJECT as id,
-			    wir.model_id as typeId,
-			    mat2.`NAME` as maType,
-				mat1.`NAME` as maName,
-				mat1.UNIT as maUnit,
-				mat1.is_count as isCount,
-				bp.`NAME` AS projectName,
-				bc.`NAME` as companyName,
-				wla.`CODE` AS agreementCode,
-				SUM( wir.NUM ) AS leaseNum,
-				"0" AS backNum,
-				wla.ID AS agreementId ,
-				min(wir.time) as firstTime,
-				max(wir.time) as lastTime,
-				wir.time as backTime
-			FROM
-				wf_task_record wtr
-				LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
-				LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
-				LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
-				LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
-				LEFT JOIN wf_task_record wte ON wtr.ID = wte.SUP_ID
-				LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
-				LEFT JOIN mm_type mat1 ON wir.MODEL_ID = mat1.ID
-			    LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			WHERE
-				wir.TYPE = 2
-				AND wtr.IS_ACTIVE = 1
-				 <if test="projectId != null and projectId != ''">
-				and wla.PROJECT = #{projectId}
-	       </if>
-			GROUP BY
-				wla.ID,wir.model_id
-				 UNION
-			SELECT
-				wla.PROJECT as id,
-				wir.model_id as typeId,
-				  mat2.`NAME` as maType,
-				mat1.`NAME` as maName,
-				mat1.UNIT as maUnit,
-				mat1.is_count as isCount,
-				bp.`NAME` AS projectName,
-						bc.`NAME` as companyName,
-				wla.`CODE` AS agreementCode,
-				"0" AS leaseNum,
-				SUM( wir.NUM ) AS backNum,
-				wla.ID AS agreementId ,
-					"" as firstTime,
-			     "" as lastTime,
-					max(wir.time) as backTime
-			FROM
-				wf_task_record wtr
-				LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
-				LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
-				LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
-				LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
-				LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
-				LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
-				LEFT JOIN mm_type mat1 ON wir.MODEL_ID = mat1.ID
-			    LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
-			WHERE
-				wir.TYPE = 4
-				AND wtr.IS_ACTIVE = 1
-					 <if test="projectId != null and projectId != ''">
-				and wla.PROJECT = #{projectId}
-	       </if>
-
-			GROUP BY
-				wla.ID ,wir.model_id
-			) a
-	   <if test="keyword != null and keyword != ''">
-		   where
-		   maName like concat('%', #{keyword}, '%') or
-		   maType like concat('%', #{keyword}, '%')
-	   </if>
+	<select id="getProjectMaDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
+		SELECT
+		id as projectId,
+		typeId,
+		maType,
+		maName,
+		maUnit,
+		isCount,
+		projectName,
+		companyName,
+		SUM( leaseNum ) AS useCount,
+		SUM( backNum ) AS returnCount,
+		SUM( leaseNum ) - SUM( backNum ) diffCount ,
+		firstTime,
+		lastTime,
+		max(backTime) as backTime
+		FROM
+		(
+		SELECT
+		wla.PROJECT as id,
+		wir.model_id as typeId,
+		mat2.`NAME` as maType,
+		mat1.`NAME` as maName,
+		mat1.UNIT as maUnit,
+		mat1.is_count as isCount,
+		bp.`NAME` AS projectName,
+		bc.`NAME` as companyName,
+		wla.`CODE` AS agreementCode,
+		SUM( wir.NUM ) AS leaseNum,
+		"0" AS backNum,
+		wla.ID AS agreementId ,
+		min(wir.time) as firstTime,
+		max(wir.time) as lastTime,
+		wir.time as backTime
+		FROM
+		wf_task_record wtr
+		LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
+		LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
+		LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
+		LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
+		LEFT JOIN wf_task_record wte ON wtr.ID = wte.SUP_ID
+		LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
+		LEFT JOIN mm_type mat1 ON wir.MODEL_ID = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		WHERE
+		wir.TYPE = 2
+		AND wtr.IS_ACTIVE = 1
+		<if test="projectId != null and projectId != ''">
+			and wla.PROJECT = #{projectId}
+		</if>
 		GROUP BY
-			a.typeId
-			order by diffCount desc
+		wla.ID,wir.model_id
+		UNION
+		SELECT
+		wla.PROJECT as id,
+		wir.model_id as typeId,
+		mat2.`NAME` as maType,
+		mat1.`NAME` as maName,
+		mat1.UNIT as maUnit,
+		mat1.is_count as isCount,
+		bp.`NAME` AS projectName,
+		bc.`NAME` as companyName,
+		wla.`CODE` AS agreementCode,
+		"0" AS leaseNum,
+		SUM( wir.NUM ) AS backNum,
+		wla.ID AS agreementId ,
+		"" as firstTime,
+		"" as lastTime,
+		max(wir.time) as backTime
+		FROM
+		wf_task_record wtr
+		LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
+		LEFT JOIN wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
+		LEFT JOIN bm_project bp ON wla.PROJECT = bp.ID
+		LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
+		LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
+		LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
+		LEFT JOIN mm_type mat1 ON wir.MODEL_ID = mat1.ID
+		LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
+		WHERE
+		wir.TYPE = 4
+		AND wtr.IS_ACTIVE = 1
+		<if test="projectId != null and projectId != ''">
+			and wla.PROJECT = #{projectId}
+		</if>
+
+		GROUP BY
+		wla.ID ,wir.model_id
+		) a
+		<if test="keyword != null and keyword != ''">
+			where
+			maName like concat('%', #{keyword}, '%') or
+			maType like concat('%', #{keyword}, '%')
+		</if>
+		GROUP BY
+		a.typeId
+		order by diffCount desc
 
 
 
 	</select>
 
 
-            <select id="getProjectCompany" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
-			SELECT
-		bc.ID as companyId,
-		bc.`NAME` as companyName
+	<select id="getProjectCompany" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
+		SELECT
+			bc.ID as companyId,
+			bc.`NAME` as companyName
 		FROM
-		bm_company bc
+			bm_company bc
 		WHERE bc.IS_ACTIVE =1
 	</select>
 	<!-- 查询  -->
-	   <select id="getProjectSub" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
-			SELECT
-		bs.ID as companyId,
-		bs.`NAME` as companyName
+	<select id="getProjectSub" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
+		SELECT
+			bs.ID as companyId,
+			bs.`NAME` as companyName
 		FROM
-		bm_unit  bs
+			bm_unit  bs
 		WHERE bs.IS_ACTIVE =1
 	</select>
 
-             <select id="getToOutList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
+	<select id="getToOutList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
 
 		SELECT
 			wtr.DEFINITION_ID,
@@ -1254,114 +1254,129 @@
 			wtr.OPERATION_TIME as time,
 			"/backstage/out/isApproval" as linkUrl
 
-			FROM
+		FROM
 			wf_collar_details wcd
-			LEFT JOIN wf_task_record wtr on wcd.TASK_ID = wtr.ID
-			LEFT JOIN pm_user pu on wtr.OPERATION_USER = pu.ID
-			LEFT JOIN wf_task_definition wd on wtr.DEFINITION_ID = wd.ID
-			WHERE wcd.IS_APPROVAL = 0 and wcd.IS_EXAMINE =1
+				LEFT JOIN wf_task_record wtr on wcd.TASK_ID = wtr.ID
+				LEFT JOIN pm_user pu on wtr.OPERATION_USER = pu.ID
+				LEFT JOIN wf_task_definition wd on wtr.DEFINITION_ID = wd.ID
+		WHERE wcd.IS_APPROVAL = 0 and wcd.IS_EXAMINE =1
 
 		GROUP BY  wtr.ID
 	</select>
 
-          <select id="getToBackList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
+	<select id="getToBackList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
 
 		SELECT
-				wtr.DEFINITION_ID,
-				wd.`NAME` as taskType,
-				wtr.NUMBER as taskCode,
-				pu.`NAME` as userName,
-				wtr.OPERATION_TIME  as time,
-				"/backstage/audit/list" as linkUrl
-			FROM
-				wf_return_material_details rm
+			wtr.DEFINITION_ID,
+			wd.`NAME` as taskType,
+			wtr.NUMBER as taskCode,
+			pu.`NAME` as userName,
+			wtr.OPERATION_TIME  as time,
+			"/backstage/audit/list" as linkUrl
+		FROM
+			wf_return_material_details rm
 				LEFT JOIN wf_task_record wtr ON rm.TASK_ID = wtr.ID
 				LEFT JOIN wf_task_definition wd ON wtr.DEFINITION_ID = wd.ID
 				LEFT JOIN pm_user pu ON wtr.OPERATION_USER = pu.ID
-			WHERE
-				rm.IS_APPROVAL = 0
-			GROUP BY
-				wtr.ID
+		WHERE
+			rm.IS_APPROVAL = 0
+		GROUP BY
+			wtr.ID
 	</select>
 
-          <select id="getToNewList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
+	<select id="getToNewList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
 
-				SELECT
-			     wtr.DEFINITION_ID,
-				wd.`NAME`  as taskType,
-				wtr.NUMBER as taskCode,
-				pu.`NAME` as userName,
-				wtr.OPERATION_TIME  as time,
-				"/backstage/new/isApproval" as linkUrl
-				FROM
-				wf_new_details wnd
+		SELECT
+			wtr.DEFINITION_ID,
+			concat(wd.`NAME`,'-批准')  as taskType,
+			wtr.NUMBER as taskCode,
+			pu.`NAME` as userName,
+			wtr.OPERATION_TIME  as time,
+			"/backstage/new/isApproval" as linkUrl
+		FROM
+			wf_new_details wnd
 				LEFT JOIN wf_task_record wtr ON wnd.TASK_ID = wtr.ID
 				LEFT JOIN wf_task_definition wd ON wtr.DEFINITION_ID = wd.ID
 				LEFT JOIN pm_user pu ON wtr.OPERATION_USER = pu.ID
-				WHERE wnd.IS_APPROVAL = 0
-				GROUP BY 	wtr.ID
+		WHERE wnd.IS_APPROVAL = 0 AND wnd.IS_EXAMINE=1
+		GROUP BY 	wtr.ID
+		UNION all
+		SELECT
+			wtr.DEFINITION_ID,
+			concat(wd.`NAME`,'-审核')  as taskType,
+			wtr.NUMBER as taskCode,
+			pu.`NAME` as userName,
+			wtr.OPERATION_TIME  as time,
+			"/backstage/new/isExamine" as linkUrl
+		FROM
+			wf_new_details wnd
+				LEFT JOIN wf_task_record wtr ON wnd.TASK_ID = wtr.ID
+				LEFT JOIN wf_task_definition wd ON wtr.DEFINITION_ID = wd.ID
+				LEFT JOIN pm_user pu ON wtr.OPERATION_USER = pu.ID
+		WHERE wnd.IS_EXAMINE = 0
+		GROUP BY 	wtr.ID
 	</select>
 
 
-             <select id="getCalendarOut" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
-			SELECT
-			     	    wtr2.ID,
-						wtr2.NUMBER AS taskCode,
-						mt2.`NAME` as maType,
-						mt.`NAME` as maName,
-						wir.num,
-						wir.`CODE` as maCode,
-						wot.OUT_PERSON,
-						pu.`NAME` as userName,
-						wir.TIME as currentTime,
-						bp.`NAME` as projectName,
-						bc.`NAME` as companyName
-						FROM
-						wf_info_record wir
-						LEFT JOIN mm_type mt on wir.model_id = mt.ID
-						LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-						LEFT JOIN wf_task_record wtr on wir.SUP_ID = wtr.ID
-						LEFT JOIN wf_task_record wtr2 on wtr.SUP_ID = wtr2.ID
-						LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_ID
-						LEFT JOIN pm_user pu on wot.OUT_PERSON = pu.ID
-						LEFT JOIN wf_agreement_task wat on wtr2.ID = wat.TASK_ID
-						LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
-						LEFT JOIN bm_project bp on wla.PROJECT = bp.ID
-						LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
-						WHERE wir.TYPE =2 and  wot.IS_APPROVAL = 1
+	<select id="getCalendarOut" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+		SELECT
+		wtr2.ID,
+		wtr2.NUMBER AS taskCode,
+		mt2.`NAME` as maType,
+		mt.`NAME` as maName,
+		wir.num,
+		wir.`CODE` as maCode,
+		wot.OUT_PERSON,
+		pu.`NAME` as userName,
+		wir.TIME as currentTime,
+		bp.`NAME` as projectName,
+		bc.`NAME` as companyName
+		FROM
+		wf_info_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_task_record wtr on wir.SUP_ID = wtr.ID
+		LEFT JOIN wf_task_record wtr2 on wtr.SUP_ID = wtr2.ID
+		LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_ID
+		LEFT JOIN pm_user pu on wot.OUT_PERSON = pu.ID
+		LEFT JOIN wf_agreement_task wat on wtr2.ID = wat.TASK_ID
+		LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
+		LEFT JOIN bm_project bp on wla.PROJECT = bp.ID
+		LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
+		WHERE wir.TYPE =2 and  wot.IS_APPROVAL = 1
 
-						AND LEFT(wir.TIME,10) = #{currentTime}
-						<if test="proId!=null and proId!=''">
-							AND bp.id = #{proId}
-						</if>
+		AND LEFT(wir.TIME,10) = #{currentTime}
+		<if test="proId!=null and proId!=''">
+			AND bp.id = #{proId}
+		</if>
 
-				GROUP BY  wtr2.ID ,wir.model_id,wir.ma_id
+		GROUP BY  wtr2.ID ,wir.model_id,wir.ma_id
 
 	</select>
 
-             <select id="getCalendarBack" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
-				SELECT
-            wtr.ID,
-			wtr.NUMBER AS taskCode,
-			mt2.`NAME` as maType,
-			mt.`NAME` as maName,
-			wir.num,
-			wir.`CODE` as maCode,
-            wrd.OPERATOR as userName,
-			wir.TIME as currentTime,
-			bp.`NAME` as projectName,
-			bc.`NAME` as companyName
-			FROM
-			wf_info_record wir
-			LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			LEFT JOIN wf_return_material_details wrd on wir.SUP_ID = wrd.ID
-			LEFT JOIN wf_task_record wtr on wrd.TASK_ID = wtr.ID
-			LEFT JOIN wf_agreement_task wat on wtr.ID = wat.TASK_ID
-			LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
-			LEFT JOIN bm_project bp on wla.PROJECT = bp.ID
-			LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
-			WHERE wir.TYPE =4
+	<select id="getCalendarBack" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+		SELECT
+		wtr.ID,
+		wtr.NUMBER AS taskCode,
+		mt2.`NAME` as maType,
+		mt.`NAME` as maName,
+		wir.num,
+		wir.`CODE` as maCode,
+		wrd.OPERATOR as userName,
+		wir.TIME as currentTime,
+		bp.`NAME` as projectName,
+		bc.`NAME` as companyName
+		FROM
+		wf_info_record wir
+		LEFT JOIN mm_type mt on wir.model_id = mt.ID
+		LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		LEFT JOIN wf_return_material_details wrd on wir.SUP_ID = wrd.ID
+		LEFT JOIN wf_task_record wtr on wrd.TASK_ID = wtr.ID
+		LEFT JOIN wf_agreement_task wat on wtr.ID = wat.TASK_ID
+		LEFT JOIN wf_lease_agreement wla on wat.AGREEMENT_ID = wla.ID
+		LEFT JOIN bm_project bp on wla.PROJECT = bp.ID
+		LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
+		WHERE wir.TYPE =4
 		and LEFT(wir.TIME,10) = #{currentTime}
 		<if test="proId!=null and proId!=''">
 			AND bp.id = #{proId}
@@ -1371,8 +1386,8 @@
 	</select>
 
 
-             <select id="getCalendarRepair" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
-			SELECT
+	<select id="getCalendarRepair" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+		SELECT
 			wir.ID,
 			mt2.`NAME` as maType,
 			mt.`NAME` as  maName,
@@ -1384,116 +1399,116 @@
 			wir.REPAIR_PERSON_NAME as userName,
 			rf.file_url as fileUrl,
 			wir.REMARK
-			FROM
+		FROM
 			wf_info_record wir
 
-			LEFT JOIN mm_type mt on wir.MODEL_ID = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			LEFT JOIN mm_machines mm on mm.DEVICE_CODE = wir.`CODE`
-			LEFT JOIN repair_file rf on wir.id = rf.info_id
+				LEFT JOIN mm_type mt on wir.MODEL_ID = mt.ID
+				LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+				LEFT JOIN mm_machines mm on mm.DEVICE_CODE = wir.`CODE`
+				LEFT JOIN repair_file rf on wir.id = rf.info_id
 
-			WHERE wir.TYPE = 6
-            and left(wir.TIME,10) =#{currentTime}
+		WHERE wir.TYPE = 6
+		  and left(wir.TIME,10) =#{currentTime}
 
 
 	</select>
 
-             <select id="getCalendarScrap" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
-			SELECT
-						wir.ID,
-						    mtt.`NAME` AS maType,
-							mt.`NAME` AS maName,
-							mam.DEVICE_CODE AS maCode,
-					        wir.TIME AS currentTime,
-					        ROUND(wir.NUM) as num,
-							wir.SCRAP_URL as fileUrl,
-							pu.`NAME` as userName,
-							wir.SCRAP_REASON AS remark
-					FROM wf_info_record wir
-			LEFT JOIN wf_task_record sup1 ON sup1.ID = wir.SUP_ID
-			LEFT JOIN wf_task_record sup2 ON sup2.ID = sup1.SUP_ID
-			LEFT JOIN mm_type mt ON mt.ID = wir.MODEL_ID
-			LEFT JOIN mm_type mtt ON mtt.ID = mt.PARENT_ID
-			LEFT JOIN mm_machines mam ON  wir.`CODE` = mam.DEVICE_CODE and  wir.MODEL_ID = mam.TYPE
-			LEFT JOIN pm_user pu on sup2.OPERATION_USER = pu.ID
-			WHERE left(wir.TIME,10) =#{currentTime} and wir.RM_STATUS = 14
+	<select id="getCalendarScrap" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+		SELECT
+			wir.ID,
+			mtt.`NAME` AS maType,
+			mt.`NAME` AS maName,
+			mam.DEVICE_CODE AS maCode,
+			wir.TIME AS currentTime,
+			ROUND(wir.NUM) as num,
+			wir.SCRAP_URL as fileUrl,
+			pu.`NAME` as userName,
+			wir.SCRAP_REASON AS remark
+		FROM wf_info_record wir
+				 LEFT JOIN wf_task_record sup1 ON sup1.ID = wir.SUP_ID
+				 LEFT JOIN wf_task_record sup2 ON sup2.ID = sup1.SUP_ID
+				 LEFT JOIN mm_type mt ON mt.ID = wir.MODEL_ID
+				 LEFT JOIN mm_type mtt ON mtt.ID = mt.PARENT_ID
+				 LEFT JOIN mm_machines mam ON  wir.`CODE` = mam.DEVICE_CODE and  wir.MODEL_ID = mam.TYPE
+				 LEFT JOIN pm_user pu on sup2.OPERATION_USER = pu.ID
+		WHERE left(wir.TIME,10) =#{currentTime} and wir.RM_STATUS = 14
 
 
 	</select>
 
-             <select id="getCalendarRepairInput" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
-					SELECT
-			            wtr.ID,
-						wtr.NUMBER AS taskCode,
-						mt2.`NAME` as maType,
-						mt.`NAME` as maName,
-						wir.num,
-						IFNULL(wir.`CODE`,"-") as maCode,
-			            pu.`NAME` as userName,
-						wir.TIME as currentTime
-						FROM
-						wf_info_record wir
-						LEFT JOIN mm_type mt on wir.model_id = mt.ID
-						LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-						LEFT JOIN wf_put_storage_details wpd on wir.SUP_ID = wpd.TASK_ID
-						LEFT JOIN wf_task_record wtr on wpd.TASK_ID = wtr.ID
-					  LEFT JOIN pm_user pu on wpd.CUSTOMER_SERVICE_REP = pu.ID
-						WHERE wir.TYPE =3
-					and LEFT(wir.TIME,10) = #{currentTime}
-					GROUP BY  wtr.ID ,wir.model_id,wir.`CODE`
+	<select id="getCalendarRepairInput" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+		SELECT
+			wtr.ID,
+			wtr.NUMBER AS taskCode,
+			mt2.`NAME` as maType,
+			mt.`NAME` as maName,
+			wir.num,
+			IFNULL(wir.`CODE`,"-") as maCode,
+			pu.`NAME` as userName,
+			wir.TIME as currentTime
+		FROM
+			wf_info_record wir
+				LEFT JOIN mm_type mt on wir.model_id = mt.ID
+				LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+				LEFT JOIN wf_put_storage_details wpd on wir.SUP_ID = wpd.TASK_ID
+				LEFT JOIN wf_task_record wtr on wpd.TASK_ID = wtr.ID
+				LEFT JOIN pm_user pu on wpd.CUSTOMER_SERVICE_REP = pu.ID
+		WHERE wir.TYPE =3
+		  and LEFT(wir.TIME,10) = #{currentTime}
+		GROUP BY  wtr.ID ,wir.model_id,wir.`CODE`
 
 
 	</select>
 
-             <select id="getCalendarNewInput" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+	<select id="getCalendarNewInput" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
 		SELECT
 			mt2.`NAME` as maType,
 			mt.`NAME` as maName,
 			wir.num,
-		    wnd.ACTUAL_PRICE as price,
+			wnd.ACTUAL_PRICE as price,
 			wnd.CHECK_URL as fileUrl,
-            pu.`NAME` as userName,
+			pu.`NAME` as userName,
 			wir.TIME as currentTime,
 			wfa.LAUNCH_TIME as startTime,
 			wfa.FINISH_TIME as endTime ,
 			mv.`NAME` as remark
-			FROM
+		FROM
 			wf_info_record wir
-			LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-			LEFT JOIN wf_new_details wnd on wir.SUP_ID = wnd.TASK_ID
-			LEFT JOIN wf_task_appoint wfa on wnd.TASK_ID = wfa.TASK_ID
-		  LEFT JOIN mm_vender mv on wnd.MA_VENDER = mv.ID
-		  LEFT JOIN pm_user pu on wnd.CUSTOMER_SERVICE_REP = pu.ID
-			WHERE wir.TYPE =5
-		and LEFT(wir.TIME,10) = #{currentTime}
-
-
-	</select>
-
-             <select id="getCalendarPd" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
-
-
-				SELECT
-		        wir.ID,
-			    mt2.`NAME` as maType,
-		     	mt.`NAME` as maName,
-				GROUP_CONCAT(wir.INVENTORY_TYPE,":",wir.INVENTORY_NUM)	 AS num ,
-				wir.INVENTORY_PERSON AS userName,
-		     	wir.INVENTORY_TIME as currentTime,
-		    	wir.REMARK as remark
-				FROM
-				wf_inventory_record wir
 				LEFT JOIN mm_type mt on wir.model_id = mt.ID
-			    LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
-				WHERE wir.INVENTORY_NUM > 0
+				LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+				LEFT JOIN wf_new_details wnd on wir.SUP_ID = wnd.TASK_ID
+				LEFT JOIN wf_task_appoint wfa on wnd.TASK_ID = wfa.TASK_ID
+				LEFT JOIN mm_vender mv on wnd.MA_VENDER = mv.ID
+				LEFT JOIN pm_user pu on wnd.CUSTOMER_SERVICE_REP = pu.ID
+		WHERE wir.TYPE =5
+		  and LEFT(wir.TIME,10) = #{currentTime}
 
-			AND  LEFT(wir.INVENTORY_TIME,10) = #{currentTime}
-			GROUP BY  wir.ID
 
 	</select>
 
-    <select id="getPlanDetailsAboutExpireList" resultType="com.bonus.index.beans.IndexInuseWarnBean">
+	<select id="getCalendarPd" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
+
+
+		SELECT
+			wir.ID,
+			mt2.`NAME` as maType,
+			mt.`NAME` as maName,
+			GROUP_CONCAT(wir.INVENTORY_TYPE,":",wir.INVENTORY_NUM)	 AS num ,
+			wir.INVENTORY_PERSON AS userName,
+			wir.INVENTORY_TIME as currentTime,
+			wir.REMARK as remark
+		FROM
+			wf_inventory_record wir
+				LEFT JOIN mm_type mt on wir.model_id = mt.ID
+				LEFT JOIN mm_type mt2 on mt.PARENT_ID = mt2.ID
+		WHERE wir.INVENTORY_NUM > 0
+
+		  AND  LEFT(wir.INVENTORY_TIME,10) = #{currentTime}
+		GROUP BY  wir.ID
+
+	</select>
+
+	<select id="getPlanDetailsAboutExpireList" resultType="com.bonus.index.beans.IndexInuseWarnBean">
 		SELECT
 		'车辆需求计划' as type,
 		cpd.id,
@@ -1526,21 +1541,21 @@
 		UNION ALL
 
 		SELECT
-			'安全工器具计划' as type,
-			spd.id,
-			bp.`NAME` as projectName,
-			spd.model_id AS modelId,
-			spd.need_num AS needNum,
-			spd.need_day AS needDay,
-			spa.need_time AS backDate,
-			spd.remark,
-			spd.type maType,
-			spd.`name` maName,
-			spd.model maModel,
-			spd.unit maUnit
+		'安全工器具计划' as type,
+		spd.id,
+		bp.`NAME` as projectName,
+		spd.model_id AS modelId,
+		spd.need_num AS needNum,
+		spd.need_day AS needDay,
+		spa.need_time AS backDate,
+		spd.remark,
+		spd.type maType,
+		spd.`name` maName,
+		spd.model maModel,
+		spd.unit maUnit
 		FROM st_plan_details spd
-				 LEFT JOIN st_plan_apply spa ON spd.apply_id = spa.id
-				 LEFT JOIN bm_project bp ON spa.project_id = bp.ID
+		LEFT JOIN st_plan_apply spa ON spd.apply_id = spa.id
+		LEFT JOIN bm_project bp ON spa.project_id = bp.ID
 		WHERE bp.`NAME` IS NOT NULL
 		and spa.status = 2
 		and spa.ck_num = 0
@@ -1555,22 +1570,22 @@
 		UNION ALL
 
 		SELECT
-			'机具需求计划' as type,
-			tpd.id,
-			pro.`NAME` as projectName,
-			tpd.model_id moduleId,
-			tpd.need_num needNum,
-			tpd.need_day needDay,
-			tpa.need_time backDate,
-			tpd.remark,
-			tpd.type maType,
-			tpd.`NAME` maName,
-			tpd.module maModel,
-			tpd.unit maUnit
+		'机具需求计划' as type,
+		tpd.id,
+		pro.`NAME` as projectName,
+		tpd.model_id moduleId,
+		tpd.need_num needNum,
+		tpd.need_day needDay,
+		tpa.need_time backDate,
+		tpd.remark,
+		tpd.type maType,
+		tpd.`NAME` maName,
+		tpd.module maModel,
+		tpd.unit maUnit
 		FROM
-			t_plan_details tpd
-				LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id
-				LEFT JOIN bm_project pro on tpa.project_id=pro.ID
+		t_plan_details tpd
+		LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id
+		LEFT JOIN bm_project pro on tpa.project_id=pro.ID
 		WHERE pro.`NAME` is not null
 		and tpa.status = 2
 		and tpa.status_type = 1
@@ -1580,23 +1595,23 @@
 	</select>
 	<select id="getNewlyStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
 		select mt2.NAME as maType,
-		       mt.NAME as maName,
-		       wir.CODE as maCode,
+			   mt.NAME as maName,
+			   wir.CODE as maCode,
 			   mt.UNIT as maUnit,
 			   wir.NUM as storageNum
-		 from wf_info_record wir
-		left join mm_type mt on wir.MODEL_ID = mt.ID
-		left join mm_type mt2 on mt.PARENT_ID = mt2.ID
+		from wf_info_record wir
+				 left join mm_type mt on wir.MODEL_ID = mt.ID
+				 left join mm_type mt2 on mt.PARENT_ID = mt2.ID
 		where wir.TYPE = #{type}
 	</select>
 	<select id="getInventoryStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
 		select mt2.NAME as maType,
-		       mt.NAME as maName,
+			   mt.NAME as maName,
 			   mt.UNIT as maUnit,
 			   wir.INVENTORY_NUM as storageNum
-		 from wf_inventory_record wir
-		left join mm_type mt on wir.MODEL_ID = mt.ID
-		left join mm_type mt2 on mt.PARENT_ID = mt2.ID
+		from wf_inventory_record wir
+				 left join mm_type mt on wir.MODEL_ID = mt.ID
+				 left join mm_type mt2 on mt.PARENT_ID = mt2.ID
 		where wir.INVENTORY_TYPE = "盘盈"
 	</select>
 </mapper>
diff --git a/resources/mybatis/newInput/NewInputMapper.xml b/resources/mybatis/newInput/NewInputMapper.xml
index 9160517..5fcbd55 100644
--- a/resources/mybatis/newInput/NewInputMapper.xml
+++ b/resources/mybatis/newInput/NewInputMapper.xml
@@ -105,7 +105,35 @@
 		AND 
 		    wnd.IS_ACTIVE = '1'
  	</select>
- 	
+ 	<select id="getNewInputList" parameterType="java.util.List"  resultMap="new">
+ 	SELECT wnd.ID AS id,SUM(wir.NUM) AS nums,wnd.IS_APPROVAL AS isApproval,
+		wnd.IS_EXAMINE AS isExamine,mt.`NAME` AS maModel,mtt.`NAME` AS maType,
+		pu.`NAME` AS checker,puu.`NAME` AS customerRep,wnd.QUALIFIED_NUM AS checkNum,
+		wnd.MODEL_ID as maModelId,wnd.TASK_ID as taskId,audit.time auditTime ,pus.`NAME` auditUser 
+		FROM wf_new_details wnd
+		LEFT JOIN wf_task_appoint wta ON wta.TASK_ID = wnd.TASK_ID
+		LEFT JOIN wf_info_record wir ON wir.SUP_ID = wnd.TASK_ID AND wnd.MODEL_ID = wir.MODEL_ID
+		LEFT JOIN pm_user pu on pu.ID = wnd.CHECKER
+		LEFT JOIN pm_user puu ON puu.ID = wnd.CUSTOMER_SERVICE_REP
+		LEFT JOIN ma_org_relation mor on mor.TYPE_ID = wnd.MODEL_ID
+		LEFT JOIN mm_type mt ON mt.ID = mor.TYPE_ID
+		LEFT JOIN mm_type mtt ON mtt.ID = mt.PARENT_ID
+		LEFT JOIN(
+		SELECT  task, max(time) time ,creator
+		from  bm_logs 
+		where fun='/backstage/new/isApproval'
+		GROUP BY task
+		)audit on audit.task=wnd.TASK_ID
+		LEFT JOIN pm_user pus  on pus.ID = audit.creator
+		WHERE wir.NUM IS NOT NULL AND wnd.IS_EXAMINE = 1 AND wta.IS_ACTIVE = 1
+		and wnd.id in
+				<foreach item="id" collection="list" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+		
+		GROUP BY wnd.MODEL_ID,wnd.TASK_ID
+		ORDER BY wnd.IS_APPROVAL
+ 	</select>
  	
  	<select id="findIsApproval" parameterType="com.bonus.newInput.beans.NewInputBean" 
     	resultMap="new">
diff --git a/resources/mybatis/wf/TaskRecordMapper.xml b/resources/mybatis/wf/TaskRecordMapper.xml
index ad4aee8..c78c1eb 100644
--- a/resources/mybatis/wf/TaskRecordMapper.xml
+++ b/resources/mybatis/wf/TaskRecordMapper.xml
@@ -107,6 +107,55 @@
         </if>
         )
 
+		UNION ALL
+		
+		
+	    SELECT
+        wtr.id AS id,
+        taskinfo.ID AS checkerId,
+        '-' number,
+		concat(wpd.NAME,IF(taskinfo.IS_EXAMINE=0,'审核','批准')) processName,
+		wtd.NAME definitionName,
+        pu.NAME AS creatorName,
+        DATE_FORMAT(wtr.OPERATION_TIME, '%Y-%m-%d') AS operationTime,
+        wtr.DEFINITION_ID AS definitionId,
+        CASE
+        WHEN wtr.DEFINITION_ID = 11 THEN wtr1.IS_FINISH
+        ELSE wtr.IS_FINISH
+        END AS isFinish,
+        'TASK' AS source
+        FROM
+        wf_task_record wtr
+				INNER  join(
+				 SELECT TASK_ID,ID,IS_EXAMINE,IS_APPROVAL
+					FROM wf_new_details
+					<where>
+						CAST(QUALIFIED_NUM AS DECIMAL(18,2)) = CAST(INPUT_NUM AS DECIMAL(18,2)) 
+							and  IS_ACTIVE=1  
+						<if test='param.isFinish==1 or param.isFinish=="1"'>
+						and	(IS_APPROVAL=1 and IS_EXAMINE=1)
+						</if>
+						<if test='param.isFinish==0 or param.isFinish=="0"'>
+							and (IS_APPROVAL!=1 OR IS_EXAMINE!=1)
+						</if>
+					</where>
+				)taskinfo on taskinfo.TASK_ID=wtr.id 
+        LEFT JOIN wf_task_record wtr1 ON wtr1.ID = wtr.SUP_ID
+        LEFT JOIN pm_user pu ON pu.id = wtr.OPERATION_USER
+        LEFT JOIN wf_task_definition wtd ON wtd.ID = wtr.DEFINITION_ID
+        LEFT JOIN wf_process_definition wpd ON wpd.id = wtr.PROCESS_ID
+        WHERE wtr.DEFINITION_ID IN (12)   
+        AND wtr.IS_ACTIVE = 1
+        <if test="param.operationUserId != null and param.operationUserId != 0">
+            AND wtr.OPERATION_USER = #{param.operationUserId}
+        </if>
+        <if test="param.keyWord != null and param.keyWord != ''">
+            AND (
+            wpd.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
+            OR wtd.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
+            OR pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
+            )
+        </if>
         UNION ALL
 
         (
diff --git a/src/com/bonus/newInput/controller/InputDetailsController.java b/src/com/bonus/newInput/controller/InputDetailsController.java
index d139c35..8734be0 100644
--- a/src/com/bonus/newInput/controller/InputDetailsController.java
+++ b/src/com/bonus/newInput/controller/InputDetailsController.java
@@ -450,7 +450,7 @@ public class InputDetailsController extends BaseController<InputDetailsBean> {
 				String saveDirectory = "/data/gzimt/" + mkdirsName + "/"; // linux 系统路径
 				String os = System.getProperty("os.name");
 				if (os.toLowerCase().startsWith("win")) {
-					saveDirectory = "e://GZMachinesWeb/" + mkdirsName + "/";
+					saveDirectory = "D://GZMachinesWeb/" + mkdirsName + "/";
 				}
 				File files = new File(saveDirectory);
 				if (!files.exists()) {
diff --git a/src/com/bonus/newInput/controller/NewInputController.java b/src/com/bonus/newInput/controller/NewInputController.java
index c8014e9..0645a37 100644
--- a/src/com/bonus/newInput/controller/NewInputController.java
+++ b/src/com/bonus/newInput/controller/NewInputController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.bonus.data.StringUtil;
 import com.bonus.newInput.beans.NewInputBean;
 import com.bonus.newInput.service.NewInputService;
 import com.bonus.sys.beans.UserBean;
@@ -222,6 +223,28 @@ public class NewInputController extends BaseController<NewInputBean> {
 		ar.setSucceed(o);
 		return ar;
 	}
+	
+	@RequestMapping(value = "isExamines", method = RequestMethod.POST)
+	@ResponseBody
+	public AjaxRes isExamines(NewInputBean o) {
+		AjaxRes ar = getAjaxRes();
+		try {
+			if(!StringUtil.isEmpty(o.getId())) {
+				String[] ids=o.getId().split(",");
+				for (String string : ids) {
+					NewInputBean newInputBean=new NewInputBean();
+					newInputBean.setId(string.split("_")[0]);
+					service.isExamine(newInputBean);
+				}
+			}
+			ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED);
+		} catch (Exception e) {
+			logger.error(e.toString(), e);
+			ar.setFailMsg(GlobalConst.SAVE_FAIL);
+		}
+		ar.setSucceed(o);
+		return ar;
+	}
 
 	@RequestMapping(value = "isApproval", method = RequestMethod.POST)
 	@ResponseBody
@@ -237,6 +260,21 @@ public class NewInputController extends BaseController<NewInputBean> {
 		ar.setSucceed(o);
 		return ar;
 	}
+	
+	@RequestMapping(value = "isApprovals", method = RequestMethod.POST)
+	@ResponseBody
+	public AjaxRes isApprovals (NewInputBean o) {
+		AjaxRes ar = getAjaxRes();
+		try {
+			service.isApprovals(o);
+			ar.setSucceedMsg(GlobalConst.SAVE_SUCCEED);
+		} catch (Exception e) {
+			logger.error(e.toString(), e);
+			ar.setFailMsg(GlobalConst.SAVE_FAIL);
+		}
+		ar.setSucceed(o);
+		return ar;
+	}
 
 	@RequestMapping(value = "update", method = RequestMethod.POST)
 	@ResponseBody
diff --git a/src/com/bonus/newInput/dao/NewInputDao.java b/src/com/bonus/newInput/dao/NewInputDao.java
index 940b331..a24214d 100644
--- a/src/com/bonus/newInput/dao/NewInputDao.java
+++ b/src/com/bonus/newInput/dao/NewInputDao.java
@@ -75,4 +75,10 @@ public interface NewInputDao extends BaseDao<NewInputBean> {
 	public int delDetails(NewInputBean o);
 
 	public NewInputBean getNewInputByTaskId(NewInputBean o);
+	/**
+	 * 依据id查询数据
+	 * @param idList
+	 * @return
+	 */
+	public List<NewInputBean> getNewInputList(@Param("list")List<String> idList);
 }
diff --git a/src/com/bonus/newInput/service/NewInputQrcodeServiceImp.java b/src/com/bonus/newInput/service/NewInputQrcodeServiceImp.java
index f5223b6..d75f546 100644
--- a/src/com/bonus/newInput/service/NewInputQrcodeServiceImp.java
+++ b/src/com/bonus/newInput/service/NewInputQrcodeServiceImp.java
@@ -26,6 +26,9 @@ import com.bonus.sys.AjaxRes;
 import com.bonus.sys.BaseServiceImp;
 import com.bonus.sys.GlobalConst;
 import com.bonus.sys.Page;
+import com.bonus.sys.UserShiroHelper;
+import com.bonus.wf.beans.TaskRecordBean;
+import com.bonus.wf.dao.TaskRecordDao;
 
 @Service("newQrcode")
 public class NewInputQrcodeServiceImp extends BaseServiceImp<NewInputQrcodeBean> implements NewInputQrcodeService {
@@ -232,6 +235,7 @@ public class NewInputQrcodeServiceImp extends BaseServiceImp<NewInputQrcodeBean>
 			o.setOperationTime(DateTimeHelper.getNowTime());
 			o.setState("5");
 			if (StringHelper.isNotEmpty(o.getQrCode()) || StringHelper.isNotEmpty(o.getDeviceCode())) {
+				//第一次添加数据
 				o.setNums("1");
 				res = insertInfoRecordByCode(o);
 			} else {
@@ -245,6 +249,9 @@ public class NewInputQrcodeServiceImp extends BaseServiceImp<NewInputQrcodeBean>
 		return res;
 	}
 
+	
+
+
 	private void isFinish(NewInputQrcodeBean o) {
 		List<NewInputQrcodeBean> list = dao.findIsSure(o);
 		if (list.size() > 0 && list != null) {
diff --git a/src/com/bonus/newInput/service/NewInputService.java b/src/com/bonus/newInput/service/NewInputService.java
index 030231d..d420633 100644
--- a/src/com/bonus/newInput/service/NewInputService.java
+++ b/src/com/bonus/newInput/service/NewInputService.java
@@ -29,4 +29,9 @@ public interface NewInputService extends BaseService<NewInputBean> {
 	public int deleteQrcode(NewInputBean o);
 
 	public AjaxRes getProcessInfo(NewInputBean o);
+	/**
+	 * 批量批准
+	 * @param o
+	 */
+	void isApprovals(NewInputBean o);
 }
diff --git a/src/com/bonus/newInput/service/NewInputServiceImp.java b/src/com/bonus/newInput/service/NewInputServiceImp.java
index a6f2a31..db05d9e 100644
--- a/src/com/bonus/newInput/service/NewInputServiceImp.java
+++ b/src/com/bonus/newInput/service/NewInputServiceImp.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import com.bonus.bm.beans.LogBean;
 import com.bonus.bm.dao.LogDao;
 import com.bonus.core.DateTimeHelper;
+import com.bonus.data.StringUtil;
 import com.bonus.ma.beans.MachineBean;
 import com.bonus.ma.beans.MachineTypeBean;
 import com.bonus.ma.dao.MachineDao;
@@ -138,9 +139,27 @@ public class NewInputServiceImp extends BaseServiceImp<NewInputBean> implements
 		o.setAuditTime(time);
 		o.setIsExamine("1");
 		dao.isExamine(o);
-
 	}
 
+	@Override
+	public void isApprovals(NewInputBean o) {
+		String ids=o.getId();
+		if(!StringUtil.isEmpty(ids)) {
+			String[]  idData=ids.split(",");
+			List<String> idList=new ArrayList<String>();
+			for (String string : idData) {
+				idList.add(string.split("_")[0]);
+			}
+			List<NewInputBean> list=dao.getNewInputList(idList);
+			for (NewInputBean newInputBean : list) {
+				//审核
+				//System.err.print(false);
+				isApproval(newInputBean);
+			}
+		}
+		
+	}
+	
 	/**
 	 * 批准 1.修改机具状态，增加库存 2.修改任务状态3.修改批准状态
 	 */