报告签章代码

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -1669,9 +1669,16 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         //委托单位
         if(null != workContractInfo){
             if (null != workContractInfo.getClient()) {
-                data.put("entrustUnit",workContractInfo.getClient().getName());
+                if(StringUtils.isNotBlank(workContractInfo.getClient().getName())){
+                    data.put("entrustUnit",workContractInfo.getClient().getName());
+                    data.put("entrustingParty",workContractInfo.getClient().getName());
+                }else{
+                    data.put("entrustUnit","");
+                    data.put("entrustingParty","");
+                }
             }else{
                 data.put("entrustUnit","");
+                data.put("entrustingParty","");
             }
             if (StringUtils.isNotBlank(workContractInfo.getContractNum())){
                 data.put("contractNumber",workContractInfo.getContractNum());
@@ -2108,7 +2115,6 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
         }
 
         //咨询项目委托方全称
-        data.put("entrustingParty","咨询项目委托方全称");
         data.put("querySite","ccpm.xgccpm.com");
 
         String querySite = serverDomain+"/ruralProject/ruralProjectRecords/getDownloadProjectView?id="+projectReportData.getProject().getId();

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -110,6 +110,7 @@ import java.util.*;
 public class RuralProjectMessageService extends CrudService<RuralProjectMessageDao, RuralProjectRecords> {
     private static final String HTTPTOP = Global.getConfig("signature_http_top");
     private static final String COMPANYROUNDSEALID = Global.getConfig("company_round_seal_id");
+    private static final String COMPANYROUNDSEALIDVERTICAL = Global.getConfig("company_round_seal_id_vertical");
     private static final String COMPANYPARTIESSEALID = Global.getConfig("company_parties_seal_id");
     private static final String APPROVALCATEGORYID = Global.getConfig("approval_category_id");
     private static final String REPORTCATEGORYID = Global.getConfig("report_category_id");
@@ -191,6 +192,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     private ProjectReportedTypeService projectReportedTypeService;
     @Autowired
     private ProjectEngineeringService engineeringService;
+    @Autowired
+    private RuralProjectMessageElectronicSealService ruralProjectMessageElectronicSealService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -3873,8 +3876,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         companyAction.setType("CORPORATE");
         companyAction.setName("公司印章");
         companyAction.setSerialNo("1");
-        //公司圆章
-        companyAction.setSealId(COMPANYROUNDSEALID);
+        //公司圆章-竖
+        companyAction.setSealId(COMPANYROUNDSEALIDVERTICAL);
         //添加盖章位置
         List<Location> locations = Lists.newArrayList();
         Location location = new Location();
@@ -3895,7 +3898,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             User user = UserUtils.get(principalUserId);
             if(null != user){
                 //获取成员印章id信息
-                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章");
+                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章-竖");
                 if(StringUtils.isNotBlank(userSealId)){
                     Action actionUser = new Action();
                     actionUser.setType("CORPORATE");
@@ -3923,7 +3926,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
         if(null != technologyPrincipalUser){
             //获取成员印章id信息
-            String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章");
+            String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章-竖");
             if(StringUtils.isNotBlank(userSealId)){
                 Action actionUser = new Action();
                 actionUser.setType("CORPORATE");
@@ -4139,6 +4142,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     public String getReportSignatureContractId(String projectId, List<String> documentList ,String principalUserId,String generalManagerUserId){
         //根据项目id查询项目信息
         RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectId);
+        //查询到显示信息
+        ProjectReportSignatureInfo projectReportSignatureInfo = ruralProjectMessageElectronicSealService.findProjectReportSignatureInfoByProjectId(projectId);
+
         //创建签署方信息
         List<Action> actions = Lists.newArrayList();
         Action companyAction = new Action();
@@ -4229,9 +4235,61 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     principalLocationSigns.add(principalLocationSign);
                     actionUserSign.setLocations(principalLocationSigns);
                     actions.add(actionUserSign);
+
+
+                    Action actionUserSignFirst = new Action();
+                    actionUserSignFirst.setType("CORPORATE");
+                    actionUserSignFirst.setName(user.getName() + "印章");    //填写人员信息
+                    actionUserSignFirst.setSerialNo("1");
+                    actionUserSignFirst.setSealId(userSealId);   //人员印章id
+
+                    //添加盖章位置
+                    List<Location> principalLocationSignFirsts = Lists.newArrayList();
+                    Location principalLocationSignFirst = new Location();
+                    principalLocationSignFirst.setDocumentId(documentList.get(0));
+                    //principalLocation.setPage(0);
+                    principalLocationSignFirst.setRectType("SEAL_CORPORATE");
+                    principalLocationSignFirst.setKeyword("项目负责人签名");
+                    principalLocationSignFirst.setKeywordIndex(1);
+                    /*principalLocation.setOffsetX(0.7759);
+                    principalLocation.setOffsetY(0.1934);*/
+                    principalLocationSignFirsts.add(principalLocationSignFirst);
+                    actionUserSignFirst.setLocations(principalLocationSignFirsts);
+                    actions.add(actionUserSignFirst);
                 }
             }
         }
+
+        //查询咨询员信息
+        if(null != projectReportSignatureInfo && StringUtils.isNotBlank(projectReportSignatureInfo.getConsultant())){
+            User user = UserUtils.get(projectReportSignatureInfo.getConsultant());
+            if(null != user) {
+                //获取成员印章id信息
+                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(), "", user.getName() + "一级注册造价工程师章");
+                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(2);
+                    /*principalLocation.setOffsetX(0.7759);
+                    principalLocation.setOffsetY(0.1934);*/
+                    principalLocations.add(principalLocation);
+                    actionUser.setLocations(principalLocations);
+                    actions.add(actionUser);
+                }
+            }
+        }
+
         //总经理
         User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
         if(null != technologyPrincipalUser){

src/main/resources/jeeplus.properties

@@ -299,6 +299,8 @@ vertical_templateId = 2896237810850173018
 across_templateId = 2896237585095954500
 #무鱇途覽
 company_round_seal_id = 2895593387063378002
+#무鱇途覽-紺
+company_round_seal_id_vertical = 2898042707446829376
 #무鱇렘覽
 company_parties_seal_id = 2895597212998434929
 #�땍데痰丹직넋id

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportIssueView.jsp

@@ -192,9 +192,9 @@
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label">
 					<c:if test="${projectRecords.submitMoney == 2}">
-						<shiro:hasPermission name="ruralProject:ruralProjectMessage:importReportFile">
+						<%--<shiro:hasPermission name="ruralProject:ruralProjectMessage:importReportFile">
 							<div style="float: right;margin:0px 0px 0px 5px;"> <a href="javascript:void(0)" style='background-color: #009FFA' onclick="openDialogre('报告签章', '${ctx}/ruralProject/ruralProjectMessage/skipImportReportWord?id=${projectRecords.id}&visitType=0','400px', '35%','','导入,关闭')" class="layui-btn layui-btn-sm" > 报告签章</a></div>
-						</shiro:hasPermission>
+						</shiro:hasPermission>--%>
 					</c:if>
 					<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl1?id=${projectReportData.id}"  onclick="return confirmx('确认要下载签发流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载签发流程单</a></div>
 <%--					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>--%>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -343,9 +343,9 @@
 					<c:if test="${projectRecords.submitMoney == 2}">
 						<c:if test="${projectRecords.operateFlag == 1}">
 							<c:if test="${projectReportData.signatureFlag != 1}">
-								<shiro:hasPermission name="ruralProject:ruralProjectMessage:importApprovalFile">
+								<%--<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', '300px','','导入,关闭')" class="layui-btn layui-btn-sm" > 审定单签章</a></div>
-								</shiro:hasPermission>
+								</shiro:hasPermission>--%>
 							</c:if>
 						</c:if>
 					</c:if>