系统调整

李林

2024-04-07 d3da07f30ac1e1ca9de4fdb079a967e7b7da3089

系统调整

 data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java

@@ -211,9 +211,8 @@
                        break;
                }
            }
            list.add(reporting);
            if(reporting.getAccountConsumption().compareTo(BigDecimal.ZERO) > 0) list.add(reporting);
        }
        deleteAllData(format);
        dataReportingService.addDataReporting(list, format, param);
        return Result.success();
    }
@@ -390,6 +389,13 @@
        return Result.success(dataReportingService.selectDataReportingForCreateUserNames(time));
    }

    @ApiOperation(value = "获取项目数据统计的项目筛选项")
    @PostMapping("/selectDataReportingForProduct")
    @ValueAuth
    public Result selectDataReportingForProduct(String time) {
        return Result.success(dataReportingService.selectDataReportingForProduct(time));
    }

    @ApiOperation(value = "获取微信号列表")
    @GetMapping("/selectVxs")
    @ValueAuth

 data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java

@@ -44,6 +44,8 @@
    IPage<DataComparisonDto> selectDataComparisonDtoPageList(Page page, DataComparisonDto dataComparisonDto);

    List<String> selectDataReportingForCreateUserNames(String time);

    List<String> selectDataReportingForProduct(String time);
}



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

@@ -51,6 +51,8 @@

    List<String> selectDataReportingForCreateUserNames(String time);

    List<String> selectDataReportingForProduct(String time);

    int updateVxCards(List<DataReporting> list);



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

@@ -1,5 +1,6 @@
package com.yuanchu.mom.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.file.FileReader;
@@ -174,13 +175,7 @@
            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"));
        for (DataReporting dataReporting : list) {
//            List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, dataReporting.getProduct()).eq(FansSubmit::getVx, param).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, date));
            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"));
//            Integer sum = 0;
//            for (FansSubmit fansSubmit : fansSubmits) {
//                sum += fansSubmit.getFansAdd();
//            }
//            dataReporting.setFansAdd(sum);
            if(ObjectUtil.isNotEmpty(financeSubmit)){
                dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
            }
@@ -211,27 +206,26 @@
                dataReporting.setRemark(dataReporting.getConsumption().subtract(dataReporting.getRebateConsumption()));
            } catch (Exception e) {
            }
//            dataReporting.setVxCard(param);
//            if (ObjectUtil.isEmpty(one)) {
            dataReporting.setRegistrant(map.get("name"));
            dataReporting.setDepartment(map.get("department"));
            dataReporting.setCreateTime(LocalDateTime.parse(date2 + " " + new SimpleDateFormat("HH:mm:ss").format(new Date()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
            dataReportingMapper.insert(dataReporting);
//            } else {
//                dataReporting.setId(one.getId());
//                dataReporting.setName(null);
//                dataReportingMapper.updateById(dataReporting);
//            }
            DataReporting dataReporting1 = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery()
                    .eq(DataReporting::getName, dataReporting.getName())
                    .eq(DataReporting::getAccountConsumption, dataReporting.getAccountConsumption())
                    .eq(DataReporting::getShowNum, dataReporting.getShowNum())
                    .eq(DataReporting::getClick, dataReporting.getClick()));
            if(BeanUtil.isNotEmpty(dataReporting1)){
                dataReporting.setId(dataReporting1.getId());
                dataReportingMapper.updateById(dataReporting);
            }else{
                dataReportingMapper.insert(dataReporting);
            }
        }
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Integer delDataReporting(Integer id) {
        /*List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getDataId, id).select(FansSubmit::getId));
        if(fansSubmits.size()>0)fansSubmitMapper.deleteBatchIds(fansSubmits);
        List<FinanceSubmit> financeSubmits = financeSubmitMapper.selectList(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getDataId, id).select(FinanceSubmit::getId));
        if(financeSubmits.size()>0)financeSubmitMapper.deleteBatchIds(financeSubmits);*/
        return dataReportingMapper.deleteById(id);
    }

@@ -412,6 +406,11 @@
    }

    @Override
    public List<String> selectDataReportingForProduct(String time) {
        return dataReportingMapper.selectDataReportingForProduct(time.split(" ")[0]);
    }

    @Override
    public int updateVxCards(List<DataReporting> list) {
        for (DataReporting reporting : list) {
            updateDataReporting(reporting);

 data-server/src/main/resources/mapper/DataReportingMapper.xml

@@ -162,4 +162,9 @@
        left join user u1 on dr.create_user = u1.id
        where dr.create_time like concat('%', #{time}, '%')
    </select>

    <select id="selectDataReportingForProduct" resultType="java.lang.String">
        select distinct product from data_reporting
        where create_time like concat('%', #{time}, '%')
    </select>
</mapper>

 system-run/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8001
  port: 8002
spring:
  profiles:
    active: dev