机具库存收藏修改

WebContent/WEB-INF/views/rm/UnFinishContentList.jsp

@@ -192,7 +192,7 @@
 
 
                     </th> --%>
-				<th style="vertical-align:middle;color:red" onclick="topage()" class="center">${ma.number}</th>
+				<th style="vertical-align:middle;color:red" onclick="topage(${ma.id} , '${ma.processName}')" class="center">${ma.number}</th>
 				<th style="vertical-align:middle;" class="center">${ma.creatorName}</th>
 				<th style="vertical-align:middle;color:red" class="center">
 					<c:choose>
@@ -217,7 +217,7 @@
 <script type="text/javascript">
 	var  uname = localStorage.getItem("uname");
 	var  pwd = localStorage.getItem("pwd");
-	function topage() {
+	function topage(id,processName) {
 		$.ajax({
 			type: "post",
 			url: "http://127.0.0.1:21522/gz-car/login/userLogin",
@@ -231,8 +231,13 @@
 					localStorage.setItem("token", data.token);
 					localStorage.setItem("name", name);
 					//window.open("http://192.168.0.14:21625/gz-gqj/index.html")
-					window.open("http://localhost:63343/gz_car_ui/index.html#/page/car_demand_plan/dispatch_car_list.html")
+					if(processName === '派车计划'){
+						window.open("http://localhost:63343/gz_car_ui/page/car_demand_plan/child/dispatch_car_detail.html?id="+id +"&token="+data.token)
 
+					}else if(processName === '用车计划'){
+						window.open("http://localhost:63343/gz_car_ui/page/car_demand_plan/child/apply_plan_detail.html?id="+id +"&token="+data.token)
+
+					}
 				} else {
 					alert("没有权限！");
 

resources/mybatis/wf/TaskRecordMapper.xml

@@ -112,23 +112,19 @@ FROM
 		LEFT JOIN pm_user pu ON pu.id = cpa.creator
 		WHERE
 		cpa.status = '1'
-    AND (
+
-        <if test="param.operationUserId == null or param.operationUserId == ''">
-            1 = 1
-        </if>
 		<if test="param.operationUserId == '14'">
-            cpa.status_type = '3'
+			AND cpa.status_type = '3'
 		</if>
 		<if test="param.operationUserId in ('57','29','55','56','67')">
-            cpa.status_type = '4'
+			AND cpa.status_type = '4'
 		</if>
 		<if test="!(param.operationUserId == null
                  or param.operationUserId == ''
                  or param.operationUserId == '14'
                  or param.operationUserId in ('57','29','55','56','67'))">
-            1 = 0
+			AND 1 = 0
 		</if>
-    )
 		<if test="param.keyWord != null and param.keyWord != ''">
 			AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')
 		</if>
@@ -138,7 +134,7 @@ UNION ALL
 
 		(
 		SELECT
-    cpo.id AS id,
+		cpa.id AS id,
 		cpa.code AS number,
 		'派车计划' AS processName,
 		CASE cpo.type
@@ -168,7 +164,7 @@ WHERE
                  or param.operationUserId == ''
                  or param.operationUserId in ('49','50')
                  or param.operationUserId in ('57','29','55','56','67'))">
-            1 = 0
+			AND 1 = 0
 		</if>
 		<if test="param.keyWord != null and param.keyWord != ''">
 			AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%')