报告签章调整

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

@@ -563,6 +563,7 @@ public class ProjectReportSignatureWorkController extends BaseController {
                         return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
                     }
                 }
+                t.setSignatureType("1");
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
                 str = projectReportSignatureService.save(t, ProjectStatusEnum.SIGNED);//保存
             } else {//新增表单保存
@@ -601,6 +602,7 @@ public class ProjectReportSignatureWorkController extends BaseController {
                     }
 
                 }
+                t.setSignatureType("2");
                 MyBeanUtils.copyBeanNotNull2Bean(projectReportSignature, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
                 str = projectReportSignatureService.saveApproval(t, ProjectStatusEnum.SIGNED);//保存
             } else {//新增表单保存

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

@@ -474,7 +474,6 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
 
             ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
             ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
-            ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
             //判断签章类型是否发生改变
             if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
                 //修改报告签章信息
@@ -491,13 +490,12 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
 
         }else {
             ProjectReportSignatureWork signatureWork = dao.get(projectReportSignature.getId());
-            ReportSignature reportSignature = dao.getReportBySigId(projectReportSignature.getId());
             ReportSignature approvalSignature = dao.getApprovalBySigId(projectReportSignature.getId());
             //判断签章类型是否发生改变
             if (signatureWork.getSignatureType().equals(projectReportSignature.getSignatureType())){
                 //修改报告签章信息
-                if (null != reportSignature){
-                    signature.setId(reportSignature.getId());
+                if (null != approvalSignature){
+                    signature.setId(approvalSignature.getId());
                     signature.preUpdate();
                     dao.updateApprovalSignature(signature);
                 }else {

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

@@ -320,8 +320,10 @@
 					<div class="layui-item layui-col-sm6 lw7" id="d1">
 						<label class="layui-form-label"><span class="require-item">*</span>选择项目：</label>
 						<div class="layui-input-block  with-icon">
-							<sys:gridselectSignatureProject url="${ctx}/projectReport/projectReportSignature/getProjectReportList" type="" isTotal="" id="projectId" name="reportSignatureRelation.projectId"  value="${projectReportSignature.reportSignatureRelation.projectId}"  title="选择所属项目" labelName="reportSignatureRelation.projectName"
-															cssStyle="background-color: #fff" labelValue="${projectReportSignature.reportSignatureRelation.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectSignatureProject>
+<%--							<sys:gridselectSignatureProject url="${ctx}/projectReport/projectReportSignature/getProjectReportList" type="" isTotal="" id="projectId" name="reportSignatureRelation.projectId"  value="${projectReportSignature.reportSignatureRelation.projectId}"  title="选择所属项目" labelName="reportSignatureRelation.projectName"--%>
+<%--															cssStyle="background-color: #fff" labelValue="${projectReportSignature.reportSignatureRelation.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectSignatureProject>--%>
+							<input  htmlEscape="false"  readonly="true" id="projectName"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectName}"/>
+							<input  htmlEscape="false"  readonly="true" type="hidden" id="projectId"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectId}"/>
 
 						</div>
 					</div>

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

@@ -320,8 +320,10 @@
 					<div class="layui-item layui-col-sm6 lw7" id="d1">
 						<label class="layui-form-label"><span class="require-item">*</span>选择项目：</label>
 						<div class="layui-input-block  with-icon">
-							<sys:gridselectSignatureProject url="${ctx}/projectReport/projectReportSignature/getProjectReportList" type="" isTotal="" id="projectId" name="reportSignatureRelation.projectId"  value="${projectReportSignature.reportSignatureRelation.projectId}"  title="选择所属项目" labelName="reportSignatureRelation.projectName"
-															cssStyle="background-color: #fff" labelValue="${projectReportSignature.reportSignatureRelation.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectSignatureProject>
+<%--							<sys:gridselectSignatureProject url="${ctx}/projectReport/projectReportSignature/getProjectReportList" type="" isTotal="" id="projectId" name="reportSignatureRelation.projectId"  value="${projectReportSignature.reportSignatureRelation.projectId}"  title="选择所属项目" labelName="reportSignatureRelation.projectName"--%>
+<%--															cssStyle="background-color: #fff" labelValue="${projectReportSignature.reportSignatureRelation.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName"></sys:gridselectSignatureProject>--%>
+							<input  htmlEscape="false"  readonly="true" id="projectName"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectName}"/>
+							<input  htmlEscape="false"  readonly="true" type="hidden" id="projectId"  class="form-control layui-input" value="${projectReportSignature.reportSignatureRelation.projectId}"/>
 
 						</div>
 					</div>
@@ -415,6 +417,8 @@
 							<form:option value=""/>
 							<form:options items="${fns:getMainDictList('signature_type_project_report_work')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 						</form:select>
+<%--						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectReportSignature.signatureName}"/>--%>
+
 					</div>
 				</div>