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());//检测项目 inspect-server/src/main/resources/static/report-template.docxBinary files differ
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 { performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
@@ -47,7 +47,7 @@ } @ValueClassify("工时管理") @ApiOperation(value = "统计产量工时汇总和辅助工时汇总") //@ApiOperation(value = "统计产量工时汇总和辅助工时汇总") @PostMapping("/collectWorkingHours") public Result collectWorkingHours(){ return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours()); performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
@@ -49,49 +49,49 @@ } @ValueClassify("工时管理") @ApiOperation(value = "根据编号查询辅助工时配置信息") //@ApiOperation(value = "根据编号查询辅助工时配置信息") @PostMapping("/selectAuxiliaryWorkingHoursByNumber") public Result selectAuxiliaryWorkingHoursByNumber(String number) { return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursByNumber(number)); } @ValueClassify("工时管理") @ApiOperation(value = "根据编号当前用户信息查询所在班次") //@ApiOperation(value = "根据编号当前用户信息查询所在班次") @PostMapping("/selectshiftByUser") public Result selectshiftByUser(LocalDateTime dateTime) { return Result.success(auxiliaryWorkingHoursDayService.selectshiftByUser(dateTime)); } @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)); 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"); 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"); 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"); 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"); 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);
