瀏覽代碼

报销项目选择去除需要三级校审通过的限制

user5 4 年之前
父節點
當前提交
4615af127d

+ 1 - 1
src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -844,4 +844,4 @@ public class WorkReimbursementController extends BaseController {
 		model.addAttribute("page",page);
 		return "modules/sys/gridReimburProjectList";
 	}
-}
+}

+ 14 - 14
src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -51,12 +51,12 @@
 		a.project_type as "projectType",
 		a.over_due_status as "overDueStatus"
 	</sql>
-	
+
 	<sql id="projectRecordsJoins">
 		LEFT JOIN sys_area area ON area.id = a.area_id
 	</sql>
-	
-    
+
+
 	<select id="get" resultType="ProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
@@ -83,7 +83,7 @@
         left join project_report_data prd on a.id = prd.project_id
         WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="ProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
@@ -343,15 +343,15 @@
             AND a.del_flag = #{DEL_FLAG_NORMAL}
         </where>
     </select>
-	
+
 	<select id="findAllList" resultType="ProjectRecords" >
-		SELECT 
+		SELECT
 			<include refid="projectRecordsColumns"/>
 		FROM project_records a
 		<include refid="projectRecordsJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -496,18 +496,18 @@
 			construction_linkman = #{constructionLinkman}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!--物理删除-->
 	<update id="delete">
 		UPDATE project_records SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-	
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE project_records SET 
+		UPDATE project_records SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
@@ -535,7 +535,7 @@
           status = #{projectStatus}
         WHERE id = #{id}
     </update>
-	
+
 	<update id="updateSelectiveById">
 		UPDATE  rural_project_records
 		<set>
@@ -735,7 +735,7 @@
 		LEFT JOIN sys_office o ON o.id = a.office_id
 		LEFT JOIN project_report_data prd ON a.id = prd.project_id
 		where a.status='5'  and a.del_flag='0' and w.del_flag='0'
-		and prd.number is not null
+		/*and prd.number is not null*/
 		and wci.del_flag='0' and (wci.completion_status!='5' or wci.completion_status is null)
 		<if test="projectName != null and projectName != ''">
 			AND a.project_name like concat(concat('%',#{projectName}),'%')
@@ -1361,4 +1361,4 @@
 			</otherwise>
 		</choose>
 	</select>
-</mapper>
+</mapper>

+ 2 - 1
src/main/webapp/webpage/modules/sys/gridselectcallprojectOnReimbur.jsp

@@ -89,6 +89,7 @@
 					<input type="hidden" name="searchKey" value="${searchKey}"/>
 					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<input id="extId" name="extid" type="hidden" value="${extId}"/>
 					<div id="td3">
 						<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
 					</div>
@@ -171,4 +172,4 @@
 	</div>
 </div>
 </body>
-</html>
+</html>