blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2024-06-07 2f640b1038fa331954f78ed1f4317212cf5bb34d 
 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java


@@ -1,7 +1,9 @@


package com.example.erp.service.sd;




import com.baomidou.dynamic.datasource.annotation.DS;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.example.erp.entity.sd.BasicData;


import com.example.erp.entity.sd.BasicOtherMoney;


import com.example.erp.entity.sd.Customer;


import com.example.erp.mapper.sd.BasicDateMapper;


import com.example.erp.mapper.sd.BasicOtherMoneyMapper;


@@ -42,7 +44,10 @@


            orderBasicDataMap.get("customer").add(customer);


        }




        orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));


        orderBasicDataMap.put("orderOtherMoney",


                Collections.singletonList(


                        basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))


                ));






        //返回Map对象


@@ -90,6 +95,7 @@


            //将数据放入List中


            BasicDataMap.get(item.getBasicCategory()).add(item);


        }


        BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));


        return BasicDataMap;


    }