功能恢复

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

@@ -83,6 +83,10 @@ import com.jeeplus.modules.signature.dailyOfficeWork.entity.DailyOfficeWork;
 import com.jeeplus.modules.signature.dailyOfficeWork.service.DailyOfficeWorkService;
 import com.jeeplus.modules.signature.projectReportSignatureWork.entity.ProjectReportSignatureWork;
 import com.jeeplus.modules.signature.projectReportSignatureWork.service.ProjectReportSignatureWorkService;
+import com.jeeplus.modules.signatureManagement.businessSignature.entity.BusinessSignatureInfo;
+import com.jeeplus.modules.signatureManagement.businessSignature.service.BusinessSignatureService;
+import com.jeeplus.modules.signatureManagement.electronicSignature.entity.ElectronicSignatureInfo;
+import com.jeeplus.modules.signatureManagement.electronicSignature.service.ElectronicSignatureService;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
 import com.jeeplus.modules.sys.dao.RoleDao;
@@ -556,6 +560,11 @@ public class WorkProjectNotifyController extends BaseController {
 	private DailyOfficeWorkService dailyOfficeWorkService;
 
 	@Autowired
+	private ElectronicSignatureService electronicSignatureService;
+	@Autowired
+	private BusinessSignatureService businessSignatureService;
+
+	@Autowired
 	private ActTestService actTestService;
 
 	@Autowired
@@ -1597,119 +1606,17 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView";
 					}
 				} else if (workProjectNotify.getType().equals("170")) {    //日常签章
-
-					DailyOfficeWork dailyOfficeWork = dailyOfficeWorkService.get(workProjectNotify.getNotifyId());
-
-					if (dailyOfficeWork != null && StringUtils.isNotBlank(dailyOfficeWork.getId())) {
-
-
-						if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-							dailyOfficeWork.setSignatureUrlFlag(1);
-							//处理文件路径
-							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-							/*if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
-								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
-									dailyOfficeWork.setSignatureUrl(signatureUrl);
-								}
-								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}else{
-								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}*/
-						}else{
-							dailyOfficeWork.setSignatureUrlFlag(0);
-						}
-					}
-					dailyOfficeWork.setAct(getByAct(dailyOfficeWork.getProcessInstanceId()));
-					if(StringUtils.isNotBlank(workProjectNotify.getHome())){
-						dailyOfficeWork.setHome(workProjectNotify.getHome());
-					}else{
-						dailyOfficeWork.setHome("home");
-					}
-					//判定当前流程页面签署是否已经签署过，若签署过，则auditFlag 赋值 1
-					model.addAttribute("auditFlag",dailyOfficeWork.getSignatureFlag());
-
-					model.addAttribute("processInstanceId", dailyOfficeWork.getProcessInstanceId());
-					model.addAttribute("dailyOfficeWork", dailyOfficeWork);
-
-					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-						List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-						if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-							WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-							//处理文件路径
-							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-							if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
-								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
-									dailyOfficeWork.setSignatureUrl(signatureUrl);
-								}
-								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}else{
-								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}
-							User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
-							signatureAttachment.setCreateBy(user);
-							signatureAttachment.setUpdateBy(user);
-							signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
-							signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
-							signatureAttachment.setDelFlag("0");
-							signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
-							String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
-							signatureAttachment.setType(type);
-							signatureWorkAttachments.add(signatureAttachment);
-						}
-
-
-						if(signatureWorkAttachments.size()>0){
-							dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
-						}
-						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
-					}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						//审核模板标识
-						model.addAttribute("identification", "signatureDailyOfficeWork");
-						model.addAttribute("identificationName","日常签章申请审核意见");
-						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureAudit";
-					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureModify";
-					} else {
-						List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-						if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-							WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-
-							//处理文件路径
-							//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-							if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
-								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
-									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
-									dailyOfficeWork.setSignatureUrl(signatureUrl);
-								}
-								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}else{
-								signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
-							}
-							User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
-							signatureAttachment.setCreateBy(user);
-							signatureAttachment.setUpdateBy(user);
-							signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
-							signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
-							signatureAttachment.setDelFlag("0");
-							signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
-							String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
-							signatureAttachment.setType(type);
-							signatureWorkAttachments.add(signatureAttachment);
-						}
-
-
-						if(signatureWorkAttachments.size()>0){
-							dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
-						}
-						return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
-					}
+					return this.dailyOfficeWorkAudit(workProjectNotify,model);
 				} else if (workProjectNotify.getType().equals("173")) {    //报告签章
 					return this.disposeProjectReportSignatureWork(workProjectNotify,model);
 
-				} else if (workProjectNotify.getType().equals("171")) {    //合同管理new
+				} else if (workProjectNotify.getType().equals("192")) {    //电子用章申请
+					return this.electronicSignatureAudit(workProjectNotify,model);
+				} else if (workProjectNotify.getType().equals("193")) {    //业务用章申请
+					return this.businessSignatureAudit(workProjectNotify,model);
+				}
+
+				else if (workProjectNotify.getType().equals("171")) {    //合同管理new
 					RuralProjectRecords ruralProjectRecords = ruralProjectMessageElectronicSealService.getProjectApprovalSignatureById(workProjectNotify.getNotifyId());
 					ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
 					ruralProjectRecords.setSignatureContractId(projectReportData.getSignatureContractId());
@@ -10102,4 +10009,190 @@ public class WorkProjectNotifyController extends BaseController {
 	}
 
 
+	private String dailyOfficeWorkAudit(WorkProjectNotify workProjectNotify,Model model) {
+
+		DailyOfficeWork dailyOfficeWork = dailyOfficeWorkService.get(workProjectNotify.getNotifyId());
+
+		if (dailyOfficeWork != null && StringUtils.isNotBlank(dailyOfficeWork.getId())) {
+
+
+			if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+				dailyOfficeWork.setSignatureUrlFlag(1);
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+							/*if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
+								if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+									String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
+									dailyOfficeWork.setSignatureUrl(signatureUrl);
+								}
+								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}else{
+								dailyOfficeWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+							}*/
+			}else{
+				dailyOfficeWork.setSignatureUrlFlag(0);
+			}
+		}
+		dailyOfficeWork.setAct(getByAct(dailyOfficeWork.getProcessInstanceId()));
+		if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+			dailyOfficeWork.setHome(workProjectNotify.getHome());
+		}else{
+			dailyOfficeWork.setHome("home");
+		}
+		//判定当前流程页面签署是否已经签署过，若签署过，则auditFlag 赋值 1
+		model.addAttribute("auditFlag",dailyOfficeWork.getSignatureFlag());
+
+		model.addAttribute("processInstanceId", dailyOfficeWork.getProcessInstanceId());
+		model.addAttribute("dailyOfficeWork", dailyOfficeWork);
+
+		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+			if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+				if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
+					if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+						String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
+						dailyOfficeWork.setSignatureUrl(signatureUrl);
+					}
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+				}else{
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+				}
+				User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
+				signatureAttachment.setCreateBy(user);
+				signatureAttachment.setUpdateBy(user);
+				signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
+				signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
+				signatureAttachment.setDelFlag("0");
+				signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
+				String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
+				signatureAttachment.setType(type);
+				signatureWorkAttachments.add(signatureAttachment);
+			}
+
+
+			if(signatureWorkAttachments.size()>0){
+				dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
+			}
+			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
+		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+			//审核模板标识
+			model.addAttribute("identification", "signatureDailyOfficeWork");
+			model.addAttribute("identificationName","日常签章申请审核意见");
+			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureAudit";
+		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureModify";
+		} else {
+			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+			if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+				if(dailyOfficeWork.getSignatureUrl().contains("/xg-qz")){
+					if(StringUtils.isNotBlank(dailyOfficeWork.getSignatureUrl())){
+						String signatureUrl = dailyOfficeWork.getSignatureUrl().replace("/xg-qz","");
+						dailyOfficeWork.setSignatureUrl(signatureUrl);
+					}
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+				}else{
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + dailyOfficeWork.getSignatureUrl()));
+				}
+				User user = UserUtils.get(dailyOfficeWork.getSignatureUploadFileUser().getId());
+				signatureAttachment.setCreateBy(user);
+				signatureAttachment.setUpdateBy(user);
+				signatureAttachment.setCreateDate(dailyOfficeWork.getSignatureUploadDate());
+				signatureAttachment.setUpdateDate(dailyOfficeWork.getSignatureUploadDate());
+				signatureAttachment.setDelFlag("0");
+				signatureAttachment.setAttachmentName(dailyOfficeWork.getSignatureFileName());
+				String type = dailyOfficeWork.getSignatureUrl().substring(dailyOfficeWork.getSignatureUrl().lastIndexOf(".") + 1);
+				signatureAttachment.setType(type);
+				signatureWorkAttachments.add(signatureAttachment);
+			}
+
+
+			if(signatureWorkAttachments.size()>0){
+				dailyOfficeWork.setSignatureWorkAttachments(signatureWorkAttachments);
+			}
+			return "modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureView";
+		}
+	}
+
+	/**
+	 * 电子用章申请
+	 * @param workProjectNotify
+	 * @param model
+	 * @return
+	 */
+	private String electronicSignatureAudit(WorkProjectNotify workProjectNotify,Model model) {
+
+		ElectronicSignatureInfo electronicSignatureInfo = electronicSignatureService.get(workProjectNotify.getNotifyId());
+
+		electronicSignatureInfo.setAct(getByAct(electronicSignatureInfo.getProcessInstanceId()));
+		if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+			electronicSignatureInfo.setHome(workProjectNotify.getHome());
+		}else{
+			electronicSignatureInfo.setHome("home");
+		}
+
+		model.addAttribute("processInstanceId", electronicSignatureInfo.getProcessInstanceId());
+		model.addAttribute("electronicSignatureInfo", electronicSignatureInfo);
+
+		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+			return "modules/signatureManagement/electronicSignature/ElectronicSignatureView";
+		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+
+			String useTypeStr = DictUtils.getMainDictLabel(electronicSignatureInfo.getUseType(), "electronicSignature", "");
+			electronicSignatureInfo.setUseType(useTypeStr);
+			//审核模板标识
+			model.addAttribute("identification", "electronicSignature");
+			model.addAttribute("identificationName","电子用章申请审核意见");
+			return "modules/signatureManagement/electronicSignature/ElectronicSignatureAudit";
+		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+			return "modules/signatureManagement/electronicSignature/ElectronicSignatureModify";
+		} else {
+			return "modules/signatureManagement/electronicSignature/ElectronicSignatureView";
+		}
+	}
+
+	/**
+	 * 业务用章申请
+	 * @param workProjectNotify
+	 * @param model
+	 * @return
+	 */
+	private String businessSignatureAudit(WorkProjectNotify workProjectNotify,Model model) {
+
+		BusinessSignatureInfo businessSignatureInfo = businessSignatureService.get(workProjectNotify.getNotifyId());
+
+		businessSignatureInfo.setAct(getByAct(businessSignatureInfo.getProcessInstanceId()));
+		if(StringUtils.isNotBlank(workProjectNotify.getHome())){
+			businessSignatureInfo.setHome(workProjectNotify.getHome());
+		}else{
+			businessSignatureInfo.setHome("home");
+		}
+
+		model.addAttribute("processInstanceId", businessSignatureInfo.getProcessInstanceId());
+		model.addAttribute("businessSignatureInfo", businessSignatureInfo);
+
+		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+			return "modules/signatureManagement/businessSignature/BusinessSignatureView";
+		}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+
+			String useTypeStr = DictUtils.getMainDictLabel(businessSignatureInfo.getUseType(), "businessSignature", "");
+			businessSignatureInfo.setUseType(useTypeStr);
+			//审核模板标识
+			model.addAttribute("identification", "electronicSignature");
+			model.addAttribute("identificationName","业务用章申请审核意见");
+			return "modules/signatureManagement/businessSignature/BusinessSignatureAudit";
+		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+			return "modules/signatureManagement/businessSignature/BusinessSignatureModify";
+		} else {
+			return "modules/signatureManagement/businessSignature/BusinessSignatureView";
+		}
+	}
+
 }