代码提交

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

@@ -1027,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;
@@ -1063,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
@@ -1600,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());
@@ -1982,21 +1991,7 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
                         vars.put("passs",true);
                         approval.setSignatureType("2");
                         //发起签章申请
-                        HashMap<String, Object> map = this.getManualSignatureUrl(projectReportSignature.getSignatureId() ,approval);
-                        Boolean success = (Boolean) map.get("success");
-                        //如果数据报错，则数据撤回到暂存环节
-                        if(!success){
-                            //如果发起签章不正确，则需要将已发起的流程撤回 并调整为暂存状态
-                            if (projectReportSignature.getSignatureType().equals("1")){
-                                //报告撤回
-                                this.cancelInvalidate(projectReportSignature);
-                            }else {
-                                //审定单撤回
-                                this.cancelInvalidateApproval(projectReportSignature);
-                            }
-                            String message = (String) map.get("str");
-                            return message;
-                        }
+                        HashMap<String, Object> map = this.getManualSignatureUrl(approval.getSignatureId() ,approval);
 
                     }else{
                         workActivityProcess.setIsApproval("2");

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>
 

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('');