资金对接

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/FundsManagementEndpoint.java

@@ -34,10 +34,6 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  @RequestParam(value = "belongCommunity" ,required = false)String belongCommunity,
                                  @ApiParam(name = "equNum" ,value = "设备编码" ,required = false)
                                  @RequestParam(value = "equNum",required = false)String equNum,
                                  @ApiParam(name = "startTime" ,value = "开始时间",required = false)
                                  @RequestParam(value = "startTime" ,required = false)String startTime,
                                  @ApiParam(name = "endTime",value = "截止时间",required = false)
                                  @RequestParam(value = "endTime",required = false)String endTime,
                                  @ApiParam(name = "page",value = "页码",required = false)
                                  @RequestParam(value = "page",defaultValue = "1",required = false)int page,
                                  @ApiParam(name = "size",value = "页码",required = false)
@@ -45,7 +41,7 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  HttpServletResponse response){
        MixEnvelop expressages = null;
        try {
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,page,size);
            List<Map<String, Object>> list = expressages.getDetailModelList();
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("pushDataList.xls".getBytes("utf-8"), "iso8859-1"));
@@ -62,18 +58,16 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  @RequestParam(value = "belongCommunity" ,required = false)String belongCommunity,
                                  @ApiParam(name = "equNum" ,value = "设备编码" ,required = false)
                                  @RequestParam(value = "equNum",required = false)String equNum,
                                  @ApiParam(name = "startTime" ,value = "开始时间",required = false)
                                  @RequestParam(value = "startTime" ,required = false)String startTime,
                                  @ApiParam(name = "endTime",value = "截止时间",required = false)
                                  @RequestParam(value = "endTime",required = false)String endTime,
                                  @ApiParam(name = "page",value = "页码",required = false)
                                      @RequestParam(value = "page",defaultValue = "1",required = false)int page,
                                  @ApiParam(name = "size",value = "页码",required = false)
                                      @RequestParam(value = "size",defaultValue = "15",required = false)int size){
        MixEnvelop expressages=null;
        try {
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,page,size);
            if (expressages!=null)
            return success(expressages);
            else return failed("该设备不存在");
        } catch (Exception e) {
            return failedException(e);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -1566,11 +1566,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
//        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
//    }
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, String startTime, String endTime, int page, int size) {
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, int page, int size) {
        List<Map<String,Object>> mapList=new ArrayList<>();
        //查询出所有的设备
        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)
        &&!org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)) {
        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)) {
            page=(page-1)*size;
            Iterable<Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page, size);
            for (Mediicinedevice mediicinedevice : mediicinedevices) {
@@ -1618,11 +1617,17 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                oneSql += "AND t.belong_community = '"+belongCommunity+"' ";
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
                    if (device==null){
                        return null;
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    if (device==null){
                        return null;
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
@@ -1633,6 +1638,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    if (device==null){
                        return null;
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
@@ -1644,12 +1652,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
//            }else {
//                map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
//            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
                oneSql += "AND t.shipping_time >= "+ startTime  ;
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
                oneSql += "AND t.shipping_time <= "+ endTime ;
            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
//                oneSql += "AND t.shipping_time >= "+ startTime  ;
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
//                oneSql += "AND t.shipping_time <= "+ endTime ;
//            }
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();