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 listCheckItemDTO() { - Map params = getHashMap(0); + Map 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 listCheckItemOptionDTO() { - Map params = getHashMap(0); + Map params = getHashMap(2); return checkItemOptionService.listCheckItemOption(params); } @@ -693,8 +694,8 @@ public class CountServiceImpl extends BaseService implements ICountService { */ private SuccessResultData> returnCountResult(List> resultList, String startDate, String endDate) { Map 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) #{endTime} + + AND + t1.type = #{type} + 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);