账单功能,用户新增修改增加返回字段

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineorderDao.java

@@ -38,5 +38,7 @@ public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineo
    List<Mediicineorder> findMediicineordersBySocialSecurityCardNum(String cardNum);
    List<Mediicineorder> findMediicineordersBySocialSecurityCardNumAndSellState(String cardNum, String sellState);
}

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

@@ -126,4 +126,9 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
            return failedException(e);
        }
    }
    @ApiOperation("所有设备销售额")
    @GetMapping("/getAmount")
    public Envelop getAmount(){
        return success(medicineOrderService.getAllAmount());
    }
}

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

@@ -1491,17 +1491,36 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    }
    public MixEnvelop getSumAmountExcel(String belongCommunity, String equNum, String startTime, String endTime,int page,int size) {
        List<Map<String,Object>> mapList=new ArrayList<>();
        Map<String,Object> countMap = new HashMap<>();
        //第几页
        countMap.put("page",page);
        //多少条
        countMap.put("size",size);
        page = (page - 1) * size;
        //查询出所有的设备
        Iterable <Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page,size);
        List<Mediicinedevice> mediicinedeviceList= IterableUtils.toList(mediicinedevices);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device as t " +
                "  where " +
                "  1=1   " ;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        int decCount = jdbcTemplate.queryForObject(countSql,Integer.class);
        //总页数
        int total=decCount/size+(decCount%size>0?1:0);
        countMap.put("total",total);
        //总条数
        countMap.put("count",decCount);
        mapList.add(countMap);
        //将同一个设备的社区/名称/设备编码/历史记录/总金额放到一个Map中,并将这些Map放到同一个list中返回
        List<Map<String,Object>> mapList=new ArrayList<>();
        for (Mediicinedevice mediicinedevice:mediicinedeviceList){
            Map<String,Object> map=new HashMap<>();
            map.put("community",mediicinedevice.getCommunity());
            map.put("equName",mediicinedevice.getEquNum()+"/"+mediicinedevice.getEquName()==null?"":mediicinedevice.getEquName());
            map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
                    "                COUNT(*) AS count,\n" +
                    "                t.shipping_equ AS equNum\n" +
@@ -1524,7 +1543,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                map.put("count",count);
                map.put("ordercount",count);
                map.put("sumAmount",sumAmount);
            }
            mapList.add(map);
@@ -1541,7 +1560,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device " +
                "     t_mediicine_device as t " +
                "  where " +
                "  1=1   " ;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
@@ -1554,7 +1573,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        for (Mediicinedevice mediicinedevice:mediicinedeviceList){
            Map<String,Object> map=new HashMap<>();
            map.put("community",mediicinedevice.getCommunity());
            map.put("equName",mediicinedevice.getEquNum()+"/"+mediicinedevice.getEquName()==null?"":mediicinedevice.getEquName());
            map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
                    "                COUNT(*) AS count,\n" +
                    "                t.shipping_equ AS equNum\n" +
@@ -1575,7 +1594,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                map.put("count",count);
                map.put("ordercount",count);
                map.put("sumAmount",sumAmount);
            }
            mapList.add(map);
@@ -1599,7 +1618,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            for (Map<String, Object> tmp : list) {
                addCell(sheet, j, 0, tmp.get("community")==null ? "" : tmp.get("community").toString());
                addCell(sheet, j, 1, tmp.get("equName") == null? "" : tmp.get("equName").toString());
                addCell(sheet, j, 2, tmp.get("count") == null ? "" : tmp.get("count").toString());
                addCell(sheet, j, 2, tmp.get("ordercount") == null ? "" : tmp.get("ordercount").toString());
                addCell(sheet, j, 3, tmp.get("sumAmount") == null ? "" :tmp.get("sumAmount").toString());
                j++;
            }
@@ -1701,4 +1720,15 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            throw e;
        }
    }
    public List<Map<String,Object>> getAllAmount() {
        String sql="SELECT sum(t.amount) AS 'sumAmount' " +
                "from t_mediicine_order t ," +
                "t_mediicine_device a " +
                "where " +
                "a.equ_num=t.shipping_equ " +
                "and t.sell_state='1' ";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        return list;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -336,6 +336,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        JSONObject user = jsonObject.getJSONObject("user");
//        JSONArray org = jsonObject.getJSONArray("org");
        JSONArray area = user.getJSONArray("area");
        JSONArray belongArea = user.getJSONArray("belongArea");
        JSONArray equipment = user.getJSONArray("equipment");
       /* //归属租户为默认租户，表示用户为超级管理员，不需要机构
@@ -402,6 +403,30 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            }
        }
        result.put("area",list);
        List<WlyyUserAreaDO> arealist=new ArrayList<>();
        if (belongArea!=null&&belongArea.size()!=0){
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<belongArea.size();i++){
                JSONObject object = belongArea.getJSONObject(i);
                WlyyUserAreaDO userAreaDO = new WlyyUserAreaDO();
                userAreaDO.setUserId(userDO.getId());
                userAreaDO.setCity(object.getString("city"));
                userAreaDO.setCityName(object.getString("cityName"));
                userAreaDO.setTown(object.getString("town"));
                userAreaDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                    userAreaDO.setHospital(object.getString("hospital"));
                    userAreaDO.setHospitalName(object.getString("hospitalName"));
                }
                userAreaDO.setCreateTime(new Date());
                userAreaDO.setUpdateTime(new Date());
                userAreaDO.setDel(1);
                userAreaDO=userAreaDao.save(userAreaDO);
                arealist.add(userAreaDO);
            }
        }
        result.put("belongArea",arealist);
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        List<WlyyUserEquipmentDO> equipmentDOS=new ArrayList<>();
@@ -458,6 +483,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        JSONObject user = jsonObject.getJSONObject("user");
 //       JSONArray org = jsonObject.getJSONArray("org");
        JSONArray belongArea = user.getJSONArray("belongArea");
        JSONArray area = user.getJSONArray("area");
        JSONArray equipment = user.getJSONArray("equipment");
       /* if (null == user ||  CollectionUtils.isEmpty(org) && !user.getString("saasId").equalsIgnoreCase(defaultSaasId)) {
@@ -532,6 +558,30 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
            }
        }
        result.put("area",list);
        List<WlyyUserAreaDO> arealist=new ArrayList<>();
        if (belongArea!=null&&belongArea.size()!=0){
            userAreaDao.deleteByUserId(userDO.getId());
            for (int i=0;i<belongArea.size();i++){
                JSONObject object = belongArea.getJSONObject(i);
                WlyyUserAreaDO userAreaDO = new WlyyUserAreaDO();
                userAreaDO.setUserId(userDO.getId());
                userAreaDO.setCity(object.getString("city"));
                userAreaDO.setCityName(object.getString("cityName"));
                userAreaDO.setTown(object.getString("town"));
                userAreaDO.setTownName(object.getString("townName"));
                if (!StringUtils.isEmpty(object.getString("hospital"))){
                    userAreaDO.setHospital(object.getString("hospital"));
                    userAreaDO.setHospitalName(object.getString("hospitalName"));
                }
                userAreaDO.setCreateTime(new Date());
                userAreaDO.setUpdateTime(new Date());
                userAreaDO.setDel(1);
                userAreaDO=userAreaDao.save(userAreaDO);
                arealist.add(userAreaDO);
            }
        }
        result.put("belongArea",arealist);
        //用户所管设备添加
        //equipment:[{"equipmentId":"","equipmentName":""}]
        List<WlyyUserEquipmentDO> equipmentDOS=new ArrayList<>();