From 00ae048ace3f7877a89bfe024344d686d7503511 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 23 五月 2024 01:22:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 9 ++++
user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java | 2 +
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 2 +
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 7 ++-
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 58 ++++++++++++++++++++++------
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 10 +++++
user-server/src/main/resources/mapper/UserMapper.xml | 18 +++++++++
7 files changed, 91 insertions(+), 15 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
index e6fa72e..d4f0b04 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
@@ -19,6 +19,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -100,7 +101,7 @@
List<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYearPage(time, userName, laboratory);
mapIPage.getRecords().forEach(i -> {
String[] shiftTimes = i.getShiftTime().split(";");
- int totalAttendance = 0;
+ double totalAttendance = 0;
List<Map<String, Object>> map = new ArrayList<>();
// 鍒嗗壊鏃ユ湡
for (String shiftTime : shiftTimes) {
@@ -111,19 +112,29 @@
i.getMonthlyAttendance().put(enums.getLabel(), 0);
}
if (enums.getValue().equals(shiftTimeAndShift[1])) {
- Integer num = (Integer) i.getMonthlyAttendance().get(enums.getLabel());
- i.getMonthlyAttendance().put(enums.getLabel(), num += 1);
+ BigDecimal bigDecimal = new BigDecimal(i.getMonthlyAttendance().get(enums.getLabel()).toString());
+ i.getMonthlyAttendance().put(enums.getLabel(), bigDecimal.add(new BigDecimal("1")));
+ }
+ // 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃�
+ if (shiftTimeAndShift[1].equals("5") && enums.getValue().equals("0")) {
+ BigDecimal bigDecimal = new BigDecimal(i.getMonthlyAttendance().get(enums.getLabel()).toString());
+ i.getMonthlyAttendance().put(enums.getLabel(), bigDecimal.add(new BigDecimal("0.5")));
}
}
- if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0")) {
+ // 鏃╋紝涓紝澶滐紝宸�
+ if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0") || shiftTimeAndShift[1].equals("6")) {
i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 1);
+ }
+ // 鍗�
+ if (shiftTimeAndShift[1].equals("5")) {
+ i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 0.5);
}
hashMap.put("id", shiftTimeAndShift[2]);
hashMap.put("shift", shiftTimeAndShift[1]);
hashMap.put("time", shiftTimeAndShift[0]);
map.add(hashMap);
}
- int totalYearAttendance = 0;
+ double totalYearAttendance = 0;
Map<String, Object> hashMap = new HashMap<>();
for (Map<String, Object> record : mapYearIPage) {
if (record.get("user_id").toString().equals(i.getUserId())) {
@@ -132,12 +143,21 @@
hashMap.put(enums.getLabel(), 0);
}
if (enums.getValue().equals(record.get("shift"))) {
- Integer num = (Integer) hashMap.get(enums.getLabel());
- hashMap.put(enums.getLabel(), num += 1);
+ BigDecimal num = new BigDecimal(hashMap.get(enums.getLabel()).toString());
+ hashMap.put(enums.getLabel(), num.add(new BigDecimal("1")));
+ }
+ // 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃�
+ if (record.get("shift").equals("5") && enums.getValue().equals("0")) {
+ BigDecimal bigDecimal = new BigDecimal(hashMap.get(enums.getLabel()).toString());
+ hashMap.put(enums.getLabel(), bigDecimal.add(new BigDecimal("0.5")));
}
}
- if (record.get("shift").equals("1") || record.get("shift").equals("2") || record.get("shift").equals("0")) {
+ if (record.get("shift").equals("1") || record.get("shift").equals("2") || record.get("shift").equals("0") || record.get("shift").equals("6")) {
hashMap.put("totalAttendance", totalYearAttendance += 1);
+ }
+ // 鍗�
+ if (record.get("shift").equals("5")) {
+ hashMap.put("totalAttendance", totalYearAttendance += 0.5);
}
}
}
@@ -187,11 +207,11 @@
for (Map<String, Object> map : mapYearList) {
Map<String, Object> resultMap = new LinkedHashMap<>();
Map<String, Object> hashMapYear = new LinkedHashMap<>();
- int totalYearAttendance = 0;
+ double totalYearAttendance = 0;
// 涓�骞�12涓湀
for (int i = 1; i < 13; i++) {
Map<String, Object> hashMapMonth = new LinkedHashMap<>();
- int totalMonthAttendance = 0;
+ double totalMonthAttendance = 0;
for (Enums enums : shiftType) {
if (!hashMapYear.containsKey(enums.getLabel())) {
hashMapYear.put(enums.getLabel(), 0);
@@ -202,9 +222,17 @@
int count = countOccurrences(charArray, i + "锛�" + enums.getValue());
hashMapMonth.put(enums.getLabel(), count);
hashMapYear.put(enums.getLabel(), Integer.parseInt(hashMapYear.get(enums.getLabel()).toString()) + count );
- if (enums.getValue().equals("0") || enums.getValue().equals("1") || enums.getValue().equals("2")) {
+ if (enums.getValue().equals("0") || enums.getValue().equals("1") || enums.getValue().equals("2") || enums.getValue().equals("6")) {
totalMonthAttendance += count;
totalYearAttendance += count;
+ }
+ // 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃�
+ if (enums.getValue().equals("5")) {
+ BigDecimal multiply = new BigDecimal("0.5").multiply(new BigDecimal(count)).setScale(1, BigDecimal.ROUND_CEILING);
+ hashMapMonth.put(shiftType.get(0).getLabel(), new BigDecimal(hashMapMonth.get(shiftType.get(0).getLabel()).toString()).add(multiply));
+ hashMapYear.put(shiftType.get(0).getLabel(), new BigDecimal(hashMapYear.get(shiftType.get(0).getLabel()).toString()).add(multiply));
+ totalMonthAttendance += multiply.doubleValue();
+ totalYearAttendance += multiply.doubleValue();
}
}
// 绌烘暟鎹�
@@ -245,14 +273,18 @@
Map<String, Object> year = JackSonUtil.unmarshal(JackSonUtil.marshal(list.get(i).get("year")), Map.class);
excelRowList.add(year.get("totalYearAttendance"));
enums.forEach(j -> {
- excelRowList.add(year.get(j.getLabel()));
+ if (!j.getValue().equals("5")) {
+ excelRowList.add(year.get(j.getLabel()));
+ }
});
Map<String, Map<String, Object>> month = JackSonUtil.unmarshal(JackSonUtil.marshal(list.get(i).get("month")), Map.class);
for (int j = 1; j < 13; j++) {
Object totalMonthAttendance = month.get(j + "").get("totalMonthAttendance");
excelRowList.add(totalMonthAttendance);
for (Enums anEnum : enums) {
- excelRowList.add(month.get(j + "").get(anEnum.getLabel()));
+ if (!anEnum.getValue().equals("5")) {
+ excelRowList.add(month.get(j + "").get(anEnum.getLabel()));
+ }
}
}
data.add(excelRowList);
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 697da8a..31d6551 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -26,6 +26,7 @@
</if>
</where>
GROUP BY u.id
+ order by s.create_time
</select>
<select id="performanceShiftYearPage" resultType="map">
@@ -43,6 +44,7 @@
</if>
<if test="laboratory != null and laboratory != ''">
</if>
+ order by s.create_time
</select>
<select id="performanceShiftYear" resultType="java.util.Map">
@@ -63,7 +65,7 @@
<if test="laboratory != null and laboratory != ''">
</if>
GROUP BY u.id
- order by s.work_time
+ order by s.create_time
</select>
<select id="performanceShiftYearList" resultType="map">
@@ -84,7 +86,7 @@
<if test="laboratory != null and laboratory != ''">
</if>
GROUP BY u.id
- order by s.work_time
+ order by s.create_time
</select>
<select id="performanceShiftList" resultMap="performanceShiftPageMap">
@@ -104,5 +106,6 @@
</if>
</where>
GROUP BY u.id
+ order by s.create_time
</select>
</mapper>
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 47da54b..7ad8f6e 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
@@ -100,6 +100,15 @@
}
@ValueClassify("鐢ㄦ埛绠＄悊")
+ @ApiOperation(value = "璧勬簮瑕佹眰-浜哄憳鎬昏")
+ @PostMapping("/selectPersonnelOverview")
+ public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectPersonnelOverview(page, user));
+ }
+
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
public Result<?> updateUser(@RequestBody User user) {
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
index e0ec91b..42a89ae 100644
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/UserMapper.java
@@ -16,6 +16,8 @@
IPage<User> selectUserDtoPageList(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);
+ IPage<User> selectPersonnelOverview(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);
+
//鑾峰彇璁惧璐熻矗浜�
List<User> getDeviceManager();
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 778c0fc..1784a33 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
@@ -18,6 +18,8 @@
Map<String, Object> selectUserList(IPage<UserPageDto> page, UserPageDto user);
+ Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user);
+
int updateUser(User user);
int addUser(User user);
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index 65c305d..d8cc65f 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -68,6 +68,16 @@
}
@Override
+ public Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(UserPageDto.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
+ if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
+ map.put("body", userMapper.selectPersonnelOverview(page, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
+
+ @Override
public int updateUser(User user) {
user.setDepartId("1," + user.getDepartId());
return userMapper.updateById(user);
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index ce2fe6b..4ce6510 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -16,6 +16,24 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="selectPersonnelOverview" resultType="com.yuanchu.mom.dto.UserPageDto">
+ select * from (
+ select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
+ u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
+ create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
+ u1.name_en
+ from user u1
+ left join user u2 on u2.id = u1.create_user
+ left join user u3 on u3.id = u1.update_user
+ left join role r on u1.role_id = r.id
+ where u1.depart_lims_id is not null
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
<select id="getDeviceManager" resultType="com.yuanchu.mom.dto.UserPageDto">
select id, name
from user
--
Gitblit v1.9.3