浏览代码

修改bug

xian 4 年之前
父节点
当前提交
4674337e71

+ 1 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -509,7 +509,7 @@
         and cd.detect_state in(32,33,36,37)
       </if>
       <if test="afterState != null and afterState == 7">
-        and cd.detect_state in(33,37,39) and cd.detect_placeorder = 1
+        and cd.detect_state in(33,37,39,27) and cd.detect_placeorder = 1
       </if>
       <if test="afterState != null and afterState == 8">
         and cd.detect_state in(32,36) and cd.detect_placeorder = 1 AND maintenance_results = 1

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

@@ -784,7 +784,7 @@
       sum(CASE WHEN (detect_state = 1 AND cpt.proc_type_id = 3) then 1 else 0 end) AS beDetected,
       sum(CASE WHEN detect_state in(24,30,34,38) then 1 else 0 end) AS beConfirmed,
       sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
-      sum(CASE WHEN (detect_state in(33,37,39) and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
+      sum(CASE WHEN (detect_state in(33,37,39,27) and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
       sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum,
       sum(CASE WHEN (maintenance_cut_time &lt; now() AND cpt.proc_type_id = 3 and detect_placeorder = 1 and detect_state = 1) then 1 else 0 end) AS maintenanceCutTimeNum,
       sum(CASE WHEN (complete_cut_time &lt; now() AND cpt.proc_type_id = 3 and detect_placeorder = 1 and detect_state != 32 AND detect_state != 36) then 1 else 0 end) AS completeCutTimeNum

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

@@ -293,7 +293,7 @@
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c" width="120">
 
-                        <#if detect.detectState == 21 ||detect.detectState == 26 ||detect.detectState == 32 || detect.detectState == 36 || detect.detectState == 39|| detect.detectState == 33>
+                        <#if detect.detectState == 21 ||detect.detectState == 26 ||detect.detectState == 32 || detect.detectState == 36 || detect.detectState == 39 || detect.detectState == 33 || detect.detectState == 27>
                             <#if !detect.maintenanceResults?? || detect.maintenanceResults == 2 >
                                 <a style="text-decoration:none" href="javascript:;" title="QC检测"
                                    onclick="add_remark('QC检测','${path}/admin/detect/to_add_QC?detectId=${detect.detectId!''}','570','450');">