value
2024-04-27 06f256c166529b0c333171f76fd49eec4b66afe3
功能调整
已修改8个文件
43 ■■■■ 文件已修改
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/resources/mapper/FansSubmitMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
system-run/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -96,6 +96,13 @@
        return Result.success(fansSubmitService.selectFansSubmitList(page, fansSubmit));
    }
    @ApiOperation(value = "获取进粉上报总数")
    @PostMapping("/countFansSubmitList")
    @ValueAuth
    public Result countFansSubmitList(@RequestBody FansSubmit fansSubmit) {
        return Result.success(fansSubmitService.countFansSubmitList(fansSubmit));
    }
    @ApiOperation(value = "删除进粉上报列表")
    @PostMapping("/delFansSubmit")
    public Result delFansSubmit(Integer id) {
data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.pojo.FansSubmit;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @author Administrator
@@ -15,6 +16,8 @@
    IPage<FansSubmit> selectFansSubmitPageList(IPage<FansSubmit> page, QueryWrapper<FansSubmit> ew);
    Double countFansSubmitList(@Param("ew") QueryWrapper<FansSubmit> ew);
}
data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
@@ -1,7 +1,6 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yuanchu.mom.dto.DataReportingPageDto;
import com.yuanchu.mom.pojo.FansSubmit;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -29,4 +28,6 @@
    void deleteAllFans(String date);
    Double countFansSubmitList(FansSubmit fansSubmit);
}
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -337,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";
@@ -344,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);
@@ -366,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);
data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
@@ -99,7 +99,7 @@
            fansSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
        }
        try {
            FansSubmit fansSubmit1 = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getCustom, fansSubmit.getCustom()).eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).last("limit 1"));
            FansSubmit fansSubmit1 = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getCustom, fansSubmit.getCustom()).eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).like(FansSubmit::getCreateTime, date).last("limit 1"));
            if(BeanUtil.isEmpty(fansSubmit1)){
                fansSubmitMapper.insert(fansSubmit);
            }else{
@@ -147,6 +147,13 @@
        }
    }
    @Override
    public Double countFansSubmitList(FansSubmit fansSubmit) {
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectFansSubmitList");
        if(map1.get("look")==1) fansSubmit.setCreateUser(map1.get("userId"));
        fansSubmit.setCreateTime(fansSubmit.getCreateTime().plusDays(1));
        return fansSubmitMapper.countFansSubmitList(QueryWrappers.queryWrappers(fansSubmit));
    }
}
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
@@ -123,7 +123,7 @@
            financeSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
        }
        try {
            FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).last("limit 1"));
            FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).like(FinanceSubmit::getCreateTime, date).last("limit 1"));
            if(BeanUtil.isEmpty(financeSubmit1)){
                financeSubmitMapper.insert(financeSubmit);
            }else{
data-server/src/main/resources/mapper/FansSubmitMapper.xml
@@ -24,5 +24,14 @@
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="countFansSubmitList" resultType="java.lang.Double">
        select sum(a.fans_add) from (
        select fm.* from fans_submit fm, user u
        where fm.create_user = u.id
        ) a
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
    </select>
</mapper>
system-run/src/main/resources/application.yml
@@ -26,4 +26,4 @@
  okhttp:
    enabled: true # 开启 okhttp
outPath: D:\项目文件存储\image
outPath: D:\项目文件存储\image\