blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-09-18 e9049622e5c75b022adbfea5e0fe09790ca146d6 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java


@@ -5,6 +5,7 @@


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


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


import com.example.erp.dto.pp.PatchLogAddDTO;


import com.example.erp.dto.pp.PatchLogDTO;


import com.example.erp.entity.pp.FlowCard;


import com.example.erp.entity.pp.PatchLog;


import com.example.erp.entity.pp.ReportingWork;


@@ -57,7 +58,7 @@




    }




    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize,List<String> selectDate,PatchLog patchLog) {


    public Map<String, Object> SelectReplenish(Integer pageNum, Integer pageSize, List<String> selectDate, PatchLogDTO patchLogDTO) {


        Integer offset = (pageNum-1)*pageSize;


        String endDate = LocalDate.now().toString();


        String startDate = LocalDate.now().minusDays(15).toString();


@@ -70,8 +71,8 @@


            }


        }


        Map<String,Object> map = new HashMap<>();


        map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLog));


        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLog));


        map.put("data",patchMapper.SelectReplenish(offset,pageSize,startDate,endDate,patchLogDTO));


        map.put("total",patchMapper.SelectReplenishPageTotal(offset,pageSize,startDate,endDate,patchLogDTO));




        List<String> list = new ArrayList<>();


        list.add(startDate);