品质检测功能

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

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.cm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -31,8 +34,14 @@ public class ComplaintDetectInfo implements Serializable {
     private Date signclosedUpdateTime;//修改时间
     private String machineNo;//机器编号
 
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date detectDate;//检测时间
+
+
     private String questionTitle;//问题标题
     private String detectIsMaintenance;//是否需要维修
+    private String productName;//是否需要维修
 
 
     public Integer getDetectId() {
@@ -202,4 +211,20 @@ public class ComplaintDetectInfo implements Serializable {
     public void setDetectIsMaintenance(String detectIsMaintenance) {
         this.detectIsMaintenance = detectIsMaintenance;
     }
+
+    public Date getDetectDate() {
+        return detectDate;
+    }
+
+    public void setDetectDate(Date detectDate) {
+        this.detectDate = detectDate;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/product/ProductService.java

@@ -44,4 +44,10 @@ public interface ProductService {
      * @return
      */
     List<Product> listProduce();
+
+    /**
+     * 获取单个水机  奶机
+     * @return
+     */
+    Product getProduce(String productId);
 }

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

@@ -6,7 +6,6 @@
     <result column="customer_id" property="customerId" jdbcType="INTEGER" />
     <result column="signclosed_id" property="signclosedId" jdbcType="INTEGER" />
     <result column="product_id" property="productId" jdbcType="INTEGER" />
-    <result column="detect_product_type" property="detectProductType" jdbcType="BIT" />
     <result column="detect_product_number" property="detectProductNumber" jdbcType="VARCHAR" />
     <result column="detect_state" property="detectState" jdbcType="BIT" />
     <result column="detect_phenomenon" property="detectPhenomenon" jdbcType="VARCHAR" />
@@ -22,12 +21,14 @@
     <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
     <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
     <result column="detect_is_maintenance" property="detectIsMaintenance" jdbcType="VARCHAR" />
+    <result column="detect_date" property="detectDate" jdbcType="DATE" />
+
   </resultMap>
   <sql id="Base_Column_List" >
-    detect_id, customer_id,signclosed_id,product_id, detect_product_type, detect_product_number, detect_state,
+    detect_id, customer_id,signclosed_id,product_id,detect_product_number, detect_state,
     detect_phenomenon, detect_failure_classification, detect_failure_cause, detect_results, 
     detect_point, detect_analysis, detect_customer_id, detect_revolution_produced, detect_desc, 
-    signclosed_create_time, signclosed_update_time,detect_is_maintenance
+    signclosed_create_time, signclosed_update_time,detect_is_maintenance,detect_date
   </sql>
   <select id="getComplaintDetectById" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -42,7 +43,6 @@
       cd.signclosed_id signclosedId,
       cd.product_id productId,
       cd.customer_id customerId,
-      cd.detect_product_type detectProductType,
       cd.detect_product_number detectProductNumber,
       cd.detect_state detectState,
       cd.detect_phenomenon detectPhenomenon,
@@ -57,12 +57,13 @@
       cd.signclosed_create_time signclosedCreateTime,
       cd.signclosed_update_time signclosedUpdateTime,
       cd.machine_no machineNo,
-      cd.detect_is_maintenance
+      cd.detect_is_maintenance detectIsMaintenance,
+      cd.detect_date detectDate,
+      ci.customer_question_title questionTitle,
+      pi.product_name productName
     from tb_rst_complaint_detect cd LEFT JOIN tb_rst_customer_info ci ON cd.customer_id = ci.customer_id
+        LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     <where>
-      <if test="detectProductType != null and detectProductType != ''">
-        cd.detect_product_type = #{detectProductType,jdbcType=BIT}
-      </if>
       <if test="detectProductNumber != null and detectProductNumber != ''" >
        AND cd.detect_product_number = #{detectProductNumber,jdbcType=VARCHAR}
       </if>
@@ -102,20 +103,21 @@
     </where>
   </select>
   <insert id="insert" parameterType="ComplaintDetectInfo" >
-    insert into tb_rst_complaint_detect (detect_id, customer_id,signclosed_id,product_id, detect_product_type,
+    insert into tb_rst_complaint_detect (detect_id, customer_id,signclosed_id,product_id,
       detect_product_number, detect_state, detect_phenomenon, 
       detect_failure_classification, detect_failure_cause, 
       detect_results, detect_point, detect_analysis, 
       detect_customer_id, detect_revolution_produced, 
-      detect_desc, signclosed_create_time, signclosed_update_time,machine_no,detect_is_maintenance
+      detect_desc, signclosed_create_time, signclosed_update_time,machine_no,detect_is_maintenance,detect_date
       )
-    values (#{detectId,jdbcType=INTEGER}, #{customerId,jdbcType=INTEGER}, #{detectProductType,jdbcType=BIT}, 
+    values (#{detectId,jdbcType=INTEGER}, #{customerId,jdbcType=INTEGER},#{signclosedId,jdbcType=INTEGER},
+      #{productId,jdbcType=INTEGER},
       #{detectProductNumber,jdbcType=VARCHAR}, #{detectState,jdbcType=BIT}, #{detectPhenomenon,jdbcType=VARCHAR}, 
       #{detectFailureClassification,jdbcType=VARCHAR}, #{detectFailureCause,jdbcType=VARCHAR}, 
       #{detectResults,jdbcType=VARCHAR}, #{detectPoint,jdbcType=VARCHAR}, #{detectAnalysis,jdbcType=VARCHAR}, 
       #{detectCustomerId,jdbcType=INTEGER}, #{detectRevolutionProduced,jdbcType=BIT}, 
       #{detectDesc,jdbcType=VARCHAR}, #{signclosedCreateTime,jdbcType=TIMESTAMP}, #{signclosedUpdateTime,jdbcType=TIMESTAMP}
-      ,#{machineNo,jdbcType=TIMESTAMP},#{detectIsMaintenance,jdbcType=BIT}
+      ,#{machineNo,jdbcType=VARCHAR},#{detectIsMaintenance,jdbcType=BIT},#{detectDate,jdbcType=DATE}
       )
   </insert>
 
@@ -125,9 +127,6 @@
       <if test="customerId != null" >
         customer_id = #{customerId,jdbcType=INTEGER},
       </if>
-      <if test="detectProductType != null" >
-        detect_product_type = #{detectProductType,jdbcType=BIT},
-      </if>
       <if test="detectProductNumber != null" >
         detect_product_number = #{detectProductNumber,jdbcType=VARCHAR},
       </if>
@@ -161,9 +160,6 @@
       <if test="detectDesc != null" >
         detect_desc = #{detectDesc,jdbcType=VARCHAR},
       </if>
-      <if test="signclosedCreateTime != null" >
-        signclosed_create_time = #{signclosedCreateTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="signclosedUpdateTime != null" >
         signclosed_update_time = #{signclosedUpdateTime,jdbcType=TIMESTAMP},
       </if>

watero-rst-service/src/main/java/com/iamberry/rst/service/product/ProductServiceImpl.java

@@ -100,4 +100,9 @@ public class ProductServiceImpl implements ProductService {
     public List<Product> listProduce() {
         return productMapper.listProduce();
     }
+
+    @Override
+    public Product getProduce(String productId) {
+        return productMapper.getProduce(productId);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/ProductMapper.java

@@ -26,4 +26,9 @@ public interface ProductMapper {
      * @return
      */
     List<Product> listProduce();
+    /**
+     * 获取单个水机  奶机
+     * @return
+     */
+    Product getProduce(String productId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -21,5 +21,7 @@
     <select id="listProduce"  resultType="product">
         select * from tb_rst_product_info where product_type = 1
     </select>
-
+    <select id="getProduce"  resultType="product">
+        select * from tb_rst_product_info where product_id = #{productId}
+    </select>
 </mapper>

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

@@ -7,19 +7,24 @@ import com.iamberry.rst.core.order.Product;
 import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsDevice;
 import com.iamberry.rst.faces.cm.ComplaintDetectInfoService;
 import com.iamberry.rst.faces.cm.FittingsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.utils.AdminUtils;
+import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,9 +55,9 @@ public class AdminDetectController {
         //获取所有产品
         List<Product> productList = productService.listProduce();
         mv.addObject("productList",productList);
-        //获取所有配件
+        /*//获取所有配件
         List<FittingsInfo> listFittings = fittingsInfoService.listFittings();
-        mv.addObject("listFittings",listFittings);
+        mv.addObject("listFittings",listFittings);*/
         return mv;
     }
 
@@ -122,5 +127,48 @@ public class AdminDetectController {
         return mv;
     }
 
+    /**
+     * 添加检测信息
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("detect:add:detect")
+    @ResponseBody
+    @RequestMapping("/add_detect")
+    public ResponseJson addDetect(HttpServletRequest request, ComplaintDetectInfo detectInfo) throws Exception {
+        ResponseJson msg = new ResponseJson();
+        if(detectInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        if(detectInfo.getProductId() == null || detectInfo.getProductId().equals("")){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        Product  product =  productService.getProduce(String.valueOf(detectInfo.getProductId()));
+        detectInfo.setDetectProductNumber(product.getProductNumber());
+
+
+        String detectDate = request.getParameter("detect_date");
+        if(detectDate == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        detectInfo.setDetectDate(format.parse(detectDate));
+        Integer num = complaintDetectInfoService.insert(detectInfo);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
 }
 

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

@@ -30,7 +30,6 @@ public class MQTask implements InitializingBean {
 	private MessageService messageService;
 	@Autowired
 	private SmsService smsService;
-
 	public void afterPropertiesSet() throws Exception {
 	}
 
@@ -60,4 +59,32 @@ public class MQTask implements InitializingBean {
 			}
 		}
 	}
+
+	/**
+	 * 实时监测 换货、维修、补发时efast订单是否发货
+	 */
+	public void monitoringEfast(){
+		logger.info("------------执行efast监测 start-----------");
+
+		List<SmsMessage> smsMessageList = messageService.listOrderMessages();
+		if(smsMessageList != null && smsMessageList.size() > 0){
+			//循环推送短信
+			for(SmsMessage smsMessage : smsMessageList){
+				ResponseJson json = smsService.sms(smsMessage.getTel(),smsMessage.getTypes(),smsMessage.getCounts());
+				if(json.getReturnCode() == 200){
+					logger.info("------------推送到+"+smsMessage.getTel()+"一条"+(smsMessage.getTypes() == 1?"待处理":"驳回")+"短信成功");
+					//设置审核通过记录为无效
+					if(smsMessage.getTypes() == 3){
+						OrderMessage orderMessage = new OrderMessage();
+						orderMessage.setMessageStatus(2);
+						orderMessage.setMessageType(3);
+						messageService.updateOrderMessageStatus(orderMessage);
+					}
+				}else{
+					logger.info("------------推送到+"+smsMessage.getTel()+"一条"+(smsMessage.getTypes() == 1?"待处理":"驳回")+"短信失败"+json.getReturnMsg());
+				}
+			}
+		}
+		logger.info("------------执行efast监测 end-----------");
+	}
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/PtsCodeController.java

@@ -87,7 +87,7 @@ public class PtsCodeController {
             if(phones.get(i).length() != 11){
                 return "快递公司出错，请检查文档内的数据是否正常！";
             }
-            String text = MessageFormat.format(SEND_NOTICE_INFORM, autograph);
+            String text = MessageFormat.format(SEND_NOTICE_INFORM2, autograph);
             msg = smsService.sendOtherCMS(phones.get(i),text);
             if(msg.equals("SUCCESS")){
                 successNumber++;

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

@@ -30,14 +30,10 @@
 <body>
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
-
-
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">检测产品&nbsp;&nbsp;</span>
             <label for="radio-1">
-                <input type="radio" id="radio-1" name="detectProductType" value="1" checked/>产品
-                <select name="orderPayType" style="width:100px">
-
+                <select name="productId" style="width:100px" class="select">
                 <#if (productList ?size > 0)>
                     <#list productList as list>
                         <option value ="${list.productId}">${list.productName}</option>
@@ -46,16 +42,16 @@
                     <option value ="">暂无产品，请先添加产品</option>
                 </#if>
                 </select>
-                <input class="my-input" type="text" id="machineNo" name="machineNo" style="width: 30%;" placeholder="机器编号" />
+                <input class="input-text" type="text" id="machineNo" name="machineNo" style="width: 50%;" placeholder="机器编号" />
             </label>
         </div>
 
-        <div class="input-box">
+        <#--<div class="input-box">
             <span class="input-dic" style="margin-top: 0">&nbsp;</span>
 
             <label for="radio-2" style="margin-left: 50px;">
                 <input type="radio" id="radio-2" name="detectProductType" value="2"/>配件
-                <select name="orderPayType"  style="width:100px">
+                <select name="productId2" class="select" style="width:100px">
                 <#if (listFittings ?size > 0)>
                     <#list listFittings as list>
                         <option value ="${list.fittingsId}">${list.fittingsName}</option>
@@ -65,9 +61,9 @@
                 </#if>
                 </select>
             </label>
-        </div>
+        </div>-->
 
-        <div class="input-box"><span class="input-dic spanhidth">检测日期</span><input class="my-input-date" type="text" style="width: 76%;"  name="signclosedUpdateTime" id="signclosedUpdateTime" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/> </div>
+        <div class="input-box"><span class="input-dic spanhidth">检测日期</span><input class="my-input-date" type="text" style="width: 76%;"  name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/> </div>
 
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0">检测结果</span>
@@ -128,39 +124,94 @@
             <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
         </div>
         <div>
-           <button type="button" class="my-btn-submit" onclick="">确认提交</button>
+           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
-    $(function(){
 
 
-    });
-
     function  add() {
+        var detectDate = $("#detectDate").val();
+        if( detectDate == null || detectDate == "" ){
+            layer.msg('请选择检测日期',{icon: 5,time:1000});
+            return;
+        }
+        var detectPhenomenon = $("#detectPhenomenon").val();
+        if( detectPhenomenon == null || detectPhenomenon == "" ){
+            layer.msg('请输入工厂检测现象',{icon: 5,time:1000});
+            return;
+        }
+        if( detectPhenomenon.length > 300 ){
+            layer.msg('工厂检测现象长度不得大于150个字符',{icon: 5,time:1000});
+            return;
+        }
+        var detectFailureClassification = $("#detectFailureClassification").val();
+        if( detectFailureClassification == null || detectFailureClassification == "" ){
+            layer.msg('请输入故障分类',{icon: 5,time:1000});
+            return;
+        }
+        if( detectFailureClassification.length > 50 ){
+            layer.msg('故障分类长度不得大于25个字符',{icon: 5,time:1000});
+            return;
+        }
+        var detectFailureCause = $("#detectFailureCause").val();
+        if( detectFailureCause == null || detectFailureCause == "" ){
+            layer.msg('请输入故障原因',{icon: 5,time:1000});
+            return;
+        }
+        if( detectFailureCause.length > 100 ){
+            layer.msg('故障原因长度不得大于50个字符',{icon: 5,time:1000});
+            return;
+        }
+
+        var detectResults = $("#detectResults").val();
+        if( detectResults == null || detectResults == "" ){
+            layer.msg('请输入判定结果',{icon: 5,time:1000});
+            return;
+        }
+        if( detectResults.length > 100 ){
+            layer.msg('判定结果长度不得大于50个字符',{icon: 5,time:1000});
+            return;
+        }
+
+        var detectPoint = $("#detectPoint").val();
+        if( detectPoint == null || detectPoint == "" ){
+            layer.msg('请输入故障指向',{icon: 5,time:1000});
+            return;
+        }
+        if( detectPoint.length > 100 ){
+            layer.msg('故障指向长度不得大于50个字符',{icon: 5,time:1000});
+            return;
+        }
+
+        var detectAnalysis = $("#detectAnalysis").val();
+        if( detectAnalysis == null || detectAnalysis == "" ){
+            layer.msg('请输入原因分析',{icon: 5,time:1000});
+            return;
+        }
+        if( detectAnalysis.length > 100 ){
+            layer.msg('原因分析长度不得大于50个字符',{icon: 5,time:1000});
+            return;
+        }
         $.ajax({
             cache: true,
             type: "POST",
-            url: "${path}/admin/order/save_order_money",
+            url: "${path}/admin/detect/add_detect",
             data:$('#form-admin-add').serialize(),// 你的formid
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    window.parent.admin_result("支付成功!",1);
+                    layer.msg('添加成功',{icon: 1,time:1000},function () {
+                        location.replace(location.href);
+                    });
                 } else {
-                    window.parent.admin_result(data.resultMsg,5);
+                    layer.msg('添加失败',{icon: 5,time:1000});
                 }
-                var index = parent.layer.getFrameIndex(window.name);
-                parent.$('.btn-refresh').click();
-                parent.layer.close(index);
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){
-                window.parent.admin_result("支付失败!",5);
-                var index = parent.layer.getFrameIndex(window.name);
-                parent.$('.btn-refresh').click();
-                parent.layer.close(index);
+                layer.msg('添加错误',{icon: 5,time:1000});
             }
         });
     }

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

@@ -5,7 +5,7 @@
     <title></title>
     <style>
         *{padding: 0;margin: 0;}
-        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
@@ -26,12 +26,12 @@
     <div class="text-c">
         <form name="form1" action="${path}/admin/detect/select_detect_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_detect('添加品质检测','${path}/admin/detect/to_add_detect','570','450');">新建品检</button>
-            <input class="my-input" type="text" name="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
-            <input class="my-input" type="text" name="detectPhenomenon" value="${detectPhenomenon!}" placeholder="工厂检测现象"/>
-            <input class="my-input" type="text" name="detectFailureCause" value="${detectFailureCause!}" placeholder="故障原因"/>
-            <input class="my-input" type="text" name="detectPoint" value="${detectPoint!}" placeholder="故障指向"/>
-            <input class="my-input" type="text" name="detectAnalysis" value="${detectAnalysis!}" placeholder="原因分析"/>
-            <input class="my-input" type="text" name="detectFailureClassification" value="${detectFailureClassification!}" placeholder="故障分类"/>
+            <input class="my-input" style="width: 70px;" type="text" name="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
+            <input class="my-input" style="width: 70px;" type="text" name="detectPhenomenon" value="${detectPhenomenon!}" placeholder="工厂检测现象"/>
+            <input class="my-input" style="width: 70px;" type="text" name="detectFailureCause" value="${detectFailureCause!}" placeholder="故障原因"/>
+            <input class="my-input" style="width: 70px;" type="text" name="detectPoint" value="${detectPoint!}" placeholder="故障指向"/>
+            <input class="my-input" style="width: 70px;" type="text" name="detectAnalysis" value="${detectAnalysis!}" placeholder="原因分析"/>
+            <input class="my-input" style="width: 70px;" type="text" name="detectFailureClassification" value="${detectFailureClassification!}" placeholder="故障分类"/>
 
             <select class="my-select" name="detectState" style="height: 30px;width: 150px">
                 <option value ="">选择状态</option>
@@ -72,7 +72,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as detect>
                 <tr>
-                    <td class="text-c" width="100">${detect.detectProductType!}</td>
+                    <td class="text-c" width="100">${detect.productName!}</td>
                     <td class="text-c" width="100">${detect.detectProductNumber!}</td>
                     <td class="text-c" width="100">
                         <#if detect.detectState == 1>
@@ -107,7 +107,7 @@
                         </#if>
                     </td>
                     <td class="text-c" width="100">${detect.detectDesc!}</td>
-                    <td class="text-c" width="100">${(detect.signclosedCreateTime?string("yyyy-MM-dd"))!''}</td>
+                    <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!''}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c">
                         <#--<a style="text-decoration:none" href="javascript:;" title="修改"