Merge remote-tracking branch 'origin/master'

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -113,15 +113,17 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
                             if(productColor == null){
                                 msg = 2;
                             }
-                            signclosedProductInfo.setSignclosedId(record.getSignclosedId());
-                            signclosedProductInfo.setProductName(productColor.getProductName());
-                            signclosedProductInfo.setProductNum(salesOrderItem.getItemNum());
-                            signclosedProductInfo.setSignclosedProductType(1);
-                            signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
-                            signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
-                            signclosedProductInfo.setSignclosedCreateTime(new Date());
-                            signclosedProductInfo.setSignclosedState(2);
-                            complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                            if(salesOrderItem.getItemNum() != null && salesOrderItem.getItemNum() == 0){
+                                signclosedProductInfo.setSignclosedId(record.getSignclosedId());
+                                signclosedProductInfo.setProductName(productColor.getProductName());
+                                signclosedProductInfo.setProductNum(salesOrderItem.getItemNum());
+                                signclosedProductInfo.setSignclosedProductType(1);
+                                signclosedProductInfo.setSignclosedProductId(productColor.getColorProductId());
+                                signclosedProductInfo.setSignclosedProductColor(salesOrderItem.getItemColorId());
+                                signclosedProductInfo.setSignclosedCreateTime(new Date());
+                                signclosedProductInfo.setSignclosedState(2);
+                                complaintSignclosedProductInfoMapper.insert(signclosedProductInfo);
+                            }
                     }
                 }
             }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -33,6 +33,7 @@ import net.sf.json.JSONObject;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -3009,6 +3010,33 @@ public class AdminCustomerController {
                     row.createCell(10).setCellValue( customerStatisticalInfo.getNumberFive());
                 }
             }
+
+            HashMap<Integer,Integer> cellMap = new HashMap<>();
+            int c1 = 0;
+            //合并单元格
+            for(int i=0;i < sheet.getPhysicalNumberOfRows() -1;i++){
+                if(i >= c1){
+                    for(int j=0;j < sheet.getPhysicalNumberOfRows() -1;j++){
+                        if(j >= c1){
+                            System.out.println("---------"+sheet.getRow(j+1).getCell(0)+"-----");
+                            if(sheet.getRow(j+1).getCell(0).toString().equals("") || sheet.getRow(j+1).getCell(0) == null){
+                                cellMap.put(i,j+1);
+                                c1 = j+1;
+                            }else{
+                                c1 = j+1;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        for(Map.Entry<Integer,Integer> entry : cellMap.entrySet())
+        {
+            CellRangeAddress region = new CellRangeAddress(entry.getKey(), entry.getValue(), 0, 0);
+            sheet.addMergedRegion(region);
+        }
+            style.setAlignment(HSSFCellStyle.ALIGN_CENTER);//左右居中
+            style.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);// 上下居中
             NumberFormat numberFormat = NumberFormat.getInstance();
             numberFormat.setMaximumFractionDigits(2);
             downloadProgressInfo.setDownloadProgress("100");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -1034,7 +1034,7 @@ public class AwaitSendController {
         if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
             for (SalesOrder salesOrder : temporarySalesOrderList) {
                 List<Object> row = new ArrayList<Object>();
-                SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日");
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss");
                 row.add(salesOrder.getSalesCreateTime() == null ? null:formatter.format(salesOrder.getSalesCreateTime()));
                 row.add(salesOrder.getSalesOrderId() == null ? null:salesOrder.getSalesOrderId());
                 row.add(salesOrder.getSalesDealCode() == null ? null:salesOrder.getSalesDealCode());

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_detail.ftl

@@ -191,7 +191,7 @@
                 <td width="10"></td>
                 <th width="10">客诉处理：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.customerId??>${detectinfo.procTypeName!''}-${detectinfo.procMethodName!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">客服信息：</th>
@@ -199,7 +199,7 @@
                 <td width="10"></td>
                 <th width="10">客诉描述：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.describeHandleDesc??>${detectinfo.describeHandleDesc!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">问题回复：</th>
@@ -207,17 +207,17 @@
                 <td width="10"></td>
                 <th width="10">客服备注：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectCustomerDesc??>${detectinfo.detectCustomerDesc!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">问题描述：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionTitle??>${detectinfo.questionTitle!''}-${detectinfo.questionTitle!''}</#if>
-                <br><#if detectinfo.questionTitle??><#if detectinfo.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detectinfo.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>-->
+                <br><#if detectinfo.questionTitle??><#if detectinfo.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detectinfo.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if>
                 </span></td>
                 <td width="10"></td>
                 <th width="10"></th>
                 <td width="10" style="font-weight: normal;"></td>
-                <td width="10"></td>
+
             </tr>
             <#--<tr>
                 <th width="10">客服备注：</th>
@@ -245,11 +245,9 @@
             <thead>
             <tr>
                 <th width="10">业务员：</th>
-                <td width="10" style="font-weight: normal;"><span><#if detectinfo.salesmanAdminName??>${detectinfo.salesmanAdminName!''}</#if></span></td>
-                <td width="10"></td>
-                <th width="10"></th>
-                <td width="10" style="font-weight: normal;"><span></span></td>
-                <td width="10"></td>
+                <td width="10" style="font-weight: normal;" colspan="4"><span><#if detectinfo.salesmanAdminName??>${detectinfo.salesmanAdminName!''}</#if></span></td>
+
+
             </tr>
             <tr>
                 <th width="10">客户姓名：</th>
@@ -257,7 +255,7 @@
                 <td width="10"></td>
                 <th width="10">客户电话：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.detectTel??>${detectinfo.detectTel!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">客户问题：</th>
@@ -265,7 +263,7 @@
                 <td width="10"></td>
                 <th width="10">问题回复：</th>
                 <td width="10" style="font-weight: normal;"><span><#if detectinfo.questionProfile??>${detectinfo.questionProfile!''}</#if></span></td>
-                <td width="10"></td>
+
             </tr>
             </thead>
         </table>
@@ -300,7 +298,6 @@
                     无故障
                 </#if>
                 </span></td>
-                <td width="10"></td>
             </tr>
             <tr>
                 <th width="10">厚膜类型：</th>
@@ -324,7 +321,6 @@
                     </#if>
                 </#if>
                 </span></td>
-                <td width="10"></td>
             </tr>
             <tr>
                 <th width="10">生产月份：</th>
@@ -340,7 +336,6 @@
                     </#if>
                 </#if>
                 </span></td>
-                <td width="10"></td>
             </tr>
             <tr>
                 <th width="10">机身条码：</th>
@@ -348,7 +343,7 @@
                 <td width="10"></td>
                 <th width="10">版本号：</th>
                 <td width="10" style="font-weight: normal;"><span>${detectinfo.detectVersionNumber!''}</span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">检测现象：</th>
@@ -432,7 +427,7 @@
                 <td width="10"></td>
                 <th width="10">检测日期：</th>
                 <td width="10" style="font-weight: normal;"><span>${(detectinfo.detectDate?string("yyyy-MM-dd"))!''}</span></td>
-                <td width="10"></td>
+
             </tr>
             <tr>
                 <th width="10">备注：</th>