Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java

@@ -1,7 +1,6 @@
package com.ltkj.hosp.service.impl;

import java.util.Date;
import java.util.List;
import java.util.*;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
@@ -128,4 +127,24 @@
    public void getTjBlCall(String tjh) {
        tjFlowingWaterMapper.getTjBlCall(tjh);
    }

    @Override
    public Map<String, Object> gettuantijiesuanrenyuan(Integer page, Integer pageSize,
                                                       String dwId, String djkssj, String djjssj, String jskssj, String jsjssj, String tjh, String jsrid) {
        Map<String, Object> map = new HashMap<>();
        map.put("page",page);
        map.put("pageSize",pageSize);
        map.put("dwId",dwId);
        map.put("djkssj",djkssj);
        map.put("djjssj",djjssj);
        map.put("jskssj",jskssj);
        map.put("jsjssj",jsjssj);
        map.put("tjh",tjh);
        map.put("jsrid",jsrid);
        List<List<?>> list = tjFlowingWaterMapper.gettuantijiesuanrenyuan(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("customers",list);
        map1.put("total",map.get("total"));
        return map1;
    }
}