diff --git a/src/main/java/com/example/demo/domain/dou/Total.java b/src/main/java/com/example/demo/domain/dou/Total.java
index 25529dd..e62325d 100644
--- a/src/main/java/com/example/demo/domain/dou/Total.java
+++ b/src/main/java/com/example/demo/domain/dou/Total.java
@@ -17,6 +17,7 @@ public class Total {
private String orderNo;
private String type;
private String ipAddress;
+ private String deptName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date startTime;
diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
index e4c5c4e..86b7c35 100644
--- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
@@ -98,9 +98,9 @@ public class OtherServiceImpl implements OtherService {
typesToUpdateOne.add("43");
typesToUpdateOne.add("50");
typesToUpdateOne.add("51");
- typesToUpdateOne.add("52");
typesToUpdateOne.add("62");
+ typesToUpdateTwo.add("52");
typesToUpdateTwo.add("55");
typesToUpdateTwo.add("56");
typesToUpdateTwo.add("57");
diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index fb08232..c8fa981 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -9,6 +9,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -58,6 +59,8 @@ public class UserServiceImpl implements UserSevice {
if (!ObjectUtils.isEmpty(sUser)){
throw new Exception("已存在此用户");
}
+ BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
+ user.setPassword(passwordEncoder.encode("123"));
return userMapper.add(user);
}
diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml
index 1ba9f0c..17e0eb7 100644
--- a/src/main/resources/mapper/StatisticsMapper.xml
+++ b/src/main/resources/mapper/StatisticsMapper.xml
@@ -124,4 +124,18 @@
GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
+
\ No newline at end of file
diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml
index 474f54a..17f614e 100644
--- a/src/main/resources/mapperLink/DouMapper.xml
+++ b/src/main/resources/mapperLink/DouMapper.xml
@@ -209,8 +209,8 @@
and type LIKE CONCAT('%', #{type}, '%')
-
- and fm.ip_address = #{ipAddress}
+
+ and fm.ip_address = #{deptName}
and FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime}