Home Explore Help
Register Sign In
user5
/
simple_xg_total_process_master
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

[user3] 3 years ago
parent
bb63d2ca51 9b1e5cfc8f
commit
50bea1df6a
8 changed files with 41 additions and 17 deletions
Split View Show Diff Stats
  1. 2 0
      src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryController.java
  2. 18 0
      src/main/java/com/jeeplus/modules/sys/entity/Workattachment.java
  3. 2 0
      src/main/resources/mappings/modules/projectAccessory/ProjectAccessoryDao.xml
  4. 2 0
      src/main/resources/mappings/modules/sys/WorkattachmentDao.xml
  5. 2 2
      src/main/webapp/webpage/modules/identification/AuditTemplateForm.jsp
  6. 3 3
      src/main/webapp/webpage/modules/identification/AuditTemplateGenList.jsp
  7. 6 6
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp
  8. 6 6
      src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

+ 2 - 0
src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryController.java
View File 

@@ -528,6 +528,8 @@ public class ProjectAccessoryController extends BaseController {
 
 		}
 
 		if(null != workattachment){
 
 			collectAccessoryInfo.setFileName(workattachment.getAttachmentName());
 
+			//添加文件描述信息
 
+			collectAccessoryInfo.setFileDescription(workattachment.getDescription());
 
 		}
 
 		//收藏附件信息
 
 		Integer result = projectAccessoryService.saveCollectAccessory(collectAccessoryInfo);

+ 18 - 0
src/main/java/com/jeeplus/modules/sys/entity/Workattachment.java
View File 

@@ -32,6 +32,8 @@ public class Workattachment extends DataEntity<Workattachment> {
 
 	private String collectFlag;		// 收藏判定
 
 	private String fileSize;	//文件大小
 
 	private String projectId;	//项目id
 
+	private String sort;	//排序
 
+	private String description;	//文件描述
 
 
 
 	public String getDivIdType() {
 
@@ -166,4 +168,20 @@ public class Workattachment extends DataEntity<Workattachment> {
 
 	public void setProjectId(String projectId) {
 
 		this.projectId = projectId;
 
 	}
 
+
 
+	public String getSort() {
 
+		return sort;
 
+	}
 
+
 
+	public void setSort(String sort) {
 
+		this.sort = sort;
 
+	}
 
+
 
+	public String getDescription() {
 
+		return description;
 
+	}
 
+
 
+	public void setDescription(String description) {
 
+		this.description = description;
 
+	}
 
 }

+ 2 - 0
src/main/resources/mappings/modules/projectAccessory/ProjectAccessoryDao.xml
View File 

@@ -226,6 +226,7 @@
 
 		  collect_type,
 
 		  collect_user_id,
 
 		  file_size
 
+		  ,fileDescription
 
 		)
 
 		values
 
 		  (
 
@@ -244,6 +245,7 @@
 
 			#{collectType},
 
 			#{collectUserId},
 
 			#{fileSize}
 
+			,#{fileDescription}
 
 		  )
 
 	</insert>

+ 2 - 0
src/main/resources/mappings/modules/sys/WorkattachmentDao.xml
View File 

@@ -20,6 +20,8 @@
 
 		a.div_id_type AS "divIdType",
 
 		a.file_size AS "fileSize",
 
 		createBy.name AS "createBy.name"
 
+		,a.sort as "sort"
 
+		,a.description as "description"
 
 	</sql>
 
 
 	<sql id="workattachmentJoins">

+ 2 - 2
src/main/webapp/webpage/modules/identification/AuditTemplateForm.jsp
View File 

@@ -62,7 +62,7 @@
 
             <form:hidden path="name" readonly="true" htmlEscape="false"  class="form-control layui-input"/>
 
 
             <div class="form-group layui-row first">
 
-                <div class="form-group-label"><h2>审核模板信息</h2></div>
 
+                <div class="form-group-label"><h2>模板信息</h2></div>
 
                 <div class="layui-item layui-col-sm12 with-textarea">
 
                     <label class="layui-form-label ">模板信息：</label>
 
                     <div class="layui-input-block">
 
@@ -79,4 +79,4 @@
 
 
 </script>
 
 </body>
 
-</html>
 
+</html>

+ 3 - 3
src/main/webapp/webpage/modules/identification/AuditTemplateGenList.jsp
View File 

@@ -108,7 +108,7 @@
 
     </script>
 
 </head>
 
 <body>
 
-<div style="margin: 10px 30px;background-color: #FFB800"> <a href="javascript:void(0)"  onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${auditTemplate.identification}&name=${auditTemplate.name}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加审核意见模板</a></div>
 
+<div style="margin: 10px 30px;background-color: #FFB800"> <a href="javascript:void(0)"  onclick="openDialogre('添加模板', '${ctx}/auditTemplate/auditTemplate/toSave?identification=${auditTemplate.identification}&name=${auditTemplate.name}','80%', '50%','','添加,关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 添加模板</a></div>
 
 <div class="single-form">
 
     <div class="container">
 
         <table class="table table-bordered">
 
@@ -123,7 +123,7 @@
 
                         <td>
 
                             <div class="layui-btn-group">
 
                                 <div class="op-btn-box">
 
-                                    <a href="${ctx}/auditTemplate/auditTemplate/delete?id=${tem.id}" onclick="return deleteByid('确认要删除该审核模板吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
 
+                                    <a href="${ctx}/auditTemplate/auditTemplate/delete?id=${tem.id}" onclick="return deleteByid('确认要删除该模板吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
 
                                 </div>
 
                             </div>
 
                         </td>
 
@@ -139,4 +139,4 @@
 
 
 </script>
 
 </body>
 
-</html>
 
+</html>

+ 6 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp
View File 

@@ -1306,11 +1306,11 @@
 
 								<thead>
 
 								<tr>
 
 									<th width="20%">文件要求</th>
 
-									<th width="35%">文件描述/文件</th>
 
+									<th width="30%">文件描述/文件</th>
 
 									<th width="20%">文件类型</th>
 
 									<th width="160px">上传时间</th>
 
 									<th width="120px">文件大小(M)</th>
 
-									<th width="100px">操作</th>
 
+									<th width="180px">操作</th>
 
 								</tr>
 
 								</thead>
 
 								<tbody id="file_attachment">
 
@@ -1464,11 +1464,11 @@
 
 								<thead>
 
 								<tr>
 
 									<th width="20%">文件要求</th>
 
-									<th width="35%">文件描述/文件</th>
 
+									<th width="30%">文件描述/文件</th>
 
 									<th width="20%">文件类型</th>
 
 									<th width="160px">上传时间</th>
 
 									<th width="120px">文件大小(M)</th>
 
-									<th width="100px">操作</th>
 
+									<th width="180px">操作</th>
 
 								</tr>
 
 								</thead>
 
 								<tbody id="file_gistdata">
 
@@ -1623,11 +1623,11 @@
 
 								<thead>
 
 								<tr>
 
 									<th width="20%">文件要求</th>
 
-									<th width="35%">文件描述/文件</th>
 
+									<th width="30%">文件描述/文件</th>
 
 									<th width="20%">文件类型</th>
 
 									<th width="160px">上传时间</th>
 
 									<th width="120px">文件大小(M)</th>
 
-									<th width="100px">操作</th>
 
+									<th width="180px">操作</th>
 
 								</tr>
 
 								</thead>
 
 								<tbody id="file_other">

+ 6 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp
View File 

@@ -116,11 +116,11 @@
 
 						<thead>
 
 						<tr>
 
 							<th width="20%">文件要求</th>
 
-							<th width="35%">文件描述/文件</th>
 
+							<th width="30%">文件描述/文件</th>
 
 							<th width="20%">文件类型</th>
 
 							<th width="160px">上传时间</th>
 
 							<th width="120px">文件大小(M)</th>
 
-							<th width="100px">操作</th>
 
+							<th width="180px">操作</th>
 
 						</tr>
 
 						</thead>
 
 						<tbody id="file_attachment">
 
@@ -295,11 +295,11 @@
 
 						<thead>
 
 						<tr>
 
 							<th width="20%">文件要求</th>
 
-							<th width="35%">文件描述/文件</th>
 
+							<th width="30%">文件描述/文件</th>
 
 							<th width="20%">文件类型</th>
 
 							<th width="160px">上传时间</th>
 
 							<th width="120px">文件大小(M)</th>
 
-							<th width="100px">操作</th>
 
+							<th width="180px">操作</th>
 
 						</tr>
 
 						</thead>
 
 						<tbody id="file_gistdata">
 
@@ -472,11 +472,11 @@
 
 						<thead>
 
 						<tr>
 
 							<th width="20%">文件要求</th>
 
-							<th width="35%">文件描述/文件</th>
 
+							<th width="30%">文件描述/文件</th>
 
 							<th width="20%">文件类型</th>
 
 							<th width="160px">上传时间</th>
 
 							<th width="120px">文件大小(M)</th>
 
-							<th width="100px">操作</th>
 
+							<th width="180px">操作</th>
 
 						</tr>
 
 						</thead>
 
 						<tbody id="file_other">