报告签章调整

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

@@ -124,22 +124,42 @@ public class ProjectReportSignatureWorkController extends BaseController {
         List<ProjectReportSignatureWork> list = page.getList();
 
         for (ProjectReportSignatureWork officeWork : list) {
-            if(StringUtils.isNotBlank(officeWork.getSignatureUrl())){
-                officeWork.setSignatureUrlFlag(1);
-                //处理文件路径
-                //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-                if(officeWork.getSignatureUrl().contains("/xg-qz")){
-                    if(StringUtils.isNotBlank(officeWork.getSignatureUrl())){
-                        String signatureUrl = officeWork.getSignatureUrl().replace("/xg-qz","");
-                        officeWork.setSignatureUrl(signatureUrl);
+            if (StringUtils.isNotBlank(officeWork.getReportId())){
+                if(StringUtils.isNotBlank(officeWork.getReportSignatureUrl())){
+                    officeWork.setReportSignatureUrlFlag(1);
+                    //处理文件路径
+                    //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                    if(officeWork.getReportSignatureUrl().contains("/xg-qz")){
+                        if(StringUtils.isNotBlank(officeWork.getReportSignatureUrl())){
+                            String signatureUrl = officeWork.getReportSignatureUrl().replace("/xg-qz","");
+                            officeWork.setReportSignatureUrl(signatureUrl);
+                        }
+                        officeWork.setReportSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + officeWork.getReportSignatureUrl()));
+                    }else{
+                        officeWork.setReportSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + officeWork.getReportSignatureUrl()));
                     }
-                    officeWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + officeWork.getSignatureUrl()));
                 }else{
-                    officeWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + officeWork.getSignatureUrl()));
+                    officeWork.setReportSignatureUrlFlag(0);
+                }
+            }else if (StringUtils.isNotBlank(officeWork.getApprovalId())){
+                if(StringUtils.isNotBlank(officeWork.getApprovalSignatureUrl())){
+                    officeWork.setApprovalSignatureUrlFlag(1);
+                    //处理文件路径
+                    //如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+                    if(officeWork.getApprovalSignatureUrl().contains("/xg-qz")){
+                        if(StringUtils.isNotBlank(officeWork.getApprovalSignatureUrl())){
+                            String signatureUrl = officeWork.getApprovalSignatureUrl().replace("/xg-qz","");
+                            officeWork.setApprovalSignatureUrl(signatureUrl);
+                        }
+                        officeWork.setApprovalSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + officeWork.getApprovalSignatureUrl()));
+                    }else{
+                        officeWork.setApprovalSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + officeWork.getApprovalSignatureUrl()));
+                    }
+                }else{
+                    officeWork.setApprovalSignatureUrlFlag(0);
                 }
-            }else{
-                officeWork.setSignatureUrlFlag(0);
             }
+
         }
 
         model.addAttribute("page", page);
@@ -334,6 +354,8 @@ public class ProjectReportSignatureWorkController extends BaseController {
             projectReportSignature.setWorkAttachments(report.getWorkAttachments());
             projectReportSignature.setOffice(report.getOffice());
             projectReportSignature.setSignatureType(report.getSignatureType());
+            projectReportSignature.setLabel(report.getLabel());
+            projectReportSignature.setDutyPersonName(report.getDutyPersonName());
             if(StringUtils.isNotBlank(report.getProcessInstanceId())){
                 if(null == report.getAct() || StringUtils.isBlank(report.getAct().getProcInsId())){
                     Act act = new Act();
@@ -408,6 +430,8 @@ public class ProjectReportSignatureWorkController extends BaseController {
             projectReportSignature.setWorkAttachments(report.getWorkAttachments());
             projectReportSignature.setOffice(report.getOffice());
             projectReportSignature.setSignatureType(report.getSignatureType());
+            projectReportSignature.setLabel(report.getLabel());
+            projectReportSignature.setDutyPersonName(report.getDutyPersonName());
             if(StringUtils.isNotBlank(report.getProcessInstanceId())){
                 if(null == report.getAct() || StringUtils.isBlank(report.getAct().getProcInsId())){
                     Act act = new Act();
@@ -694,6 +718,41 @@ public class ProjectReportSignatureWorkController extends BaseController {
         }
     }
 
+    /**
+     * 删除操作
+     */
+    @RequiresPermissions("projectReport:projectReportSignature:del")
+    @RequestMapping(value = "deleteApproval")
+    public String deleteApproval(ReportSignature projectReportSignature, RedirectAttributes redirectAttributes) {
+
+        projectReportSignatureService.deleteApproval(projectReportSignature);
+        addMessage(redirectAttributes, "作废报告签章申请成功");
+        if (StringUtils.isNotBlank(projectReportSignature.getHome()) && "home".equals(projectReportSignature.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(projectReportSignature.getHome()) && "notifyList".equals(projectReportSignature.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+        }else {
+            return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+        }
+    }
+
+    /**
+     * 删除操作
+     */
+    @RequiresPermissions("projectReport:projectReportSignature:del")
+    @RequestMapping(value = "deleteReport")
+    public String deleteReport(ReportSignature projectReportSignature, RedirectAttributes redirectAttributes) {
+
+        projectReportSignatureService.deleteReport(projectReportSignature);
+        addMessage(redirectAttributes, "作废报告签章申请成功");
+        if (StringUtils.isNotBlank(projectReportSignature.getHome()) && "home".equals(projectReportSignature.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(projectReportSignature.getHome()) && "notifyList".equals(projectReportSignature.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+        }else {
+            return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+        }
+    }
 
     @RequestMapping(value = "getProcess")
     public String getProcess(ProjectReportSignatureWork projectReportSignature, Model model, HttpServletRequest request){

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/entity/ProjectReportSignatureWork.java

@@ -53,14 +53,28 @@ public class ProjectReportSignatureWork extends ActEntity<ProjectReportSignature
     private String approvalStatus; //审定单签章-状态
 
 
-    private Integer signatureReportFlag;		//是否已签章（报告）(1为已签章)
-    private String signatureReportDocumentId;		//签章documentid（报告）
-    private String signatureReportContractId;		//签章contractid（报告）
-    private String signatureReportUrl;		//签章附件url（报告）
-    private String signatureReportFileName;		//签章附件名称（报告）
-    private Integer signatureReportUrlFlag;		//签章完成值判定条件（报告）
-    private Date signatureReportUploadDate;		//签章完成时间（报告）
-    private User signatureReportUploadFileUser;		//签章文件上传人信息（报告）
+    //报告签章
+    private Integer reportSignatureFlag;		//是否已签章(1为已签章)
+    private String reportSignatureDocumentId;		//签章documentid
+    private String reportSignatureContractId;		//签章contractid
+    private String reportSignatureUrl;		//签章附件url
+    private String reportSignatureFileName;		//签章附件名称
+    private Integer reportSignatureUrlFlag;		//签章完成值判定条件
+    private Date reportSignatureUploadDate;		//签章完成时间
+    private User reportSignatureUploadFileUser;		//签章文件上传人信息
+
+    //审定单签章签章
+    private Integer approvalSignatureFlag;		//是否已签章(1为已签章)
+    private String approvalSignatureDocumentId;		//签章documentid
+    private String approvalSignatureContractId;		//签章contractid
+    private String approvalSignatureUrl;		//签章附件url
+    private String approvalSignatureFileName;		//签章附件名称
+    private Integer approvalSignatureUrlFlag;		//签章完成值判定条件
+    private Date approvalSignatureUploadDate;		//签章完成时间
+    private User approvalSignatureUploadFileUser;		//签章文件上传人信息
+
+    private String label; //签章类型label
+    private String dutyPersonName; //签章责任人名称
 
     private ProjectReportSignatureRelation reportSignatureRelation;
 
@@ -71,6 +85,22 @@ public class ProjectReportSignatureWork extends ActEntity<ProjectReportSignature
     private List<WorkClientAttachment> workAttachments = Lists.newArrayList();//签章附件
     private List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();//已签章附件
 
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDutyPersonName() {
+        return dutyPersonName;
+    }
+
+    public void setDutyPersonName(String dutyPersonName) {
+        this.dutyPersonName = dutyPersonName;
+    }
+
     public String getReportStatus() {
         return reportStatus;
     }
@@ -361,67 +391,131 @@ public class ProjectReportSignatureWork extends ActEntity<ProjectReportSignature
         this.projectName = projectName;
     }
 
-    public Integer getSignatureReportFlag() {
-        return signatureReportFlag;
+    public Integer getReportSignatureFlag() {
+        return reportSignatureFlag;
+    }
+
+    public void setReportSignatureFlag(Integer reportSignatureFlag) {
+        this.reportSignatureFlag = reportSignatureFlag;
+    }
+
+    public String getReportSignatureDocumentId() {
+        return reportSignatureDocumentId;
+    }
+
+    public void setReportSignatureDocumentId(String reportSignatureDocumentId) {
+        this.reportSignatureDocumentId = reportSignatureDocumentId;
+    }
+
+    public String getReportSignatureContractId() {
+        return reportSignatureContractId;
+    }
+
+    public void setReportSignatureContractId(String reportSignatureContractId) {
+        this.reportSignatureContractId = reportSignatureContractId;
+    }
+
+    public String getReportSignatureUrl() {
+        return reportSignatureUrl;
+    }
+
+    public void setReportSignatureUrl(String reportSignatureUrl) {
+        this.reportSignatureUrl = reportSignatureUrl;
+    }
+
+    public String getReportSignatureFileName() {
+        return reportSignatureFileName;
+    }
+
+    public void setReportSignatureFileName(String reportSignatureFileName) {
+        this.reportSignatureFileName = reportSignatureFileName;
+    }
+
+    public Integer getReportSignatureUrlFlag() {
+        return reportSignatureUrlFlag;
+    }
+
+    public void setReportSignatureUrlFlag(Integer reportSignatureUrlFlag) {
+        this.reportSignatureUrlFlag = reportSignatureUrlFlag;
+    }
+
+    public Date getReportSignatureUploadDate() {
+        return reportSignatureUploadDate;
+    }
+
+    public void setReportSignatureUploadDate(Date reportSignatureUploadDate) {
+        this.reportSignatureUploadDate = reportSignatureUploadDate;
+    }
+
+    public User getReportSignatureUploadFileUser() {
+        return reportSignatureUploadFileUser;
+    }
+
+    public void setReportSignatureUploadFileUser(User reportSignatureUploadFileUser) {
+        this.reportSignatureUploadFileUser = reportSignatureUploadFileUser;
+    }
+
+    public Integer getApprovalSignatureFlag() {
+        return approvalSignatureFlag;
     }
 
-    public void setSignatureReportFlag(Integer signatureReportFlag) {
-        this.signatureReportFlag = signatureReportFlag;
+    public void setApprovalSignatureFlag(Integer approvalSignatureFlag) {
+        this.approvalSignatureFlag = approvalSignatureFlag;
     }
 
-    public String getSignatureReportDocumentId() {
-        return signatureReportDocumentId;
+    public String getApprovalSignatureDocumentId() {
+        return approvalSignatureDocumentId;
     }
 
-    public void setSignatureReportDocumentId(String signatureReportDocumentId) {
-        this.signatureReportDocumentId = signatureReportDocumentId;
+    public void setApprovalSignatureDocumentId(String approvalSignatureDocumentId) {
+        this.approvalSignatureDocumentId = approvalSignatureDocumentId;
     }
 
-    public String getSignatureReportContractId() {
-        return signatureReportContractId;
+    public String getApprovalSignatureContractId() {
+        return approvalSignatureContractId;
     }
 
-    public void setSignatureReportContractId(String signatureReportContractId) {
-        this.signatureReportContractId = signatureReportContractId;
+    public void setApprovalSignatureContractId(String approvalSignatureContractId) {
+        this.approvalSignatureContractId = approvalSignatureContractId;
     }
 
-    public String getSignatureReportUrl() {
-        return signatureReportUrl;
+    public String getApprovalSignatureUrl() {
+        return approvalSignatureUrl;
     }
 
-    public void setSignatureReportUrl(String signatureReportUrl) {
-        this.signatureReportUrl = signatureReportUrl;
+    public void setApprovalSignatureUrl(String approvalSignatureUrl) {
+        this.approvalSignatureUrl = approvalSignatureUrl;
     }
 
-    public String getSignatureReportFileName() {
-        return signatureReportFileName;
+    public String getApprovalSignatureFileName() {
+        return approvalSignatureFileName;
     }
 
-    public void setSignatureReportFileName(String signatureReportFileName) {
-        this.signatureReportFileName = signatureReportFileName;
+    public void setApprovalSignatureFileName(String approvalSignatureFileName) {
+        this.approvalSignatureFileName = approvalSignatureFileName;
     }
 
-    public Integer getSignatureReportUrlFlag() {
-        return signatureReportUrlFlag;
+    public Integer getApprovalSignatureUrlFlag() {
+        return approvalSignatureUrlFlag;
     }
 
-    public void setSignatureReportUrlFlag(Integer signatureReportUrlFlag) {
-        this.signatureReportUrlFlag = signatureReportUrlFlag;
+    public void setApprovalSignatureUrlFlag(Integer approvalSignatureUrlFlag) {
+        this.approvalSignatureUrlFlag = approvalSignatureUrlFlag;
     }
 
-    public Date getSignatureReportUploadDate() {
-        return signatureReportUploadDate;
+    public Date getApprovalSignatureUploadDate() {
+        return approvalSignatureUploadDate;
     }
 
-    public void setSignatureReportUploadDate(Date signatureReportUploadDate) {
-        this.signatureReportUploadDate = signatureReportUploadDate;
+    public void setApprovalSignatureUploadDate(Date approvalSignatureUploadDate) {
+        this.approvalSignatureUploadDate = approvalSignatureUploadDate;
     }
 
-    public User getSignatureReportUploadFileUser() {
-        return signatureReportUploadFileUser;
+    public User getApprovalSignatureUploadFileUser() {
+        return approvalSignatureUploadFileUser;
     }
 
-    public void setSignatureReportUploadFileUser(User signatureReportUploadFileUser) {
-        this.signatureReportUploadFileUser = signatureReportUploadFileUser;
+    public void setApprovalSignatureUploadFileUser(User approvalSignatureUploadFileUser) {
+        this.approvalSignatureUploadFileUser = approvalSignatureUploadFileUser;
     }
 }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/entity/ReportSignature.java

@@ -35,11 +35,38 @@ public class ReportSignature extends ActEntity<ReportSignature> {
     private Integer signatureUrlFlag;		//签章完成值判定条件
     private Date signatureUploadDate;		//签章完成时间
     private User signatureUploadFileUser;		//签章文件上传人信息
+    private String label; //签章类型label
+    private String dutyPersonName; //负责人名称
+    private List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();//已签章附件
 
 
 
 
 
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDutyPersonName() {
+        return dutyPersonName;
+    }
+
+    public void setDutyPersonName(String dutyPersonName) {
+        this.dutyPersonName = dutyPersonName;
+    }
+
+    public List<WorkClientAttachment> getSignatureWorkAttachments() {
+        return signatureWorkAttachments;
+    }
+
+    public void setSignatureWorkAttachments(List<WorkClientAttachment> signatureWorkAttachments) {
+        this.signatureWorkAttachments = signatureWorkAttachments;
+    }
+
     public List<User> getDutyPersonList() {
         return dutyPersonList;
     }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -1410,16 +1410,6 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
     @Transactional(readOnly = false)
     public void delete(ProjectReportSignatureWork projectReportSignature) {
         super.delete(projectReportSignature);
-        //删除报告签章
-        ReportSignature reportBySigId = dao.getReportBySigId(projectReportSignature.getId());
-        if (null != reportBySigId){
-            dao.deleteReportSignature(reportBySigId.getId());
-        }
-        //删除审定单签章
-        ReportSignature approvalBySigId = dao.getApprovalBySigId(projectReportSignature.getId());
-        if (null != approvalBySigId){
-            dao.deleteApprovalSignature(approvalBySigId.getId());
-        }
     }
 
 
@@ -2647,6 +2637,12 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         ReportSignature reportSignature = dao.getReport(id);
         if (StringUtils.isBlank(reportSignature.getSignatureType())){
             reportSignature.setSignatureType("1");
+            //签章类型label
+            String dictLabel = DictUtils.getDictLabel(reportSignature.getSignatureType(), "signature_type_project_report_work", "");
+            reportSignature.setLabel(dictLabel);
+            //负责人名称
+            User user = UserUtils.get(reportSignature.getDutyPerson());
+            reportSignature.setDutyPersonName(user.getName());
         }
         //根据开票id查询关联项目
         ProjectReportSignatureRelation reportSignatureRelation = dao.getProject(reportSignature.getReportSignatureRelation().getProjectId());
@@ -2683,6 +2679,12 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         ReportSignature reportSignature = dao.getApproval(id);
         if (StringUtils.isBlank(reportSignature.getSignatureType())){
             reportSignature.setSignatureType("2");
+            //签章类型label
+            String dictLabel = DictUtils.getDictLabel(reportSignature.getSignatureType(), "signature_type_project_report_work", "");
+            reportSignature.setLabel(dictLabel);
+            //负责人名称
+            User user = UserUtils.get(reportSignature.getDutyPerson());
+            reportSignature.setDutyPersonName(user.getName());
         }
         //根据开票id查询关联项目
         ProjectReportSignatureRelation reportSignatureRelation = dao.getProject(reportSignature.getReportSignatureRelation().getProjectId());
@@ -2722,4 +2724,11 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         return projectRecords;
     }
 
+    public void deleteApproval(ReportSignature projectReportSignature) {
+        dao.deleteApprovalSignature(projectReportSignature.getId());
+    }
+
+    public void deleteReport(ReportSignature projectReportSignature) {
+        dao.deleteReportSignature(projectReportSignature.getId());
+    }
 }

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

@@ -9672,26 +9672,26 @@ public class WorkProjectNotifyController extends BaseController {
 	private String disposeProjectReportSignatureWork(WorkProjectNotify workProjectNotify, Model model) {
 		ReportSignature reportSignature = projectReportSignatureService.getReport(workProjectNotify.getNotifyId());
 
-//		if (reportSignature != null && StringUtils.isNotBlank(reportSignature.getId())) {
+		if (reportSignature != null && StringUtils.isNotBlank(reportSignature.getId())) {
 
 
-//			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-//				reportSignature.setSignatureUrlFlag(1);
+			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+				reportSignature.setSignatureUrlFlag(1);
 		//处理文件路径
 		//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-				/*if(projectReportSignatureWork.getSignatureUrl().contains("/xg-qz")){
-					if(StringUtils.isNotBlank(projectReportSignatureWork.getSignatureUrl())){
-						String signatureUrl = projectReportSignatureWork.getSignatureUrl().replace("/xg-qz","");
-						projectReportSignatureWork.setSignatureUrl(signatureUrl);
+				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
+					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
+						reportSignature.setSignatureUrl(signatureUrl);
 					}
-					projectReportSignatureWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
+					reportSignature.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
 				}else{
-					projectReportSignatureWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
-				}*/
-//			}else{
-//				reportSignature.setSignatureUrlFlag(0);
-//			}
-//		}
+					reportSignature.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}
+			}else{
+				reportSignature.setSignatureUrlFlag(0);
+			}
+		}
 		//签章责任列表
 		User user = UserUtils.get(reportSignature.getCreateBy().getId());
 		List<User> dutyPersonList = projectReportSignatureService.getDutyPersonList(user);
@@ -9710,37 +9710,37 @@ public class WorkProjectNotifyController extends BaseController {
 		model.addAttribute("projectReportSignature", reportSignature);
 //
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-//			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-//			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-//				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-//
-//				//处理文件路径
-//				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-//				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
-//					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-//						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
-//						reportSignature.setSignatureUrl(signatureUrl);
-//					}
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
-//				}else{
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
-//				}
-//				User user = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
-//				signatureAttachment.setCreateBy(user);
-//				signatureAttachment.setUpdateBy(user);
-//				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
-//				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
-//				signatureAttachment.setDelFlag("0");
-//				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
-//				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
-//				signatureAttachment.setType(type);
-//				signatureWorkAttachments.add(signatureAttachment);
-//			}
-//
-//
-//			if(signatureWorkAttachments.size()>0){
-//				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
-//			}
+			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
+					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
+						reportSignature.setSignatureUrl(signatureUrl);
+					}
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}else{
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}
+				User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
+				signatureAttachment.setCreateBy(user1);
+				signatureAttachment.setUpdateBy(user1);
+				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setDelFlag("0");
+				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
+				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
+				signatureAttachment.setType(type);
+				signatureWorkAttachments.add(signatureAttachment);
+			}
+
+
+			if(signatureWorkAttachments.size()>0){
+				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+			}
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkView";
 		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			//审核模板标识
@@ -9756,65 +9756,65 @@ public class WorkProjectNotifyController extends BaseController {
 
 		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkModify";
-		}
-//			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-//			if(StringUtils.isNotBlank(projectReportSignatureWork.getSignatureUrl())){
-//				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-//
-//				//处理文件路径
-//				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-//				if(projectReportSignatureWork.getSignatureUrl().contains("/xg-qz")){
-//					if(StringUtils.isNotBlank(projectReportSignatureWork.getSignatureUrl())){
-//						String signatureUrl = projectReportSignatureWork.getSignatureUrl().replace("/xg-qz","");
-//						projectReportSignatureWork.setSignatureUrl(signatureUrl);
-//					}
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
-//				}else{
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
-//				}
-//				User user = UserUtils.get(projectReportSignatureWork.getSignatureUploadFileUser().getId());
-//				signatureAttachment.setCreateBy(user);
-//				signatureAttachment.setUpdateBy(user);
-//				signatureAttachment.setCreateDate(projectReportSignatureWork.getSignatureUploadDate());
-//				signatureAttachment.setUpdateDate(projectReportSignatureWork.getSignatureUploadDate());
-//				signatureAttachment.setDelFlag("0");
-//				signatureAttachment.setAttachmentName(projectReportSignatureWork.getSignatureFileName());
-//				String type = projectReportSignatureWork.getSignatureUrl().substring(projectReportSignatureWork.getSignatureUrl().lastIndexOf(".") + 1);
-//				signatureAttachment.setType(type);
-//				signatureWorkAttachments.add(signatureAttachment);
-//			}
-
-
-//			if(signatureWorkAttachments.size()>0){
-//				projectReportSignatureWork.setSignatureWorkAttachments(signatureWorkAttachments);
-//			}
-			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkView";
+		}else {
+			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+			if (StringUtils.isNotBlank(reportSignature.getSignatureUrl())) {
+				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+				if (reportSignature.getSignatureUrl().contains("/xg-qz")) {
+					if (StringUtils.isNotBlank(reportSignature.getSignatureUrl())) {
+						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz", "");
+						reportSignature.setSignatureUrl(signatureUrl);
+					}
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				} else {
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}
+				User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
+				signatureAttachment.setCreateBy(user1);
+				signatureAttachment.setUpdateBy(user1);
+				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setDelFlag("0");
+				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
+				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
+				signatureAttachment.setType(type);
+				signatureWorkAttachments.add(signatureAttachment);
+			}
+
 
+			if (signatureWorkAttachments.size() > 0) {
+				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+			}
+			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkView";
+		}
 	}
 
 	private String disposeProjectReportSignatureWorkApproval(WorkProjectNotify workProjectNotify, Model model) {
 		ReportSignature reportSignature = projectReportSignatureService.getApproval(workProjectNotify.getNotifyId());
 
-//		if (reportSignature != null && StringUtils.isNotBlank(reportSignature.getId())) {
+		if (reportSignature != null && StringUtils.isNotBlank(reportSignature.getId())) {
 
 
-//			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-//				reportSignature.setSignatureUrlFlag(1);
+			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+				reportSignature.setSignatureUrlFlag(1);
 		//处理文件路径
 		//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-				/*if(projectReportSignatureWork.getSignatureUrl().contains("/xg-qz")){
-					if(StringUtils.isNotBlank(projectReportSignatureWork.getSignatureUrl())){
-						String signatureUrl = projectReportSignatureWork.getSignatureUrl().replace("/xg-qz","");
-						projectReportSignatureWork.setSignatureUrl(signatureUrl);
+				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
+					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
+						reportSignature.setSignatureUrl(signatureUrl);
 					}
-					projectReportSignatureWork.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
+					reportSignature.setSignatureUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
 				}else{
-					projectReportSignatureWork.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
-				}*/
-//			}else{
-//				reportSignature.setSignatureUrlFlag(0);
-//			}
-//		}
+					reportSignature.setSignatureUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}
+			}else{
+				reportSignature.setSignatureUrlFlag(0);
+			}
+		}
 		//签章责任列表
 		User user = UserUtils.get(reportSignature.getCreateBy().getId());
 		List<User> dutyPersonList = projectReportSignatureService.getDutyPersonList(user);
@@ -9833,37 +9833,37 @@ public class WorkProjectNotifyController extends BaseController {
 		model.addAttribute("projectReportSignature", reportSignature);
 //
 		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
-//			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-//			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-//				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-//
-//				//处理文件路径
-//				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-//				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
-//					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
-//						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
-//						reportSignature.setSignatureUrl(signatureUrl);
-//					}
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
-//				}else{
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
-//				}
-//				User user = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
-//				signatureAttachment.setCreateBy(user);
-//				signatureAttachment.setUpdateBy(user);
-//				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
-//				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
-//				signatureAttachment.setDelFlag("0");
-//				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
-//				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
-//				signatureAttachment.setType(type);
-//				signatureWorkAttachments.add(signatureAttachment);
-//			}
-//
-//
-//			if(signatureWorkAttachments.size()>0){
-//				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
-//			}
+			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+			if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
+
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+				if(reportSignature.getSignatureUrl().contains("/xg-qz")){
+					if(StringUtils.isNotBlank(reportSignature.getSignatureUrl())){
+						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz","");
+						reportSignature.setSignatureUrl(signatureUrl);
+					}
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}else{
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}
+				User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
+				signatureAttachment.setCreateBy(user1);
+				signatureAttachment.setUpdateBy(user1);
+				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setDelFlag("0");
+				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
+				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
+				signatureAttachment.setType(type);
+				signatureWorkAttachments.add(signatureAttachment);
+			}
+
+
+			if(signatureWorkAttachments.size()>0){
+				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+			}
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkViewApproval";
 		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 			//审核模板标识
@@ -9879,40 +9879,40 @@ public class WorkProjectNotifyController extends BaseController {
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkAuditApproval";
 		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkModifyApproval";
-		}
-//			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
-//			if(StringUtils.isNotBlank(projectReportSignatureWork.getSignatureUrl())){
-//				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
-//
-//				//处理文件路径
-//				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
-//				if(projectReportSignatureWork.getSignatureUrl().contains("/xg-qz")){
-//					if(StringUtils.isNotBlank(projectReportSignatureWork.getSignatureUrl())){
-//						String signatureUrl = projectReportSignatureWork.getSignatureUrl().replace("/xg-qz","");
-//						projectReportSignatureWork.setSignatureUrl(signatureUrl);
-//					}
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
-//				}else{
-//					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + projectReportSignatureWork.getSignatureUrl()));
-//				}
-//				User user = UserUtils.get(projectReportSignatureWork.getSignatureUploadFileUser().getId());
-//				signatureAttachment.setCreateBy(user);
-//				signatureAttachment.setUpdateBy(user);
-//				signatureAttachment.setCreateDate(projectReportSignatureWork.getSignatureUploadDate());
-//				signatureAttachment.setUpdateDate(projectReportSignatureWork.getSignatureUploadDate());
-//				signatureAttachment.setDelFlag("0");
-//				signatureAttachment.setAttachmentName(projectReportSignatureWork.getSignatureFileName());
-//				String type = projectReportSignatureWork.getSignatureUrl().substring(projectReportSignatureWork.getSignatureUrl().lastIndexOf(".") + 1);
-//				signatureAttachment.setType(type);
-//				signatureWorkAttachments.add(signatureAttachment);
-//			}
-
-
-//			if(signatureWorkAttachments.size()>0){
-//				projectReportSignatureWork.setSignatureWorkAttachments(signatureWorkAttachments);
-//			}
-		return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkView";
+		}else {
+			List<WorkClientAttachment> signatureWorkAttachments = Lists.newArrayList();
+			if (StringUtils.isNotBlank(reportSignature.getSignatureUrl())) {
+				WorkClientAttachment signatureAttachment = new WorkClientAttachment();
 
+				//处理文件路径
+				//如果文件路径中包含 /xg-qz 则表示文件存储在签章的对应文件库中需要单独进行处理
+				if (reportSignature.getSignatureUrl().contains("/xg-qz")) {
+					if (StringUtils.isNotBlank(reportSignature.getSignatureUrl())) {
+						String signatureUrl = reportSignature.getSignatureUrl().replace("/xg-qz", "");
+						reportSignature.setSignatureUrl(signatureUrl);
+					}
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				} else {
+					signatureAttachment.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(aliyunUrl + reportSignature.getSignatureUrl()));
+				}
+				User user1 = UserUtils.get(reportSignature.getSignatureUploadFileUser().getId());
+				signatureAttachment.setCreateBy(user1);
+				signatureAttachment.setUpdateBy(user1);
+				signatureAttachment.setCreateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setUpdateDate(reportSignature.getSignatureUploadDate());
+				signatureAttachment.setDelFlag("0");
+				signatureAttachment.setAttachmentName(reportSignature.getSignatureFileName());
+				String type = reportSignature.getSignatureUrl().substring(reportSignature.getSignatureUrl().lastIndexOf(".") + 1);
+				signatureAttachment.setType(type);
+				signatureWorkAttachments.add(signatureAttachment);
+			}
+
+
+			if (signatureWorkAttachments.size() > 0) {
+				reportSignature.setSignatureWorkAttachments(signatureWorkAttachments);
+			}
+			return "modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkViewApproval";
+		}
 	}
 
 	private String workReimbursementElectronicInvoiceAudit(WorkProjectNotify workProjectNotify,Model model) {

src/main/resources/mappings/modules/projectrecord/ProjectRecordsDao.xml

@@ -1620,7 +1620,7 @@
 				</choose>
 			</if>
 
-			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL} and a.submit_money = '1'
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL} and a.submit_money = '1' and prd.status in ('5','7')
 			/*and prd.number is not null*/
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
@@ -1731,7 +1731,7 @@
 					</otherwise>
 				</choose>
 			</if>
-			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL} and a.submit_money = '1'
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL} and a.submit_money = '1' and prd.status in ('5','7')
 			/*and prd.number is not null*/
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )

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

@@ -138,15 +138,35 @@
 		rsr.status as "reportStatus",
 		rsr.process_instance_id as "reportProcInsId",
 		rsr.id as "reportId",
+		rsr.signature_contract_id as "reportSignatureContractId",
+		rsr.signature_document_id as "reportSignatureDocumentId",
+		rsr.signature_url as "reportSignatureUrl",
+		rsr.signature_url_flag as "reportSignatureUrlFlag",
+		rsr.signature_file_name as "reportSignatureFileName",
+		rsr.signature_upload_date as "reportSignatureUploadDate",
+		rsr.signature_upload_file_user as "reportSignatureUploadFileUser.id",
+		sur.name as "reportSignatureUploadFileUser.name",
+		rsr.signature_flag as "signatureFlag",
 		rsa.status as "approvalStatus",
 		rsa.process_instance_id as "approvalProcInsId",
-		rsa.id as "approvalId"
+		rsa.id as "approvalId",
+		rsa.signature_contract_id as "approvalSignatureContractId",
+		rsa.signature_document_id as "approvalSignatureDocumentId",
+		rsa.signature_url as "approvalSignatureUrl",
+		rsa.signature_url_flag as "approvalSignatureUrlFlag",
+		rsa.signature_file_name as "approvalSignatureFileName",
+		rsa.signature_upload_date as "approvalSignatureUploadDate",
+		rsa.signature_upload_file_user as "approvalSignatureUploadFileUser.id",
+		sua.name as "approvalSignatureUploadFileUser.name",
+		rsr.signature_flag as "signatureFlag"
 		FROM signature_project_report_relation a
 		<include refid="dailyOfficeWorkLeftColumns"/>
 		left join rural_project_records rpr on a.project_id = rpr.id
 		left join project_report_data prd on prd.project_id = a.project_id
 		left join report_signature_report rsr on a.id = rsr.signature_id and rsr.del_flag = '0'
+		LEFT JOIN sys_user sur ON sur.id = rsr.signature_upload_file_user
 		left join report_signature_approval rsa on a.id = rsa.signature_id and rsa.del_flag = '0'
+		LEFT JOIN sys_user sua ON sua.id = rsa.signature_upload_file_user
 		<where>
 			a.del_flag = 0
 			<if test="signatureName != null and signatureName != ''">

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

@@ -328,10 +328,12 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+<%--                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
+                        <form:input path="label" id="label" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章类型" class="form-control layui-input required"/>
+
                     </div>
                 </div>
 
@@ -348,16 +350,18 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章责任人：</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <select class="form-control judgment layui-input" disabled="disabled" id="dutyPerson" name="dutyPerson">
-                            <option value=""/>
-                            <c:forEach items="${dutyPersonList}" var="user">
-                                <option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>
-                            </c:forEach>
-                        </select>
+<%--                        <select class="form-control judgment layui-input" disabled="disabled" id="dutyPerson" name="dutyPerson">--%>
+<%--                            <option value=""/>--%>
+<%--                            <c:forEach items="${dutyPersonList}" var="user">--%>
+<%--                                <option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>--%>
+<%--                            </c:forEach>--%>
+<%--                        </select>--%>
+                        <form:input path="dutyPersonName" id="dutyPersonName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章责任人" class="form-control layui-input required"/>
+
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>签章描述：</label>
+                    <label class="layui-form-label">签章描述：</label>
                     <div class="layui-input-block">
                         <form:input path="signatureName" id="signatureName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
                     </div>

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

@@ -328,10 +328,12 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                        </form:select>
+<%--                        <form:select placeholder="请选择" path="signatureType" class="form-control judgment editable-select layui-input" id="signatureType" disabled="true"  readonly="true" value="${projectReportSignature.signatureType}">--%>
+<%--                            <form:option value=""/>--%>
+<%--                            <form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--                        </form:select>--%>
+                        <form:input path="label" id="label" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章类型" class="form-control layui-input required"/>
+
                     </div>
                 </div>
 
@@ -349,17 +351,19 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>签章责任人：</label>
                     <div class="layui-input-block readOnlyFFF">
-                        <select class="form-control judgment layui-input" disabled="disabled" id="dutyPerson" name="dutyPerson">
-                            <option value=""/>
-                            <c:forEach items="${dutyPersonList}" var="user">
-                                <option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>
-                            </c:forEach>
-                        </select>
+<%--                        <select class="form-control judgment layui-input" disabled="disabled" id="dutyPerson" name="dutyPerson">--%>
+<%--                            <option value=""/>--%>
+<%--                            <c:forEach items="${dutyPersonList}" var="user">--%>
+<%--                                <option value="${user.id}" <c:if test="${projectReportSignature.dutyPerson eq user.id }">selected</c:if>>${user.name}</option>--%>
+<%--                            </c:forEach>--%>
+<%--                        </select>--%>
+                        <form:input path="dutyPersonName" id="dutyPersonName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章责任人" class="form-control layui-input required"/>
+
                     </div>
                 </div>
 
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>签章描述：</label>
+                    <label class="layui-form-label">签章描述：</label>
                     <div class="layui-input-block">
                         <form:input path="signatureName" id="signatureName" maxlength="255" readonly="true" htmlEscape="false" placeholder="请输入签章描述" class="form-control layui-input required"/>
                     </div>