Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

src/main/java/com/jeeplus/common/utils/MenuStatusEnum.java

@@ -74,6 +74,7 @@ public enum MenuStatusEnum {
     WORK_SALARYITEM("608b03d7c081465789be7f80993b4869","工资项"),
     WORK_WAGE("2215996d069d435ea3a673e0ae2beb3a","单笔工资项"),
     WORK_CONTRACT_LIST_INFO("4650ceada41d46b382dc81f8980fda66","合同明细一览表"),
+    FILING_BATCH ("e7ac5a36777e4dbfb1ca9fec1d2f5d1b","批量归档"),
     END("19940722131313","废弃");
 
     private String value;

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -401,7 +401,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             WorkProjectNotify workProjectNotify = UtilNotify
                     .saveNotify(projectFilingBatch.getId(),
                             projectFilingBatch.getCreateBy(),
-                            office.getParent().getId(),
+                            projectFilingBatch.getCompany().getId(),
                             titleStr,
                             contentStr,
                             "100",

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -161,6 +161,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String boxNum; //案卷号
 	private String reBoxNum;//确认案卷号
 	private String information; //归档批次信息
+	private String url; //链接
+	private String parentId; //父借点
 
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
@@ -1104,4 +1106,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setFileNumTow(String fileNumTow) {
 		this.fileNumTow = fileNumTow;
 	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -135,6 +135,21 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	@Autowired
 	private ProjectTemplateDao projectTemplateDao;
 
+	/**
+	 * 获取咨询项目类别
+	 * @return
+	 */
+	public static List<MainDictDetail> projectSortList(){
+		return  DictUtils.getMainDictList("attachment_project_sort");
+	}
+
+	/**
+	 * 获取造价项目类别
+	 * @return
+	 */
+	public static List<MainDictDetail> projectSortCostList(){
+		return  DictUtils.getMainDictList("attachment_project_sort_cost");
+	}
 
 	/**
 	 * 获取项目附件模板类型
@@ -1785,7 +1800,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public Page<RuralProjectRecords> projectFind(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
 		//设置数据权限
 		if(!UserUtils.getUser().isAdmin()) {
-			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.FILING_BATCH.getValue());
 			projectRecords.getSqlMap().put("dsf", dataScopeSql);
 		}
 		projectRecords.setCreateBy(UserUtils.getUser());
@@ -1802,6 +1817,34 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			records.setProjectLeaders(users);
 			records.setLeaderNameStr(Collections3.extractToString(users, "name", ","));
 			records.setLeaderIds(Collections3.extractToString(users, "id", ","));
+
+			List<MainDictDetail> mainDictDetails = Lists.newArrayList();
+			if(StringUtils.isNotBlank(records.getProjectType())){
+				switch (records.getProjectType()){
+					case "1":
+						mainDictDetails = projectSortList();
+						if(StringUtils.isNotBlank(records.getAttachmentProjectSort())){
+							for (MainDictDetail info: mainDictDetails) {
+								if(records.getAttachmentProjectSort().equals(info.getValue())){
+									records.setAttachmentProjectSort(info.getLabel());
+									break;
+								}
+							}
+						}
+						break;
+					case "2":
+						mainDictDetails = projectSortCostList();
+						if(StringUtils.isNotBlank(records.getAttachmentProjectSort())){
+							for (MainDictDetail info: mainDictDetails) {
+								if(records.getAttachmentProjectSort().equals(info.getValue())){
+									records.setAttachmentProjectSort(info.getLabel());
+									break;
+								}
+							}
+						}
+						break;
+				}
+			}
 		}
 		page.setList(recordsList);
 		return page;

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -68,10 +68,7 @@ import com.jeeplus.modules.ruralprojectrecords.service.*;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.RoleDao;
 import com.jeeplus.modules.sys.entity.*;
-import com.jeeplus.modules.sys.service.CompanyService;
-import com.jeeplus.modules.sys.service.OfficeService;
-import com.jeeplus.modules.sys.service.RoleService;
-import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.service.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysuseroffice.entity.Useroffice;
@@ -465,6 +462,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private ProjectFilingBatchService projectFilingBatchService;
 	@Autowired
 	private ProjectFilingbatchRelationDao projectFilingbatchRelationDao;
+	@Autowired
+	private WorkattachmentService workattachmentService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -2739,7 +2738,28 @@ public class WorkProjectNotifyController extends BaseController {
 						RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
 						ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
 						ruralProjectRecords.setId(filingBatch.getRelationId());
+						ruralProjectRecords.setParentId("0");
 						ruralProjectRecordsList.add(ruralProjectRecords);
+						//获取子项目信息
+						Workattachment workattachmentInfo = new Workattachment();
+						workattachmentInfo.setAttachmentId(filingBatch.getProjectId());
+						workattachmentInfo.setDivIdType("_filingBatch");
+						//查询对应子项目数据
+						List<Workattachment> attachmentList = workattachmentService.findList(workattachmentInfo);
+						for (Workattachment attachment:attachmentList) {
+							//查询附件信息
+							RuralProjectRecords workattachment = new RuralProjectRecords();
+							//附件文件类型
+							workattachment.setProjectId(attachment.getRemarks());
+							//附件文件名称
+							workattachment.setProjectReportNumber(attachment.getAttachmentName());
+							//文件路径
+							workattachment.setUrl(attachment.getUrl());
+							//项目名称
+							workattachment.setFilingName("");
+							workattachment.setParentId(ruralProjectRecords.getId());
+							ruralProjectRecordsList.add(workattachment);
+						}
 					}
 					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getId());
 					projectFilingBatch.setProjectFilingbatchRelations(projectFilingbatchRelations);

src/main/resources/mappings/modules/projectGuidang/ProjectFilingbatchRelationDao.xml

@@ -26,26 +26,24 @@
 	<update id="update">
 		update project_flingbatch_relation
 		<set>
+			del_flag=#{delFlag}
 			<if test="updateBy!=null and updateBy.id!=null and updateBy.id!=''">
-				update_by = #{updateBy.id},
+				,update_by = #{updateBy.id}
 			</if>
 			<if test="updateDate!=null and updateDate!=''">
-				update_date = #{updateDate},
+				,update_date = #{updateDate}
 			</if>
 			<if test="filingBatch!=null and filingBatch!=''">
-				filing_batch=#{filingBatch},
+				,filing_batch=#{filingBatch}
 			</if>
 			<if test="status!=null and status!=''">
-				`status`=#{status},
+				,`status`=#{status}
 			</if>
 			<if test="boxNum!=null">
-				box_num=#{boxNum},
+				,box_num=#{boxNum}
 			</if>
 			<if test="reBoxNum!=null">
-				re_box_num=#{reBoxNum}
-			</if>
-			<if test="delFlag!=null">
-				,del_flag=#{delFlag}
+				,re_box_num=#{reBoxNum}
 			</if>
 		</set>
 		where id=#{id}

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1378,7 +1378,7 @@
 		left join sys_user su on su.id = w1.user_id
 		left join sys_office so on so.id = su.office_id
 		<where>
-			and a.del_flag = 0 and project_type in (1,2) and prr.`status`=5
+			and a.del_flag = 0 and project_type in (1,2) and prd.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
 		    and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="projectName != null and projectName != ''">
@@ -1397,6 +1397,7 @@
 		,prr.process_instance_id as prrProcessInstanceId
 		,a.project_type as "projectType"
 		,prd.number as"projectReportNumber"
+		,sur.name as "createBy.name"
 		FROM rural_project_records a
 		left join work_contract_info wci on a.contract_id = wci.id
 		left join project_report_data prd on prd.project_id = a.id
@@ -1406,13 +1407,14 @@
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		left join sys_user su on su.id = w1.user_id
+		left join sys_user sur on sur.id = a.create_by
 		left join sys_office so on so.id = su.office_id
 		<where>
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
 
-			and a.del_flag = 0 and a.project_type in (1,2) and prr.`status`=5
+			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
 			/*不捞取已经发起审批并审批状态为2、3、5的项目信息*/
 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">

src/main/webapp/webpage/modules/projectFilingBatch/projectChoiceLink.jsp

@@ -90,6 +90,9 @@
 						<th width="30%">归档项目编号</th>
 						<th width="30%">归档项目名称</th>
 						<th width="30%">报告号</th>
+						<th width="30%">项目类别</th>
+						<th width="30%">项目负责人</th>
+						<th width="30%">项目登记人</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -101,12 +104,15 @@
 							<td title="${obj.projectId}" class="codelabel">${obj.projectId}</td>
 							<td title="${obj.projectName}" class="codelabel4">${obj.projectName}</td>
 							<td title="${obj.projectReportNumber}" class="codelabel5">${obj.projectReportNumber}</td>
+							<td title="${obj.attachmentProjectSort}" class="codelabel7">${obj.attachmentProjectSort}</td>
+							<td title="${obj.leaderNameStr}" class="codelabel8">${obj.leaderNameStr}</td>
+							<td title="${obj.createBy.name}" class="codelabel9">${obj.createBy.name}</td>
 						</tr>
 					</c:forEach>
 				</c:when>
 					<c:otherwise>
 						<tr>
-							<td colspan="15" align="center">
+							<td colspan="7" align="center">
 								暂无数据
 							</td>
 						</tr>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchAudit.jsp

@@ -7,6 +7,7 @@
 	<script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<script type="text/javascript">
 		var validateForm;
 		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -26,23 +27,26 @@
 					for(var i = 0;i < tdlen;i++){
 						var status = $("#projectFilingbatchRelations"+i+"_status").val();
 						var boxNum = $("#projectFilingbatchRelations"+i+"_boxNum").val();
-						var reboxNum = $("#projectFilingbatchRelations"+i+"_reBoxNum").val();
+						var parentId = $("#projectFilingbatchRelations"+i+"_parentId").val();
+						//var reboxNum = $("#projectFilingbatchRelations"+i+"_reBoxNum").val();
 						var projectName = $("#projectFilingbatchRelations"+i+"_projectName").val();
-						if(undefined != status && null !=status && ''!= status){
-							if(5 == status){
-								if('' != boxNum && undefined!= boxNum && null != boxNum){
-									if(boxNum != reboxNum){
-										layer.msg(projectName +"：两次案卷号不相同，请重新填写", { icon: 2, offset: "error", time:1000 });
+						if("0" == parentId){
+							if(undefined != status && null !=status && ''!= status){
+								if(5 == status){
+									if('' != boxNum && undefined!= boxNum && null != boxNum){
+										/*if(boxNum != reboxNum){
+                                            layer.msg(projectName +"：两次案卷号不相同，请重新填写", { icon: 2, offset: "error", time:1000 });
+                                            return false;
+                                        }*/
+									}else{
+										layer.msg("请输入项目 "+projectName+" 的案卷号", { icon: 2, offset: "error", time:1000 });
 										return false;
 									}
-								}else{
-									layer.msg("请输入项目 "+projectName+" 的案卷号", { icon: 2, offset: "error", time:1000 });
-									return false;
 								}
+							}else{
+								layer.msg("请给项目 "+projectName+" 选择审批状态", { icon: 2, offset: "error", time:1000 });
+								return false;
 							}
-						}else{
-							layer.msg("请给项目 "+projectName+" 选择审批状态", { icon: 2, offset: "error", time:1000 });
-							return false;
 						}
 					}
 				}
@@ -57,6 +61,19 @@
 		  return false;
 		}
 		$(document).ready(function() {
+			$(".listTr").click(function(){
+				var name=$(this).find("td").eq(0).find("input").eq(0).val();
+				var tiao="."+name;
+				var span=$(this).find("td").eq(2);
+				var ss=$(span).val().split(" ")[4];
+				$(span).toggle(function () {
+					$(tiao).hide();
+					$(span).find("span").attr("class","treeTable-icon")
+				},function () {
+					$(tiao).show();
+					$(span).find("span").attr("class","treeTable-icon open")
+				});
+			})
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -146,6 +163,7 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">归档批次号：</label>
 						<div class="layui-input-block">
+
 							<form:input path="filingBatch" id="filingBatch"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
@@ -155,8 +173,14 @@
 							<form:input path="createBy.name" id="createBy"  readonly="true" class="form-control layui-input" />
 						</div>
 					</div>
-					<div class="layui-item layui-col-sm12 lw7">
-						<label class="layui-form-label">归档信息：</label>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label">归档名称：</label>
+						<div class="layui-input-block">
+							<form:input path="filingName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm12 lw7 with-textarea">
+						<label class="layui-form-label">归档说明：</label>
 						<div class="layui-input-block">
 							<form:textarea path="information" readonly="true" htmlEscape="false" rows="4" maxlength="200" class="form-control "/>
 						</div>
@@ -181,35 +205,65 @@
 						<c:choose>
 							<c:when test="${not empty projectFilingBatch}">
 								<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
-									<tr id="workAccountList${index.index}">
-										<td class="hide">
-											<input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${project.id}"/>
-											<input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
-										</td>
-										<td>
-											<input type="text" readonly value="${project.projectId}" class="form-control"/>
-										</td>
-										<td>
-											<input type="text" readonly value="${project.projectName}" class="form-control"/>
-										</td>
-										<td>
-											<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
-										</td>
+									<c:choose>
+										<c:when test="${project.flag ==1}">
+											<tr id="workAccountList${index.index}">
+												<td class="hide">
+													<input id="workAccountList${index.index}_id" name="workAccountList[${index.index}].id" type="hidden" value="${project.id}"/>
+													<input id="workAccountList${index.index}_delFlag" name="workAccountList[${index.index}].delFlag" type="hidden" value="0"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectId}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectName}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+
+												<td>
+													<input id="workAccountList${index.index}_boxNum"  name="workAccountList[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control required layui-input"/>
+												</td>
+												<td>
+													<input id="workAccountList${index.index}_reBoxNum"  name="workAccountList[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control required layui-input"/>
+												</td>
+												<td style="overflow: visible;">
+													<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
+														<option value="" >--是否通过--</option>
+														<option value="5" itemLabel="label">通过</option>
+														<option value="4" itemLabel="label">驳回</option>
+													</select>
+												</td>
+											</tr>
+										</c:when>
+										<c:otherwise>
+											<tr id="workAccountList${index.index}">
+												<td class="hide">
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectId}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectName}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+												<td>
+													<input type="text" readonly value="${project.projectReportNumber}" class="form-control"/>
+												</td>
+											</tr>
+										</c:otherwise>
+									</c:choose>
 
-										<td>
-											<input id="workAccountList${index.index}_boxNum"  name="workAccountList[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control required layui-input"/>
-										</td>
-										<td>
-											<input id="workAccountList${index.index}_reBoxNum"  name="workAccountList[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control required layui-input"/>
-										</td>
-										<td style="overflow: visible;">
-											<select name="clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
-												<option value="" >--是否通过--</option>
-												<option value="5" itemLabel="label">通过</option>
-												<option value="4" itemLabel="label">驳回</option>
-											</select>
-										</td>
-									</tr>
 								</c:forEach>
 							</c:when>
 							<c:otherwise>
@@ -229,48 +283,80 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit">
 						<thead>
 						<tr>
-							<th style="text-align: center">归档项目编号</th>
-							<th style="text-align: center" >归档项目名称</th>
-							<th style="text-align: center">报告号</th>
-							<th style="text-align: center" >案卷号</th>
-							<th style="text-align: center" >确认案卷号</th>
-							<th style="text-align: center" >审批</th>
+							<th width="20%" style="text-align: center">归档项目编号</th>
+							<th width="20%" style="text-align: center" >归档项目名称</th>
+							<th width="20%" style="text-align: center">报告号</th>
+							<th width="20%" style="text-align: center" >案卷号</th>
+<%--							<th style="text-align: center" >确认案卷号</th>--%>
+							<th width="20%" style="text-align: center" >审批</th>
 						</tr>
 						</thead>
 						<tbody id="workClientLinkmanList">
 						<c:if test="${not empty projectFilingBatch}">
 							<c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
-								<tr id="projectFilingbatchRelations${index.index}">
-									<td class="hide">
-										<input id="projectFilingbatchRelations${index.index}_id" name="projectFilingbatchRelations[${index.index}].id" type="hidden" value="${project.id}"/>
-										<input id="projectFilingbatchRelations${index.index}_delFlag" name="projectFilingbatchRelations[${index.index}].delFlag" type="hidden" value="0"/>
-									</td>
-									<td class="hide">
-										<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
-									</td>
-									<td>
-										<input type="text" value="${project.projectId}" readonly="readonly"  class="form-control"/>
-									</td>
-									<td>
-										<input id="projectFilingbatchRelations${index.index}_projectName" type="text" value="${project.projectName}" readonly="readonly"  class="form-control"/>
-									</td>
-									<td>
-										<input type="text" value="${project.projectReportNumber}" readonly="readonly"  class="form-control"/>
-									</td>
-									<td>
-										<input id="projectFilingbatchRelations${index.index}_boxNum"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
-									</td>
-									<td>
-										<input id="projectFilingbatchRelations${index.index}_reBoxNum"  name="projectFilingbatchRelations[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control layui-input"/>
-									</td>
-									<td style="overflow: visible;">
-										<select  id="projectFilingbatchRelations${index.index}_clientType" name="projectFilingbatchRelations${index.index}.clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
-											<option value="" >--是否通过--</option>
-											<option value="5" itemLabel="label">通过</option>
-											<option value="4" itemLabel="label">驳回</option>
-										</select>
-									</td>
-								</tr>
+								<c:choose>
+								<c:when test="${project.parentId == '0'}">
+									<tr class="listTr" id="projectFilingbatchRelations${index.index}">
+										<td class="hide">
+											<input id="projectFilingbatchRelations${index.index}_id" name="projectFilingbatchRelations[${index.index}].id" type="hidden" value="${project.id}"/>
+											<input id="projectFilingbatchRelations${index.index}_delFlag" name="projectFilingbatchRelations[${index.index}].delFlag" type="hidden" value="0"/>
+											<input id="projectFilingbatchRelations${index.index}_parentId" type="hidden" value="${project.parentId}"/>
+										</td>
+										<td class="hide">
+											<input id="projectFilingbatchRelations${index.index}_status" name="projectFilingbatchRelations[${index.index}].status" type="hidden" value=""/>
+										</td>
+										<td style="background-color: #f1f1f1;">
+											<div></div>
+											<span class="treeTable-icon open" style="padding-left: 10px;"><i class="layui-icon layui-icon-triangle-d"></i></span>  ${project.projectId}
+<%--											<span style="padding-left: 10px;padding-right: 10px;float: left">-</span>${project.projectId}--%>
+<%--											<input style="cursor:Pointer" type="text" value="  -  ${project.projectId}" readonly="readonly"  class="form-control"/>--%>
+										</td>
+										<td>
+											<input id="projectFilingbatchRelations${index.index}_projectName" type="text" value="${project.projectName}" readonly="readonly"  class="form-control"/>
+										</td>
+										<td>
+											<input type="text" value="${project.projectReportNumber}" readonly="readonly"  class="form-control"/>
+										</td>
+										<td>
+											<input id="projectFilingbatchRelations${index.index}_boxNum"  name="projectFilingbatchRelations[${index.index}].boxNum" maxlength="32" type="text" value="${projectFilingBatch.boxNum}"  class="form-control layui-input"/>
+										</td>
+<%--										<td>--%>
+<%--											<input id="projectFilingbatchRelations${index.index}_reBoxNum"  name="projectFilingbatchRelations[${index.index}].reBoxNum" maxlength="32" type="text" value="${projectFilingBatch.reBoxNum}"  class="form-control layui-input"/>--%>
+<%--										</td>--%>
+										<td style="overflow: visible;">
+											<select  id="projectFilingbatchRelations${index.index}_clientType" name="projectFilingbatchRelations${index.index}.clientType" id="clientType" lay-filter="cc" lay-verify="ctype" class="form-control simple-select clientType">
+												<option value="" >--是否通过--</option>
+												<option value="5" itemLabel="label">通过</option>
+												<option value="4" itemLabel="label">驳回</option>
+											</select>
+										</td>
+									</tr>
+								</c:when>
+								<c:otherwise>
+									<tr class="${project.parentId}" id="workAccountList${index.index}">
+										<td class="hide">
+											<input id="projectFilingbatchRelations${index.index}_parentId" type="hidden" value="${project.parentId}"/>
+										</td>
+										<td>
+											<input type="text" readonly value="${project.projectId}" style="text-align: center" class="form-control"/>
+										</td>
+										<td style="background-color: #f1f1f1;display:table-cell; vertical-align:middle;text-align: center">
+											<a class="attention-info" title="${project.projectReportNumber}" href="javascript:void(0);" onclick="preview('预览', '${project.url}','80%', '80%')">${project.projectReportNumber}</a>
+										</td>
+										<td>
+											<input type="text" readonly value="" class="form-control"/>
+										</td>
+
+										<td>
+											<input type="text" readonly value="" class="form-control"/>
+										</td>
+										<td style="background-color: #f1f1f1;display:table-cell; vertical-align:middle;text-align: center">
+											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${project.url}');" class="op-btn op-btn-add"> 下载 </a>
+										</td>
+									</tr>
+								</c:otherwise>
+								</c:choose>
+
 							</c:forEach>
 						</c:if>
 						</tbody>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchView.jsp

@@ -311,7 +311,7 @@
                             if(0 == d.pid){
                                 return "<font style = 'font-size:14px;font-weight:500;'>"+d.statusStr+"</font>";
                             }else{
-                                return "<font>"+d.statusStr+"</font>";
+                                return "<a href=\"javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('"+d.url+"');\" class=\"op-btn op-btn-add\"> 下载 </a>"
                             }
                         }}
                 ]],

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowForm.jsp

@@ -128,7 +128,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowModify.jsp

@@ -139,7 +139,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea path="remarks" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>