Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent into develop

# Conflicts:
#	watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintTypeInfo.java

@@ -22,6 +22,7 @@ public class ComplaintTypeInfo implements Serializable {
     private Integer complaintClassState;      //类型状态
     private Date complaintCreateTime;      //创建时间
     private Date complaintUpdateTime;      //修改时间
+    private Integer complaintType;      //与产品类型表绑定  1净水机2电动牙刷3净水花洒4软水机5果蔬机6净水龙头
 
     private Integer complaintNum;       //查询数量
 
@@ -98,4 +99,12 @@ public class ComplaintTypeInfo implements Serializable {
     public void setComplaintNum(Integer complaintNum) {
         this.complaintNum = complaintNum;
     }
+
+    public Integer getComplaintType() {
+        return complaintType;
+    }
+
+    public void setComplaintType(Integer complaintType) {
+        this.complaintType = complaintType;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintDetectInfo.java

@@ -119,7 +119,7 @@ public class ComplaintDetectInfo implements Serializable {
     private Date scrapCompletionTime;//报废完成时间
 
     private Integer state;//查询各状态条数
-    private Integer detectIsWhetherLess;//是否少件 1是 2否
+    private Integer signclosedIsWhetherLess;//是否少件 1是 2否
 
 
     public Integer getDetectId() {
@@ -738,11 +738,11 @@ public class ComplaintDetectInfo implements Serializable {
         this.state = state;
     }
 
-    public Integer getDetectIsWhetherLess() {
-        return detectIsWhetherLess;
+    public Integer getSignclosedIsWhetherLess() {
+        return signclosedIsWhetherLess;
     }
 
-    public void setDetectIsWhetherLess(Integer detectIsWhetherLess) {
-        this.detectIsWhetherLess = detectIsWhetherLess;
+    public void setSignclosedIsWhetherLess(Integer signclosedIsWhetherLess) {
+        this.signclosedIsWhetherLess = signclosedIsWhetherLess;
     }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintSignclosedInfo.java

@@ -46,6 +46,7 @@ public class ComplaintSignclosedInfo implements Serializable {
     private Integer sendbackId;//客诉寄回id
     private String signclosedLogisticsName;//物流公司名称
     private String date;//日期查询
+    private Integer signclosedIsWhetherLess;//是否少件 1是2否
 
     private Integer adminId;//登录人id
 
@@ -280,4 +281,12 @@ public class ComplaintSignclosedInfo implements Serializable {
     public void setDate(String date) {
         this.date = date;
     }
+
+    public Integer getSignclosedIsWhetherLess() {
+        return signclosedIsWhetherLess;
+    }
+
+    public void setSignclosedIsWhetherLess(Integer signclosedIsWhetherLess) {
+        this.signclosedIsWhetherLess = signclosedIsWhetherLess;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductType.java

@@ -29,6 +29,8 @@ public class ProductType implements Serializable {
 
     private Integer typeCompany;    // 所属商城
 
+    private Integer complaintType;    // 与客诉问题标绑定 1净水机2电动牙刷3净水花洒4软水机5果蔬机6净水龙头
+
     public Integer getTypeId() {
         return typeId;
     }
@@ -84,4 +86,12 @@ public class ProductType implements Serializable {
     public void setTypeCompany(Integer typeCompany) {
         this.typeCompany = typeCompany;
     }
+
+    public Integer getComplaintType() {
+        return complaintType;
+    }
+
+    public void setComplaintType(Integer complaintType) {
+        this.complaintType = complaintType;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/fm/ComplaintDetectInfoService.java

@@ -195,4 +195,16 @@ public interface ComplaintDetectInfoService {
      * @return
      */
     ComplaintAfterSalesNum getDetectCount();
+
+    /**
+     * 检测超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listMaintenanceCutNotice();
+
+    /**
+     * 维修超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listCompleteCutNotice();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintTypeInfoMapper.xml

@@ -29,6 +29,9 @@
       <if test="complaintConsultingType !=null">
         AND complaint_consulting_type = #{complaintConsultingType}
       </if>
+      <if test="complaintType !=null and complaintType != 0 ">
+        AND complaint_type = #{complaintType}
+      </if>
       AND complaint_class_state = 1
     </where>
   </select>

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

@@ -646,5 +646,15 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
         return complaintDetectInfoMapper.getDetectCount();
     }
 
+    @Override
+    public List<ComplaintDetectInfo> listMaintenanceCutNotice() {
+        return complaintDetectInfoMapper.listMaintenanceCutNotice();
+    }
+
+    @Override
+    public List<ComplaintDetectInfo> listCompleteCutNotice() {
+        return complaintDetectInfoMapper.listCompleteCutNotice();
+    }
+
 
 }

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

@@ -176,6 +176,18 @@ public interface ComplaintDetectInfoMapper {
      */
     ComplaintAfterSalesNum getDetectCount();
 
+    /**
+     * 检测超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listMaintenanceCutNotice();
+
+    /**
+     * 维修超时查询
+     * @return
+     */
+    List<ComplaintDetectInfo> listCompleteCutNotice();
+
 
     /**
      * 根据订单id查询维修状态

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -145,7 +145,8 @@
     cd.scrap_completion_time scrapCompletionTime,
     qd.describe_content describeContent,
     qd.describe_handle_desc describeHandleDesc,
-    sa.admin_name adminName
+    sa.admin_name adminName,
+    cs.signclosed_is_whetherLess signclosedIsWhetherLess
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
@@ -775,4 +776,21 @@
     tb_rst_complaint_detect
   </select>
 
+  <select id="listMaintenanceCutNotice" resultType="ComplaintDetectInfo">
+    SELECT
+        *
+    FROM
+        tb_rst_complaint_detect
+    WHERE
+        to_days(NOW( ))-to_days(maintenance_cut_time) = -1
+  </select>
+
+  <select id="listCompleteCutNotice" resultType="ComplaintDetectInfo">
+    SELECT
+        *
+    FROM
+        tb_rst_complaint_detect
+    WHERE
+        to_days(NOW( ))-to_days(complete_cut_time) = -1
+  </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -23,7 +23,7 @@
     signclosed_id, signclosed_logistics,
     signclosed_logistics_number, signclosed_send_name, signclosed_send_tel, signclosed_addr_provinces, 
     signclosed_addr_city,signclosed_addr_area, signclosed_date,signclosed_customer_id,signclosed_desc,
-    signclosed_create_time, signclosed_update_time,signclosed_customer_desc,sendback_id
+    signclosed_create_time, signclosed_update_time,signclosed_customer_desc,sendback_id,signclosed_is_whetherLess
   </sql>
   <select id="getSignclosedById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -59,6 +59,7 @@
     <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
     <result column="signclosed_customer_desc" property="signclosedCustomerDesc" jdbcType="VARCHAR" />
     <result column="sendback_id" property="sendbackId" jdbcType="INTEGER" />
+    <result column="signclosed_is_whetherLess" property="signclosedIsWhetherLess" jdbcType="INTEGER" />
     <collection property="signclosedProductInfoList" column="signclosed_id" ofType="SignclosedProductInfo" select="listSignclosedById"/>
     <collection property="signclosedImgInfoList" column="signclosed_id" ofType="ComplaintSignclosedImg" select="listSignclosedImgById"/>
   </resultMap>
@@ -129,6 +130,7 @@
     cs.signclosed_customer_desc,
     cs.signclosed_is_receiving,
     cs.sendback_id,
+    cs.signclosed_is_whetherLess,
     ap.province signclosedAddrProvincesName,
     ac.city signclosedAddrCityName,
     ad.district signclosedAddrAreaName,
@@ -174,7 +176,7 @@
       signclosed_send_name, signclosed_send_tel, 
       signclosed_addr_provinces, signclosed_addr_city, signclosed_addr_area, signclosed_date,
       signclosed_customer_id,
-      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id
+      signclosed_desc,signclosed_customer_desc,signclosed_is_receiving,signclosed_company_id,sendback_id,signclosed_is_whetherLess
       )
     values (
       #{signclosedLogistics,jdbcType=VARCHAR}, #{signclosedLogisticsNumber,jdbcType=VARCHAR},
@@ -186,7 +188,8 @@
       #{signclosedCustomerDesc,jdbcType=VARCHAR},
       #{signclosedIsReceiving,jdbcType=VARCHAR},
       #{signclosedCompanyId,jdbcType=VARCHAR},
-      #{sendbackId,jdbcType=INTEGER}
+      #{sendbackId,jdbcType=INTEGER},
+      #{signclosedIsWhetherLess,jdbcType=INTEGER}
       )
   </insert>
   <update id="updateSignclosedById" parameterType="ComplaintSignclosedInfo" >
@@ -235,7 +238,10 @@
         signclosed_is_receiving = #{signclosedIsReceiving,jdbcType=INTEGER},
       </if>
       <if test="sendbackId != null" >
-        sendback_id = #{sendbackId,jdbcType=INTEGER}
+        sendback_id = #{sendbackId,jdbcType=INTEGER},
+      </if>
+      <if test="signclosedIsWhetherLess != null" >
+        signclosed_is_whetherLess = #{signclosedIsWhetherLess,jdbcType=INTEGER}
       </if>
     </set>
       where

watero-rst-service/src/main/java/com/iamberry/rst/util/SmsConfig.java

@@ -79,8 +79,8 @@ public class SmsConfig {
     public static String CUSTOMER_RETURN="";
     public static String CUSTOMER_CONTACT="";
 
-
-
+    /* 维修即将超时通知短信 */
+    public static String DETECTION_TIMEOUT_NOTIFICATION="";
 
 
     static {
@@ -132,6 +132,7 @@ public class SmsConfig {
             CUSTOMER_EXCHANGE=pro.getProperty("CUSTOMER_EXCHANGE");
             CUSTOMER_RETURN=pro.getProperty("CUSTOMER_RETURN");
             CUSTOMER_CONTACT=pro.getProperty("CUSTOMER_CONTACT");
+            DETECTION_TIMEOUT_NOTIFICATION=pro.getProperty("DETECTION_TIMEOUT_NOTIFICATION");
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -227,7 +227,9 @@ public class AdminCustomerController {
         complaintSmallClassInfo.setComplaintId(complaintQuestionInfo.getComplaintId());
         List<ComplaintSmallClassInfo> complaintSmallClassInfoList = complaintSmallClassInfoService.listComplaintSmallClassInfo(complaintSmallClassInfo);
         //查询问题大类
+        ProductType pType = productService.getProductType(customerInfo.getCustomerId());
         ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
+        complaintTypeInfo.setComplaintType(pType.getComplaintType());
         List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(complaintTypeInfo);
 
         mv.addObject("cmRelation", cmRelation);

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

@@ -811,7 +811,7 @@ public class AdminDetectController {
             return;
         }
         String[] cells = {
-                "维修编号","产品名称","颜色","生产月份","机身条码",
+                "维修编号","产品名称","颜色","生产月份","机身条码","是否少件",
                 "退货地区","返厂日期","购买日期","客诉日期","客诉类型",
                 "客诉问题","售后原因","售后处理类型","工厂检测现象","是否翻新机",
                 "故障原因","判断结果","故障指向","原因分析",
@@ -878,12 +878,20 @@ public class AdminDetectController {
                     case 2:detectFloatType = "短";break;
                 }
             }
+            String signclosedIsWhetherLess = "";
+            if(detect.getSignclosedIsWhetherLess() != null){
+                switch (detect.getSignclosedIsWhetherLess()) {
+                    case 1:signclosedIsWhetherLess = "是";break;
+                    case 2:signclosedIsWhetherLess = "否";break;
+                }
+            }
             // 创建单元格，设置值
             row.createCell(0).setCellValue(detect.getDetectNumber()==null?"":detect.getDetectNumber());
             row.createCell(1).setCellValue(detect.getProductName()==null?"":detect.getProductName());
             row.createCell(2).setCellValue(detect.getColorName()==null?"":detect.getColorName());
             row.createCell(3).setCellValue(detect.getDetectProduction()==null?"":detect.getDetectProduction());
             row.createCell(4).setCellValue(detect.getDetectFuselageBarcode()==null?"":detect.getDetectFuselageBarcode());
+            row.createCell(5).setCellValue(signclosedIsWhetherLess);
             StringBuffer area = new StringBuffer(" ");
             if(detect.getSignclosedAddrProvincesName() == null || detect.getSignclosedAddrProvincesName().equals("")){
                 area.append("");
@@ -900,26 +908,27 @@ public class AdminDetectController {
             }else{
                 area.append("-"+detect.getSignclosedAddrCityName());
             }
-            row.createCell(5).setCellValue(area.toString());
+            row.createCell(6).setCellValue(area.toString());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             if(detect.getSignclosedDate()==null){
-                row.createCell(6).setCellValue( "");
+                row.createCell(7).setCellValue( "");
             }else{
-                row.createCell(6).setCellValue(sdf.format(detect.getSignclosedDate()));
+                row.createCell(7).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
             if(detect.getSalesTime()==null){
-                row.createCell(7).setCellValue("");
+                row.createCell(8).setCellValue("");
             }else{
-                row.createCell(7).setCellValue(sdf.format(detect.getSalesTime()));
+                row.createCell(8).setCellValue(sdf.format(detect.getSalesTime()));
             }
             if(detect.getCustomerCreateTime()==null){
-                row.createCell(8).setCellValue("");
+                row.createCell(9).setCellValue("");
             }else{
-                row.createCell(8).setCellValue(sdf.format(detect.getCustomerCreateTime()));
+                row.createCell(9).setCellValue(sdf.format(detect.getCustomerCreateTime()));
             }
 
-            row.createCell(9).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
-            row.createCell(10).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
+            row.createCell(10).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());
+            row.createCell(11).setCellValue(detect.getQuestionTitle()==null?"":detect.getQuestionTitle());
+            row.createCell(11).setCellValue(detect.getDescribeHandleDesc()==null?"":detect.getDescribeHandleDesc());
             row.createCell(12).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
             row.createCell(13).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
             row.createCell(14).setCellValue(detectIsRefurbishing);
@@ -1008,7 +1017,7 @@ public class AdminDetectController {
             return;
         }*/
         String[] cells = {
-                "维修编号","快递单号","产品简称","产品颜色","生产月份","机身条码",
+                "维修编号","快递单号","产品简称","产品颜色","生产月份","机身条码","是否少件",
                 "退货地区","返厂日期","售后处理类型","工厂检测现象","是否翻新机","厚膜类型","浮子类型","版本号","检测日期"
         };
         exportExcel2(request,res,cells,detectList);
@@ -1071,6 +1080,13 @@ public class AdminDetectController {
                     case 2:detectFloatType = "短";break;
                 }
             }
+            String signclosedIsWhetherLess = "";
+            if(detect.getSignclosedIsWhetherLess() != null){
+                switch (detect.getSignclosedIsWhetherLess()) {
+                    case 1:signclosedIsWhetherLess = "是";break;
+                    case 2:signclosedIsWhetherLess = "否";break;
+                }
+            }
             // 创建单元格，设置值
             row.createCell(0).setCellValue(detect.getDetectNumber()==null?"":detect.getDetectNumber());
             row.createCell(1).setCellValue(detect.getLogisticsNumber()==null?"":detect.getLogisticsNumber());
@@ -1078,6 +1094,7 @@ public class AdminDetectController {
             row.createCell(3).setCellValue(detect.getColorName()==null?"":detect.getColorName());
             row.createCell(4).setCellValue(detect.getDetectProduction()==null?"":detect.getDetectProduction());
             row.createCell(5).setCellValue(detect.getDetectFuselageBarcode()==null?"":detect.getDetectFuselageBarcode());
+            row.createCell(6).setCellValue(signclosedIsWhetherLess);
             StringBuffer area = new StringBuffer(" ");
             if(detect.getSignclosedAddrProvincesName() == null || detect.getSignclosedAddrProvincesName().equals("")){
                 area.append("");
@@ -1089,24 +1106,24 @@ public class AdminDetectController {
             }else{
                 area.append("-"+detect.getSignclosedAddrCityName());
             }
-            row.createCell(6).setCellValue(area.toString());
+            row.createCell(7).setCellValue(area.toString());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             if(detect.getSignclosedDate()==null){
-                row.createCell(7).setCellValue( "");
+                row.createCell(8).setCellValue( "");
             }else{
-                row.createCell(7).setCellValue(sdf.format(detect.getSignclosedDate()));
+                row.createCell(8).setCellValue(sdf.format(detect.getSignclosedDate()));
             }
             /*row.createCell(9).setCellValue(detect.getProcTypeName()==null?"":detect.getProcTypeName());*/
-            row.createCell(8).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
-            row.createCell(9).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
-            row.createCell(10).setCellValue(detectIsRefurbishing);
-            row.createCell(11).setCellValue(detectFilmType);
-            row.createCell(12).setCellValue(detectFloatType);
-            row.createCell(13).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
+            row.createCell(9).setCellValue(detect.getProcMethodName()==null?"":detect.getProcMethodName());
+            row.createCell(10).setCellValue(detect.getDetectPhenomenon()==null?"":detect.getDetectPhenomenon());
+            row.createCell(11).setCellValue(detectIsRefurbishing);
+            row.createCell(12).setCellValue(detectFilmType);
+            row.createCell(13).setCellValue(detectFloatType);
+            row.createCell(14).setCellValue(detect.getDetectVersionNumber()==null?"":detect.getDetectVersionNumber());
             if(detect.getDetectPrintTime()==null){
-                row.createCell(14).setCellValue( "");
+                row.createCell(15).setCellValue( "");
             }else{
-                row.createCell(14).setCellValue(sdf.format(detect.getDetectPrintTime()));
+                row.createCell(15).setCellValue(sdf.format(detect.getDetectPrintTime()));
             }
         }
         //下载导出订单Excel

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

@@ -55,6 +55,12 @@ public class ComplaintQuestionInfoController {
             Integer complaintConsultingType = Integer.valueOf(complaintConsultingTypeOther);
             complaintTypeInfo.setComplaintConsultingType(complaintConsultingType);
         }
+        String complaintType =  request.getParameter("complaintType");
+
+        if (complaintType != null && !"".equals(complaintType)) {
+            Integer type = Integer.valueOf(complaintType);
+            complaintTypeInfo.setComplaintType(type);
+        }
 
         List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(complaintTypeInfo);
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.address.City;
 import com.iamberry.rst.core.address.District;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import com.iamberry.rst.core.order.EfastOrder;
 import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.order.ProductType;
@@ -15,6 +16,7 @@ import com.iamberry.rst.core.sys.Relu;
 import com.iamberry.rst.core.sys.SysConfig;
 import com.iamberry.rst.faces.address.AddressService;
 import com.iamberry.rst.faces.cm.*;
+import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
 import com.iamberry.rst.faces.order.EfastOrderService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.MessageService;
@@ -23,6 +25,7 @@ import com.iamberry.rst.faces.sys.SysConfigService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.service.cm.mapper.CustomerInfoMapper;
 import com.iamberry.rst.service.sms.mapper.MessageMapper;
+import com.iamberry.rst.util.SmsConfig;
 import com.iamberry.rst.utils.EfastUtil;
 import com.iamberry.rst.utils.KuaiDi100;
 import com.iamberry.wechat.tools.DateTimeUtil;
@@ -82,6 +85,8 @@ public class MQTask implements InitializingBean {
 	@Autowired
 	private  CmRelationService cmRelationService;
 	@Autowired
+	private ComplaintDetectInfoService complaintDetectInfoService;
+	@Autowired
 	private  EfastUtil efastUtil;
 
 	private Object lock = new Object();
@@ -554,4 +559,41 @@ public class MQTask implements InitializingBean {
 		}
 	}
 
+	/**
+	 * 查询维修超时数据并短信通知
+	 */
+	@Scheduled(cron = "0 0 9 * * ?")//每天上午午9点触发
+/*	@Scheduled(cron = "0 0/1 * * * ?")//每2分钟执行一次*/
+	public void detectTimeoutNotice() throws Exception {
+		logger.info("---------------- 询维修超时数据并短信通知开始 ---------------");
+		//待检测即将超时数据
+		List<ComplaintDetectInfo>  listMaintenanceCut = complaintDetectInfoService.listMaintenanceCutNotice();
+		//待维修即将超时数据
+		List<ComplaintDetectInfo>  listCompleteCut = complaintDetectInfoService.listCompleteCutNotice();
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		if(listMaintenanceCut != null && listMaintenanceCut.size() > 0){
+			for(ComplaintDetectInfo info : listMaintenanceCut){
+				if(info.getDetectNumber() != null && info.getMaintenanceCutTime() != null){
+					//发送短信通知维修检测人员
+					String text = MessageFormat.format(SmsConfig.DETECTION_TIMEOUT_NOTIFICATION, info.getDetectNumber(),"检测超时",format.format(info.getMaintenanceCutTime()));
+					String result = smsService.sendOtherCMS(SmsConfig.CUSTOMER_PHONE, text);
+					logger.info("给 " + SmsConfig.CUSTOMER_PHONE + " 手机用户发送短信：" + text+"发送检测即将超时数据维修人员："+result);
+				}
+
+			}
+		}
+		if(listCompleteCut != null && listCompleteCut.size() > 0){
+			for(ComplaintDetectInfo info : listCompleteCut){
+				//发送短信通知维修检测人员
+				if(info.getDetectNumber() != null && info.getCompleteCutTime() != null){
+					String text = MessageFormat.format(SmsConfig.DETECTION_TIMEOUT_NOTIFICATION, info.getDetectNumber(),"维修超时",format.format(info.getCompleteCutTime()));
+					String result = smsService.sendOtherCMS(SmsConfig.CUSTOMER_PHONE, text);
+					logger.info("给 " + SmsConfig.CUSTOMER_PHONE + " 手机用户发送短信：" + text+"发送维修即将超时数据维修人员："+result);
+				}
+			}
+		}
+
+		logger.info("---------------- 询维修超时数据并短信通知结束 ---------------");
+	}
+
 }

watero-rst-web/src/main/resources/platform.properties

@@ -67,6 +67,7 @@ CUSTOMER_PHONE=15207170059
 CUSTOMER_EXCHANGE=\u3010\u7231\u8d1d\u6e90RST\u3011{0}\u8bf7\u5f00\u59cb{1}\uff0c\u6b64\u4e3a\u6362\u8d27\u673a\u5668\uff0c\u8bf7\u5f00\u59cb\u5904\u7406\uff1b
 CUSTOMER_RETURN=\u3010\u7231\u8d1d\u6e90RST\u3011{0}\u8bf7\u5f00\u59cb{1}\uff0c\u6b64\u4e3a\u9000\u8d27\u673a\u5668\uff0c\u8bf7\u5f00\u59cb\u5904\u7406\uff1b
 CUSTOMER_CONTACT=\u3010\u7231\u8d1d\u6e90RST\u3011{0}\u5ba2\u670d\u5df2\u7ecf\u786e\u8ba4\uff0c\u7ef4\u4fee\u7f16\u53f7\u4e3a{1}\uff0c\u8bf7\u6253\u5370\u6b64\u673a\u5668\u7ef4\u4fee\u5361\u5e76\u5f00\u59cb\u68c0\u6d4b\uff1b
+DETECTION_TIMEOUT_NOTIFICATION=\u3010\u7231\u8d1d\u6e90RST\u3011{0}\u5373\u5c06{1}\uff0c\u622a\u6b62\u65e5\u671f\uff1a{2}\uff0c\u5982\u5df2\u68c0\u6d4b\u5b8c\u6210\u8bf7\u5c3d\u5feb\u5f55\u5165\u5230\u7cfb\u7edf
 #---SMS end---#
 
 # token

watero-rst-web/src/main/resources/watero-rst-ioc.xml

@@ -37,7 +37,7 @@
     <aop:aspectj-autoproxy proxy-target-class="true"/>
 
 	<!-- 开启注解启动定时器 -->
-    <!--<task:annotation-driven/>-->
+    <task:annotation-driven/>
 
 	<!-- DataSource -->
 	<import resource="classpath:watero-rst-db.xml"/>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -833,7 +833,7 @@
         initProduceType();
 
         /*初始化问题分类*/
-        initComplaintTypeInfo();
+        initComplaintTypeInfo(null);
 
         /*初始化客服*/
         initSysAdmin();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -162,7 +162,7 @@
                 <div class="formControls col-10 col-sm-10 skin-minimal" id="produceTypeHtml">
                     <#list typeList as type>
                         <div class="radio-box" style="width: 180px;">
-                            <input type="radio" id="produceType-${type_index}" name="typeId" typeCompany="${type.typeCompany}"  value="${type.typeId!''}" <#if customerInfo.typeId == type.typeId>checked</#if> >
+                            <input type="radio" id="produceType-${type_index}" name="typeId" typeCompany="${type.typeCompany}"  complaintType="${type.complaintType}" value="${type.typeId!''}" <#if customerInfo.typeId == type.typeId>checked</#if> >
                             <label for="produceType-${type_index}">${type.typeName!''}</label>
                         </div>
                     </#list>
@@ -908,6 +908,7 @@
         $("input[name='typeId']").change(function (){
             var typeId = parseInt($(this).val());
             var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
+            var complaintType = parseInt($("input:radio[name='typeId']:checked").attr("complaintType"));
             $("#selectCompany").val(typeCompany);
             $("#companyId").val(typeCompany);
             var isShowTDS = 2;//是否展示tds 1是 2否
@@ -954,14 +955,15 @@
                 $("#tdsId").hide();
             }
 
-            for(var i=0;i<productTypeArray.length;i++){
+            /*for(var i=0;i<productTypeArray.length;i++){
                 var array = productTypeArray[i];
                 if(typeId == array[0]){
                     customerTypeId = array[1];
                 }
-            }
+            }*/
+            initComplaintTypeInfo(complaintType);
+            /*initComplaintSmallClassInfo(customerTypeId);*/
             $("#complaintId").val(customerTypeId);
-            initComplaintSmallClassInfo(customerTypeId);
         });
 
         /*监听处理结果选择事件*/

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -218,6 +218,19 @@
             </div>
 
             <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少件：</label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="radio-box">
+                        <input type="radio" value="2"  checked="checked" name="signclosedIsWhetherLess">
+                        <label for="tel-1">不少件</label>
+                    </div>
+                       <div class="radio-box">
+                                <input type="radio" value="1"  name="signclosedIsWhetherLess">
+                                <label for="tel-1">少件</label>
+                       </div>
+                </div>
+            </div>
+            <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3">签收图片：</label>
                 <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">
                     <input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 90px;height: 80px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -167,7 +167,19 @@
                 <input type="hidden" name="signclosedAddrCity" id="signclosedAddrCity" >
                 <input type="hidden" name="signclosedAddrArea" id="signclosedAddrArea" >
             </div>
-
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少件：</label>
+                <div class="formControls col-7 col-sm-7">
+                    <div class="radio-box">
+                        <input type="radio" value="2"<#if complaintSignclosedInfo.signclosedIsWhetherLess??> <#if complaintSignclosedInfo.signclosedIsWhetherLess == 2>checked="checked" </#if><#else>checked="checked" </#if> name="signclosedIsWhetherLess">
+                        <label for="tel-1">不少件</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="1" <#if complaintSignclosedInfo.signclosedIsWhetherLess??> <#if complaintSignclosedInfo.signclosedIsWhetherLess == 1>checked="checked" </#if></#if> name="signclosedIsWhetherLess">
+                        <label for="tel-1">少件</label>
+                    </div>
+                </div>
+            </div>
             <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3">签收图片：</label>
                 <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -78,6 +78,7 @@
                 <th width="100">寄件人姓名</th>
                 <th width="100">寄件人电话</th>
                 <th width="250">签收产品</th>
+                <th width="50">是否少件</th>
                 <th width="130">退货地区</th>
 
                 <#--<th width="150">客服备注</th>-->
@@ -130,6 +131,15 @@
                         </#if>
                         </div>
                     </td>
+                    <td class="text-c" width="100">
+                        <#if signclosed.signclosedIsWhetherLess??>
+                            <#if signclosed.signclosedIsWhetherLess == 1>
+                                <span class="c-red">是</span>
+                            <#elseif signclosed.signclosedIsWhetherLess == 2>
+                                <span class="c-success">否</span>
+                            </#if>
+                        </#if>
+                    </td>
                     <td class="text-c" width="100">${signclosed.signclosedAddrProvincesName!}-${signclosed.signclosedAddrCityName!}-${signclosed.signclosedAddrAreaName!}</td>
                     <#--<td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>-->
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
     <#include "/base/list_base.ftl">
-    <script type="text/javascript" src="//s.iamberry.com/js/LodopFuncs.js"></script>
+    <script type="text/javascript" src="//s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
     <link href="${path}/common/lib/lightbox2/2.8.1/css/lightbox.css" rel="stylesheet" type="text/css" >
     <title>待发货订单列表</title>
     <style>
@@ -117,7 +117,7 @@
         </thead>
         <tbody>
         <#if (page.dataList?size <= 0)>
-        <tr class="text-c"><td colspan="13">暂无数据</td></tr>
+        <tr class="text-c"><td colspan="15">暂无数据</td></tr>
         <#else>
             <#list page.dataList as o>
             <tr class="text-c">
@@ -242,7 +242,6 @@
 </div>
 <#include "/base/page_util.ftl">
 <script type="text/javascript">
-    var LODOP=getLodop();
     $(function () {
         $("#print-order-send").click(function() {
             var inputs = $(".salesid-input:checked");
@@ -283,35 +282,75 @@
     });
 
     function re_print_order(orderId) {
-        // 选择打印设备
-        LODOP.SELECT_PRINTER();
-        $.ajax({
-            type: "POST",
-            data: {
-                "orderId":orderId
-            },
-            async: true,
-            url: "${path}/admin/await_send/rePrintOrder",
-            success: function(data){
-                // 请求成功
-                var res = $.parseJSON(data.returnMsg.json);
-                if (data.resultMsg && res.Success) {
-                    var html = res.PrintTemplate;
-                    $("#temp-print-order").html(html);
-                    LODOP.PRINT_INIT('打印订单');
-                    LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                    LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
-                    var flag = LODOP.PRINT();
-                    if (flag) {
-                        layer.msg("打印成功",{icon: 6,time:3000});
+        var LODOP=getLodop();
+        // 选择打印设备,注意：选择打印机时，需要区别IE类浏览器和非IE浏览器
+        var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
+        if (!isIE) {
+            // 非IE类浏览器
+            $.ajax({
+                type: "POST",
+                data: {
+                    "orderId":orderId
+                },
+                async: true,
+                url: "${path}/admin/await_send/rePrintOrder",
+                success: function(data){
+                    // 请求成功
+                    var res = $.parseJSON(data.returnMsg.json);
+                    if (data.resultMsg && res.Success) {
+                        var html = res.PrintTemplate;
+                        $("#temp-print-order").html(html);
+                        LODOP.PRINT_INIT('打印订单' + orderId);
+                        LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
+                        LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
+                        LODOP.SELECT_PRINTER(true);
+                        // 注意，选择打印机后，需要更改打印机事件，否则无法执行回调
+                        var spans = $("span");
+                        for (var i = 0; i < spans.length; i++) {
+                            if ($(spans[i]).text() === "打印份数：") {
+                                $(spans[i]).parent().next()[0].onclick = function () {
+                                    CLODOP.SelectBox.clickOK(false);
+                                    layer.msg("打印成功",{icon: 6,time:3000});
+                                };
+                            }
+                        }
+                    } else {
+                        layer.msg(res.Reason,{icon: 2,time:3000});
                     }
-                } else {
-                    layer.msg(res.Reason,{icon: 2,time:3000});
                 }
+            });
+        } else {
+            // IE浏览器
+            var printIndex = LODOP.SELECT_PRINTER();
+            // 如果返回-1表示不打印
+            if (printIndex!==-1) {
+                $.ajax({
+                    type: "POST",
+                    data: {
+                        "orderId":orderId
+                    },
+                    async: true,
+                    url: "${path}/admin/await_send/rePrintOrder",
+                    success: function(data){
+                        // 请求成功
+                        var res = $.parseJSON(data.returnMsg.json);
+                        if (data.resultMsg && res.Success) {
+                            var html = res.PrintTemplate;
+                            $("#temp-print-order").html(html);
+                            LODOP.PRINT_INIT('打印订单' + orderId);
+                            LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
+                            LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
+                            var flag = LODOP.PRINT();
+                            if (flag) {
+                                layer.msg("打印成功",{icon: 6,time:3000});
+                            }
+                        } else {
+                            layer.msg(res.Reason,{icon: 2,time:3000});
+                        }
+                    }
+                });
             }
-        });
-
-
+        }
     }
 
     /*查看物流*/

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
     <#include "/base/add_base.ftl">
-    <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs.js"></script>
+    <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs_v_5_0.js"></script>
     <title>打单发货</title>
 
 </head>
@@ -92,7 +92,8 @@
 
 <script type="text/javascript">
     // 选择打印设备
-    var LODOP=getLodop();
+    var selPrinter = -1;
+    var LODOP = null;
     $(function () {
         $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0");
         // 获取系统的打印机
@@ -106,15 +107,27 @@
         }
         // 开始打印
         $("#sub-post").click(function() {
-            LODOP.SELECT_PRINTER();
+            // 判断当前是否选中了订单
             var index = getCurrTab();
             var orders = $("." + index + "-wait-print-order");
             if (orders == null || orders.length <= 0) {
                 layer.msg("未选中订单",{icon: 2,time:3000});
                 return;
             }
-            // 启动打印
-            startPrint();
+            LODOP=getLodop();
+            // 选择打印设备,注意：选择打印机时，需要区别IE类浏览器和非IE浏览器
+            var isIE = (navigator.userAgent.indexOf('MSIE')>=0) || (navigator.userAgent.indexOf('Trident')>=0);
+            if (!isIE) {
+                // 非IE类浏览器，第一次时需要将内容设置到页面后，调用选择打印机接口，后续调用打印接口
+                startPrint(false, true);
+            } else {
+                // IE 浏览器
+                var printIndex = LODOP.SELECT_PRINTER();
+                if (printIndex!==-1) {
+                    // 启动打印
+                    startPrint(true, true);
+                }
+            }
         });
 
         function nextPrintOrder() {
@@ -130,7 +143,7 @@
             }
         }
 
-        function startPrint() {
+        function startPrint(isIE, isFirst) {
             var order = nextPrintOrder();
             if (order == null || typeof(order) == undefined) {
                 alert("打印完成，请切换快递公司继续打印");
@@ -162,31 +175,63 @@
                     }
                     if (tempObject.hasOwnProperty("error")) {
                         // 捕获系统级的错误(比如因为空指针抛出的Exception)
-                        re_print(order, tempObject.error_msg);
+                        re_print(order, tempObject.error_msg, isIE, isFirst);
                     } else {
                         if (data && data.returnCode && data.returnCode != 200) {
                             // 捕获业务级的操作（如订单的店铺没有绑定发货人信息）
-                            re_print(order, data.returnMsg.error);
+                            re_print(order, data.returnMsg.error, isIE, isFirst);
                         } else {
                             var res = $.parseJSON(data.returnMsg.json);
                             if (data.resultMsg && res.Success) {
                                 var html = res.PrintTemplate;
                                 $("#temp-print-order").html(html);
-                                LODOP.PRINT_INIT('打印订单');
+                                LODOP.PRINT_INIT('打印订单'+orderId);
                                 LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
                                 LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", $("#temp-print-order").html());
-                                var flag = LODOP.PRINT();
-                                if (flag) {
-                                    startPrint();
-                                    $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
+                                if (isIE) {
+                                    // IE类浏览器，直接打印
+                                    if (LODOP.PRINT()) {
+                                        startPrint(isIE, false);
+                                        $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
+                                    } else {
+                                        // 向后台提交失败打印的信息
+                                        order.attr("printState", "2");
+                                        $(order.find("td")[0]).html("<span style='color: red;'>失败(打印机异常)</span>");
+                                    }
                                 } else {
-                                    // 向后台提交失败打印的信息
-                                    order.attr("printState", "2");
-                                    $(order.find("td")[0]).html("<span style='color: red;'>失败(打印机异常)</span>");
+                                    // 非IE 浏览器
+                                    if (isFirst) {
+                                        // 如果是第一次打印，调用选择打印机接口
+                                        LODOP.SELECT_PRINTER(true);
+                                        // 注意，选择打印机后，需要更改打印机事件，否则无法执行回调
+                                        var spans = $("span");
+                                        for (var i = 0; i < spans.length; i++) {
+                                            if ($(spans[i]).text() === "打印份数：") {
+                                                $(spans[i]).parent().next()[0].onclick = function () {
+                                                    CLODOP.SelectBox.clickOK(false);
+                                                    selPrinter = CLODOP.SelectBox.selPrinter.value;
+                                                    $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
+                                                    startPrint(isIE, false);
+                                                };
+                                            }
+                                        }
+                                    } else {
+                                        // 如果非第一次打印，则调用打印接口
+                                        console.log(selPrinter);
+                                        LODOP.SET_PRINTER_INDEX(selPrinter);
+                                        if (LODOP.PRINT()) {
+                                            startPrint(isIE, false);
+                                            $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
+                                        } else {
+                                            // 向后台提交失败打印的信息
+                                            order.attr("printState", "2");
+                                            $(order.find("td")[0]).html("<span style='color: red;'>失败(打印机异常)</span>");
+                                        }
+                                    }
                                 }
                             } else {
                                 // 第三方接口错误
-                                re_print(order, res.Reason);
+                                re_print(order, res.Reason, isIE, isFirst);
                             }
                         }
                     }
@@ -195,7 +240,7 @@
         }
 
         /* 打印失败后，重新打印 */
-        function re_print(order, errorMsg) {
+        function re_print(order, errorMsg, isIE, isFirst) {
             // 设置当前被打印的内容为“未打印”
             var printNum = parseInt(order.attr("printNum"));
             if(printNum >= 2) {
@@ -207,7 +252,7 @@
                 order.attr("printNum", (printNum + 1));
                 $(order.find("td")[0]).html("<span style='color: blue;'>正在重试(" + errorMsg + ")</span>");
             }
-            startPrint();
+            startPrint(isIE, isFirst);
         }
 
         function getCurrTab() {

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -345,7 +345,7 @@ function initProduceType(){
                 for(var i=0;i<data.returnMsg.productTypeList.length;i++){
                     var produce = data.returnMsg.productTypeList[i];
                     html += ' <div class="radio-box"  style="width: 180px;">' +
-                        '<input type="radio" class="single_loading"  id="produce-type-'+ i +'" name="typeId" typeCompany="'+ produce.typeCompany +'"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
+                        '<input type="radio" class="single_loading"  id="produce-type-'+ i +'" name="typeId" typeCompany="'+ produce.typeCompany +'" complaintType="'+ produce.complaintType +'"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
                         ' <label for="produce-type-'+ i +'">'+ produce.typeName +'</label>' +
                         ' </div>';
                     check = "";
@@ -360,6 +360,7 @@ function initProduceType(){
             $("input[name='typeId']").change(function (){
                 var typeId = parseInt($(this).val());
                 var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
+                var complaintType = parseInt($("input:radio[name='typeId']:checked").attr("complaintType"));
                 $("#selectCompany").val(typeCompany);
                 $("#companyId").val(typeCompany);
                 var isOrder = 1;
@@ -406,14 +407,15 @@ function initProduceType(){
                     $("#tdsId").hide();
                 }
 
-                for(var i=0;i<productTypeArray.length;i++){
+                /*for(var i=0;i<productTypeArray.length;i++){
                     var array = productTypeArray[i];
                     if(typeId == array[0]){
                         customerTypeId = array[1];
                     }
-                }
-               $("#complaintId").val(customerTypeId);
-                initComplaintSmallClassInfo(customerTypeId);
+                }*/
+                initComplaintTypeInfo(complaintType);
+                /*initComplaintSmallClassInfo(customerTypeId);*/
+                $("#complaintId").val(customerTypeId);
 
             });
             /*当前第一个默认选中上朵电动牙刷  isNeedSelectOrder = 2  默认不需要选择订单*/
@@ -539,14 +541,18 @@ function otherHied(customerInfoType){
 }
 
 /*初始化问题大类*/
-function initComplaintTypeInfo() {
+function initComplaintTypeInfo(complaintType) {
     //默认为售前咨询
     //var customerCounselTypeOverall = allCustomerInfoType;
     var customerCounselTypeOverall = null;
+    if(complaintType == null){
+        complaintType = 2;
+    }
     $.ajax({
         type: "POST",
         data: {
-            complaintConsultingType : customerCounselTypeOverall
+            complaintConsultingType : customerCounselTypeOverall,
+            complaintType : complaintType
         },
         url: url_path + "/admin/complaintQuestion/list_complaintType",
         async: true,
@@ -566,10 +572,10 @@ function initComplaintTypeInfo() {
             }
             $("[name='complaintId']").html(html);
 
-            if(isEmpty(customerTypeId) ){
+            /*if(isEmpty(customerTypeId) ){
                 $("[name='complaintId']").val(customerTypeId);
-            }
-            initComplaintSmallClassInfo(customerTypeId);
+            }*/
+            initComplaintSmallClassInfo(id);
         },
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -190,7 +190,7 @@ function setSelectCustomer(customerId){
                             detectStateName = "原机退回，待发货";
                         }
                         html += '<tr class="text-c">' +
-                            ' <td><input type="checkbox" name="detectId" value="'+detet.detectId+'"><label></td>' +
+                            ' <td><input type="radio" name="detectId" value="'+detet.detectId+'"><label></td>' +
                             ' <td>'+ cufte(detet.detectNumber) +'</td>' +
                             ' <td>'+ detectStateName +'</td>' +
                             ' <td>'+ cufte(detet.productName) +'</td>' +

watero-rst-web/src/main/webapp/common/static/h-ui.admin/js/H-ui.admin.js

@@ -26,7 +26,7 @@ function tabNavallwidth(){
 		$tabNavmore.show()}
 	else{
 		$tabNavmore.hide();
-		$tabNav.css({left:0})
+		$tabNav.css({left:10})
 	}
 }