代码提交：内容展示信息调整

src/main/java/com/jeeplus/modules/areaStaff/dao/AreaStaffDao.java

@@ -39,6 +39,8 @@ public interface AreaStaffDao extends TreeDao<AreaStaffInfo> {
      */
     AreaStaffInfo getOfficeInfo(String officeId);
 
+    AreaStaffInfo getByLeaderIdAndAreaManagement(AreaStaffInfo areaStaffInfo);
+
     /**
      * 根据父节点id查询信息
      * @param parentIdList

src/main/java/com/jeeplus/modules/areaStaff/service/AreaStaffService.java

@@ -264,6 +264,11 @@ public class AreaStaffService  extends TreeService<AreaStaffDao, AreaStaffInfo>
     }
 
 
+    public AreaStaffInfo getByLeaderIdAndAreaManagement(AreaStaffInfo areaStaffInfo) {
+        return dao.getByLeaderIdAndAreaManagement(areaStaffInfo);
+    }
+
+
     /**
      * 查询第一级数据信息
      * @param workReimbursementTypeInfo

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

@@ -143,6 +143,8 @@ public class RuralProjectMessageElectronicSealController extends BaseController
         model.addAttribute("userList", auditUserList);
         //添加查询类型list
         projectRecords.setTypeList(typeList);
+        //签章仅可对B类项目进行签章
+        projectRecords.setSubmitMoney("1");
         Page<RuralProjectRecords> page = ruralProjectMessageAllService.findSignaturePage(new Page<RuralProjectRecords>(request, response), projectRecords);
         model.addAttribute("page", page);
         //无合同状态下，获取委托方的名称

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/yanChengSignature/RuralProjectMessageElectronicSealYCController.java

@@ -139,6 +139,7 @@ public class RuralProjectMessageElectronicSealYCController extends BaseControlle
         model.addAttribute("userList", auditUserList);
         //添加查询类型list
         projectRecords.setTypeList(typeList);
+        //签章仅可以针对于B类项目进行签章
         projectRecords.setSubmitMoney("1");
         Page<RuralProjectRecords> page = ruralProjectMessageAllService.findSignatureYCPage(new Page<RuralProjectRecords>(request, response), projectRecords);
         model.addAttribute("page", page);

src/main/java/com/jeeplus/modules/signatureManagement/electronicSignature/controller/DistrictDirectorApplicationController.java

@@ -324,14 +324,19 @@ public class DistrictDirectorApplicationController extends BaseController {
      */
     @RequestMapping(value = "delete")
     public String delete(DistrictDirectorApplication directorApplication, RedirectAttributes redirectAttributes) {
-
-        directorApplicationService.delete(directorApplication);
-        addMessage(redirectAttributes, "删除成功");
-        if (StringUtils.isNotBlank(directorApplication.getHome()) && "home".equals(directorApplication.getHome())){
-            return "redirect:" + Global.getAdminPath() + "/home/?repage";
-        }else {
+        //验证数据的状态是不是已审核通过，若状态值为5 则可进行删除
+        if(!"5".equals(directorApplication.getStatus())){
+            addMessage(redirectAttributes, "该申请没有审核完成，无需进行删除。");
             return "redirect:"+Global.getAdminPath()+"/districtDirectorApplication/districtDirectorApplication/?repage";
         }
+        /*if(StringUtils.isBlank(directorApplication.getAreaDirector())){
+            directorApplicationService.delete(directorApplication);
+            addMessage(redirectAttributes, "该数据的区域负责人名称为空值，此处将仅删除申请信息。");
+            return "redirect:"+Global.getAdminPath()+"/districtDirectorApplication/districtDirectorApplication/?repage";
+        }*/
+        directorApplicationService.delete(directorApplication);
+        addMessage(redirectAttributes, "删除成功");
+        return "redirect:"+Global.getAdminPath()+"/districtDirectorApplication/districtDirectorApplication/?repage";
     }
 
 

src/main/java/com/jeeplus/modules/signatureManagement/electronicSignature/service/DistrictDirectorApplicationService.java

@@ -7,6 +7,7 @@ import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.areaStaff.entity.AreaStaffInfo;
 import com.jeeplus.modules.areaStaff.service.AreaStaffService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.signatureManagement.electronicSignature.dao.DistrictDirectorApplicationDao;
@@ -95,7 +96,6 @@ public class DistrictDirectorApplicationService extends CrudService<DistrictDire
             dataScopeSql = dataScopeFilter(directorApplication.getCurrentUser(), "o", "u", "s", MenuStatusEnum.ELECTRONIC_SIGNATURE.getValue());
             directorApplication.getSqlMap().put("dsf", dataScopeSql);
             directorApplication.getSqlMap().put("delFlag", "AND a.del_flag = 0");
-            directorApplication.setCreateBy(UserUtils.getUser());
         }
         if(null!= directorApplication.getOffice() && org.apache.commons.lang3.StringUtils.isNotBlank(directorApplication.getOffice().getId())){
             //查询该选择节点下所有的部门Id
@@ -557,4 +557,24 @@ public class DistrictDirectorApplicationService extends CrudService<DistrictDire
         List<DistrictDirectorApplication> districtDirectorApplication=directorApplicationDao.isApplyArea(directorApplication);
         return districtDirectorApplication;
     }
+
+    /**
+     * 删除操作
+     * @param directorApplication
+     * @return
+     */
+    @Transactional(readOnly = false)
+    public void delete(DistrictDirectorApplication directorApplication){
+        //删除数据
+        dao.delete(directorApplication);
+        /*if(StringUtils.isNotBlank(directorApplication.getAreaDirector())){
+            //查询删除地区负责人相关信息
+            AreaStaffInfo areaStaffInfo = new AreaStaffInfo();
+            areaStaffInfo.setAreaManagement(directorApplication.getAreaDirector());
+            areaStaffInfo.setAreaLeaderId(directorApplication.getCreateBy().getId());
+            AreaStaffInfo byLeaderIdAndAreaManagement = areaStaffService.getByLeaderIdAndAreaManagement(areaStaffInfo);
+            areaStaffService.delete(byLeaderIdAndAreaManagement);
+        }*/
+
+    }
 }

src/main/resources/mappings/modules/areaStaff/AreaStaffDao.xml

@@ -228,6 +228,11 @@
     </select>
 
 
+	<select id="getByLeaderIdAndAreaManagement" resultType="com.jeeplus.modules.areaStaff.entity.AreaStaffInfo">
+        SELECT * FROM sys_area_staff WHERE area_management = #{areaManagement} and area_leader_id = #{areaLeaderId} and del_flag = 0
+    </select>
+
+
 	<select id="getByParentIdList" resultType="com.jeeplus.modules.areaStaff.entity.AreaStaffInfo">
 		SELECT <include refid="workReviewStandardColumns"/>
 		FROM sys_area_staff a
@@ -318,8 +323,7 @@
 		select * from sys_area_staff
 		<where>
 			del_flag = 0
-			and type = 'master'
-			and id in (select parent_id from sys_area_staff where del_flag = 0 and standard_detail = #{userId})
+			and area_leader_id = #{userId}
 		</where>
 		limit 1
 	</select>

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?14" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?16" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -455,7 +455,7 @@
 						</div>
 
 
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
@@ -464,7 +464,7 @@
 									<form:option value="1" label="B级"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSealYC/ruralProjectMessageElectronicSealYCList.jsp

@@ -394,18 +394,18 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>
 									<form:option value="1" label="B级"/>
-									<%--<form:option value="3" label="B级紧急"/>
-									<form:option value="1" label="B级非紧急"/>--%>
+									&lt;%&ndash;<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/ElectronicSignatureList.jsp

@@ -391,10 +391,10 @@
                         </shiro:hasPermission>
                         <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
                         <%--<c:if test="${isArea != '1'}">--%>
-                            <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</button>
+                            <button class="layui-btn layui-btn-sm layui-bg-blue" title="签章责任人申请" onclick="openDialogDis('签章责任人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;签章责任人申请</button>
                         <%--</c:if>--%>
                         <c:if test="${isArea == '1'}">
-                            <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请详情" onclick="openDialogForm('地区负责人申请详情','${ctx}/districtDirectorApplication/districtDirectorApplication/ListByCreate','95%','95%','','关闭')">&nbsp;地区负责人申请详情</button>
+                            <button class="layui-btn layui-btn-sm layui-bg-blue" title="签章责任人申请详情" onclick="openDialogForm('签章责任人申请详情','${ctx}/districtDirectorApplication/districtDirectorApplication/ListByCreate','95%','95%','','关闭')">&nbsp;签章责任人申请详情</button>
                         </c:if>
 
 

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/directorApplicationAudit.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>地区负责人申请管理</title>
+	<title>签章责任人申请管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
@@ -35,7 +35,7 @@
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 			});
-			$("#area").on("change",function(){
+			/*$("#area").on("change",function(){
 						var area = $("#area").val()
 						$.ajax({
 							url:"${ctx}/districtDirectorApplication/districtDirectorApplication/checkArea",
@@ -50,7 +50,7 @@
 							}
 						});
 					}
-			)
+			)*/
 			function openDialogre(title,url,width,height,target,buttons) {
 				if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 					width = 'auto';
@@ -99,23 +99,30 @@
 			<form:hidden id="flag" path="act.flag"/>
 			<c:set var="status" value="${districtDirectorApplication.act.status}" />
 			<div class="form-group layui-row first lw9">
-				<div class="form-group-label"><h2>基础信息</h2></div>
+				<div class="form-group-label"><h2>基础信息<span style="color: red;font-size: 14px"> （注：签章责任人一般为地区负责人）</span></h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>负责区域：</label>
 					<div class="layui-input-block with-icon">
 						<form:input path="territory" htmlEscape="false" readonly="true" maxlength="64" class="form-control  layui-input"/>
 					</div>
 				</div>
+
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">关联地区：</label>
 					<div class="layui-input-block with-icon">
+						<input id="areaName" htmlEscape="false" readonly="true" value="${districtDirectorApplication.area.name}"  class="form-control layui-input"/>
+					</div>
+				</div>
+				<%--<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">关联地区：</label>
+					<div class="layui-input-block with-icon">
 						<sys:treeselect id="area" name="area.id" disabled="disabled" value="${districtDirectorApplication.area.id}" labelName="area.name"
 										labelValue="${districtDirectorApplication.area.name}"
 										cssStyle="background-color:#fff"
 										title="区域" url="/sys/area/treeData" cssClass="form-control layui-input"
 										allowClear="true" notAllowSelectParent="false"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">申请人：</label>
 					<div class="layui-input-block">
@@ -144,7 +151,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入备注" readonly="true" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入备注" style="background-color: #f1f1f1" readonly="true" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/directorApplicationForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>地区负责人申请管理</title>
+	<title>签章责任人申请管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
         var validateForm;
@@ -34,7 +34,7 @@
         });
 
 		function setAreaValue(area){
-			$.ajax({
+			/*$.ajax({
 				url:"${ctx}/districtDirectorApplication/districtDirectorApplication/checkArea",
 				type:"post",
 				data:{"areaId":area.id,},
@@ -48,7 +48,7 @@
 						$("#ph").html('');
 					}
 				}
-			});
+			});*/
 		}
 
 
@@ -61,7 +61,7 @@
 		<form:form id="inputForm" modelAttribute="districtDirectorApplication" action="${ctx}/districtDirectorApplication/districtDirectorApplication/save" method="post" class="form-horizontal">
 			<form:hidden path="id"/>
 			<div class="form-group layui-row first">
-				<div class="form-group-label"><h2>基础信息</h2></div>
+				<div class="form-group-label"><h2>基础信息<span style="color: red;font-size: 14px"> （注：签章责任人一般为地区负责人）</span></h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>负责区域：</label>
 					<div class="layui-input-block with-icon">

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/directorApplicationLookForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>地区负责人申请管理</title>
+	<title>签章责任人申请管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
         var validateForm;
@@ -19,7 +19,7 @@
         $(document).ready(function() {
 
 			$("#area").on("change",function(){
-						var area = $("#area").val()
+						/*var area = $("#area").val()
 						$.ajax({
 							url:"${ctx}/districtDirectorApplication/districtDirectorApplication/checkArea",
 							type:"post",
@@ -31,7 +31,7 @@
 									$("#ph").html('');
 								}
 							}
-						});
+						});*/
 					}
 			)
 			function openDialogre(title,url,width,height,target,buttons) {

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/directorApplicationView.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>地区负责人申请管理</title>
+	<title>签章责任人申请管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
         var validateForm;
@@ -19,7 +19,7 @@
         $(document).ready(function() {
 
 			$("#area").on("change",function(){
-						var area = $("#area").val()
+						/*var area = $("#area").val()
 						$.ajax({
 							url:"${ctx}/districtDirectorApplication/districtDirectorApplication/checkArea",
 							type:"post",
@@ -31,7 +31,7 @@
 									$("#ph").html('');
 								}
 							}
-						});
+						});*/
 					}
 			)
 			function openDialogre(title,url,width,height,target,buttons) {

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/districtDirectorApplicationList.jsp

@@ -335,7 +335,7 @@
                         <div class="layui-item athird">
                                 <label class="layui-form-label">申请人：</label>
                                 <div class="layui-input-block with-icon">
-                                    <sys:inquireselectUserNotReadolny id="createBy" name="createBy.id" value="${districtDirectorApplication.createBy.id}" labelName="createBy.name" labelValue="${districtDirectorApplication.createBy.name}" cssStyle="background-color: #fff"
+                                    <sys:inquireselectUserNotReadolny id="createBy" name="createBy.id" value="" labelName="createBy.name" labelValue="" cssStyle="background-color: #fff"
                                                                       title="登记人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                                 </div>
                         </div>

src/main/webapp/webpage/modules/signatureManagement/electronicSignature/districtDirectorApplicationListForm.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>地区负责人申请</title>
+	<title>签章责任人申请</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?14" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?16" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/sys/sysLogin2.jsp

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?14" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?16" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />