付款单模板，导入下载word文件图片高度为0的bug

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java

@@ -428,7 +428,6 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
                 Object name = o.get("name");
                 if (i==0){
                     payEnclosureStr.append(name);
-                    payEnclosureStr.append("<br/>"+name);
                 }else {
                     payEnclosureStr.append("<br/>"+name);
                 }

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -583,6 +583,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
                             Section sectionn = document.getLastSection();
                             PageSetup pageSetup = sectionn.getPageSetup();
+
 //获取页面宽度
                             float pageWidth = (float)pageSetup.getPageSize().getWidth();
 //获取左右页边距宽度
@@ -593,7 +594,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
 //设置图片大小代码
 
-                            picture.setWidth(width );
+
                             Integer     height = 0;
                             Integer    widthh = 0;
                             if (map1.get("width") != null) {
@@ -603,7 +604,15 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                            height = Integer.valueOf(String.valueOf(map1.get("height")));
                             }
 
-                            picture.setHeight(widthh!=0?width*(height/widthh):0);
+
+                            if (widthh!=0){
+                                float i2 =(float) height / widthh;
+                                picture.setHeight(width*i2);
+                                picture.setWidth(width);
+                            }else {
+                                picture.setHeight(0);
+                                picture.setWidth(0);
+                            }
 
 
 //                            picture.setWidth(picWidth==0?500:picWidth);
@@ -1361,8 +1370,6 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
     @Override
     public void getVehicle(List<HashMap<String, Object>> vehicleInfo, String templateFilePath,String settlements) throws Exception {
-//        BufferedInputStream input = null;
-//        BufferedOutputStream out = null;
         if (vehicleInfo != null && vehicleInfo.size() > 0) {
             for (int i = 0; i < vehicleInfo.size(); i++) {
                 HashMap<String, Object> map = vehicleInfo.get(i);
@@ -1382,18 +1389,8 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
                             if (!parentFile.exists()) {
                                 parentFile.mkdirs();
                             }
-//                               log.warn(templateFilePath+s1+"\\"+"vehicle\\"+ UUID.randomUUID().toString().replaceAll("-", "")+".png");
-//
                             FileCopy.copyFile(vehicleImg, templateFilePath + "车辆信息照片"+settlements+"吨\\" + s1 + "\\");
-//                                   input = new BufferedInputStream(new FileInputStream(vehicleImg));
-//                                   out = new BufferedOutputStream(new FileOutputStream(outImg));
-//                                   byte[] bys = new byte[1024];
-//                                   int len = 0;
-//                                   while ((len = input.read(bys)) != -1)
-//                                   {
-//                                       out.write(bys, 0, len);
-//                                   }
-//
+
                         }
                     }
                 }