异常报告打印，放行条打印调整

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.js

@@ -205,3 +205,7 @@ function reloadGrid() {
     dutyPersonGridManager.loadData();
 }
 
+function  printPage() {
+    Public.openPostWindow(web_app.name + '/PDFViewer/PDFViewer.do',{id: $("#id").val(),applicationType:"exceptionReport"});
+}
+

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetail.jsp

@@ -27,6 +27,13 @@
         <x:hidden name="statusId"/>
         <x:hidden name="frgdt"/>
         <div class="hg-form-cols">
+            <c:if test="${statusId==3}">
+            <div style="float: right; margin-right: 10px;" class="btn-group" id="buttonBox">
+                <button id="save" title="" type="button" onclick="printPage()" class="btn btn-gray"><i
+                        class="fa fa-save"></i>打印
+                </button>
+            </div>
+            </c:if>
             <div class="hg-form-row">
                 <x:selectC name="exceptionType" label="异常类型" labelCol="1" fieldCol="2" required="true" dictionary="exceptionType"/>
                 <x:inputC name="reportDate" label="呈报日期" labelCol="1" fieldCol="2" required="true" wrapper="date"/>

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.jsp

@@ -24,11 +24,13 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <div class="hg-form-cols">
+    <c:if test="${statusId==3}">
         <div style="float: right; margin-right: 10px;" class="btn-group" id="buttonBox">
             <button id="save" title="" type="button" onclick="printPage()" class="btn btn-gray"><i
                     class="fa fa-save"></i>打印
             </button>
         </div>
+    </c:if>
         <div class="hg-form-row">
 
             <x:hidden name="dutyDepart"/>

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/ExceptionReportApplication.java

@@ -3,6 +3,8 @@ package com.huigou.topsun.sap.exceptionReport.application;
 import com.huigou.topsun.sap.exceptionReport.domain.ExceptionReport;
 import com.huigou.topsun.sap.exceptionReport.domain.query.ExceptionReportQueryRequest;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
 import java.util.Map;
 
 /**
@@ -23,4 +25,5 @@ public interface ExceptionReportApplication {
 
     ExceptionReport saveExceptionReport(ExceptionReport exceptionReport);
 
+    ByteArrayOutputStream printInfo(HttpServletResponse response, String id);
 }

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java

@@ -4,6 +4,7 @@ import com.huigou.cache.DictUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
 import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
+import com.huigou.topsun.common.CommonUtils;
 import com.huigou.topsun.sap.exceptionReport.application.ExceptionReportApplication;
 import com.huigou.topsun.sap.exceptionReport.application.ExceptionReportDutyPersonApplication;
 import com.huigou.topsun.sap.exceptionReport.application.ExceptionReportItemApplication;
@@ -12,16 +13,24 @@ import com.huigou.topsun.sap.exceptionReport.domain.ExceptionReportDutyPerson;
 import com.huigou.topsun.sap.exceptionReport.domain.ExceptionReportItem;
 import com.huigou.topsun.sap.exceptionReport.domain.query.ExceptionReportQueryRequest;
 import com.huigou.topsun.sap.exceptionReport.repository.ExceptionReportRepository;
+import com.huigou.topsun.sap.permit.domain.SapPermit;
+import com.huigou.topsun.sap.permit.domain.SapPermitItem;
 import com.huigou.uasp.bmp.common.BizBillStatus;
 import com.huigou.uasp.bpm.FlowBroker;
 import com.huigou.util.*;
+import freemarker.template.Template;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.DelegateTask;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
+import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,7 +50,8 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
 
     @Autowired
     private ExceptionReportDutyPersonApplication exceptionReportDutyPersonApplication;
-
+    @Autowired
+    private FreeMarkerConfigurer freemarkerConfigurer;
     @Override
     public Map<String, Object> slicedExceptionReportList(ExceptionReportQueryRequest queryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "exceptionReport");
@@ -179,4 +189,65 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
         Assert.hasText(id, CommonDomainConstants.ID_NOT_BLANK);
         exceptionReportRepository.delete(id);
     }
+
+
+    public ByteArrayOutputStream printInfo(HttpServletResponse response, String id) {
+
+        ExceptionReport exceptionReport=this.exceptionReportRepository.findOne(id);
+        List<ExceptionReportItem> itemList=exceptionReportItemApplication.findByExceptionReportId(id);
+        List<ExceptionReportDutyPerson> dutyList=exceptionReportDutyPersonApplication.findByExceptionReportId(id);
+        if ("in".equals(exceptionReport.getExceptionType())){
+            exceptionReport.setExceptionType("内部");
+        } else{
+            exceptionReport.setExceptionType("外部");
+        }
+        String sql="select s.code,w.handler_name,w.handler_id,w.dept_name,w.full_id,w.HANDLED_DATE  FROM WF_PROCUNITHANDLER w left join sa_oporg s on s.id=w.HANDLER_ID";
+        sql+="  where  biz_id='"+id+"' order  by w.HANDLED_DATE desc ";
+        List<Map<String, Object>> mapList=sqlExecutorDao.queryToListMap(sql);
+        Map<String ,Object> data = new HashMap<>();
+        if  (mapList.size()>0){
+           String lastAuditPerson=mapList.get(0).get("handlerName").toString();
+            data.put("lastAuditPerson",lastAuditPerson);
+        }
+        if  (mapList.size()>1) {
+            String preLastAuditPerson = mapList.get(1).get("handlerName").toString();
+            data.put("preAuditPerson",preLastAuditPerson);
+        }
+
+        data.put("head",exceptionReport);
+        data.put("itemList",itemList);
+        data.put("dutyList",dutyList);
+
+        //Document document = null;
+        ByteArrayOutputStream byteArrayOutputStream = null;
+        try {
+            response.reset();
+            response.setHeader("Content-Type", "application/pdf-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("异常单据.pdf", "UTF-8"));
+           /* String randoms=CommonUtil.createGUID().substring(0,10);
+            File  fileDir=new File("bar");
+            if(!fileDir.exists()) {
+               fileDir.mkdirs();
+            }*/
+           /* File file = new File("bar-"+permit.getBillCode()+".png");
+            if(!file.exists()) {
+                String IMG_TYPE_PNG = "image/png";
+                data.put("barCode", CommonUtils.genBarCode128(permit.getBillCode(), IMG_TYPE_PNG, file));
+            } else {
+                data.put("barCode",file);
+            }*/
+            File  fileb = new File("baoshen.png");
+            data.put("baoshen",fileb);
+            Template template = freemarkerConfigurer.getConfiguration().getTemplate("exceptionReport.ftl");
+            byteArrayOutputStream = CommonUtils.createPDF(data,template);
+
+        }catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("PDF生成失败！");
+        } finally {
+
+        }
+        return  byteArrayOutputStream;
+    }
+
 }

topsun/src/main/java/com/huigou/topsun/sap/permit/application/impl/SapPermitApplicationImpl.java

@@ -240,8 +240,26 @@ public class SapPermitApplicationImpl extends FlowBroker implements SapPermitApp
 
         SapPermit permit=this.sapPermitRepository.findOne(id);
         List <SapPermitItem> itemList=this.sapPermitItemRepository.findBySapPermitId(id);
-
+        if (itemList.size()<10){
+            int s=itemList.size();
+            for (int u=0;u<10-s;u++) {
+                SapPermitItem item = new SapPermitItem();
+                item.setBelongings("&nbsp;");
+                itemList.add(item);
+            }
+        }
+        String sql="select s.code,w.handler_name,w.handler_id,w.dept_name,w.full_id,w.HANDLED_DATE  FROM WF_PROCUNITHANDLER w left join sa_oporg s on s.id=w.HANDLER_ID";
+        sql+="  where  biz_id='"+id+"' order  by w.HANDLED_DATE desc ";
+        List<Map<String, Object>> mapList=sqlExecutorDao.queryToListMap(sql);
         Map<String ,Object> data = new HashMap<>();
+        if  (mapList.size()>0){
+            String lastAuditPerson=mapList.get(0).get("handlerName").toString();
+            data.put("lastAuditPerson",lastAuditPerson);
+        }
+        if  (mapList.size()>1) {
+            String preLastAuditPerson = mapList.get(1).get("handlerName").toString();
+            data.put("preAuditPerson",preLastAuditPerson);
+        }
         data.put("head",permit);
         data.put("itemList",itemList);
 

topsun/src/main/java/com/huigou/topsun/syncOrg/application/impl/OrgSyncApplicationImpl.java

@@ -157,6 +157,9 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp
             mdClientSapVo.setKunnr(sapPersonVo.getCode());//员工编码
             mdClientSapVo.setNameOrg1(sapPersonVo.getName());//名称
             mdClientSapVo.setNameOrg3(sapPersonVo.getEnglishName());//英文名称
+            if (StringUtil.isBlank(sapPersonVo.getEnglishName())){
+                mdClientSapVo.setNameOrg3(sapPersonVo.getName());//
+            }
             mdClientSapVo.setBuSort1(sapPersonVo.getName());//搜索词
             mdClientSapVo.setSmtpAddr(sapPersonVo.getEmail());//邮件
             if ("0".equals(sapPersonVo.getSex())){