代码提交

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

@@ -858,7 +858,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 					}
 				} else if ("2".equals(projectRecords.getProjectType())) {	//造价审核
 					//预算审核、结算审核、分包审核 需要纸质归档
-					if ("2".equals(projectRecords.getAttachmentProjectSort()) || "4".equals(projectRecords.getAttachmentProjectSort()) || "7".equals(projectRecords.getAttachmentProjectSort()) || "20".equals(projectRecords.getAttachmentProjectSort()) || "10".equals(projectRecords.getAttachmentProjectSort()) || "11".equals(projectRecords.getAttachmentProjectSort())) {
+					if ("2".equals(projectRecords.getAttachmentProjectSort()) || "4".equals(projectRecords.getAttachmentProjectSort()) || "7".equals(projectRecords.getAttachmentProjectSort()) || "20".equals(projectRecords.getAttachmentProjectSort()) || "10".equals(projectRecords.getAttachmentProjectSort()) || "11".equals(projectRecords.getAttachmentProjectSort()) || "12".equals(projectRecords.getAttachmentProjectSort())) {
 						projectRecords.setPaperFilingStatus(null);
 					}else{
 						projectRecords.setPaperFilingStatus("10");

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1411,7 +1411,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
             addMessage(redirectAttributes, "保存报告归档暂存失败");
             logger.error("保存报告归档暂存失败",e);
         }
-        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
     }
 
     /**

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientInfo.java

@@ -9,6 +9,7 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +92,16 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 	private Date endDate;
 	private String createMobile;
 
+	private Office office;
+
+	public Office getOffice() {
+		return office;
+	}
+
+	public void setOffice(Office office) {
+		this.office = office;
+	}
+
 	public String getCreateMobile() {
 		return createMobile;
 	}

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoAllService.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.modules.workclientinfo.service;
 
+import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
@@ -13,11 +14,9 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.AreaDao;
 import com.jeeplus.modules.sys.dao.MainDictDetailDao;
-import com.jeeplus.modules.sys.entity.Area;
-import com.jeeplus.modules.sys.entity.MainDict;
-import com.jeeplus.modules.sys.entity.MainDictDetail;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.MainDictService;
+import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
@@ -71,6 +70,9 @@ public class WorkClientInfoAllService extends CrudService<WorkClientInfoDao, Wor
     @Autowired
     private AreaDao areaDao;
 
+    @Autowired
+    private OfficeService officeService;
+
     private static MainDictService mainDictService = SpringContextHolder.getBean(MainDictService.class);
 
     private static MainDictDetailDao mainDictDetailDao = SpringContextHolder.getBean(MainDictDetailDao.class);
@@ -192,6 +194,23 @@ public class WorkClientInfoAllService extends CrudService<WorkClientInfoDao, Wor
             workClientInfo.setOfficeId(UserUtils.getSelectOffice().getId());
             workClientInfo.getSqlMap().put("dsf", dataScopeFilter(workClientInfo.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_CLIENT_INFO.getValue()));
         }*/
+
+
+        if(null!= workClientInfo.getOffice() && StringUtils.isNotBlank(workClientInfo.getOffice().getId())){
+            if ("一部本部".equals(workClientInfo.getOffice().getId())) {
+                List<String> officeIdList = Lists.newArrayList();
+                Office office = officeService.getByName("工程一部");
+                officeIdList.add(office.getId());
+                workClientInfo.setOfficeIdList(officeIdList);
+            } else {
+                //查询该选择节点下所有的部门Id
+                List<String> officeIdList = officeService.getChildrenOffice(workClientInfo.getOffice().getId());
+                officeIdList.add(workClientInfo.getOffice().getId());
+                workClientInfo.setOfficeIdList(officeIdList);
+            }
+
+        }
+
         long t1 = System.currentTimeMillis();
         //根据项目类型获取对应的客户id个数
         int count = workClientInfoDao.queryCount(workClientInfo);

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
+import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
@@ -187,6 +188,16 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String isProject;     //是否关联项目（0：否；1：是）
 	private String createUserMobile;
 
+	private Office office;
+
+	public Office getOffice() {
+		return office;
+	}
+
+	public void setOffice(Office office) {
+		this.office = office;
+	}
+
 	public String getCreateUserMobile() {
 		return createUserMobile;
 	}

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoAllService.java

@@ -100,6 +100,9 @@ public class WorkContractInfoAllService extends CrudService<WorkContractInfoDao,
 	@Autowired
 	private WorkClientInfoService workClientInfoService;
 
+	@Autowired
+	private OfficeService officeService;
+
 	public List<WorkContractInfo> findList(WorkContractInfo workContractInfo) {
 		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
 			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
@@ -111,6 +114,22 @@ public class WorkContractInfoAllService extends CrudService<WorkContractInfoDao,
 		if (StringUtils.isNotBlank(workContractInfo.getTotalContractIds())){
 			workContractInfo.setTotalContractIds(","+workContractInfo.getTotalContractIds()+",");
 		}
+
+		if(null!= workContractInfo.getOffice() && StringUtils.isNotBlank(workContractInfo.getOffice().getId())){
+			if ("一部本部".equals(workContractInfo.getOffice().getId())) {
+				List<String> officeIdList = Lists.newArrayList();
+				Office office = officeService.getByName("工程一部");
+				officeIdList.add(office.getId());
+				workContractInfo.setOfficeIdList(officeIdList);
+			} else {
+				//查询该选择节点下所有的部门Id
+				List<String> officeIdList = officeService.getChildrenOffice(workContractInfo.getOffice().getId());
+				officeIdList.add(workContractInfo.getOffice().getId());
+				workContractInfo.setOfficeIdList(officeIdList);
+			}
+
+		}
+
 		String companyId = UserUtils.getUser().getComId();
 		int count = dao.queryCount(workContractInfo);
 		page.setCount(count);

src/main/resources/mappings/modules/sys/OfficeDao.xml

@@ -374,6 +374,7 @@
 		<if test="oldName != null and oldName != ''">
 			and a.name like concat('%',#{oldName},'%')
 		</if>
+		and a.id not in ('5c38f1ce85224d74bd9d110ea6fab976','eb6879557ca8497fb18864eb7ac13809','876aaf31050d4829a8c916aaf2184487')
 		ORDER BY a.code
 	</select>
 	<select id="findByParentIdsByProjectId" resultType="Office">
@@ -799,7 +800,7 @@
 		FROM sys_office a
 		<include refid="officeJoins"/>
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable = '1' AND (
-		a.id = #{id} or (a.CODE BETWEEN 10001008 AND 10001014 or a.code = 10001020) and a.code != 10001012)
+		a.id = #{id} OR ( a.CODE BETWEEN 10001008 AND 10001014 OR a.CODE = 10001019 OR a.CODE = 10001020 )  and a.code != 10001012)
 		<if test="oldName != null and oldName != ''">
 			and a.name like concat('%',#{oldName},'%')
 		</if>

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -82,6 +82,7 @@
 		<include refid="workClientInfoJoinsLink"/>
 		left join sys_user su on su.id = a.create_by
 		left join sys_office so on so.id = su.office_id
+		left join sys_office o on o.id = a.office_id
 		<if test="workClientLinkman != null and workClientLinkman.name !=null and workClientLinkman.name !=''">
 			LEFT JOIN work_client_linkman b ON a.id = b.client_id
 		</if>
@@ -116,6 +117,17 @@
             <if test="workClientLinkman != null and workClientLinkman.linkPhone != null and workClientLinkman.linkPhone !=''">
 				AND b.link_phone LIKE concat('%',#{workClientLinkman.linkPhone},'%')
             </if>
+
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
+			<if test="officeIdList!=null and officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
+
 			<if test="address != null and address != ''">
 				AND a.address LIKE
 					<if test="dbName == 'oracle'">'%'||#{address}||'%'</if>
@@ -137,9 +149,9 @@
 			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
 				AND (a.create_by = #{createId} or su.name like concat('%',#{createNameStr},'%'))
 			</if>
-			<if test="officeId != null and officeId != ''">
+			<!--<if test="officeId != null and officeId != ''">
 				AND so.id = #{officeId}
-			</if>
+			</if>-->
             AND a.company_id = #{currentUser.company.id}
 			${sqlMap.dsf}
 			<choose>
@@ -340,6 +352,7 @@
 		left join work_client_job_type_info c on c.work_client_id=a.id
 		left join sys_user su on su.id = a.create_by
 		left join sys_office so on so.id = su.office_id
+		left join sys_office o on o.id = a.office_id
         <where>
             a.del_flag = #{DEL_FLAG_NORMAL}
             <if test="name != null and name != ''">
@@ -366,6 +379,17 @@
             <if test="workClientLinkman != null and workClientLinkman.linkPhone != null and workClientLinkman.linkPhone !=''">
                 AND b.link_phone LIKE concat('%',#{workClientLinkman.linkPhone},'%')
             </if>
+
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
+			<if test="officeIdList!=null and officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
+
             <if test="address != null and address != ''">
                 AND a.address LIKE
                 <if test="dbName == 'oracle'">'%'||#{address}||'%'</if>
@@ -387,9 +411,9 @@
 			<if test="(createId != null and createId != '') or (createNameStr != null and createNameStr != '')">
 				AND (a.create_by = #{createId} or su.name = #{createNameStr})
 			</if>
-			<if test="officeId != null and officeId != ''">
+			<!--<if test="officeId != null and officeId != ''">
 				AND so.id = #{officeId}
-			</if>
+			</if>-->
             AND a.company_id = #{currentUser.company.id}
 			${sqlMap.dsf}
             <choose>

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -295,6 +295,17 @@
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.contract_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
+
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
+			<if test="officeIdList!=null and officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
+
 			<if test="name != null and name != ''">
 				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
@@ -478,6 +489,17 @@
 			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
 				AND a.contract_date BETWEEN #{beginContractDate} AND #{endContractDate}
 			</if>
+
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
+			<if test="officeIdList!=null and officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
+
 			<if test="name != null and name != ''">
 				AND a.name LIKE
 				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryCompanyList.jsp

@@ -300,7 +300,7 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">收藏分类:</label>
+							<label class="layui-form-label">收藏分类：</label>
 							<div class="layui-input-block with-icon">
 								<span style="width: 100%;text-align: left;position: relative;" id="demo100">
 									<input htmlEscape="false" name="classification" id="classification" maxlength="60" class="form-control layui-input" value="${collectAccessoryInfo.classification}"/>

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryList.jsp

@@ -370,7 +370,7 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">收藏分类:</label>
+							<label class="layui-form-label">收藏分类：</label>
 							<div class="layui-input-block with-icon">
 								<span style="width: 100%;text-align: left;position: relative;" id="demo100">
 									<input htmlEscape="false" name="classification" id="classification" maxlength="60" class="form-control layui-input" value="${collectAccessoryInfo.classification}"/>

src/main/webapp/webpage/modules/collectAccessory/collectAccessoryOfficeList.jsp

@@ -301,7 +301,7 @@
 					</div>
 					<div id="moresees" style="clear:both;display:none;" class="lw6">
 						<div class="layui-item query athird">
-							<label class="layui-form-label">收藏分类:</label>
+							<label class="layui-form-label">收藏分类：</label>
 							<div class="layui-input-block with-icon">
 								<span style="width: 100%;text-align: left;position: relative;" id="demo100">
 									<input htmlEscape="false" name="classification" id="classification" maxlength="60" class="form-control layui-input" value="${collectAccessoryInfo.classification}"/>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -897,6 +897,9 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 								}
 							}
+							if((d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7) && (d.downProjectReportRecordStatus !=5 && d.downProjectReportRecordStatus != 7)) {
+								xml+="<a href=\"#\" onclick=\"openDialogre('重新发起电子归档申请', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+							}
 						}
 					}
 				}else{
@@ -925,6 +928,9 @@
 								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
 							}
 						}
+						if((d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7) && (d.paperFilingStatus !=5 && d.paperFilingStatus != 7)) {
+							xml+="<a href=\"#\" onclick=\"openDialogre('重新发起电子归档申请', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+						}
 					}
 				}
 				//归档资料缺失说明

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordModify.jsp

@@ -185,7 +185,7 @@
 <body>
 <div class="single-form">
 	<div class="container">
-		<form:form id="inputForm" modelAttribute="projectReportRecord" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectReportRecord" method="post" class="form-horizontal layui-form">
 			<form:hidden path="id"/>
 			<form:hidden path="view"/>
 			<form:hidden path="numberCount"/>
@@ -292,8 +292,8 @@
 								<%-- <th>序号</th>--%>
 									<th width="30%">文件类型</th>
 									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
+									<th width="120px">文件大小(M)</th>
+									<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -311,7 +311,7 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+									<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
 								</td>
 								<td></td>
 								<td class="op-td">
@@ -469,8 +469,8 @@
 								<%-- <th>序号</th>--%>
 									<th width="30%">文件类型</th>
 									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
+									<th width="120px">文件大小(M)</th>
+									<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -489,7 +489,7 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M; </div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
 								</td>
 								<td></td>
 
@@ -650,8 +650,8 @@
 								<%-- <th>序号</th>--%>
 									<th width="30%">文件类型</th>
 									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
+									<th width="120px">文件大小(M)</th>
+									<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -670,7 +670,7 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M; </div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
 								</td>
 								<td></td>
 								<td class="op-td">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -827,6 +827,9 @@
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
 								}
 							}
+							if((d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7) && (d.downProjectReportRecordStatus !=5 && d.downProjectReportRecordStatus != 7)) {
+								xml+="<a href=\"#\" onclick=\"openDialogre('重新发起电子归档申请', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+							}
 						}
 					}
 				}else{
@@ -854,6 +857,9 @@
 								xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\"  style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 线上重新归档</a>";
 							}
 						}
+						if((d.projectReportRecordStatus == 5 || d.projectReportRecordStatus == 7) && (d.paperFilingStatus !=5 && d.paperFilingStatus != 7)) {
+							xml+="<a href=\"#\" onclick=\"openDialogre('重新发起电子归档申请', '${ctx}/ruralProject/ruralCostProjectMessageNewTwo/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' > 线上重新归档</a>";
+						}
 					}
 				}
 				//归档资料缺失说明

src/main/webapp/webpage/modules/workclientinfo/all/workClientInfoList.jsp

@@ -201,7 +201,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">统一社会信用代码：</label>
+							<label class="layui-form-label" style="line-height:20px">统一社会信用代码：</label>
 							<div class="layui-input-block">
                                 <form:input path="uscCode" htmlEscape="false"  class="form-control layui-input"/>
 							</div>
@@ -214,6 +214,13 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
+							<label class="layui-form-label">部门：</label>
+							<div class="layui-input-block with-icon">
+								<sys:treeselectMoHu id="officeId" name="office.id" value="${workClientInfo.office.id}" labelName="office.name" labelValue="${workClientInfo.office.name}"
+													title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
 							<label class="layui-form-label">代表方：</label>
 							<div class="layui-input-block">
 								<form:select path="jobTypeShow" class="form-control layui-input">

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -213,7 +213,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">统一社会信用代码：</label>
+							<label class="layui-form-label"  style="line-height:20px">统一社会信用代码：</label>
 							<div class="layui-input-block">
                                 <form:input path="uscCode" htmlEscape="false"  class="form-control layui-input"/>
 							</div>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAllList.jsp

@@ -624,6 +624,13 @@
 						</div>
 					</div>
 					<div class="layui-item query athird">
+						<label class="layui-form-label">部门：</label>
+						<div class="layui-input-block with-icon">
+							<sys:treeselectMoHu id="officeId" name="office.id" value="${workContractInfo.office.id}" labelName="office.name" labelValue="${workContractInfo.office.name}"
+												title="部门" url="/sys/office/treeDataAll?type=6" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+						</div>
+					</div>
+					<div class="layui-item query athird">
 						<label class="layui-form-label">中标通知书：</label>
 						<div class="layui-input-block with-icon">
 							<form:select path="letterOfAcceptanceFlag" class="form-control simple-select">
@@ -715,6 +722,9 @@
                 ,{field:'createBy',align:'center', title: '创建人',  width:80,templet:function(d){
                         return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
                     }}
+                ,{field:'createUserOfficeName',align:'center', title: '部门',  width:80,templet:function(d){
+                        return "<span title='"+ d.createUserOfficeName +"'>" + d.createUserOfficeName + "</span>";
+                    }}
                 ,{field:'signDate',align:'center', title: '签订日期',  width:80}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.status);--%>
@@ -896,6 +906,7 @@
                     ,"borrowStatus":"${workContractInfo.borrowStatus}"
                     ,"giveStatus":"${workContractInfo.giveStatus}"
                     ,"borrowId":"${workContractInfo.borrowId}"
+                    ,"createUserOfficeName":"${workContractInfo.createUserOfficeName}"
                     ,"flagAdmin":"${workContractInfo.flagAdmin}"
 					,"notifyFlag":"${workContractInfo.notifyFlag}"
 					,"newContractNotifyFlagAudit":"${workContractInfo.newContractNotifyFlagAudit}"

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -721,6 +721,9 @@
                 ,{field:'createBy',align:'center', title: '创建人',  width:80,templet:function(d){
                         return "<span title='"+ d.createBy +"'>" + d.createBy + "</span>";
                     }}
+				,{field:'createUserOfficeName',align:'center', title: '部门',  width:80,templet:function(d){
+						return "<span title='"+ d.createUserOfficeName +"'>" + d.createUserOfficeName + "</span>";
+					}}
                 ,{field:'signDate',align:'center', title: '签订日期',  width:80}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
                         <%--var st = getAuditState(d.status);--%>
@@ -908,6 +911,7 @@
                     ,"contrractRecordStatus":"${workContractInfo.contrractRecordStatus}"
                     ,"contrractRecordId":"${workContractInfo.contrractRecordId}"
                     ,"recordNum":"${workContractInfo.recordNum}"
+                    ,"createUserOfficeName":"${workContractInfo.createUserOfficeName}"
                     ,"borrowStatus":"${workContractInfo.borrowStatus}"
                     ,"giveStatus":"${workContractInfo.giveStatus}"
                     ,"borrowId":"${workContractInfo.borrowId}"