Переглянути джерело

审定单签章部分代码

user5 3 роки тому
батько
коміт
5aff972f9a

+ 122 - 11
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -80,6 +80,7 @@ import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
+import net.sf.json.JSONArray;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.IdentityService;
@@ -3866,9 +3867,21 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         List<Action> actions = Lists.newArrayList();
         Action companyAction = new Action();
         companyAction.setType("CORPORATE");
-        companyAction.setName("公司章");
+        companyAction.setName("公司章");
         companyAction.setSerialNo("1");
-        companyAction.setSealId("2893044362440138791");
+        companyAction.setSealId("2894161942659543252");
+        //添加盖章位置
+        List<Location> locations = Lists.newArrayList();
+        Location location = new Location();
+        location.setDocumentId(documentList.get(0));
+        location.setPage(0);
+        location.setRectType("SEAL_CORPORATE");
+        //location.setKeyword("咨询企业(章)");
+        location.setKeywordIndex(-1);
+        location.setOffsetX(0.7749);
+        location.setOffsetY(0.2725);
+        locations.add(location);
+        companyAction.setLocations(locations);
         actions.add(companyAction);
 
         //根据角色信息录入签署方信息
@@ -3877,13 +3890,26 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             User user = UserUtils.get(principalUserId);
             if(null != user){
                 //获取成员印章id信息
-                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"");
+                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"","");
                 if(StringUtils.isNotBlank(userSealId)){
                     Action actionUser = new Action();
                     actionUser.setType("CORPORATE");
                     actionUser.setName(user.getName() + "印章");    //填写人员信息
                     actionUser.setSerialNo("1");
                     actionUser.setSealId(userSealId);   //人员印章id
+
+                    //添加盖章位置
+                    List<Location> principalLocations = Lists.newArrayList();
+                    Location principalLocation = new Location();
+                    principalLocation.setDocumentId(documentList.get(0));
+                    principalLocation.setPage(0);
+                    principalLocation.setRectType("SEAL_CORPORATE");
+                    //principalLocation.setKeyword("项目负责人(签字盖章)");
+                    principalLocation.setKeywordIndex(-1);
+                    principalLocation.setOffsetX(0.7759);
+                    principalLocation.setOffsetY(0.1934);
+                    principalLocations.add(principalLocation);
+                    actionUser.setLocations(principalLocations);
                     actions.add(actionUser);
                 }
             }
@@ -3892,13 +3918,26 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
         if(null != technologyPrincipalUser){
             //获取成员印章id信息
-            String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"chenhongxing_yuan");
+            String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章");
             if(StringUtils.isNotBlank(userSealId)){
                 Action actionUser = new Action();
                 actionUser.setType("CORPORATE");
                 actionUser.setName(technologyPrincipalUser.getName() + "印章");    //填写人员信息
                 actionUser.setSerialNo("1");
                 actionUser.setSealId(userSealId);   //人员印章id
+
+                //添加盖章位置
+                List<Location> principalLocations = Lists.newArrayList();
+                Location principalLocation = new Location();
+                principalLocation.setDocumentId(documentList.get(0));
+                principalLocation.setPage(0);
+                principalLocation.setRectType("SEAL_CORPORATE");
+                //principalLocation.setKeyword("签发人");
+                principalLocation.setKeywordIndex(-1);
+                principalLocation.setOffsetX(0.7518);
+                principalLocation.setOffsetY(0.1642);
+                principalLocations.add(principalLocation);
+                actionUser.setLocations(principalLocations);
                 actions.add(actionUser);
             }
         }
@@ -3914,7 +3953,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatories.add(signatorieInfo1);
         SignatureContract signatureContract = new SignatureContract();
         signatureContract.setDocuments(documentList);
-        signatureContract.setCategoryId("2893044445151813683");
+        signatureContract.setCategoryId("2894155655423012945");
         signatureContract.setSend(false);
         signatureContract.setSignatories(signatories);
         signatureContract.setSn("");
@@ -3922,8 +3961,12 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
         HashMap hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
-        String contractId = hashMap.get("contractId").toString();
-        return contractId;
+        String code = hashMap.get("code").toString();
+        if("0".equals(code)){
+            String contractId = hashMap.get("contractId").toString();
+            return contractId;
+        }
+        return "";
     }
 
     /**
@@ -3937,16 +3980,84 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         map.put("contractId",contractId);
         map.put("tenantType","COMPANY");
         map.put("tenantName","江苏兴光项目管理有限公司");
-        map.put("receiverName","徐滕");
-        map.put("contact","15240492484");
+        /*map.put("receiverName","徐滕");
+        map.put("contact","15240492484");*/
         map.put("canSend","false");
         String contractIdUrl = SignaturePostUtil.doGet(map,HTTPTOP + "/contract/presignurl" );
         HashMap signUrlHashMap = JSON.parseObject(contractIdUrl, HashMap.class);
-        String signUrl = signUrlHashMap.get("presignUrl").toString();
+        String code = signUrlHashMap.get("code").toString();
+        if("0".equals(code)){
+            String signUrl = signUrlHashMap.get("presignUrl").toString();
+            return signUrl;
+        }
         /*String jsonString = JSON.toJSONString(map);
         String contractIdUrl = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/signurl", jsonString);
         HashMap signUrlHashMap = JSON.parseObject(contractIdUrl, HashMap.class);
         String signUrl = signUrlHashMap.get("signUrl").toString();*/
-        return signUrl;
+        return "";
+    }
+
+    /**
+     * 根据contractId进行静默签署
+     * @param contractId
+     * @return
+     */
+    public String signbyCompany (String contractId,List<String> invalidDocumentIdList){
+
+        //根据合同id查询坐标
+        Map map = new HashMap();
+        map.put("contractId",contractId);
+        String coordinateMapStr = SignaturePostUtil.doGet( map,HTTPTOP + "/contract/query/location");
+        HashMap hashMap = JSON.parseObject(coordinateMapStr, HashMap.class);
+        String resultStr = hashMap.get("result").toString();
+        Map  classMap = new HashMap();
+        classMap.put("locations", Location.class);
+        //2、使用JSONArray
+        JSONArray jsonArray= JSONArray.fromObject(resultStr);
+        //获得jsonArray的第一个元素
+        Object o=jsonArray.get(0);
+        net.sf.json.JSONObject jsonObject= net.sf.json.JSONObject.fromObject(o);
+        //对json数据进行实例化
+        CoordinateInfo coordinateInfo = (CoordinateInfo) net.sf.json.JSONObject.toBean(jsonObject, CoordinateInfo.class, classMap);
+        //发起合同
+        Map sendContractMap = new HashMap();
+        sendContractMap.put("contractId",contractId);
+        String sendContractJsonString = JSON.toJSONString(sendContractMap);
+        String sendContractStr = SignaturePostUtil.sendPostApplicationJson( HTTPTOP + "/contract/send",sendContractJsonString);
+        HashMap signUrlHashMap = JSON.parseObject(sendContractStr, HashMap.class);
+        String sendContractResult = signUrlHashMap.get("code").toString();
+        if("0".equals(sendContractResult)) {
+            List<Location> locations = coordinateInfo.getLocations();
+
+            SignByCompanyInfo signByCompanyInfo = new SignByCompanyInfo();
+            signByCompanyInfo.setContractId(contractId);
+            signByCompanyInfo.setTenantName("江苏兴光项目管理有限公司");
+
+            for (Location location : locations) {
+                List<Stamper> stampers = Lists.newArrayList();
+                for (String invalidDocumentId : invalidDocumentIdList) {
+                    Stamper stamper = new Stamper();
+                    stamper.setDocumentId(invalidDocumentId);
+                    stamper.setType("SEAL_CORPORATE");
+                    stamper.setSealId(location.getSealId());
+                    stamper.setPage(location.getPage());
+                    stamper.setX(location.getOffsetX());
+                    stamper.setY(location.getOffsetY());
+                    stampers.add(stamper);
+                }
+                signByCompanyInfo.setStampers(stampers);
+                //将数据转换为jsonString
+                Object obj = com.alibaba.fastjson.JSONArray.toJSON(signByCompanyInfo);
+                String signByCompanyInfoJsonStr = obj.toString();
+                //进行静默签署
+                String signByCompanyStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/signbycompany", signByCompanyInfoJsonStr);
+                HashMap signByCompanyStrMap = JSON.parseObject(signByCompanyStr, HashMap.class);
+                String signByCompanyStrResult = signByCompanyStrMap.get("code").toString();
+                if (!"0".equals(signByCompanyStrResult)) {
+                    return null;
+                }
+            }
+        }
+        return "";
     }
 }

+ 30 - 8
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.ruralprojectrecords.web;
 
+import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -1809,30 +1810,51 @@ public class RuralProjectMessageController extends BaseController {
             String fileName = srcFile.getName().substring(0,srcFile.getName().lastIndexOf("."));
             //截取文件后缀名
             String substring = srcFile.getName().substring(srcFile.getName().lastIndexOf(".")+1, srcFile.getName().length());
-            if(!"doc".equals(substring) && !"docx".equals(substring)){
-                map.put("str","请上传doc或者docx的文件进行签章操作");
+            if(!"doc".equals(substring.toLowerCase()) && !"docx".equals(substring.toLowerCase()) && !"pdf".equals(substring.toLowerCase())){
+                map.put("str","请上传doc、docx或者pdf的文件进行签章操作");
                 return map;
             }
             //获取真签单的documentId
             String documentId = SignaturePostUtil.getDocument(srcFile);
             //获取竖版假(空白)签单的documentId
-            String verticalInvalidDocumentId = SignaturePostUtil.getVerticalInvalidDocument(verticalInvalidFile.getName(),verticalInvalidFile);
+            /*String verticalInvalidDocumentId = SignaturePostUtil.getVerticalInvalidDocument(verticalInvalidFile.getName(),verticalInvalidFile);
+            if("".equals(verticalInvalidDocumentId)){
+                map.put("str","竖版模板文件创建失败");
+                return map;
+            }*/
             //获取横板假(空白)签单的documentId
             String acrossInvalidDocumentId = SignaturePostUtil.getAcrossVerticalInvalidDocument(acrossInvalidFile.getName(),acrossInvalidFile);
+            if("".equals(acrossInvalidDocumentId)){
+                map.put("str","横版模板文件创建失败");
+                return map;
+            }
             List<String> documentList = Lists.newArrayList();
             List<String> invalidDocumentList = Lists.newArrayList();
             documentList.add(documentId);
-            documentList.add(verticalInvalidDocumentId);
+            //documentList.add(verticalInvalidDocumentId);
             documentList.add(acrossInvalidDocumentId);
-            invalidDocumentList.add(verticalInvalidDocumentId);
+            //invalidDocumentList.add(verticalInvalidDocumentId);
             invalidDocumentList.add(acrossInvalidDocumentId);
             //将空白单的documentId存入数据库种
             projectReportData.setSignatureInvalidDocumentId(String.join(",", invalidDocumentList));
             //根据项目id 和 documentId生成合同id
             String contractId = ruralProjectMessageService.getSignatureContractId(projectId, documentList,principalUserId,generalManagerUserId);
+            if("".equals(contractId)){
+                map.put("str","签章文件创建失败");
+                return map;
+            }
+            //进行静默签署
+            ruralProjectMessageService.signbyCompany(contractId,documentList);
+
             //获取contractUrl路径
-            String contractUrl = ruralProjectMessageService.getSignatureContractUrl(contractId);
+            /*String contractUrl = ruralProjectMessageService.getSignatureContractUrl(contractId);
+            if("".equals(contractUrl)){
+                map.put("str","签章文件创建失败");
+                return map;
+            }*/
             //将documentId 和contractId存储到质量复核对应的数据种
+            //签章完成则进行数据的保存
+            projectReportData.setSignatureFlag(1);
             projectReportData.setSignatureDocumentId(documentId);
             projectReportData.setSignatureContractId(contractId);
             projectReportData.setSignatureFileName(fileName);
@@ -1840,8 +1862,8 @@ public class RuralProjectMessageController extends BaseController {
             projectReportData.setSignatureUploadDate(new Date());
             //修改签章对应信息文件
             projectReportDataService.updateSignatureInfo(projectReportData);
-            map.put("contractUrl",contractUrl);
-            map.put("str","正在进行签章操作,大概需要10秒。");
+            map.put("contractUrl","");
+            map.put("str","审定单签章成功");
         } catch (Exception e) {
             addMessage(redirectAttributes, "审定单签章失败!");
         }

+ 37 - 14
src/main/java/com/jeeplus/modules/tools/utils/SignaturePostUtil.java

@@ -35,9 +35,9 @@ import java.util.Map.Entry;
 public class SignaturePostUtil {
 
     //竖版模板templateId
-    private static final String VERTICALTEMPLATEID = "2893051207158391002";
+    private static final String VERTICALTEMPLATEID = "2894156236229259396";
     //横板模板templateId
-    private static final String ACROSSTEMPLATEID = "2893769317217788089";
+    private static final String ACROSSTEMPLATEID = "2894156210627227768";
     private static final String HTTPTOP = Global.getConfig("signature_http_top");
 
     private final static String apptoken = Global.getConfig("apptoken");
@@ -439,10 +439,14 @@ public class SignaturePostUtil {
         //访问方法
         String documentResult = sendPost(HTTPTOP + "/v2/document/createbyfile", requestHeaderMap, formTextsMap, files, "", "");
         HashMap hashMap = JSON.parseObject(documentResult, HashMap.class);
-        String result = hashMap.get("result").toString();
-        HashMap documentIdMap = JSON.parseObject(result, HashMap.class);
-        String documentId = documentIdMap.get("documentId").toString();
-        return documentId;
+        String code = hashMap.get("code").toString();
+        if("0".equals(code)){
+            String result = hashMap.get("result").toString();
+            HashMap documentIdMap = JSON.parseObject(result, HashMap.class);
+            String documentId = documentIdMap.get("documentId").toString();
+            return documentId;
+        }
+        return "";
     }
 
     /**
@@ -465,8 +469,12 @@ public class SignaturePostUtil {
         //访问方法
         String documentResult = sendPost(HTTPTOP + "/document/createbytemplate", requestHeaderMap, formTextsMap, files, "", "");
         HashMap hashMap = JSON.parseObject(documentResult, HashMap.class);
-        String documentId = hashMap.get("documentId").toString();
-        return documentId;
+        String code = hashMap.get("code").toString();
+        if("0".equals(code)){
+            String documentId = hashMap.get("documentId").toString();
+            return documentId;
+        }
+        return "";
     }
 
     /**
@@ -489,8 +497,12 @@ public class SignaturePostUtil {
         //访问方法
         String documentResult = sendPost(HTTPTOP + "/document/createbytemplate", requestHeaderMap, formTextsMap, files, "", "");
         HashMap hashMap = JSON.parseObject(documentResult, HashMap.class);
-        String documentId = hashMap.get("documentId").toString();
-        return documentId;
+        String code = hashMap.get("code").toString();
+        if("0".equals(code)){
+            String documentId = hashMap.get("documentId").toString();
+            return documentId;
+        }
+        return "";
     }
 
 
@@ -555,9 +567,10 @@ public class SignaturePostUtil {
      * 根据用户手机号查询用户章信息
      * @param userMobile
      * @param employeeNo 用户编号
+     * @param sealName 印章名称
      * @return
      */
-    public static String getUserSealByMobile(String userMobile,String employeeNo){
+    public static String getUserSealByMobile(String userMobile,String employeeNo,String sealName){
         //根据contractId将文件下载下来 并上传到阿里云服务种
         //添加请求头
         Map<String,String> requestHeaderMap = new HashMap<>();
@@ -577,9 +590,19 @@ public class SignaturePostUtil {
             //获取成员印章信息列表
             List <SealUserInfo> userSealList =new Gson().fromJson(resultStr, new TypeToken<List<SealUserInfo>>() {}.getType());
             if(userSealList.size()>0){
-                if(StringUtils.isNotBlank(userSealList.get(0).getId())){
-                    //返回成员第一个印章编号id
-                    return userSealList.get(0).getId();
+                //如果需要判定得印章名称不为空则进行精确印章处理
+                if(StringUtils.isNotBlank(sealName)){
+                    for (SealUserInfo userSeal: userSealList) {
+                        if(sealName.equals(userSeal.getName())){
+                            //返回成员印章编号id
+                            return userSeal.getId();
+                        }
+                    }
+                }else{
+                    if(StringUtils.isNotBlank(userSealList.get(0).getId())){
+                        //返回成员第一个印章编号id
+                        return userSealList.get(0).getId();
+                    }
                 }
             }
         }

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/downloadType/importWordApprovalForm.jsp

@@ -46,7 +46,7 @@
 					<input id="uploadFile" name="uploadFile" type="file" style="width:330px"/>导入文件不能超过5M,仅允许导入“doc”或“docx”格式文件!<br/> 
 				</div>
 				<div class="layui-item layui-col-sm12">
-					<label class="layui-form-label" style="padding-left: 0px"><span class="require-item">*</span>项目负责人:</label>
+					<label class="layui-form-label double-line" style="padding-left: 0px"><span class="require-item">*</span>项目负责人:</label>
 					<div class="layui-input-block  ">
 						<sys:reportedtreeselectUserZXY id="principalUserId" name="principalUserId" value="" labelName="principalUserName" labelValue=""
 										cssStyle="background-color: #fff" title="用户" url="/sys/office/treeDataAll?type=5" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>

+ 23 - 11
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/electronicSeal/ruralProjectMessageElectronicSealList.jsp

@@ -146,6 +146,16 @@
 				content: url,
 				btn: split,
 				btn1: function(index, layero){
+					//关闭当前页
+					top.layer.close(index)
+
+					/*parent.layer.msg('正在进行签章,大概需要5秒钟,请稍等', {
+						icon: 1,
+						time: 5000 //2秒关闭(如果不配置,默认是3秒)
+					}, function(){
+						//do something
+					});*/
+					parent.layer.msg("正在进行签章,大概需要5秒钟,请稍等",{icon:1});
 					var body = top.layer.getChildFrame('body', index);
 					var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
 					var inputForm = body.find('#inputForm');
@@ -409,24 +419,26 @@
 							//关闭当前页
 							top.layer.close(index)
 							layer.open({
-								content: "正在进行签章操作,大概需要10秒。"
+								content: d.str
 								,btn: ['确定']
 								,yes: function(index, layero){
 									//关闭所有弹出页
 									layer.closeAll();
-									setTimeout("reloadView()","10000");  //10000毫秒后执行reloadView()函数,只执行一次。
+									setTimeout("reloadView()","100");  //10000毫秒后执行reloadView()函数,只执行一次。
 								}
 								,cancel: function(){
 									//右上角关闭回调
-									setTimeout("reloadView()","10000");  //10000毫秒后执行reloadView()函数,只执行一次。
+									setTimeout("reloadView()","100");  //10000毫秒后执行reloadView()函数,只执行一次。
 								}
 							});
 						}else{
 							//输出提示信息
 							if(d.str.length>0){
-								parent.layer.msg(d.str,{icon:0});
+								parent.layer.msg(d.str,{icon:1});
 								//关闭当前页
 								top.layer.close(index)
+								//回调
+								setTimeout("reloadView()","100");  //10000毫秒后执行reloadView()函数,只执行一次。
 							}
 						}
 					}
@@ -434,6 +446,10 @@
 			}
 		}
 
+		function reloadView(){
+			window.location.reload();
+		}
+
 		//打开对话框(查看)
 		function openDialogReportView(title,url,id,width,height){
 
@@ -698,7 +714,7 @@
 			})
 		}
 	</script>
-	<style>
+	<%--<style>
 		body{
 			background-color:transparent;
 			filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#26FFFFFF, endColorstr=#26FFFFFF);
@@ -706,7 +722,7 @@
 			background-color:rgba(255,255,255,0);
 			height:100%;
 		}
-	</style>
+	</style>--%>
 </head>
 <body>
 <div class="wrapper wrapper-content">
@@ -951,13 +967,9 @@
 				,{field: 'projId',align:'center', title: '项目编号/项目定义号',width:160}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:200,templet:function(d){
 						var xml="";
-						<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
 						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
-						</shiro:hasPermission>
 						xml+=d.projName
-						<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
 						xml+="</a>";
-						</shiro:hasPermission>
 						return xml;
 						<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralCostProjectRecords/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
@@ -1055,7 +1067,7 @@
 							//上传审定单进行签章
 							<shiro:hasPermission name="ruralProject:ruralProjectMessage:importApprovalFile">
 								if(d.signatureFlag != "1"){
-									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreByImportFile('上传审定单签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportApprovalWord?id=" + d.id + "&visitType=1','500px', '400px','','导入,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传审定单签章</a>";
+									xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogreByImportFile('上传审定单签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportApprovalWord?id=" + d.id + "&visitType=1','500px', '300px','','导入,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传审定单签章</a>";
 								}
 							</shiro:hasPermission>
 							<%--<shiro:hasPermission name="ruralProject:ruralProjectMessage:importReportFile">

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -343,7 +343,7 @@
 						<c:if test="${projectRecords.operateFlag == 1}">
 							<c:if test="${projectReportData.signatureFlag != 1}">
 								<shiro:hasPermission name="ruralProject:ruralProjectMessage:importApprovalFile">
-									<div style="float: right;margin:0px 0px 0px 5px;"> <a href="javascript:void(0)" style='background-color: #009FFA' onclick="openDialogreByImportFile('审定单签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportApprovalWord?id=${projectRecords.id}&visitType=0','500px', '400px','','导入,关闭')" class="layui-btn layui-btn-sm" > 审定单签章</a></div>
+									<div style="float: right;margin:0px 0px 0px 5px;"> <a href="javascript:void(0)" style='background-color: #009FFA' onclick="openDialogreByImportFile('审定单签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportApprovalWord?id=${projectRecords.id}&visitType=0','500px', '300px','','导入,关闭')" class="layui-btn layui-btn-sm" > 审定单签章</a></div>
 								</shiro:hasPermission>
 							</c:if>
 						</c:if>