Merge remote-tracking branch 'origin/master'

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

@@ -140,4 +140,9 @@ public interface ProjectReportSignatureWorkDao extends CrudDao<ProjectReportSign
     ReportSignature getApproval(String id);
 
     Integer checkProject(String id);
+
+    //修改报告签章信息(签章参数)
+    void updateReportSignatureSignature(ReportSignature signature);
+    //修改审定单签章信息(签章参数)
+    void updateApprovalSignatureSignature(ReportSignature signature);
 }

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

@@ -981,6 +981,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
      * @param dailyOfficeWorkId
      * @return
      */
+    @Transactional(readOnly = false)
     public HashMap<String, Object> getManualSignatureUrl( String dailyOfficeWorkId, ReportSignature signature) {
         HashMap<String, Object> map = Maps.newHashMap();
         map.put("contractUrl","");
@@ -1026,10 +1027,12 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                     if (StringUtils.isBlank(workattachment.getUrl())) {
                         map.put("str", "签章文件存储路径为空，无法进行签章操作，请驳回后重新上传盖章文件");
                         map.put("success", false);
+                        return map;
                     } else {
                         if (StringUtils.isBlank(workattachment.getUrl())) {
                             map.put("str", "签章文件存储路径为空，无法进行签章操作，请驳回后重新上传盖章文件");
                             map.put("success", false);
+                            return map;
                         } else {
                             //下载签章申请文件
                             String path = null;
@@ -1062,6 +1065,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                             if (!"doc".equals(substring.toLowerCase()) && !"docx".equals(substring.toLowerCase()) && !"pdf".equals(substring.toLowerCase())) {
                                 map.put("str", "请上传doc、docx或者pdf的文件进行签章操作");
                                 map.put("success", false);
+                                return map;
                             } else {
 
                                 //获取真签单的documentId
@@ -1328,6 +1332,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             reportSignature.setStatus(3);
             reportSignature.preUpdate();
             dao.updateReportSignature(reportSignature);
+            dao.updateReportSignatureSignature(reportSignature);
 
         }catch (ActivitiObjectNotFoundException e){
             System.err.println("签章申请撤销异常，因为这个流程已不存在!");
@@ -1391,6 +1396,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
             reportSignature.setStatus(3);
             reportSignature.preUpdate();
             dao.updateApprovalSignature(reportSignature);
+            dao.updateApprovalSignatureSignature(reportSignature);
 
         }catch (ActivitiObjectNotFoundException e){
             System.err.println("签章申请撤销异常，因为这个流程已不存在!");
@@ -1597,6 +1603,12 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass",true);
                         vars.put("passs",true);
+
+                        report.setSignatureType("2");
+                        //发起签章申请
+                        HashMap<String, Object> map = this.getManualSignatureUrl(report.getSignatureId() ,report);
+
+
                     }else{
                         workActivityProcess.setIsApproval("2");
                         projectReportSignature.setStatus(ProjectStatusEnum.RECALL.getValue());
@@ -1941,6 +1953,11 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                         vars.put("passs", false);
                         user = createUser;
                         workActivityProcess.setIsApproval("2");
+                        //修改签章数据信息
+                        dao.updateReportSignatureSignature(projectReportSignature);
+
+
+
                     }
                     break;
                 }
@@ -1972,6 +1989,10 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass",true);
                         vars.put("passs",true);
+                        approval.setSignatureType("2");
+                        //发起签章申请
+                        HashMap<String, Object> map = this.getManualSignatureUrl(approval.getSignatureId() ,approval);
+
                     }else{
                         workActivityProcess.setIsApproval("2");
                         projectReportSignature.setStatus(ProjectStatusEnum.RECALL.getValue());

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

@@ -450,27 +450,15 @@
 		<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>
+		,signature_url = ''
+		,signature_url_flag = 0
+		,signature_flag = 0
 		<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>
+		,signature_file_name = ''
+		,signature_upload_file_user = ''
+		,signature_upload_date = null
 		WHERE id = #{id}
 	</update>
 
@@ -479,27 +467,15 @@
 		<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>
+		,signature_url = ''
+		,signature_url_flag = 0
+		,signature_flag = 0
 		<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>
+		,signature_file_name = ''
+		,signature_upload_file_user = ''
+		,signature_upload_date = null
 		WHERE id = #{id}
 	</update>
 
@@ -724,7 +700,32 @@
 		<if test="company != null and company.id != null and company.id != ''">
 			,company_id = #{company.id}
 		</if>
-		,update_date = now()
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateApprovalSignatureSignature">
+		UPDATE report_signature_approval SET
+		signature_contract_id = ''
+		,signature_document_id = ''
+		,signature_url = ''
+		,signature_url_flag = 0
+		,signature_file_name = ''
+		,signature_upload_date = null
+		,signature_upload_file_user = ''
+		,signature_flag = 0
+		WHERE id = #{id}
+	</update>
+
+	<update id="updateReportSignatureSignature">
+		UPDATE report_signature_report SET
+		signature_contract_id = ''
+		,signature_document_id = ''
+		,signature_url = ''
+		,signature_url_flag = 0
+		,signature_file_name = ''
+		,signature_upload_date = null
+		,signature_upload_file_user = ''
+		,signature_flag = 0
 		WHERE id = #{id}
 	</update>
 

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

@@ -377,7 +377,7 @@
 
             })
             if (pro){
-                parent.layer.msg("项目已经存在列表中,无法添加",{icon:6});
+                parent.layer.msg("项目已经存在签章列表中,无法添加",{icon:0});
                 $.ajax({
                     async:false,
                     type:'post',
@@ -387,8 +387,8 @@
                     },
                     success:function(data){
                         var d = JSON.parse(data);
-                        $("#projectId").val('');
-                        $("#projectName").val('');
+                        $("#projectIdId").val('');
+                        $("#projectIdName").val('');
                         $("#workContractName").val('');
                         $("#projectNum").val('');
                         $("#clientName").val('');

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

@@ -513,7 +513,6 @@
                         </c:if>
                     </div>
                 </div>
-            </div>
 
 <%--                <div class="layui-item layui-col-sm6 lw7">--%>
 <%--                    <label class="layui-form-label">签章编号：</label>--%>
@@ -531,7 +530,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>
@@ -767,6 +766,7 @@
                     </table>
                 </div>
             </div>
+</div>
 
             <div class="form-group layui-row page-end"></div>
         </form:form>