功能调整

value

2024-04-30 f5f08c542b4ecf240a3dace0b79afe15d18aeab1

 data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java

@@ -23,6 +23,7 @@
import com.yuanchu.mom.dto.DataReportingPageDto;
import com.yuanchu.mom.dto.ProductCountDto;
import com.yuanchu.mom.dto.RegistrantCountDto;
import com.yuanchu.mom.mapper.AuthMapper;
import com.yuanchu.mom.mapper.FansSubmitMapper;
import com.yuanchu.mom.mapper.FinanceSubmitMapper;
import com.yuanchu.mom.pojo.DataReporting;
@@ -84,11 +85,18 @@
    @Resource
    private FinanceSubmitMapper financeSubmitMapper;

    @Resource
    private AuthMapper authMapper;

    @Override
    public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
        Map<String, Object> map = new HashMap<>();
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
        if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId"));
        if (map1.get("look") == 1) dataReportingPageDto.setUpdateUser(map1.get("userId"));
        Integer power = authMapper.isPower(map1.get("userId"), "dataReportingPower");
        if (power == 1) {
            dataReportingPageDto.setDepartment(dataReportingMapper.getUserDepartmentById(map1.get("userId")));
        }
        map.put("head", PrintChina.printChina(DataReportingPageDto.class));
        map.put("body", dataReportingMapper.selectDataReportingDtoPageList(page, QueryWrappers.queryWrappers(dataReportingPageDto)));
        return map;
@@ -129,7 +137,11 @@
        for (FansSubmit fansSubmit : fansSubmits) {
            sum += fansSubmit.getFansAdd();
        }
        dataReporting2.setFansAdd(sum);
        if (dataReporting.getFansAdd() != null || dataReporting.getFansAdd() != 0) {
            dataReporting2.setFansAdd(dataReporting.getFansAdd());
        } else {
            dataReporting2.setFansAdd(sum);
        }
        return dataReportingMapper.updateById(dataReporting2);
    }

@@ -148,8 +160,13 @@
        Map<String, Object> map = new HashMap<>();
        map.put("head", PrintChina.printChina(RegistrantCountDto.class));
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList");
        if (map1.get("look") == 1) registrantCountDto.setCreateUser(map1.get("userId"));
        map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto)));
        if (map1.get("look") == 1) {
            String name = dataReportingMapper.getUserNameById(map1.get("userId"));
            registrantCountDto.setName2(name);
        }
        String department = dataReportingMapper.getUserDepartmentById(map1.get("userId"));
        registrantCountDto.setDepartment(department);
        map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto), registrantCountDto.getStartTime(), registrantCountDto.getEndTime()));
        return map;
    }

@@ -170,13 +187,14 @@
        int userId = Integer.parseInt(JSONUtil.parseObj(new Jwt().readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
        Map<String, String> map = dataReportingMapper.selectUser(userId);
        String date2 = date;
        if(date == null) {
        if (date == null) {
            date2 = fansSubmitService.getYesterday();
            date = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        } else date = LocalDateTime.parse(date+"T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        } else
            date = LocalDateTime.parse(date + "T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        for (DataReporting dataReporting : list) {
            FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, dataReporting.getAgent()).eq(FinanceSubmit::getName, dataReporting.getName()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, date).orderByDesc(FinanceSubmit::getId).last("limit 1"));
            if(ObjectUtil.isNotEmpty(financeSubmit)){
            if (ObjectUtil.isNotEmpty(financeSubmit)) {
                dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
            }
            if (dataReporting.getName() == null || dataReporting.getName().equals(""))
@@ -213,11 +231,12 @@
                    .eq(DataReporting::getName, dataReporting.getName())
                    .eq(DataReporting::getAccountConsumption, dataReporting.getAccountConsumption())
                    .eq(DataReporting::getShowNum, dataReporting.getShowNum())
                    .eq(DataReporting::getClick, dataReporting.getClick()));
            if(BeanUtil.isNotEmpty(dataReporting1)){
                    .eq(DataReporting::getClick, dataReporting.getClick())
                    .last("limit 1"));
            if (BeanUtil.isNotEmpty(dataReporting1)) {
                dataReporting.setId(dataReporting1.getId());
                dataReportingMapper.updateById(dataReporting);
            }else{
            } else {
                dataReportingMapper.insert(dataReporting);
            }
        }
@@ -318,6 +337,7 @@

    @Override
    public String downFansSubmitFile(IPage<FansSubmit> page, FansSubmit fansSubmit) {
        fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
        Map<String, Object> map = fansSubmitService.selectFansSubmitList(page, fansSubmit);
        String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
        String name = "粉丝上报" + time + ".csv";
@@ -325,7 +345,7 @@
        CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
        writer.write(new String[]{"导出时间：" + time});
        writer.write(new String[]{});
        writer.write(new String[]{"时间范围：" + fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
        writer.write(new String[]{"时间范围：" + fansSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
        writer.write(new String[]{});
        writer.write(new String[]{});
        List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
@@ -347,14 +367,15 @@

    @Override
    public String downFinanceSubmitFile(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit) {
        financeSubmit.setCreateTime(financeSubmit.getCreateTime().plusDays(1));
        Map<String, Object> map = financeSubmitService.selectFinanceSubmitList(page, financeSubmit);
        String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
        String time = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
        String name = "财务上报" + time + ".csv";
        String path = outPath + name;
        CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
        writer.write(new String[]{"导出时间：" + time});
        writer.write(new String[]{});
        writer.write(new String[]{"时间范围：" + financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
        writer.write(new String[]{"时间范围：" + financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
        writer.write(new String[]{});
        writer.write(new String[]{});
        List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);