From 61f606548af16c4331df0f45e773e143a4e4fa86 Mon Sep 17 00:00:00 2001
From: wenc000 <450292408@qq.com>
Date: Mon, 20 Jul 2020 18:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=9F=E8=AE=A1=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=92=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspection/service/count/impl/CountServiceImpl.java  | 9 +++++----
 .../mapper/checkitemoption/checkitemoption-mapper.xml    | 4 ++++
 .../route/count/list-counthiddendangerreportdetail.html  | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java b/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java
index bfc1761..6130d5e 100644
--- a/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java
+++ b/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java
@@ -479,7 +479,8 @@ public class CountServiceImpl extends BaseService implements ICountService {
      * @return
      */
     private List<CheckItemDTO> listCheckItemDTO() {
-        Map<String, Object> params = getHashMap(0);
+        Map<String, Object> params = getHashMap(2);
+//        params.put("type", 1);
         return checkItemService.listCheckItem(params);
     }
 
@@ -489,7 +490,7 @@ public class CountServiceImpl extends BaseService implements ICountService {
      * @return
      */
     private List<CheckItemOptionDTO> listCheckItemOptionDTO() {
-        Map<String, Object> params = getHashMap(0);
+        Map<String, Object> params = getHashMap(2);
         return checkItemOptionService.listCheckItemOption(params);
     }
 
@@ -693,8 +694,8 @@ public class CountServiceImpl extends BaseService implements ICountService {
      */
     private SuccessResultData<Map<String, Object>> returnCountResult(List<Map<String, Object>> resultList, String startDate, String endDate) {
         Map<String, Object> result = getHashMap(5);
-        result.put("startDate", startDate.substring(0, 7).replace("-", "年") +"月");
-        result.put("endDate", endDate.substring(0, 7).replace("-", "年") +"月");
+        result.put("startDate", startDate.substring(0, 7).replace("-", "年") + "月");
+        result.put("endDate", endDate.substring(0, 7).replace("-", "年") + "月");
         result.put("resultList", resultList);
         return new SuccessResultData<>(result);
     }
diff --git a/src/main/resources/mybatis/mapper/checkitemoption/checkitemoption-mapper.xml b/src/main/resources/mybatis/mapper/checkitemoption/checkitemoption-mapper.xml
index f78b390..03a44e8 100644
--- a/src/main/resources/mybatis/mapper/checkitemoption/checkitemoption-mapper.xml
+++ b/src/main/resources/mybatis/mapper/checkitemoption/checkitemoption-mapper.xml
@@ -124,6 +124,10 @@
         AND
             LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="type != null">
+        AND
+            t1.type = #{type}
+        </if>
         <if test="checkItemId != null and checkItemId != ''">
         AND
             t1.check_item_id = #{checkItemId}
diff --git a/src/main/resources/static/route/count/list-counthiddendangerreportdetail.html b/src/main/resources/static/route/count/list-counthiddendangerreportdetail.html
index 26c9edb..ce0b1aa 100644
--- a/src/main/resources/static/route/count/list-counthiddendangerreportdetail.html
+++ b/src/main/resources/static/route/count/list-counthiddendangerreportdetail.html
@@ -157,7 +157,7 @@
 
         function initTable() {
             var loadLayerIndex;
-            top.restAjax.get(top.restAjax.path('api/count/counthiddendangerreportdetail/{year}', [$('#year').val() ? $('#startTime').val() : today]), {}, null, function(code, data) {
+            top.restAjax.get(top.restAjax.path('api/count/counthiddendangerreportdetail/{year}', [$('#year').val() ? $('#year').val() : today]), {}, null, function(code, data) {
                 laytpl(document.getElementById('tableBoxTemplate').innerHTML).render(data, function(html) {
                     document.getElementById('tableBox').innerHTML = html;
                     var dynamicTable = new DynamicTable(data.data.checkItemList);