Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java
#	src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

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

@@ -820,7 +820,7 @@ public class ProjectReportSignatureWorkController extends BaseController {
     public String deleteApproval(ReportSignature projectReportSignature, RedirectAttributes redirectAttributes) {
 
         projectReportSignatureService.deleteApproval(projectReportSignature);
-        addMessage(redirectAttributes, "作废报告签章申请成功");
+        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())){
@@ -838,7 +838,7 @@ public class ProjectReportSignatureWorkController extends BaseController {
     public String deleteReport(ReportSignature projectReportSignature, RedirectAttributes redirectAttributes) {
 
         projectReportSignatureService.deleteReport(projectReportSignature);
-        addMessage(redirectAttributes, "作废报告签章申请成功");
+        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())){

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/dao/ProjectReportSignatureWorkDao.java

@@ -88,6 +88,20 @@ public interface ProjectReportSignatureWorkDao extends CrudDao<ProjectReportSign
     Integer updateReportSignatureInfo(ReportSignature projectReportSignature);
 
     /**
+     * 修改签章信息
+     * @param projectReportSignature
+     * @return
+     */
+    Integer updateApprovalSignatureDocumentContract(ReportSignature projectReportSignature);
+
+    /**
+     * 修改签章信息
+     * @param projectReportSignature
+     * @return
+     */
+    Integer updateReportSignatureDocumentContract(ReportSignature projectReportSignature);
+
+    /**
      * 删除关联报告信息
      * @param id
      * @return

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

@@ -1155,13 +1155,13 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                 signature.setSignatureDocumentId(documents);
                 signature.setSignatureContractId(contractId);
                 //修改签章对应信息文件
-                dao.updateApprovalSignatureInfo(signature);
+                dao.updateApprovalSignatureDocumentContract(signature);
             }else{
                 //修改信息中对应的签章contractId（报告）
                 signature.setSignatureDocumentId(documents);
                 signature.setSignatureContractId(contractId);
                 //修改签章对应信息文件
-                dao.updateReportSignatureInfo(signature);
+                dao.updateReportSignatureDocumentContract(signature);
             }
 
 
@@ -2764,10 +2764,12 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         Integer projectRecords=dao.checkProject(id);
         return projectRecords;
     }
+
     @Transactional(readOnly = false)
     public void deleteApproval(ReportSignature projectReportSignature) {
         dao.deleteApprovalSignature(projectReportSignature.getId());
     }
+
     @Transactional(readOnly = false)
     public void deleteReport(ReportSignature projectReportSignature) {
         dao.deleteReportSignature(projectReportSignature.getId());

src/main/resources/jeeplus.properties

@@ -328,6 +328,8 @@ reportedUrl = https://comp.jszj.com.cn:8031/api/addProject
 #signature_daily_office_work = 3198093533650456821
 ##报告签章流程id
 #signature_project_report_work = 3198093569524338954
+##审定单签章流程id
+#signature_project_approval_work = 3245294605355073778
 
 #192.168.2.6签章测试参数
 apptoken = uIJQmTwyGJ

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

@@ -476,6 +476,64 @@
 		<if test="signatureDocumentId != null and signatureDocumentId != ''">
 			signature_document_id = #{signatureDocumentId}
 		</if>
+		<if test="signatureUrl != null">
+			,signature_url = #{signatureUrl}
+		</if>
+		<if test="signatureUrlFlag != null">
+			,signature_url_flag = #{signatureUrlFlag}
+		</if>
+		<if test="signatureContractId != null and signatureContractId != ''">
+			,signature_contract_id = #{signatureContractId}
+		</if>
+		<if test="signatureFlag != null">
+			,signature_flag = #{signatureFlag}
+		</if>
+		<if test="signatureFileName != null and signatureFileName != ''">
+			,signature_file_name = #{signatureFileName}
+		</if>
+		<if test="signatureUploadFileUser != null and signatureUploadFileUser.id != null and signatureUploadFileUser.id != ''">
+			,signature_upload_file_user = #{signatureUploadFileUser.id}
+		</if>
+		<if test="signatureUploadDate != null">
+			,signature_upload_date = #{signatureUploadDate}
+		</if>
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateReportSignatureInfo" >
+		UPDATE report_signature_report SET
+		<if test="signatureDocumentId != null and signatureDocumentId != ''">
+			signature_document_id = #{signatureDocumentId}
+		</if>
+		<if test="signatureUrl != null">
+			,signature_url = #{signatureUrl}
+		</if>
+		<if test="signatureUrlFlag != null">
+			,signature_url_flag = #{signatureUrlFlag}
+		</if>
+		<if test="signatureContractId != null and signatureContractId != ''">
+			,signature_contract_id = #{signatureContractId}
+		</if>
+		<if test="signatureFlag != null">
+			,signature_flag = #{signatureFlag}
+		</if>
+		<if test="signatureFileName != null and signatureFileName != ''">
+			,signature_file_name = #{signatureFileName}
+		</if>
+		<if test="signatureUploadFileUser != null and signatureUploadFileUser.id != null and signatureUploadFileUser.id != ''">
+			,signature_upload_file_user = #{signatureUploadFileUser.id}
+		</if>
+		<if test="signatureUploadDate != null">
+			,signature_upload_date = #{signatureUploadDate}
+		</if>
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateApprovalSignatureDocumentContract" >
+		UPDATE report_signature_approval SET
+		<if test="signatureDocumentId != null and signatureDocumentId != ''">
+			signature_document_id = #{signatureDocumentId}
+		</if>
 		,signature_url = ''
 		,signature_url_flag = 0
 		,signature_flag = 0
@@ -488,7 +546,8 @@
 		WHERE id = #{id}
 	</update>
 
-	<update id="updateReportSignatureInfo" >
+
+	<update id="updateReportSignatureDocumentContract" >
 		UPDATE report_signature_report SET
 		<if test="signatureDocumentId != null and signatureDocumentId != ''">
 			signature_document_id = #{signatureDocumentId}

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?16" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?17" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->

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

@@ -415,15 +415,15 @@
                             <label class="layui-form-label">创建时间：</label>
                             <div class="layui-input-block readOnlyFFF">
                                 <input id="beginDate" name="beginDate" placeholder="开始时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-                                       value="<fmt:formatDate value="${projectReportSignature.beginDate}" pattern="yyyy-MM-dd"/>"/>
+                                       value="<fmt:formatDate value="${projectReportSignatureWork.beginDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
                                 <span class="group-sep">-</span>
                                 <input id="endDate" name="endDate" placeholder="结束时间" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
-                                       value="<fmt:formatDate value="${projectReportSignature.endDate}" pattern="yyyy-MM-dd"/>"/>
+                                       value="<fmt:formatDate value="${projectReportSignatureWork.endDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
                             </div>
                         </div>
-                        <div class="layui-item query athird ">
+                        <%--<div class="layui-item query athird ">
                             <label class="layui-form-label">状态：</label>
                             <div class="layui-input-block">
                                 <form:select path="status" class=" form-control  simple-select">
@@ -431,7 +431,7 @@
                                     <form:options items="${fns:getRuralDictList('rural_project_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                                 </form:select>
                             </div>
-                        </div>
+                        </div>--%>
                         <div style="clear:both;"></div>
                     </div>
                 </form:form>
@@ -527,11 +527,11 @@
                         return xml;                    }}
                 ,{field:'reportDataNum',align:'center', title: '报告号',  width:200}
                 ,{field:'submitMoney',align:'center', title: '项目等级',  width:120}
-                ,{field:'createName', align:'center',title: '签章人', width:100,templet:function(d){
+                ,{field:'createName', align:'center',title: '创建人', width:100,templet:function(d){
                         return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:100}
-                ,{align:'center', title: '审定单签章状态',  width:100,templet:function(d){
+                ,{align:'center', title: '审定单状态',  width:100,templet:function(d){
                         var st = getSignatureState(d.approvalStatus);
                         if(st.action)
                             var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getApprovalProcess?approvalId=" + d.approvalId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -539,7 +539,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{align:'center', title: '报告签章状态',  width:100,templet:function(d){
+                ,{align:'center', title: '报告状态',  width:100,templet:function(d){
                         var st = getSignatureState(d.reportStatus);
                         if(st.action)
                             var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/projectReport/projectReportSignature/getProcess?reportId=" + d.reportId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";

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

@@ -528,7 +528,7 @@
                 <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" id="dutyPerson" name="dutyPerson">
+                        <select class="form-control judgment layui-input" 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>

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

@@ -215,6 +215,7 @@
 </head>
 <body>
 <div class="single-form">
+    <div class="container view-form" style="margin-top: 50px;">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectReportSignature" action="${ctx}/projectReport/projectReportSignature/view" method="post" class="form-horizontal layui-form ">
             <form:hidden path="id"/>
@@ -768,5 +769,6 @@
         </form:form>
 
 </div>
+</div>
 </body>
 </html>

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

@@ -215,6 +215,7 @@
 </head>
 <body>
 <div class="single-form">
+    <div class="container view-form" style="margin-top: 50px;">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectReportSignature" action="${ctx}/projectReport/projectReportSignature/view" method="post" class="form-horizontal layui-form ">
             <form:hidden path="id"/>
@@ -767,6 +768,7 @@
             <div class="form-group layui-row page-end"></div>
         </form:form>
 
+    </div>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/sys/sysLogin.jsp

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?16" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?17" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

src/main/webapp/webpage/modules/sys/sysLogin2.jsp

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?16" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?17" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />