blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-07-28 59d34cb3d22f4f99805f78997b7229a46bec4fe5 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -17,7 +17,6 @@


import com.example.erp.entity.userInfo.Log;


import com.example.erp.entity.userInfo.SysError;


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;


import com.example.erp.mapper.mm.FinishedOperateLogMapper;


import com.example.erp.mapper.pp.*;


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


@@ -71,7 +70,7 @@


    private final RestTemplate restTemplate;


    private final PatchLogMapper patchLogMapper;


    private final ReworkMapper reworkMapper;


    private final BasicDateMapper basicDataMapper;


    private final BasicDataMapper basicDataMapper;


    private final FinishedGoodsInventoryService finishedGoodsInventoryService;






@@ -1182,7 +1181,10 @@


        date.add(endDate);


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


        BasicData basicData = basicDataMapper


                .selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process")));


                .selectOne(new QueryWrapper<BasicData>()


                        .eq("basic_name", reportingWork.get("process"))


                        .last("limit 1")


                );


        result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData==null?null:basicData.getNickname()));


        result.put("date",date);


        return result;