电子印章-地区负责人申请调整

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

@@ -137,7 +137,7 @@ public class DistrictDirectorApplicationController extends BaseController {
             addMessage(attributes, "系统内部错误");
             logger.error("Exception e:"+e);
         }
-
+        addMessage(attributes, "申请成功");
         return "redirect:"+Global.getAdminPath()+"/electronicSignature/electronicSignature/?repage";
 
     }

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

@@ -12,7 +12,9 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.signature.dailyOfficeWork.entity.DailyOfficeWork;
+import com.jeeplus.modules.signatureManagement.electronicSignature.entity.DistrictDirectorApplication;
 import com.jeeplus.modules.signatureManagement.electronicSignature.entity.ElectronicSignatureInfo;
+import com.jeeplus.modules.signatureManagement.electronicSignature.service.DistrictDirectorApplicationService;
 import com.jeeplus.modules.signatureManagement.electronicSignature.service.ElectronicSignatureService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
@@ -54,6 +56,9 @@ public class ElectronicSignatureController extends BaseController {
     @Autowired
     protected HistoryService historyService;
 
+    @Autowired
+    private DistrictDirectorApplicationService directorApplicationService;
+
     @ModelAttribute
     public ElectronicSignatureInfo get(@RequestParam(required=false) String id) {
         ElectronicSignatureInfo entity = null;
@@ -93,8 +98,11 @@ public class ElectronicSignatureController extends BaseController {
         //获取电子签章印章管理
         Page<ElectronicSignatureInfo> page = electronicSignatureService.findPage(new Page<ElectronicSignatureInfo>(request, response), electronicSignatureInfo);
         List<ElectronicSignatureInfo> list = page.getList();
-
-
+        //查询当前登录人负责地区是否申请
+        List<DistrictDirectorApplication> directorApplication=directorApplicationService.isApplyArea();
+        if (null != directorApplication && directorApplication.size()>0){
+            model.addAttribute("isArea","1");
+        }
         model.addAttribute("page", page);
         return "modules/signatureManagement/electronicSignature/ElectronicSignatureList";
     }

src/main/java/com/jeeplus/modules/signatureManagement/electronicSignature/dao/DistrictDirectorApplicationDao.java

@@ -11,6 +11,8 @@ import java.util.List;
 public interface DistrictDirectorApplicationDao extends CrudDao<DistrictDirectorApplication> {
 
     void updateProcessInstanceId(DistrictDirectorApplication districtDirectorApplication);
-
+    //查询当前登录人负责的区域是否重复
     List<DistrictDirectorApplication> findByArea(DistrictDirectorApplication directorApplication);
+    //查询当前登录人是否已经提过申请
+    List<DistrictDirectorApplication> isApplyArea(DistrictDirectorApplication directorApplication);
 }

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

@@ -494,9 +494,20 @@ public class DistrictDirectorApplicationService extends CrudService<DistrictDire
         return "保存审核意见成功！";
 
     }
-
+    //查询当前登录人负责的区域是否重复
     public List<DistrictDirectorApplication> findByArea(DistrictDirectorApplication directorApplication) {
         directorApplication.setCreateBy(UserUtils.getUser());
         return directorApplicationDao.findByArea(directorApplication);
     }
+
+    /**
+     * 查询当前登录人是否已经提过申请
+     * @return
+     */
+    public List<DistrictDirectorApplication> isApplyArea() {
+        DistrictDirectorApplication directorApplication = new DistrictDirectorApplication();
+        directorApplication.setCreateBy(UserUtils.getUser());
+        List<DistrictDirectorApplication> districtDirectorApplication=directorApplicationDao.isApplyArea(directorApplication);
+        return districtDirectorApplication;
+    }
 }

src/main/resources/mappings/modules/signatureManagement/electronicSignature/DistrictDirectorApplicationDao.xml

@@ -98,6 +98,12 @@
 		WHERE id = #{id}
 	</update>
 
+	<select id="isApplyArea" resultType="districtDirectorApplication">
+		select a.id
+		from district_director_application a
+		where a.status in ('2','5') and a.del_flag = '0' and a.create_by = #{createBy.id}
+	</select>
+
 
 
 </mapper>

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

@@ -382,9 +382,11 @@
                     <div class="layui-btn-group">
                         <shiro:hasPermission name="electronicSignature:electronicSignature:add">
                             <table:addRow url="${ctx}/electronicSignature/electronicSignature/form" title="电子印章申请"></table:addRow><!-- 增加按钮 -->
-                        </shiro:hasPermission>f
+                        </shiro:hasPermission>
                         <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
-                        <button class="layui-btn layui-btn-sm layui-bg-blue" title="地区负责人申请" onclick="openDialogDis('地区负责人申请','${ctx}/districtDirectorApplication/districtDirectorApplication/form','95%','95%')">&nbsp;地区负责人申请</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>
+                        </c:if>
                     </div>
                     <div style="clear: both;"></div>
                 </div>

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

@@ -108,7 +108,7 @@
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
 			<c:set var="status" value="${districtDirectorApplication.act.status}" />
-			<div class="form-group layui-row first lw8">
+			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>负责地区：</label>
@@ -121,20 +121,20 @@
 						<span id="ph" style="color:#cc5965"></span>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
 						<form:input path="office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">申请日期：</label>
 					<div class="layui-input-block">
 						<input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${districtDirectorApplication.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>

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

@@ -28,11 +28,6 @@
         });
 
 		function setAreaValue(area){
-			console.log('area',area)
-			// $("#area").on("change",function(){
-			//
-			// 		}
-			// )
 			$.ajax({
 				url:"${ctx}/districtDirectorApplication/districtDirectorApplication/checkArea",
 				type:"post",
@@ -59,7 +54,7 @@
 	<div class="container">
 		<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 lw8">
+			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>负责地区：</label>
@@ -72,20 +67,20 @@
 						<span id="ph" style="color:#cc5965"></span>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
 						<form:input path="office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">申请日期：</label>
 					<div class="layui-input-block">
 						<input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${districtDirectorApplication.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>

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

@@ -81,7 +81,7 @@
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
 			<c:set var="status" value="${districtDirectorApplication.act.status}" />
-			<div class="form-group layui-row first lw8">
+			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>负责地区：</label>
@@ -94,20 +94,20 @@
 						<span id="ph" style="color:#cc5965"></span>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
 						<form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
 						<form:hidden path="createBy.id" htmlEscape="false"   readonly="true"  class="form-control  layui-input"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
 						<form:input path="office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">申请日期：</label>
 					<div class="layui-input-block">
 						<input id="createDate" name="createDate" htmlEscape="false"  value="<fmt:formatDate value="${districtDirectorApplication.createDate}" pattern="yyyy-MM-dd"/>" readonly="readonly"  class="form-control judgment layui-input"/>