代码提交

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

@@ -64,7 +64,7 @@ public class ProjectReportSignatureCallBackController extends BaseController {
         String[] documentIds = presignCallBack.getDocumentId().split(",");
 
         //根据contractId查询对应的报告信息
-        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByDocumentReportId(documentIds[0]);
+        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByDocumentApprovalId(documentIds[0]);
 
         if(5 == projectReportSignatureWork.getStatus()){
             return null;
@@ -117,7 +117,7 @@ public class ProjectReportSignatureCallBackController extends BaseController {
     public String getApprovalSignatureWorkCallBackAccomplish(PresignCallBack presignCallBack, HttpServletResponse response) {
 
         //根据contractId查询对应的报告信息
-        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByContractReportId(presignCallBack.getContractId());
+        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByContractApprovalId(presignCallBack.getContractId());
         if(5 == projectReportSignatureWork.getStatus()){
             return null;
         }
@@ -151,7 +151,7 @@ public class ProjectReportSignatureCallBackController extends BaseController {
         String[] documentIds = presignCallBack.getDocumentId().split(",");
 
         //根据contractId查询对应的报告信息
-        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByDocumentApprovalId(documentIds[0]);
+        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByDocumentReportId(documentIds[0]);
 
         if(5 == projectReportSignatureWork.getStatus()){
             return null;
@@ -204,7 +204,7 @@ public class ProjectReportSignatureCallBackController extends BaseController {
     public String getReportSignatureWorkCallBackAccomplish(PresignCallBack presignCallBack, HttpServletResponse response) {
 
         //根据contractId查询对应的报告信息
-        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByContractApprovalId(presignCallBack.getContractId());
+        ReportSignature projectReportSignatureWork = projectReportSignatureService.getByContractReportId(presignCallBack.getContractId());
         if(5 == projectReportSignatureWork.getStatus()){
             return null;
         }

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

@@ -503,16 +503,21 @@ public class ProjectReportSignatureWorkController extends BaseController {
             if (!projectReportSignature.getIsNewRecord()) {//编辑表单保存
                 ProjectReportSignatureWork t = projectReportSignatureService.get(projectReportSignature.getId());//从数据库取出记录的值
                 ReportSignature approvalBySigId = projectReportSignatureService.getReportBySigId(t.getId());
-                if(approvalBySigId.getStatus() == 2){
-                    addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
-                    return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                }else if(approvalBySigId.getStatus() == 5){
-                    addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
-                    return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                if(null == approvalBySigId){
+                    projectReportSignature.setStatus(1);
+                    str = projectReportSignatureService.saveInfo(projectReportSignature);//保存
+                }else{
+                    if(approvalBySigId.getStatus() == 2){
+                        addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
+                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                    }else if(approvalBySigId.getStatus() == 5){
+                        addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
+                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                    }
+                    MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+                    t.setStatus(1);
+                    str = projectReportSignatureService.saveInfo(t);//保存
                 }
-                MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-                t.setStatus(1);
-                str = projectReportSignatureService.saveInfo(t);//保存
             } else {//新增表单保存
                 projectReportSignature.setStatus(1);
                 str = projectReportSignatureService.saveInfo(projectReportSignature);//保存
@@ -537,29 +542,34 @@ public class ProjectReportSignatureWorkController extends BaseController {
             if (!projectReportSignature.getIsNewRecord()) {//编辑表单保存
                 ProjectReportSignatureWork t = projectReportSignatureService.get(projectReportSignature.getId());//从数据库取出记录的值
                 ReportSignature approvalBySigId = projectReportSignatureService.getApprovalBySigId(t.getId());
-                if (StringUtils.isBlank(projectReportSignature.getSignatureType())){
-                    addMessage(redirectAttributes, "签章类型未选择,无法保存");
-                    return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                }
+                if(null == approvalBySigId){
+                    projectReportSignature.setStatus(1);
+                    projectReportSignatureService.saveApprovalInfo(projectReportSignature);//保存
+                } else{
+                    if (StringUtils.isBlank(projectReportSignature.getSignatureType())){
+                        addMessage(redirectAttributes, "签章类型未选择,无法保存");
+                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                    }
 
-                if(approvalBySigId.getStatus() == 2){
-                    addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
-                    return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                }else if(approvalBySigId.getStatus() == 5){
-                    addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
-                    return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                    if(approvalBySigId.getStatus() == 2){
+                        addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
+                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                    }else if(approvalBySigId.getStatus() == 5){
+                        addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
+                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                    }
+                    MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+                    t.setStatus(1);
+                    projectReportSignatureService.saveApprovalInfo(t);//保存
                 }
-                MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-                t.setStatus(1);
-                projectReportSignatureService.saveApprovalInfo(t);//保存
             } else {//新增表单保存
                 projectReportSignature.setStatus(1);
                 projectReportSignatureService.saveApprovalInfo(projectReportSignature);//保存
             }
-            addMessage(redirectAttributes, "保存报告签章申请成功");
+            addMessage(redirectAttributes, "保存审定单签章申请成功");
         }catch (Exception e){
-            logger.error("保存报告签章申请异常：",e);
-            addMessage(redirectAttributes, "保存报告签章申请异常:"+e.getMessage());
+            logger.error("保存审定单签章申请异常：",e);
+            addMessage(redirectAttributes, "保存审定单签章申请异常:"+e.getMessage());
         }
         return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
     }
@@ -578,18 +588,22 @@ public class ProjectReportSignatureWorkController extends BaseController {
             if (!projectReportSignature.getIsNewRecord()) {//编辑表单保存
                 ProjectReportSignatureWork t = projectReportSignatureService.get(projectReportSignature.getId());//从数据库取出记录的值
                 ReportSignature reportBySigId = projectReportSignatureService.getReportBySigId(t.getId());
-                if (null != reportBySigId){
-                    if(reportBySigId.getStatus() == 2){
-                        addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
-                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                    }else if(reportBySigId.getStatus() == 5){
-                        addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
-                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                if(null == reportBySigId){
+                    str = projectReportSignatureService.save(projectReportSignature, ProjectStatusEnum.SIGNED);//保存
+                }else{
+                    if (null != reportBySigId){
+                        if(reportBySigId.getStatus() == 2){
+                            addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
+                            return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                        }else if(reportBySigId.getStatus() == 5){
+                            addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
+                            return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                        }
                     }
+                    t.setSignatureType("1");
+                    MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+                    str = projectReportSignatureService.save(t, ProjectStatusEnum.SIGNED);//保存
                 }
-                t.setSignatureType("1");
-                MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-                str = projectReportSignatureService.save(t, ProjectStatusEnum.SIGNED);//保存
             } else {//新增表单保存
                 str = projectReportSignatureService.save(projectReportSignature, ProjectStatusEnum.SIGNED);//保存
             }
@@ -616,19 +630,23 @@ public class ProjectReportSignatureWorkController extends BaseController {
             if (!projectReportSignature.getIsNewRecord()) {//编辑表单保存
                 ProjectReportSignatureWork t = projectReportSignatureService.get(projectReportSignature.getId());//从数据库取出记录的值
                 ReportSignature approvalBySigId = projectReportSignatureService.getApprovalBySigId(t.getId());
-                if (null != approvalBySigId){
-                    if(approvalBySigId.getStatus() == 2){
-                        addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
-                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                    }else if(approvalBySigId.getStatus() == 5){
-                        addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
-                        return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-                    }
+                if(null == approvalBySigId){
+                    str = projectReportSignatureService.saveApproval(projectReportSignature, ProjectStatusEnum.SIGNED);//保存
+                }else{
+                    if (null != approvalBySigId){
+                        if(approvalBySigId.getStatus() == 2){
+                            addMessage(redirectAttributes, "报告签章申请已送审，无法重复送审");
+                            return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                        }else if(approvalBySigId.getStatus() == 5){
+                            addMessage(redirectAttributes, "报告签章申请已审核完成，无法再次送审");
+                            return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
+                        }
 
+                    }
+                    t.setSignatureType("2");
+                    MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+                    str = projectReportSignatureService.saveApproval(t, ProjectStatusEnum.SIGNED);//保存
                 }
-                t.setSignatureType("2");
-                MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-                str = projectReportSignatureService.saveApproval(t, ProjectStatusEnum.SIGNED);//保存
             } else {//新增表单保存
                 str = projectReportSignatureService.saveApproval(projectReportSignature, ProjectStatusEnum.SIGNED);//保存
             }

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

@@ -311,7 +311,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
 
         //处理需要签章的报告信息
         //this.disposeProjectReportRelevance(projectReportSignature);
-        return null;
+        return "保存报告签章申请成功";
     }
 
     @Transactional(readOnly = false)

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

@@ -397,7 +397,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签章申请', '${ctx}/projectReport/projectReportSignature/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
                         }
 
                         if(d.canedit2 != undefined && d.canedit2 =="1")
@@ -406,7 +406,7 @@
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {