From d2afa808c6b182fe5867a7df8cde3b8668b25c1d Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:38:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java | 2 +-
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java | 14 ++++++--------
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryCorrectionHoursController.java | 2 +-
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 2 +-
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java | 1 -
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 3 ++-
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java | 2 +-
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 23 +++++++++++++----------
performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java | 2 +-
10 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index f384d76..3a6a744 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -10,6 +10,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -363,7 +364,7 @@
.eq(AuxiliaryOutputWorkingHours::getCheck, userId)
.eq(AuxiliaryOutputWorkingHours::getInspectProject, insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem())
.eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode()));
- if (count == 0) {
+ if (count == 0 && ObjectUtils.isNotEmpty(insProduct.getManHour())) {
//娣诲姞姣忎釜浜虹殑浜ч噺宸ユ椂
AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours();
auxiliaryOutputWorkingHours.setInspectProject(insProduct.getInspectionItemSubclass() + insProduct.getInspectionItem());//妫�娴嬮」鐩�
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index cc1483e..449937c 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryCorrectionHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryCorrectionHoursController.java
index 8bfd079..d9cded5 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryCorrectionHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryCorrectionHoursController.java
@@ -51,7 +51,7 @@
* @return
*/
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "瀵煎叆")
+ @ApiOperation(value = "瀵煎叆淇宸ユ椂")
@PostMapping("/upload")
public Result upload(@RequestParam("file") MultipartFile file) {
try {
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
index c558ea3..7be9807 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
@@ -46,7 +46,6 @@
return Result.success(auxiliaryOutputWorkingHoursService.selectAuxiliaryOutputWorkingHours(page, entity));
}
- @ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��")
@PostMapping("/collectWorkingHours")
public Result collectWorkingHours(){
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
index 458b825..70f9af3 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
@@ -40,7 +40,7 @@
private AuxiliaryWorkingHoursDayService auxiliaryWorkingHoursDayService;
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "鏌ヨ杈呭姪宸ユ椂")
+ @ApiOperation(value = "鏌ヨ宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/selectAuxiliaryWorkingHoursDay")
public Result selectAuxiliaryWorkingHoursDay(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -48,14 +48,12 @@
return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursDay(page, entity));
}
- @ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅")
@PostMapping("/selectAuxiliaryWorkingHoursByNumber")
public Result selectAuxiliaryWorkingHoursByNumber(String number) {
return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursByNumber(number));
}
- @ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�")
@PostMapping("/selectshiftByUser")
public Result selectshiftByUser(LocalDateTime dateTime) {
@@ -63,35 +61,35 @@
}
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "褰曞叆鏁版嵁(鏂板)")
+ @ApiOperation(value = "褰曞叆鏁版嵁(宸ユ椂缁熻鐨勮緟鍔╁伐鏃�)")
@PostMapping("/insertAuxiliaryWorkingHoursDay")
public Result insertAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
return Result.success(auxiliaryWorkingHoursDayService.insertAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "杈呭姪宸ユ椂鎵瑰噯")
+ @ApiOperation(value = "鎵瑰噯宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/approve")
public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "瀹℃牳")
+ @ApiOperation(value = "瀹℃牳宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/check")
public Result check(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay ) {
return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "缂栬緫")
+ @ApiOperation(value = "缂栬緫宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/updateAuxiliaryWorkingHoursDay")
public Result updateAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
- @ApiOperation(value = "鍒犻櫎")
+ @ApiOperation(value = "鍒犻櫎宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
@PostMapping("/deleteAuxiliaryWorkingHoursDay")
public Result deleteAuxiliaryWorkingHoursDay(Integer id) {
return Result.success(auxiliaryWorkingHoursDayService.deleteAuxiliaryWorkingHoursDay(id));
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
index d91c8f0..52783f9 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryCorrectionHoursServiceImpl.java
@@ -56,7 +56,7 @@
@Override
public Map<String, Object> selectAuxiliaryCorrectionHours(Page page, AuxiliaryCorrectionHoursDto auxiliaryCorrectionHoursDto) {
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = new ArrayList<>();
+ List<Integer> ids = null;
map.put("head", PrintChina.printChina(AuxiliaryCorrectionHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryCorrectionHours");
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
index 2026c9c..22b2f41 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOriginalHoursServiceImpl.java
@@ -57,7 +57,7 @@
@Override
public Map<String, Object> selectAuxiliaryOriginalHours(Page page, AuxiliaryOriginalHoursLookDto auxiliaryOriginalHoursLookDto) {
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = new ArrayList<>();
+ List<Integer> ids = null;
map.put("head", PrintChina.printChina(AuxiliaryCorrectionHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOriginalHours");
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
index bc1fba2..10d0ee5 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryOutputWorkingHoursServiceImpl.java
@@ -67,7 +67,7 @@
auxiliaryOutputWorkingHoursDto.setDateTime(null);
auxiliaryOutputWorkingHoursDto.setWeek(null);
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = new ArrayList<>();
+ List<Integer> ids = null;
map.put("head", PrintChina.printChina(AuxiliaryOutputWorkingHoursDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryOutputWorkingHours");
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
index d94d359..f26288f 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
@@ -63,7 +63,7 @@
auxiliaryWorkingHoursDayDto.setDateTime(null);
auxiliaryWorkingHoursDayDto.setWeek(null);
Map<String, Object> map = new HashMap<>();
- List<Integer> ids = new ArrayList<>();
+ List<Integer> ids = null;
map.put("head", PrintChina.printChina(AuxiliaryWorkingHoursDayDto.class));
//鍒ゆ柇缁勯暱,缁勫憳,绠＄悊鍛樻潈闄�
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectAuxiliaryWorkingHoursDay");
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 7e8b4ec..55d622a 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
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -27,6 +28,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
@Service
@@ -64,14 +66,14 @@
map.put("head", PrintChina.printChina(UserPageDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
if (map1.get("look") == 1) user.setCreateUser(map1.get("userId"));
- try{
- if(user.getRoleId()>10000){
- if(user.getRoleId()!=10001){
+ try {
+ if (user.getRoleId() > 10000) {
+ if (user.getRoleId() != 10001) {
List<Integer> ids = roleMapper.getRoleByDepart(user.getRoleId());
user.setRoleId(null);
- map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id",ids)));
+ map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).in("role_id", ids)));
return map;
- }else{
+ } else {
user.setRoleId(null);
map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
return map;
@@ -79,7 +81,7 @@
}
map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user).eq("role_id", user.getRoleId())));
return map;
- }catch (NullPointerException e){
+ } catch (NullPointerException e) {
map.put("body", userMapper.selectUserDtoPageList(page, QueryWrappers.queryWrappers(user)));
return map;
}
@@ -109,7 +111,8 @@
@Override
public List<User> getUserMenu() {
- List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery().ne(Role::getCategory, 10003)).stream().map(Role::getId).distinct().collect(Collectors.toList());
+ List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery()
+ .ne(Role::getCategory, 10003).or(wrapper -> wrapper.isNull(Role::getCategory))).stream().map(Role::getId).distinct().collect(Collectors.toList());
return userMapper.selectList(Wrappers.<User>lambdaQuery()
.in(User::getRoleId, roleIds)
.eq(User::getState, 1).select(User::getName, User::getId));
@@ -161,9 +164,9 @@
user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
// user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
- user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
+ user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
user.setAddress("鏈～鍐�");
- user.setRoleId(personDto.getRoleId()>10000?0:personDto.getRoleId());
+ user.setRoleId(personDto.getRoleId() > 10000 ? 0 : personDto.getRoleId());
user.setCompanyId(person.getCompanyId());
userMapper.insert(user);
} else {
@@ -171,7 +174,7 @@
user.setPhone(person.getPhoneNumber());
user.setEmail(person.getCompanyEmail());
user.setIsCustom(0);
- user.setCompany(BeanUtil.isNotEmpty(custom)?(custom.getId()+""):companyName);
+ user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
user.setCreateUser(null);
user.setCreateTime(null);
user.setUpdateUser(null);
--
Gitblit v1.9.3