diff --git a/resources/mybatis/index/IndexHomeDetailsMapper.xml b/resources/mybatis/index/IndexHomeDetailsMapper.xml
index 7d191a9..a934aab 100644
--- a/resources/mybatis/index/IndexHomeDetailsMapper.xml
+++ b/resources/mybatis/index/IndexHomeDetailsMapper.xml
@@ -3,14 +3,14 @@
 <mapper namespace="com.bonus.index.dao.IndexHomeDetailsDao" >
 
     <resultMap id="index" type="com.bonus.index.beans.IndexHomeDetailsBean">
-         
-          
+
+
     </resultMap>
-    
-   
-    
+
+
+
         <select id="getMaTypeDetails" parameterType="com.bonus.index.beans.IndexHomeDetailsBean" resultMap="index">
-  			
+
 	SELECT
 		rs.typeId,
 		mat2.`NAME` maType,
@@ -40,18 +40,18 @@
 					0 backCount,
 		      0 as pyNum,
 					0 as pkNum,
-					mat1.IS_COUNT AS isCount 
+					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 mat3 ON mat3.ID = mat2.PARENT_ID
 				WHERE
-					mat1.`LEVEL` = 4 
-					AND mat1.IS_ACTIVE = '1' 
+					mat1.`LEVEL` = 4
+					AND mat1.IS_ACTIVE = '1'
 				GROUP BY
 					mat1.ID
 					UNION
-					
+
 						SELECT
 					typeId,
 					0 storageNum,
@@ -63,7 +63,7 @@
 					SUM( backNum ) backCount,
 					0 as pyNum,
 					0 as pkNum,
-					isCount AS isCount 
+					isCount AS isCount
 				FROM
 					(
 					SELECT
@@ -75,7 +75,7 @@
 						mt.UNIT,
 						SUM( wir.NUM ) AS leaseNum,
 						0 AS backNum,
-						mt.IS_COUNT AS isCount 
+						mt.IS_COUNT AS isCount
 					FROM
 						wf_info_record wir
 						LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
@@ -83,12 +83,12 @@
 						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 
+						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 
+						wir.TYPE = 2
+						AND wtr2.IS_ACTIVE = 1
+						AND wcd.IS_APPROVAL = 1
 					GROUP BY
 						mt.ID UNION
 					SELECT
@@ -100,24 +100,24 @@
 						mt.UNIT,
 						0 AS leaseNum,
 						SUM( wir.NUM ) AS backNum,
-						mt.IS_COUNT AS isCount 
+						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 
+						LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
 					WHERE
-						wir.TYPE = 4 
-						AND wtr.IS_ACTIVE = 1 
+						wir.TYPE = 4
+						AND wtr.IS_ACTIVE = 1
 					GROUP BY
-						mt.ID 
-					) a 
+						mt.ID
+					) a
 				GROUP BY
 					typeId
 					UNION
-					
+
 				SELECT
 				  typeId,
 					0 storageNum,
@@ -132,7 +132,7 @@
 				  isCount
 				FROM
 				(
-		
+
 					SELECT
 					mat1.ID AS typeId,
 					0 storageNum,
@@ -142,14 +142,14 @@
 					0 scrapNum,
 					0 loseNum,
 					0 waitInputNum,
-				mat1.IS_COUNT AS isCount 
+				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 
+					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 				GROUP BY
-					wrd.MODEL_ID 
+					wrd.MODEL_ID
 					UNION
 							SELECT
 					mat1.ID AS typeId,
@@ -160,12 +160,12 @@
 					0 scrapNum,
 					0 loseNum,
 					0 waitInputNum,
-					mat1.IS_COUNT AS isCount 
+					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 
+					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 				GROUP BY
 					wrc.MODEL_ID
 						UNION
@@ -180,19 +180,19 @@
 					SUM(
 						IFNULL( PRE_PUT_NUM, 0 )) - sum(
 					IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
-					mat1.IS_COUNT AS isCount 
+					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 
+					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 				WHERE
-					wpd.IS_SURE = 0 
+					wpd.IS_SURE = 0
 				GROUP BY
-					wpd.MODEL_ID 
-					
-					) res 
-					GROUP BY typeId 
+					wpd.MODEL_ID
+
+					) res
+					GROUP BY typeId
 					UNION
 					SELECT
 				mat1.ID AS typeId,
@@ -205,18 +205,18 @@
 			   	0 backCount,
 					0 as pyNum,
 					0 as pkNum,
-				mat1.IS_COUNT AS isCount 
+				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 
+				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,
@@ -228,7 +228,7 @@
 			   	0 backCount,
 					0 as pyNum,
 					0 as pkNum,
-				mat1.IS_COUNT AS isCount 
+				mat1.IS_COUNT AS isCount
 					FROM
 					ma_type_project_storage mps
 					LEFT JOIN wf_lease_agreement wla on mps.agreement_id = wla.ID
@@ -255,14 +255,14 @@
 			    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 
+						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 
+					 ) res
 					 GROUP BY typeId
-					 ) rs 
+					 ) rs
 					 LEFT JOIN  mm_type mat1 ON rs.typeId = mat1.ID
 				  	LEFT JOIN mm_type mat2 ON mat2.ID = mat1.PARENT_ID
 					<where>
@@ -275,8 +275,8 @@
 					</where>
 					GROUP BY rs.typeId
 	</select>
-   
-        
+
+
          <select id="getInStorage" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
   			SELECT
 			"修试后入库" as taskType,
@@ -284,7 +284,7 @@
 			pu.`NAME` as userName,
 			wir.TIME as currentDate
 			FROM
-			wf_info_record wir 
+			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
@@ -292,7 +292,7 @@
 			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,
@@ -302,14 +302,14 @@
 				wir.TIME as currentDate
 				FROM
 				wf_info_record wir
-				LEFT JOIN wf_new_details wnd on wir.SUP_ID = wnd.TASK_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
 					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
 			"领料出库" as taskType,
@@ -319,16 +319,16 @@
 			wir.TIME as currentDate
 			FROM
 			wf_info_record wir
-			LEFT JOIN wf_ma_outstock wot on wir.SUP_ID = wot.TASK_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
 			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
 			wrd.ID,
@@ -338,13 +338,13 @@
 			wir.TIME as currentDate
 			FROM
 			wf_return_material_details wrd
-			LEFT JOIN wf_info_record wir on wir.SUP_ID = wrd.ID 
+			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
 			"机具报废" as taskType,
@@ -358,7 +358,7 @@
 			 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,
@@ -372,15 +372,15 @@
 				 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,
 			projectName,
-			taskId, 
+			taskId,
 			SUM( leaseNum ) - SUM( backNum ) inuseNum
 		FROM
 			(
@@ -391,22 +391,22 @@
 				wla.`CODE` AS agreementCode,
 				SUM( wir.NUM ) AS leaseNum,
 				"0" AS backNum,
-				wla.ID AS agreementId 
+				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 
+				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 
+				AND wtr.IS_ACTIVE = 1
 			GROUP BY
 				wla.ID
-				
-				
+
+
 				 UNION
 			SELECT
 			  0 AS taskId,
@@ -415,7 +415,7 @@
 				wla.`CODE` AS agreementCode,
 				"0" AS leaseNum,
 				SUM( wir.NUM ) AS backNum,
-				wla.ID AS agreementId 
+				wla.ID AS agreementId
 			FROM
 				wf_task_record wtr
 				LEFT JOIN wf_agreement_task wat ON wtr.ID = wat.TASK_ID
@@ -423,20 +423,20 @@
 
 				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 
+				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 
+				AND wtr.IS_ACTIVE = 1
 			GROUP BY
-				wla.ID 
-			) a 
+				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
 		GROUP BY
 			a.projectName
-			
+
 	</select>
-	
+
          <select id="getMaOutTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 			SELECT
      	    wtr2.ID,
@@ -452,23 +452,23 @@
 			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 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 
+	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,
@@ -481,11 +481,11 @@
 			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_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 
+			WHERE wir.TYPE =4
 			<if test="startTime != null and startTime != ''">
 			AND LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
 	       </if>
@@ -495,8 +495,8 @@
 	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 ,
@@ -505,21 +505,21 @@
 			 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 
+			 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
 	</select>
-	
+
        <select id="getMaPdTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 		SELECT
 		        wir.ID,
@@ -532,17 +532,17 @@
 				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 
+				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
-			
-	
+
+
 	</select>
-	
-       
+
+
           <select id="getMaNewTask" parameterType="com.bonus.index.beans.IndexHomeTaskBean" resultType="com.bonus.index.beans.IndexHomeTaskBean">
 		SELECT
 				wnd.TASK_ID AS id,
@@ -555,18 +555,18 @@
 				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_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 
+				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 ,
@@ -576,7 +576,7 @@
 			 	LEFT(wir.TIME,10) as currentDate,
 			wir.TIME as currentTime
 			FROM
-			wf_info_record wir 
+			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
@@ -586,10 +586,10 @@
 			 <if test="startTime != null and startTime != ''">
 			AND  LEFT(wir.TIME,10) BETWEEN #{startTime} and #{endTime}
 	       </if>
-	        GROUP BY wps.TASK_ID 
+	        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,
@@ -610,10 +610,10 @@
 				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,
@@ -629,16 +629,16 @@
 				    vs.companyName,
 					to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now()) AS days
 					FROM
-					mm_machines mm 
+					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 
+	                LEFT JOIN v_mtp_status vs on mm.ID = vs.maId
 					WHERE 30>	to_days(ifnull(mm.NEXT_CHECK_TIME,now())) - to_days(now())
 
-	
+
 	</select>
-	
+
               <select id="getInUseWarn" parameterType="com.bonus.index.beans.IndexInuseWarnBean" resultType="com.bonus.index.beans.IndexInuseWarnBean">
 		SELECT
 				 mt2.`NAME` AS maType,
@@ -688,7 +688,7 @@
 				  bp.ID,
 				  bc.ID
 	</select>
-       
+
 	<select id="getTotalChangeWarn" parameterType="com.bonus.index.beans.IndexTotalWarnBean" resultType="com.bonus.index.beans.IndexTotalWarnBean">
 		SELECT
 			mt.ID,
@@ -712,16 +712,16 @@
 		<if test="maName != null and maName != ''">
 				and mt.`NAME` like concat('%', #{maName}, '%')
 		</if>
-		order by  t1.TIME desc 
+		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 
+					SUM(rs.storageNum) + SUM(rs.repairNum) + SUM(rs.inuseNum) as total
 					FROM
 (
 
@@ -736,18 +736,18 @@
 					0 backCount,
 		      0 as pyNum,
 					0 as pkNum,
-					mat1.IS_COUNT AS isCount 
+					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 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
-					
+
 						SELECT
 					typeId,
 					0 storageNum,
@@ -759,7 +759,7 @@
 					SUM( backNum ) backCount,
 					0 as pyNum,
 					0 as pkNum,
-					isCount AS isCount 
+					isCount AS isCount
 				FROM
 					(
 					SELECT
@@ -771,7 +771,7 @@
 						mt.UNIT,
 						SUM( wir.NUM ) AS leaseNum,
 						0 AS backNum,
-						mt.IS_COUNT AS isCount 
+						mt.IS_COUNT AS isCount
 					FROM
 						wf_info_record wir
 						LEFT JOIN wf_task_record wtr ON wir.SUP_ID = wtr.ID
@@ -779,12 +779,12 @@
 						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 
+						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 
+						wir.TYPE = 2
+						AND wtr2.IS_ACTIVE = 1
+						AND wcd.IS_APPROVAL = 1
 						and mt.ID= #{typeId}
 					GROUP BY
 						mt.ID UNION
@@ -797,24 +797,24 @@
 						mt.UNIT,
 						0 AS leaseNum,
 						SUM( wir.NUM ) AS backNum,
-						mt.IS_COUNT AS isCount 
+						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 
+						LEFT JOIN mm_type mmt1 ON mmt.PARENT_ID = mmt1.ID
 					WHERE
 						wir.TYPE = 4 and mt.ID= #{typeId}
-						AND wtr.IS_ACTIVE = 1 
+						AND wtr.IS_ACTIVE = 1
 					GROUP BY
-						mt.ID 
-					) a 
+						mt.ID
+					) a
 				GROUP BY
 					typeId
 					UNION
-					
+
 				SELECT
 				  typeId,
 					0 storageNum,
@@ -829,7 +829,7 @@
 				  isCount
 				FROM
 				(
-		
+
 					SELECT
 					mat1.ID AS typeId,
 					0 storageNum,
@@ -839,15 +839,15 @@
 					0 scrapNum,
 					0 loseNum,
 					0 waitInputNum,
-				mat1.IS_COUNT AS isCount 
+				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 
+					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 					where  mat1.ID= #{typeId}
 				GROUP BY
-					wrd.MODEL_ID 
+					wrd.MODEL_ID
 					UNION
 							SELECT
 					mat1.ID AS typeId,
@@ -858,12 +858,12 @@
 					0 scrapNum,
 					0 loseNum,
 					0 waitInputNum,
-					mat1.IS_COUNT AS isCount 
+					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 
+					LEFT JOIN mm_type mat3 ON mat3.ID = mat2.PARENT_ID
 						where  mat1.ID= #{typeId}
 				GROUP BY
 					wrc.MODEL_ID
@@ -879,21 +879,21 @@
 					SUM(
 						IFNULL( PRE_PUT_NUM, 0 )) - sum(
 					IFNULL( AL_PUT_NUM, 0 )) AS waitInputNum,
-					mat1.IS_COUNT AS isCount 
+					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 
+					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 
-			) rs 
-					GROUP BY typeId 
+					wpd.MODEL_ID
+
+					) res
+					GROUP BY typeId
+			) rs
+					GROUP BY typeId
 	</select>
 
 	<select id="getProjectDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
@@ -927,26 +927,26 @@
 				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(
-						SELECT wla.PROJECT proId ,GROUP_CONCAT( distinct bu.`NAME`) subName 
+						SELECT wla.PROJECT proId ,GROUP_CONCAT( distinct bu.`NAME`) subName
 					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 wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
 					left join bm_unit bu on bu.id =wla.LEASE_COMPANY
-					where bu.`NAME` is not null  AND wtr.IS_ACTIVE = 1 
-					GROUP BY wla.PROJECT 
+					where bu.`NAME` is not null  AND wtr.IS_ACTIVE = 1
+					GROUP BY wla.PROJECT
 				) real_sub on real_sub.proId=wla.PROJECT
 				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 wf_info_record wir ON wte.ID = wir.SUP_ID
 			WHERE
-				wir.TYPE = 2 
-				AND wtr.IS_ACTIVE = 1 
+				wir.TYPE = 2
+				AND wtr.IS_ACTIVE = 1
 				 <if test="projectId != null and projectId != ''">
 				and wla.PROJECT = #{projectId}
 	       </if>
 			GROUP BY
-				wla.ID UNION 
+				wla.ID UNION
 			SELECT
 				wla.PROJECT as id,
 				bp.`NAME` AS projectName,
@@ -964,25 +964,25 @@
 				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(
-						SELECT wla.PROJECT proId ,GROUP_CONCAT( distinct bu.`NAME`) subName 
+						SELECT wla.PROJECT proId ,GROUP_CONCAT( distinct bu.`NAME`) subName
 					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 wf_lease_agreement wla ON wat.AGREEMENT_ID = wla.ID
 					left join bm_unit bu on bu.id =wla.LEASE_COMPANY
-					where bu.`NAME` is not null  AND wtr.IS_ACTIVE = 1 
-					GROUP BY wla.PROJECT 
+					where bu.`NAME` is not null  AND wtr.IS_ACTIVE = 1
+					GROUP BY wla.PROJECT
 				) real_sub on real_sub.proId=	wla.PROJECT
 				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   	
-			WHERE  wtr.IS_ACTIVE = 1  AND wir.TYPE = 4 
+				LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
+			WHERE  wtr.IS_ACTIVE = 1  AND wir.TYPE = 4
 					 <if test="projectId != null and projectId != ''">
 						and wla.PROJECT = #{projectId}
 	       			</if>
-		
+
 			GROUP BY
-				wla.ID 
+				wla.ID
 			) a
 		<where>
 			<if test="subName != null and subName != ''">
@@ -994,9 +994,9 @@
 		</where>
 		GROUP BY
 			a.projectName
-			order by diffCount desc 
+			order by diffCount desc
 	</select>
-	
+
            <select id="getProjectMaDiff" parameterType="com.bonus.index.beans.IndexProjectBean" resultType="com.bonus.index.beans.IndexProjectBean">
 			SELECT
 				id as projectId,
@@ -1038,18 +1038,18 @@
 				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 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 
+				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 
+				 UNION
 			SELECT
 				wla.PROJECT as id,
 				wir.model_id as typeId,
@@ -1073,16 +1073,16 @@
 				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 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 
+				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
@@ -1093,33 +1093,33 @@
 	   </if>
 		GROUP BY
 			a.typeId
-			order by diffCount desc 
-		
-			
-		
+			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 
+		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 
+		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
 			wtr.DEFINITION_ID,
 			wd.`NAME` as taskType,
@@ -1127,19 +1127,19 @@
 			pu.`NAME` as userName,
 			wtr.OPERATION_TIME as time,
 			"/backstage/out/isApproval" as linkUrl
-			
+
 			FROM
-			wf_collar_details wcd 
+			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
-			
+
 		GROUP BY  wtr.ID
 	</select>
-	
+
           <select id="getToBackList" parameterType="com.bonus.index.beans.IndexTodoWarnBean" resultType="com.bonus.index.beans.IndexTodoWarnBean">
-  	
+
 		SELECT
 				wtr.DEFINITION_ID,
 				wd.`NAME` as taskType,
@@ -1151,15 +1151,15 @@
 				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 
+				LEFT JOIN pm_user pu ON wtr.OPERATION_USER = pu.ID
 			WHERE
-				rm.IS_APPROVAL = 0 
+				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
 			     wtr.DEFINITION_ID,
 				wd.`NAME`  as taskType,
@@ -1171,12 +1171,12 @@
 				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 
+				LEFT JOIN pm_user pu ON wtr.OPERATION_USER = pu.ID
 				WHERE wnd.IS_APPROVAL = 0
 				GROUP BY 	wtr.ID
 	</select>
-	
-          
+
+
              <select id="getCalendarOut" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
 			SELECT
 			     	    wtr2.ID,
@@ -1189,30 +1189,30 @@
 						pu.`NAME` as userName,
 						wir.TIME as currentTime,
 						bp.`NAME` as projectName,
-						bc.`NAME` as companyName 
+						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 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>
-				     
-				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,
@@ -1224,27 +1224,27 @@
             wrd.OPERATOR as userName,
 			wir.TIME as currentTime,
 			bp.`NAME` as projectName,
-			bc.`NAME` as companyName 
+			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_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 
+			WHERE wir.TYPE =4
 		and LEFT(wir.TIME,10) = #{currentTime}
 		<if test="proId!=null and proId!=''">
 			AND bp.id = #{proId}
 		</if>
-		GROUP BY  wtr.ID ,wir.model_id,wir.ma_id 
-	 
+		GROUP BY  wtr.ID ,wir.model_id,wir.ma_id
+
 	</select>
-	
-	
+
+
              <select id="getCalendarRepair" parameterType="com.bonus.index.beans.IndexHomeCalendarBean" resultType="com.bonus.index.beans.IndexHomeCalendarBean">
 			SELECT
 			wir.ID,
@@ -1260,18 +1260,18 @@
 			wir.REMARK
 			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
-			
+
 			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,
@@ -1291,10 +1291,10 @@
 			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,
@@ -1309,16 +1309,16 @@
 						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_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
 			mt2.`NAME` as maType,
@@ -1335,19 +1335,19 @@
 			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_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,
@@ -1355,13 +1355,13 @@
 				GROUP_CONCAT(wir.INVENTORY_TYPE,":",wir.INVENTORY_NUM)	 AS num ,
 				wir.INVENTORY_PERSON AS userName,
 		     	wir.INVENTORY_TIME as currentTime,
-		    	wir.REMARK as remark 
+		    	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 
-					
+				WHERE wir.INVENTORY_NUM > 0
+
 			AND  LEFT(wir.INVENTORY_TIME,10) = #{currentTime}
 			GROUP BY  wir.ID
 
@@ -1375,7 +1375,7 @@
 			cpd.model_id modelId,
 			cpd.need_num needNum,
 			cpd.need_day needDay,
-			cpd.back_date backDate,
+			cpa.need_time backDate,
 			cpd.remark,
 			cmti.type maType,
 			cmti.`NAME` maName,
@@ -1387,6 +1387,7 @@
 				LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID
 				LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id
 		WHERE bp.`NAME` IS NOT NULL
+		  and cpa.status = 1
 		<if test="projectName != null and projectName != ''">
 			and bp.`NAME` like concat('%', #{projectName}, '%')
 		</if>
@@ -1403,7 +1404,7 @@
 			spd.model_id AS modelId,
 			spd.need_num AS needNum,
 			spd.need_day AS needDay,
-			spd.back_date AS backDate,
+			spa.need_time AS backDate,
 			spd.remark,
 			spd.type maType,
 			spd.`name` maName,
@@ -1413,6 +1414,7 @@
 				 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 = 1
 		<if test="projectName != null and projectName != ''">
 			and bp.`NAME` like concat('%', #{projectName}, '%')
 		</if>
@@ -1429,7 +1431,7 @@
 			tpd.model_id moduleId,
 			tpd.need_num needNum,
 			tpd.need_day needDay,
-			tpd.back_date backDate,
+			tpa.need_time backDate,
 			tpd.remark,
 			tpd.type maType,
 			tpd.`NAME` maName,
@@ -1440,8 +1442,9 @@
 				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 = 1
 		<if test="maName != null and maName != ''">
 			and tpd.`NAME` like concat('%', #{maName}, '%')
 		</if>
 	</select>
-</mapper>
\ No newline at end of file
+</mapper>