Merge branch 'master' of http://116.63.33.55/git/read_opc

# Conflicts:
#	PrintServer/src/main/java/com/jd/printserver/controller/PrintServerController.java

PrintServer/src/main/java/com/jd/printserver/utils/PrintUtils.java

@@ -158,14 +158,14 @@ public class PrintUtils {
                     try {
                         printJob.setPrintService(printService);
                     } catch (PrinterException e) {
-                        log.error("打印失败，打印机不可用，请检查");
+                        log.error("打印失败，打印机不可用，请检查。打印机名称为 {}",printParam.getPrintName());
                         return false;
                     }
                     break;
                 }
             }
             if(!isChoose){
-                log.error("打印失败，未找到打印机，请检查");
+                log.error("打印失败，未找到打印机，请检查。打印机名称为 {}",printParam.getPrintName());
                 return false;
             }
 

PrintServer/src/main/resources/static/cy-sheet/excel.js

@@ -1645,7 +1645,6 @@ var getObjType = function(obj) {
 
 var setStyleAndValue = function(cellArr, worksheet) {
 	if (!Array.isArray(cellArr)) return;
-	let status = true;
 	let address;
 	let status2 = false;
 	let stR = 0;
@@ -1667,12 +1666,9 @@ var setStyleAndValue = function(cellArr, worksheet) {
 		dbrow.height = luckysheet.getRowHeight([rowid])[rowid] * 0.9;
 		row.every(function(cell, columnid) {
 			if (!cell) return true;
-			if (status) {
-				status = false;
-				const dobCol = worksheet.getColumn(columnid + 1);
-				//设置单元格列宽除以8
-				dobCol.width = luckysheet.getColumnWidth([columnid])[columnid] / 8;
-			}
+			const dobCol = worksheet.getColumn(columnid + 1);
+			//设置单元格列宽除以8
+			dobCol.width = luckysheet.getColumnWidth([columnid])[columnid] / 8;
 			if (status2) {
 				if (columnid < address.startC || columnid > address.endC) {
 					return true;
@@ -1689,6 +1685,8 @@ var setStyleAndValue = function(cellArr, worksheet) {
 				s.forEach(function(val, num) {
 					v += val.v;
 				})
+			} else if (cell.ct && cell.ct.t == 'd') {
+				v = cell.m;
 			} else {
 				v = cell.v;
 			}