业务电子签章调整

src/main/java/com/jeeplus/modules/areaStaff/web/AreaStaffController.java

@@ -296,6 +296,25 @@ public class AreaStaffController extends BaseController {
         }else{//新增表单保存
             areaStaffService.secondSave(areaStaffInfo);//保存
         }
+        //获取地区负责人,并将他添加到岗位表中
+        if(StringUtils.isNotBlank(areaStaffInfo.getAreaLeaderId())){
+            User user = UserUtils.get(areaStaffInfo.getAreaLeaderId());
+            //将用户与签章人员进行绑定
+            Role qzRole = systemService.getRoleByName("签章人员", user.getCompany().getId());
+            boolean isHave = false;
+            //在岗位表中查询当前人是否存在于签章人员岗位中
+            List<Role> roleList = UserUtils.getRoleList(user);
+            for (Role role : roleList) {
+                if (role.getId().equals(qzRole.getId())){
+                    isHave = true;
+                    break;
+                }
+            }
+            if (!isHave){
+                systemService.assignUserToRole(qzRole,user,0);
+            }
+        }
+
         addMessage(redirectAttributes, "保存信息成功");
         return "redirect:"+ Global.getAdminPath()+"/areaStaff/areaStaff/?repage";
     }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -165,9 +165,9 @@ public class ProjectReportSignatureWorkController extends BaseController {
             }
 
         }
-
+        User user = UserUtils.getUser();
         WorkProjectNotify workProjectNotify = new WorkProjectNotify();
-        workProjectNotify.setUser(UserUtils.getUser());
+        workProjectNotify.setUser(user);
         workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
         workProjectNotify.setRemarks("待审批");
         List<String> typeList= Lists.newArrayList();
@@ -194,8 +194,24 @@ public class ProjectReportSignatureWorkController extends BaseController {
             }
         }
 
+        //获取当前登陆人可申请的签章类型
+        ArrayList<Type> sigTypes = new ArrayList<>();
+        String sigTypeList = projectReportSignatureService.getSignatureTypeList(user); //typeList 1:审定单 2:报告
+        //type 1:报告  2:审定单
+        if (StringUtils.isNotBlank(sigTypeList)){
+            if (typeList.contains(",")){
+                model.addAttribute("isApproval","2");
+                model.addAttribute("isReport","1");
+            }else {
+                if (typeList.equals("1")){
+                    model.addAttribute("isApproval","2");
+                }
+                if (typeList.equals("2")){
+                    model.addAttribute("isReport","1");
 
-
+                }
+            }
+        }
 
         model.addAttribute("page", page);
         return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList";

src/main/resources/mappings/modules/signature/projectReport/ProjectReportSignatureDao.xml

@@ -901,13 +901,13 @@
 		SELECT
 			GROUP_CONCAT(DISTINCT sei.use_type) as signatureType
 		FROM
-			sys_area_staff_user_info a
+			 sys_area_staff sas
 		LEFT JOIN
-			sys_area_staff sas ON a.area_staff_id = sas.id AND sas.del_flag = '0'
+			sys_area_staff_user_info a ON a.area_staff_id = sas.id AND a.del_flag = '0'
 		LEFT JOIN
 			signature_electronic_info sei ON sei.create_by = sas.area_leader_id AND sei.del_flag = '0' and sei.status = '5'
 		WHERE
-			(a.user_id = #{id} or sas.area_leader_id = #{id}) and a.del_flag = '0'
+			(a.user_id = #{id} or sas.area_leader_id = #{id}) and sas.del_flag = '0'
 	</select>
 
 </mapper>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -250,7 +250,7 @@
             {
                 xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"notifyDialogre('审定单签章申请审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.approvalNotifyId +"&home=projectReportSignature','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
             }
-            if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1")
+            if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1" && d.isApproval == "2")
             {
                 xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审定单签章</a>";
             }
@@ -275,7 +275,7 @@
             {
                 xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteApproval?id=" + d.approvalId + "\" onclick=\"return confirmx('确认要作废该审定单签章申请信息吗？', this.href)\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除审定单签章</a>";
             }
-            if(d.approvalCancancel2 != undefined && d.approvalCancancel2 =="1")
+            if(d.approvalCancancel2 != undefined && d.approvalCancancel2 =="1" && d.isReport == "1")
             {
                 xml+="<a href=\"#\" onclick=\"openDialogre('报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-green\" > 报告签章</a>";
             }
@@ -605,6 +605,12 @@
                     ,"signatureUrlFlag":"${projectReportSignature.signatureUrlFlag}"
                     ,"signatureContractId":"${projectReportSignature.signatureContractId}"
                     ,"reportSignatureUrl":"${projectReportSignature.reportSignatureUrl}"
+                    <c:if test="${isReport == '1'}">
+                    ,"isReport":"1"
+                    </c:if>
+                    <c:if test="${isApproval == '2'}">
+                    ,"isApproval":"2"
+                    </c:if>
                     ,"reportSignatureUrlFlag":"${projectReportSignature.reportSignatureUrlFlag}"
                     ,"reportSignatureContractId":"${projectReportSignature.reportSignatureContractId}"
                     ,"approvalSignatureUrl":"${projectReportSignature.approvalSignatureUrl}"