소스 검색

图片管理显示项目名称

yue 5 년 전
부모
커밋
ecc3a06592

+ 9 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/UploadImages.java

@@ -7,6 +7,15 @@ public class UploadImages extends ActEntity<UploadImages> {
     private String path;
     private String procInsId;
     private String uId;
+    private String projectName;
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
 
     public String getImgName() {
         return imgName;

+ 3 - 2
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/UploadImagesMapper.xml

@@ -24,9 +24,10 @@
 	</select>
 	
 	<select id="findList" resultType="UploadImages" >
-		SELECT *
-		FROM xm_upolad_images a
+		SELECT a.*,b.project_name as projectName
+		FROM xm_upolad_images a,xm_construction_clarificaiton b
 		<where>
+			a.proc_ins_id=b.proc_ins_id
 			<if test="dataScope != null and dataScope != ''">
 				${dataScope}
 			</if>

+ 7 - 1
src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.js

@@ -133,7 +133,13 @@ $(document).ready(function() {
 					   title: '流程id',
 					   sortable: true,
 					   sortName: 'procInsId',
-				   }]
+				   },{
+					   field: 'projectName',
+					   title: '项目名称',
+					   sortable: true,
+					   sortName: 'procInsId',
+				   }
+				   ]
 		});
 		
 		  

+ 2 - 2
src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.jsp

@@ -21,8 +21,8 @@
 	<div id="search-collapse" class="collapse">
 		<div class="accordion-inner">
 	<form:form id="searchForm" modelAttribute="uploadImages" class="form form-horizontal well clearfix">
-		<input type="text" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
-		<input type="text" id="path" name="path" value="${uploadImages.path}">
+		<input type="hidden" id="procInsId" name="procInsId" value="${uploadImages.act.procInsId}"/>
+		<input type="hidden" id="path" name="path" value="${uploadImages.path}">
 		 <div class="col-xs-12 col-sm-6 col-md-4">
 			<div style="margin-top:26px">
 			  <a  id="search" class="btn btn-primary btn-rounded  btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>