Tenlion/btyjj-inspection
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增统计功能和页面

Browse Source
This commit is contained in:
wenc000 2020-07-20 18:20:05 +08:00
parent 96725f41d4
commit 61f606548a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java
View File

@ -479,7 +479,8 @@ public class CountServiceImpl extends BaseService implements ICountService {
* @return * @return
*/ */
private List<CheckItemDTO> listCheckItemDTO() { private List<CheckItemDTO> listCheckItemDTO() {
Map<String, Object> params = getHashMap(0); Map<String, Object> params = getHashMap(2);
// params.put("type", 1);
return checkItemService.listCheckItem(params); return checkItemService.listCheckItem(params);
} }
@ -489,7 +490,7 @@ public class CountServiceImpl extends BaseService implements ICountService {
* @return * @return
*/ */
private List<CheckItemOptionDTO> listCheckItemOptionDTO() { private List<CheckItemOptionDTO> listCheckItemOptionDTO() {
Map<String, Object> params = getHashMap(0); Map<String, Object> params = getHashMap(2);
return checkItemOptionService.listCheckItemOption(params); 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) { private SuccessResultData<Map<String, Object>> returnCountResult(List<Map<String, Object>> resultList, String startDate, String endDate) {
Map<String, Object> result = getHashMap(5); Map<String, Object> result = getHashMap(5);
result.put("startDate", startDate.substring(0, 7).replace("-", "年") +"月"); result.put("startDate", startDate.substring(0, 7).replace("-", "年") + "月");
result.put("endDate", endDate.substring(0, 7).replace("-", "年") +"月"); result.put("endDate", endDate.substring(0, 7).replace("-", "年") + "月");
result.put("resultList", resultList); result.put("resultList", resultList);
return new SuccessResultData<>(result); return new SuccessResultData<>(result);
} }

4
src/main/resources/mybatis/mapper/checkitemoption/checkitemoption-mapper.xml
View File

@ -124,6 +124,10 @@
AND AND
LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime} LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
</if> </if>
<if test="type != null">
AND
t1.type = #{type}
</if>
<if test="checkItemId != null and checkItemId != ''"> <if test="checkItemId != null and checkItemId != ''">
AND AND
t1.check_item_id = #{checkItemId} t1.check_item_id = #{checkItemId}

2
src/main/resources/static/route/count/list-counthiddendangerreportdetail.html
View File

@ -157,7 +157,7 @@
function initTable() { function initTable() {
var loadLayerIndex; 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) { laytpl(document.getElementById('tableBoxTemplate').innerHTML).render(data, function(html) {
document.getElementById('tableBox').innerHTML = html; document.getElementById('tableBox').innerHTML = html;
var dynamicTable = new DynamicTable(data.data.checkItemList); var dynamicTable = new DynamicTable(data.data.checkItemList);