From 780578502875aa0c339cb73f11b1e635df458c77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 28 二月 2024 14:55:05 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java | 2
framework/src/main/java/com/yuanchu/mom/common/AllController.java | 4
data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java | 4
framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java | 4
data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java | 1
user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java | 2
data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java | 87 ++++++--
data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java | 2
data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java | 2
data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java | 26 +-
data-server/src/main/resources/mapper/DataReportingMapper.xml | 16 +
data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java | 87 +++++++--
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 6
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 101 ++++++++--
data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java | 5
user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java | 6
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 2
data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java | 8
data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java | 12 +
data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java | 2
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 135 ++++++++++----
21 files changed, 373 insertions(+), 141 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
index 2aa2035..b8f673f 100644
--- a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
+++ b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
@@ -6,11 +6,9 @@
import cn.hutool.core.text.csv.CsvReader;
import cn.hutool.core.text.csv.CsvRow;
import cn.hutool.core.text.csv.CsvUtil;
-import cn.hutool.core.util.CharsetUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.pojo.DataReporting;
@@ -23,22 +21,15 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.apache.tomcat.util.http.fileupload.FileUtils;
-import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.io.File;
+import javax.validation.constraints.NotBlank;
import java.io.IOException;
import java.io.InputStreamReader;
import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
@RequestMapping("/dataReporting")
@@ -138,7 +129,7 @@
@ApiOperation(value = "娣诲姞璐㈠姟涓婃姤淇℃伅")
@PostMapping("/addFinanceSubmit")
public Result<?> addFinanceSubmit(@RequestBody FinanceSubmit financeSubmit, String date) {
- return Result.success(financeSubmitService.addFinanceSubmit(financeSubmit, date));
+ return Result.success(financeSubmitService.addFinanceSubmit(financeSubmit, date, financeSubmit.getParam()));
}
@ValueAuth
@@ -150,7 +141,7 @@
@ApiOperation(value = "瀵煎叆鏁版嵁涓婃姤鍒楄〃")
@PostMapping("/inputCsv")
- public Result<?> inputCsv(@RequestParam("file") MultipartFile file) throws IOException {
+ public Result<?> inputCsv(@RequestParam("file") MultipartFile file, String param) throws IOException {
CsvReader reader = CsvUtil.getReader();
CsvData data = reader.read(new InputStreamReader(file.getInputStream(), "GB2312"));
List<CsvRow> rows = data.getRows();
@@ -162,40 +153,56 @@
e.printStackTrace();
throw new ErrorException("鏂囦欢涓棩鏈熷湪杞崲鏃跺嚭鐜伴敊璇�");
}
- for (int i = 6; i < rows.size(); i++) {
+ int fieldIndex = 5;
+ for (int i = 0; i < rows.size(); i++) {
+ if (JSON.toJSONString(rows.get(i)).contains("璐︽埛ID")) {
+ fieldIndex = i;
+ break;
+ }
+ }
+ for (int i = fieldIndex + 1; i < rows.size(); i++) {
DataReporting reporting = new DataReporting();
- for (int i1 = 0; i1 < rows.get(5).size(); i1++) {
+ for (int i1 = 0; i1 < rows.get(fieldIndex).size(); i1++) {
String str = rows.get(i).get(i1);
if (str == null) continue;
- switch (rows.get(5).get(i1)) {
+ switch (rows.get(fieldIndex).get(i1)) {
case "璐︽埛":
reporting.setName(str);
break;
case "澶囨敞":
String[] split = str.split("-");
- if (split.length == 4) {
+ if (split.length > 3) {
reporting.setName2(split[0]);
- reporting.setChannel(split[1]);
- reporting.setAgent(split[2]);
- reporting.setProduct(split[3]);
+ reporting.setChannel(split[2]);
+ reporting.setAgent(split[3]);
+ reporting.setProduct(split[1]);
break;
}
reporting.setProduct(str);
break;
case "灞曠幇閲�":
- reporting.setShowNum(Integer.parseInt(str));
+ try {
+ reporting.setShowNum(Integer.parseInt(str));
+ } catch (Exception e) {
+ }
break;
case "鐐瑰嚮閲�":
- reporting.setClick(Integer.parseInt(str));
+ try {
+ reporting.setClick(Integer.parseInt(str));
+ } catch (Exception e) {
+ }
break;
case "娑堣垂":
- reporting.setAccountConsumption(new BigDecimal(str));
+ try {
+ reporting.setAccountConsumption(new BigDecimal(str));
+ } catch (Exception e) {
+ }
break;
}
}
list.add(reporting);
}
- dataReportingService.addDataReporting(list, format);
+ dataReportingService.addDataReporting(list, format, param);
return Result.success();
}
@@ -204,7 +211,7 @@
public Result<?> addDataReporting(@RequestBody DataReporting dataReporting) {
ArrayList<DataReporting> list = new ArrayList<>();
list.add(dataReporting);
- dataReportingService.addDataReporting(list, null);
+ dataReportingService.addDataReporting(list, null,dataReporting.getVxCard());
return Result.success();
}
@@ -296,7 +303,7 @@
@ApiOperation(value = "瀵煎叆璐㈠姟涓婃姤鍒楄〃")
@PostMapping("/inputFinanceSubmitCsv")
- public Result<?> inputFinanceSubmitCsv(@RequestParam("file") MultipartFile file) throws IOException {
+ public Result<?> inputFinanceSubmitCsv(@RequestParam("file") MultipartFile file, String param) throws IOException {
CsvReader reader = CsvUtil.getReader();
CsvData data = reader.read(new InputStreamReader(file.getInputStream(), "GB2312"));
List<CsvRow> rows = data.getRows();
@@ -350,8 +357,36 @@
break;
}
}
- financeSubmitService.addFinanceSubmit(financeSubmit, format);
+ financeSubmitService.addFinanceSubmit(financeSubmit, format, param);
}
return Result.success();
}
+
+ @ApiOperation(value = "涓�閿垹闄ゆ墍鏈夋暟鎹笂鎶ョ殑鏁版嵁")
+ @PostMapping("/deleteAllData")
+ public Result deleteAllData(String date) {
+ dataReportingService.deleteAllData(date);
+ return Result.success();
+ }
+
+ @ApiOperation(value = "鑾峰彇鏁版嵁涓婃姤鐨勭櫥璁颁汉绛涢�夐」")
+ @PostMapping("/selectDataReportingForCreateUserNames")
+ @ValueAuth
+ public Result selectDataReportingForCreateUserNames(String time) {
+ return Result.success(dataReportingService.selectDataReportingForCreateUserNames(time));
+ }
+
+ @ApiOperation(value = "鑾峰彇寰俊鍙峰垪琛�")
+ @GetMapping("/selectVxs")
+ @ValueAuth
+ public Result selectVxs(String time) {
+ return Result.success(fansSubmitService.vxs(time));
+ }
+
+ @ApiOperation(value = "鎵归噺淇敼寰俊鍙�")
+ @PostMapping("/updateVxCards")
+ public Result updateVxCards(String str){
+ List<DataReporting> list = JSON.parseArray(str, DataReporting.class);
+ return Result.success(dataReportingService.updateVxCards(list));
+ }
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java
index 3b72388..93d8b52 100644
--- a/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java
+++ b/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java
@@ -31,6 +31,10 @@
@ValueTableShow(3)
private BigDecimal consumption;
+ @ApiModelProperty("椤圭洰")
+ @ValueTableShow(2)
+ private String product;
+
@ApiModelProperty("鐧昏鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@@ -47,6 +51,14 @@
@ValueTableShow(7)
private BigDecimal comparisonConsumption;
+ @ApiModelProperty("閮ㄩ棬")
+ @ValueTableShow(8)
+ private String uDepartment;
+
+ @ApiModelProperty("鍏徃")
+ @ValueTableShow(9)
+ private String uCompany;
+
@ApiModelProperty("瀵规瘮鐨勭櫥璁版椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime comparisonCreateTime;
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java
index 08d40d0..58c5a4e 100644
--- a/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java
+++ b/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java
@@ -18,10 +18,10 @@
public class ProductCountDto extends OrderBy implements Serializable {
@ValueTableShow(1)
- @ApiModelProperty("鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+ @ApiModelProperty("鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
index 8b974fd..dbbf7e1 100644
--- a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
+++ b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
@@ -137,13 +137,13 @@
*/
@ApiModelProperty("鐧昏鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ValueTableShow(1)
private LocalDateTime createTime;
/**
*
*/
@ApiModelProperty("绯荤粺鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(1)
private LocalDateTime updateTime;
@ApiModelProperty("鍒涘缓鐢ㄦ埛")
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
index 5253b16..24bb6a1 100644
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
+++ b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
@@ -42,6 +42,8 @@
Map<String, String> selectUser(Integer userId);
IPage<DataComparisonDto> selectDataComparisonDtoPageList(Page page, DataComparisonDto dataComparisonDto);
+
+ List<String> selectDataReportingForCreateUserNames(String time);
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
index ad81cb9..02c1b29 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
@@ -72,6 +72,15 @@
private String name2;
/**
+ * 椤圭洰
+ */
+ @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ApiModelProperty("椤圭洰")
+ @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
+ @ValueTableShow(4)
+ private String product;
+
+ /**
* 娓犻亾
*/
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -85,14 +94,6 @@
@ValueTableShow(4)
private String agent;
- /**
- * 椤圭洰
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(5)
- private String product;
/**
* 灞曠幇閲�
*/
@@ -171,6 +172,11 @@
@ApiModelProperty("瀹㈡埛杩旂偣")
@ValueTableShow(18)
private BigDecimal customerRebate;
+
+ @ApiModelProperty("寰俊鍙�")
+ @ValueTableShow(19)
+ private String vxCard;
+
/**
* 澶囩敤瀛楁
*/
@@ -180,7 +186,7 @@
/**
*
*/
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @ApiModelProperty("绯荤粺鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ValueTableShow(20)
@@ -188,7 +194,7 @@
/**
*
*/
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @ApiModelProperty("鐧昏鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ValueTableShow(21)
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
index f10dbb3..4960526 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
@@ -98,5 +98,4 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- private Integer dataId;
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
index 20dfcec..9db0b2f 100644
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
+++ b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
@@ -118,5 +118,7 @@
private Integer dataId;
+ @TableField(select = false, exist = false)
+ private String param;
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java b/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
index 75e00b1..6217033 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
@@ -31,7 +31,7 @@
Map<String, Object> getDataList();
- void addDataReporting(List<DataReporting> list, String date);
+ void addDataReporting(List<DataReporting> list, String date, String param);
Integer delDataReporting(Integer id);
@@ -47,4 +47,10 @@
String downFinanceSubmitFile(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit);
+ void deleteAllData(String date);
+
+ List<String> selectDataReportingForCreateUserNames(String time);
+
+ int updateVxCards(List<DataReporting> list);
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java b/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
index d233e54..8aed3e9 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
@@ -5,6 +5,7 @@
import com.yuanchu.mom.pojo.FansSubmit;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
import java.util.Map;
/**
@@ -22,4 +23,8 @@
int addFansSubmit(FansSubmit fansSubmit, String date);
+ List<FansSubmit> vxs(String date);
+
+ String getYesterday();
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java b/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
index 935e6bb..8339a69 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
@@ -20,6 +20,8 @@
int updateFinanceSubmit(FinanceSubmit financeSubmit);
- int addFinanceSubmit(FinanceSubmit financeSubmit, String date);
+ int addFinanceSubmit(FinanceSubmit financeSubmit, String date, String param);
+
+
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index 3a1de81..6357459 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -23,6 +23,7 @@
import com.yuanchu.mom.dto.ProductCountDto;
import com.yuanchu.mom.dto.RegistrantCountDto;
import com.yuanchu.mom.mapper.FansSubmitMapper;
+import com.yuanchu.mom.mapper.FinanceSubmitMapper;
import com.yuanchu.mom.pojo.DataReporting;
import com.yuanchu.mom.pojo.FansSubmit;
import com.yuanchu.mom.pojo.FinanceSubmit;
@@ -79,6 +80,9 @@
@Resource
private FinanceSubmitService financeSubmitService;
+ @Resource
+ private FinanceSubmitMapper financeSubmitMapper;
+
@Override
public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
Map<String, Object> map = new HashMap<>();
@@ -97,6 +101,7 @@
dataReporting2.setCustomerCosts(dataReporting.getCustomerCosts());
dataReporting2.setCustomerRebate(dataReporting.getCustomerRebate());
dataReporting2.setRemark(dataReporting.getRemark());
+ dataReporting2.setVxCard(dataReporting.getVxCard());
try {
dataReporting2.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP));
} catch (Exception e) {
@@ -107,13 +112,23 @@
}
try {
dataReporting2.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
try {
dataReporting2.setActualCost(dataReporting.getAccountConsumption().divide(new BigDecimal(dataReporting.getFansAdd()), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
try {
dataReporting2.setProfit(dataReporting.getRebateConsumption().subtract(dataReporting.getConsumption()));
- }catch (Exception e){}
+ } catch (Exception e) {
+ }
+ String format = dataReportingMapper.selectById(dataReporting.getId()).getCreateTime().plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, dataReporting.getProduct()).eq(FansSubmit::getVx, dataReporting.getVxCard()).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, format));
+ Integer sum = 0;
+ for (FansSubmit fansSubmit : fansSubmits) {
+ sum += fansSubmit.getFansAdd();
+ }
+ dataReporting2.setFansAdd(sum);
return dataReportingMapper.updateById(dataReporting2);
}
@@ -150,15 +165,28 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void addDataReporting(List<DataReporting> list, String date) {
+ public void addDataReporting(List<DataReporting> list, String date, String param) {
int userId = Integer.parseInt(JSONUtil.parseObj(new Jwt().readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
Map<String, String> map = dataReportingMapper.selectUser(userId);
for (DataReporting dataReporting : list) {
- if (dataReporting.getName() == null || dataReporting.getName().equals("")) dataReporting.setName(map.get("account"));
- if (date == null) {
- date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- };
- DataReporting one = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, dataReporting.getProduct()).eq(DataReporting::getName, dataReporting.getName()).eq(DataReporting::getCreateUser, userId).like(DataReporting::getCreateTime, date));
+ String date2 = date;
+ 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"));
+// 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());
+ }
+ if (dataReporting.getName() == null || dataReporting.getName().equals(""))
+ dataReporting.setName(map.get("account"));
+// DataReporting one = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, dataReporting.getProduct()).eq(DataReporting::getName, dataReporting.getName()).eq(DataReporting::getCreateUser, userId).like(DataReporting::getCreateTime, date));
try {
dataReporting.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP));
} catch (Exception e) {
@@ -183,24 +211,27 @@
dataReporting.setRemark(dataReporting.getConsumption().subtract(dataReporting.getRebateConsumption()));
} catch (Exception e) {
}
- if (ObjectUtil.isEmpty(one)) {
- dataReporting.setRegistrant(map.get("name"));
- dataReporting.setDepartment(map.get("department"));
- dataReporting.setCreateTime(LocalDateTime.parse(date + " " + 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.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);
+// }
}
}
@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));
- fansSubmitMapper.deleteBatchIds(fansSubmits);
+ /*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);
}
@@ -211,9 +242,9 @@
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[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�"+dataReportingPageDto.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + dataReportingPageDto.getCreateTime().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);
@@ -222,10 +253,10 @@
str[i] = head.get(i).get("value");
}
writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
+ JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a -> {
Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
+ str[i] = map1.get(head.get(i).get("label")) == null ? null : map1.get(head.get(i).get("label")) + "";
}
writer.write(str);
});
@@ -240,7 +271,7 @@
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[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
writer.write(new String[]{});
writer.write(new String[]{});
@@ -251,10 +282,10 @@
str[i] = head.get(i).get("value");
}
writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
+ JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a -> {
Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
+ str[i] = map1.get(head.get(i).get("label")) == null ? null : map1.get(head.get(i).get("label")) + "";
}
writer.write(str);
});
@@ -269,7 +300,7 @@
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[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
writer.write(new String[]{});
writer.write(new String[]{});
@@ -280,10 +311,10 @@
str[i] = head.get(i).get("value");
}
writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
+ JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a -> {
Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
+ str[i] = map1.get(head.get(i).get("label")) == null ? null : map1.get(head.get(i).get("label")) + "";
}
writer.write(str);
});
@@ -298,9 +329,9 @@
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[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�"+fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + fansSubmit.getCreateTime().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);
@@ -309,10 +340,10 @@
str[i] = head.get(i).get("value");
}
writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
+ JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a -> {
Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
+ str[i] = map1.get(head.get(i).get("label")) == null ? null : map1.get(head.get(i).get("label")) + "";
}
writer.write(str);
});
@@ -327,9 +358,9 @@
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[]{"瀵煎嚭鏃堕棿锛�" + time});
writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�"+financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
+ writer.write(new String[]{"鏃堕棿鑼冨洿锛�" + financeSubmit.getCreateTime().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);
@@ -338,10 +369,10 @@
str[i] = head.get(i).get("value");
}
writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
+ JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a -> {
Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
+ str[i] = map1.get(head.get(i).get("label")) == null ? null : map1.get(head.get(i).get("label")) + "";
}
writer.write(str);
});
@@ -360,15 +391,33 @@
if (StringUtils.isEmpty(dataComparisonDto.getName())
|| StringUtils.isEmpty(dataComparisonDto.getComparisonName())) {
map.put("body", new Page<DataComparisonDto>());
- }else {
- long startTime = System.currentTimeMillis();
+ } else {
IPage<DataComparisonDto> dataReportingPageDtoIPage = dataReportingMapper.selectDataComparisonDtoPageList(page, dataComparisonDto);
- long endTime = System.currentTimeMillis();
- System.out.println("鎵ц鏃堕棿锛�" + (endTime - startTime) + " 姣");
map.put("body", dataReportingPageDtoIPage);
}
return map;
}
+
+ @Override
+ public void deleteAllData(String date) {
+ List<DataReporting> list = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getCreateUser, getLook.selectPowerByMethodAndUserId("selectDataReportingList").get("userId")).like(DataReporting::getCreateTime, date));
+ for (DataReporting reporting : list) {
+ delDataReporting(reporting.getId());
+ }
+ }
+
+ @Override
+ public List<String> selectDataReportingForCreateUserNames(String time) {
+ return dataReportingMapper.selectDataReportingForCreateUserNames(time.split(" ")[0]);
+ }
+
+ @Override
+ public int updateVxCards(List<DataReporting> list) {
+ for (DataReporting reporting : list) {
+ updateDataReporting(reporting);
+ }
+ return 1;
+ }
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
index 5177530..193955e 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
@@ -1,29 +1,26 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.DataReportingPageDto;
-import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.DataReportingMapper;
import com.yuanchu.mom.pojo.DataReporting;
import com.yuanchu.mom.pojo.FansSubmit;
import com.yuanchu.mom.service.FansSubmitService;
import com.yuanchu.mom.mapper.FansSubmitMapper;
-import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.utils.ServletUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -55,39 +52,81 @@
@Transactional(rollbackFor = Exception.class)
@Override
public int delFansSubmit(Integer id) {
- FansSubmit fansSubmit = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getId, id).select(FansSubmit::getFansAdd, FansSubmit::getDataId));
- DataReporting dataReporting = dataReportingMapper.selectById(fansSubmit.getDataId());
- dataReporting.setFansAdd(dataReporting.getFansAdd() - fansSubmit.getFansAdd());
- dataReportingMapper.updateById(dataReporting);
- return fansSubmitMapper.deleteById(id);
+ FansSubmit fansSubmit = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getId, id).select(FansSubmit::getFansAdd,FansSubmit::getProduct,FansSubmit::getVx,FansSubmit::getCreateTime));
+ fansSubmitMapper.deleteById(id);
+ List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ Integer sum = 0;
+ for (FansSubmit fansSubmit2 : fansSubmits) {
+ sum += fansSubmit2.getFansAdd();
+ }
+ List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, fansSubmit.getProduct()).eq(DataReporting::getVxCard, fansSubmit.getVx()).like(DataReporting::getCreateTime, fansSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setFansAdd(sum);
+ dataReportingMapper.updateById(dataReporting);
+ }
+ return 1;
}
@Transactional(rollbackFor = Exception.class)
@Override
- public int updateFansSubmit(FansSubmit fansSubmit) {
- DataReporting dataReporting = dataReportingMapper.selectById(fansSubmit.getDataId());
- dataReporting.setFansAdd(dataReporting.getFansAdd() + fansSubmit.getFansAdd() - fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getId, fansSubmit.getId()).select(FansSubmit::getFansAdd)).getFansAdd());
- dataReportingMapper.updateById(dataReporting);
- return fansSubmitMapper.updateById(fansSubmit);
+ public int updateFansSubmit(FansSubmit fansSubmit3) {
+ fansSubmitMapper.updateById(fansSubmit3);
+ FansSubmit fansSubmit = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getId, fansSubmit3.getId()).select(FansSubmit::getFansAdd,FansSubmit::getProduct,FansSubmit::getVx,FansSubmit::getCreateTime));
+ List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getProduct, fansSubmit.getProduct()).eq(FansSubmit::getVx, fansSubmit.getVx()).select(FansSubmit::getFansAdd).like(FansSubmit::getCreateTime, fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ Integer sum = 0;
+ for (FansSubmit fansSubmit2 : fansSubmits) {
+ sum += fansSubmit2.getFansAdd();
+ }
+ List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, fansSubmit.getProduct()).eq(DataReporting::getVxCard, fansSubmit.getVx()).like(DataReporting::getCreateTime, fansSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setFansAdd(sum);
+ dataReportingMapper.updateById(dataReporting);
+ }
+ return 1;
}
@Transactional(rollbackFor = Exception.class)
@Override
public int addFansSubmit(FansSubmit fansSubmit, String date) {
- if(date == null) date = getYesterday();
- DataReporting dataReporting = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getName, fansSubmit.getCustom()).eq(DataReporting::getProduct, fansSubmit.getProduct()).eq(DataReporting::getCreateUser, getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList").get("userId")).like(DataReporting::getCreateTime, date));
- if(ObjectUtil.isEmpty(dataReporting)){
- throw new ErrorException(date+" 瀹㈡埛锛�"+fansSubmit.getCustom()+" 骞舵湭涓婃姤杩� "+fansSubmit.getProduct()+" 椤圭洰");
+ String date2 = null;
+ if(date == null) {
+ date = getToday();
+ date2 = getYesterday();
+ }else{
+ date = LocalDateTime.parse(date + "T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ date2 = LocalDateTime.parse(date + "T00:00:00").minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ fansSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
}
- dataReporting.setFansAdd((dataReporting.getFansAdd()==null?0:dataReporting.getFansAdd()) + fansSubmit.getFansAdd());
- dataReportingMapper.updateById(dataReporting);
- fansSubmit.setDataId(dataReporting.getId());
- return fansSubmitMapper.insert(fansSubmit);
+ fansSubmitMapper.insert(fansSubmit);
+ 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) {
+ sum += fansSubmit2.getFansAdd();
+ }
+ List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, fansSubmit.getProduct()).eq(DataReporting::getVxCard, fansSubmit.getVx()).like(DataReporting::getCreateTime, date2).orderByDesc(DataReporting::getAccountConsumption));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setFansAdd(sum);
+ dataReportingMapper.updateById(dataReporting);
+ }
+ return 1;
}
+ @Override
public String getYesterday(){
return LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
}
+
+ public String getToday(){
+ return LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ }
+
+ @Override
+ public List<FansSubmit> vxs(String date) {
+ String format = LocalDateTime.parse(date.replace(" ", "T")).plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ QueryWrapper<FansSubmit> queryWrapper = new QueryWrapper<FansSubmit>();
+ queryWrapper.select("DISTINCT vx").like("create_time", format);
+ return fansSubmitMapper.selectList(queryWrapper);
+ }
}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
index 612bef2..141653b 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
@@ -12,16 +12,20 @@
import com.yuanchu.mom.pojo.FansSubmit;
import com.yuanchu.mom.pojo.FinanceSubmit;
import com.yuanchu.mom.service.DataReportingService;
+import com.yuanchu.mom.service.FansSubmitService;
import com.yuanchu.mom.service.FinanceSubmitService;
import com.yuanchu.mom.mapper.FinanceSubmitMapper;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -52,35 +56,80 @@
@Override
public int delFinanceSubmit(Integer id) {
- return financeSubmitMapper.deleteById(id);
- }
-
- @Override
- public int updateFinanceSubmit(FinanceSubmit financeSubmit) {
- DataReporting reporting = dataReportingMapper.selectById(financeSubmit.getDataId());
- reporting.setId(financeSubmit.getDataId());
- reporting.setAgentRebate(financeSubmit.getEmployeeRebate());
- try {
- reporting.setDiscountedConsumption(reporting.getConsumption().divide(reporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- dataReportingMapper.updateById(reporting);
- return financeSubmitMapper.updateById(financeSubmit);
- }
-
- @Override
- public int addFinanceSubmit(FinanceSubmit financeSubmit, String date) {
- if(date == null) date = getYesterday();
- DataReporting dataReporting = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).eq(DataReporting::getCreateUser, getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList").get("userId")).like(DataReporting::getCreateTime, date));
- if(ObjectUtil.isEmpty(dataReporting)){
- throw new ErrorException(date+" 璐︽埛锛�"+financeSubmit.getName()+" 浠ｇ悊鍟嗭細"+financeSubmit.getCompany()+" 骞舵湭涓婃姤杩�");
+ FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getId, id).select(FinanceSubmit::getEmployeeRebate,FinanceSubmit::getName,FinanceSubmit::getCompany,FinanceSubmit::getCreateTime,FinanceSubmit::getDataId));
+ financeSubmitMapper.deleteById(id);
+ FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).eq(FinanceSubmit::getDataId, financeSubmit.getDataId()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).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()).eq(DataReporting::getCreateUser, financeSubmit.getDataId()).like(DataReporting::getCreateTime, financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setAgentRebate(financeSubmit2.getEmployeeRebate());
+ dataReportingMapper.updateById(computingMethod(dataReporting));
}
- dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
+ return 1;
+ }
+
+ @Override
+ public int updateFinanceSubmit(FinanceSubmit financeSubmit3) {
+ financeSubmitMapper.updateById(financeSubmit3);
+ FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getId, financeSubmit3.getId()).select(FinanceSubmit::getEmployeeRebate,FinanceSubmit::getName,FinanceSubmit::getCompany,FinanceSubmit::getCreateTime,FinanceSubmit::getDataId));
+ FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).eq(FinanceSubmit::getDataId, financeSubmit.getDataId()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).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()).eq(DataReporting::getCreateUser, financeSubmit.getDataId()).like(DataReporting::getCreateTime, financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setAgentRebate(financeSubmit2.getEmployeeRebate());
+ dataReportingMapper.updateById(computingMethod(dataReporting));
+ }
+ return 1;
+ }
+
+ public DataReporting computingMethod(DataReporting dataReporting){
+ try {
+ dataReporting.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP));
+ } catch (Exception e) {
+ }
+ try {
+ dataReporting.setConsumption(dataReporting.getCustomerCosts().multiply(BigDecimal.valueOf(dataReporting.getFansAdd())));
+ } catch (Exception e) {
+ }
try {
dataReporting.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- dataReportingMapper.updateById(dataReporting);
- financeSubmit.setDataId(dataReporting.getId());
- return financeSubmitMapper.insert(financeSubmit);
+ } catch (Exception e) {
+ }
+ try {
+ dataReporting.setActualCost(dataReporting.getAccountConsumption().divide(new BigDecimal(dataReporting.getFansAdd()), 2, RoundingMode.HALF_UP));
+ } catch (Exception e) {
+ }
+ try {
+ dataReporting.setProfit(dataReporting.getRebateConsumption().subtract(dataReporting.getConsumption()));
+ } catch (Exception e) {
+ }
+ return dataReporting;
+ }
+
+ @Override
+ public int addFinanceSubmit(FinanceSubmit financeSubmit, String date, String param) {
+ if(date == null) date = getYesterday();
+// financeSubmit.setDataId(Integer.parseInt(param));
+ String date2 = null;
+ if(date == null) {
+ date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ date2 = getYesterday();
+ }else{
+ date = LocalDateTime.parse(date + "T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ 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);
+ 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));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setAgentRebate(financeSubmit2.getEmployeeRebate());
+ dataReportingMapper.updateById(computingMethod(dataReporting));
+ }
+ return 1;
}
public String getYesterday(){
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
index d7854d0..08cfa56 100644
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ b/data-server/src/main/resources/mapper/DataReportingMapper.xml
@@ -114,19 +114,22 @@
</select>
<select id="selectDataComparisonDtoPageList" resultType="com.yuanchu.mom.dto.DataComparisonDto">
- select a.account account,
+ select a.uName account,
a.name name,
a.account_consumption consumption,
- b.account comparisonAccount,
+ a.product,
+ COALESCE(b.uName, #{dataComparisonDto.comparisonName}) comparisonAccount,
b.name comparisonName,
- b.account_consumption comparisonConsumption
+ b.account_consumption comparisonConsumption,
+ b.uDepartment,
+ b.uCompany
from (select dr1.*, user.id uId, user.name uName, user.account
from data_reporting dr1
join user on dr1.create_user = user.id
where date_format(dr1.create_time, '%Y-%m-%d') =
date_format(#{dataComparisonDto.createTime}, '%Y-%m-%d')
and user.name = #{dataComparisonDto.name}) a
- left join (select dr2.*, user.id uId, user.name uName, user.account
+ left join (select dr2.*, user.id uId, user.name uName, user.account,user.department uDepartment,user.company uCompany
from data_reporting dr2
join user on dr2.create_user = user.id
where date_format(dr2.create_time, '%Y-%m-%d') =
@@ -137,4 +140,9 @@
where (a.account_consumption != b.account_consumption
or b.account_consumption is null)
</select>
+ <select id="selectDataReportingForCreateUserNames" resultType="java.lang.String">
+ select distinct u1.name from data_reporting dr
+ left join user u1 on dr.create_user = u1.id
+ where dr.create_time like concat('%', #{time}, '%')
+ </select>
</mapper>
diff --git a/framework/src/main/java/com/yuanchu/mom/common/AllController.java b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
index 10176fc..2097319 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/AllController.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -38,6 +38,10 @@
type = "鍒犻櫎";
} else if(remark.contains("娣诲姞")||remark.contains("鏂板")){
type = "娣诲姞";
+ } else if(remark.contains("瀵煎叆")){
+ type = "瀵煎叆";
+ } else if(remark.contains("瀵煎嚭")){
+ type = "瀵煎嚭";
}
try {
authMapper.insertPower(value.getMethod().getName(), remark, type);
diff --git a/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java b/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
index 8a3a9a6..34275f7 100644
--- a/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
+++ b/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
@@ -20,9 +20,9 @@
int deletePower();
@Select("select COALESCE(count(*), 0) from power p left join user u on u.role_id = p.role_id where u.id = #{userId} and p.menu_method = #{method}")
- int isPower(Integer userId, String method);
+ Integer isPower(Integer userId, String method);
@Select("select look from power p left join user u on u.role_id = p.role_id where u.id = #{userId} and p.menu_method = #{method}")
- int countPower(Integer userId, String method);
+ Integer countPower(Integer userId, String method);
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 0840e7f..f0792ec 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -118,4 +118,10 @@
return Result.success(userService.addUser(user));
}
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅鏋氫妇")
+ @GetMapping("/getUserMenu")
+ @ValueAuth
+ public Result<?> getUserMenu() {
+ return Result.success(userService.getUserMenu());
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java b/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java
index 494b68a..b40da4b 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java
@@ -50,7 +50,7 @@
*/
@ValueTableShow(2)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鍏徃")
+ @ApiModelProperty("椤圭洰")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String company;
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index e584c81..3b8fc96 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -22,4 +22,6 @@
int addUser(User user);
+ List<User> getUserMenu();
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
index 0840dd6..7d8d7ae 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
@@ -70,4 +71,9 @@
public int addUser(User user) {
return userMapper.insert(user);
}
+
+ @Override
+ public List<User> getUserMenu() {
+ return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
+ }
}
--
Gitblit v1.9.3