data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -270,7 +270,6 @@ } catch (ParseException e) { throw new ErrorException("文件中日期在转换时出现错误"); } deleteAllFans(LocalDate.parse(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); for (int i = 6; i < rows.size(); i++) { FansSubmit fansSubmit = new FansSubmit(); for (int i1 = 0; i1 < rows.get(5).size(); i1++) { @@ -325,7 +324,6 @@ } catch (ParseException e) { throw new ErrorException("文件中日期在转换时出现错误"); } deleteAllFinance(LocalDate.parse(format).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); for (int i = 6; i < rows.size(); i++) { FinanceSubmit financeSubmit = new FinanceSubmit(); for (int i1 = 0; i1 < rows.get(5).size(); i1++) { data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
@@ -29,7 +29,6 @@ @Size(max= 255,message="编码长度不能超过255") @ApiModelProperty("登记人") @Length(max= 255,message="编码长度不能超过255") @ValueTableShow(3) private String registrant; @ApiModelProperty("姓名") data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
@@ -1,5 +1,6 @@ package com.yuanchu.mom.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -97,7 +98,17 @@ date2 = LocalDateTime.parse(date + "T00:00:00").minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); fansSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00")); } fansSubmitMapper.insert(fansSubmit); 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")); if(BeanUtil.isEmpty(fansSubmit1)){ fansSubmitMapper.insert(fansSubmit); }else{ fansSubmit1.setFansAdd(fansSubmit.getFansAdd()); fansSubmitMapper.updateById(fansSubmit1); } }catch (Exception e){ e.printStackTrace(); } List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, date)); Integer sum = 0; for (FansSubmit fansSubmit2 : fansSubmits) { data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
@@ -1,5 +1,6 @@ package com.yuanchu.mom.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -121,7 +122,21 @@ date2 = LocalDateTime.parse(date + "T00:00:00").minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); financeSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00")); } financeSubmitMapper.insert(financeSubmit); try { FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).last("limit 1")); if(BeanUtil.isEmpty(financeSubmit1)){ financeSubmitMapper.insert(financeSubmit); }else{ financeSubmit1.setConsumption(financeSubmit.getConsumption()); financeSubmit1.setAgentRebate(financeSubmit.getAgentRebate()); financeSubmit1.setMoney(financeSubmit.getMoney()); financeSubmit1.setEmployeeRebate(financeSubmit.getEmployeeRebate()); financeSubmit1.setEmployeeRebateMoney(financeSubmit.getEmployeeRebateMoney()); financeSubmitMapper.updateById(financeSubmit1); } }catch (Exception e){ e.printStackTrace(); } FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, date).orderByDesc(FinanceSubmit::getId).last("limit 1")); if(ObjectUtil.isEmpty(financeSubmit2))return 1; List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).like(DataReporting::getCreateTime, date2)); data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -79,7 +79,7 @@ create_user from data_reporting where create_time >= #{startTime} and create_time <= #{endTime} group by name2,product, date_format(create_time, '%Y-%m-%d') group by department,product, date_format(create_time, '%Y-%m-%d') ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} system-run/src/main/resources/application-dev.yml
@@ -5,20 +5,20 @@ logging: config: classpath:logback-spring.xml # 日志存储路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++ file-location: file-location: D:\项目文件存储\log # 数据库备份路径 backup: # 数据库备份路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++ path: D:\鹓雏公司\frame-after path: D:\项目文件存储\log # 数据库备份天数 destiny: 7 # 数据库备份工具路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++ mysqldump: E:\JavaCode\WMS\WMS_Admin\src\main\resources mysqldump: D:\项目文件存储\log # 照片存储路径+++++++++++++++++++++++++++运维需要配置+++++++++++++++++++++++++++ file: path: D:/webapp/images path: D:\项目文件存储\image # 上传文件允许的扩展名 allowed: png,jpg,jpeg,gif
@@ -26,4 +26,4 @@ okhttp: enabled: true # 开启 okhttp outPath: D:/Download/ outPath: D:\项目文件存储\image
