inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -493,6 +493,7 @@ result = results.get(0); } result.setInsProductId(Integer.parseInt(k)); InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, Integer.parseInt(k))); if (jo.get("insValue") != null) { JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue"))); List<Map<String, Object>> iv = new ArrayList<>(); @@ -606,15 +607,9 @@ .eq(AuxiliaryOutputWorkingHours::getInspectionItem, insProduct.getInspectionItem()) .eq(AuxiliaryOutputWorkingHours::getInspectionItemSubclass, insProduct.getInspectionItemSubclass()) .eq(AuxiliaryOutputWorkingHours::getOrderNo, insOrder.getEntrustCode())); AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours(); if (ObjectUtils.isNotEmpty(count1) ){ auxiliaryOutputWorkingHours = count1; } else if (ObjectUtils.isNotEmpty(count2) ){ auxiliaryOutputWorkingHours = count2; } if (ObjectUtils.isNotEmpty(insProduct.getManHour())) { if (isWithinRange && ObjectUtils.isEmpty(count2)) { if (ObjectUtils.isNotEmpty(insProduct.getManHour())&& ObjectUtils.isEmpty(count2) && ObjectUtils.isEmpty(count1)) { AuxiliaryOutputWorkingHours auxiliaryOutputWorkingHours = new AuxiliaryOutputWorkingHours(); if (isWithinRange) { //在时间内就是正常上班 auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//检测父项 auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//检测子项 @@ -632,7 +627,7 @@ auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//星期 auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//周次 auxiliaryOutputWorkingHours.setCheck(userId);//检测人 } else if(ObjectUtils.isEmpty(count1)) { } else { //加班 auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//检测父项 auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//检测子项 @@ -651,7 +646,9 @@ auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//周次 auxiliaryOutputWorkingHours.setCheck(userId);//检测人 } auxiliaryOutputWorkingHoursService.saveOrUpdate(auxiliaryOutputWorkingHours); if (ObjectUtils.isEmpty(insProductResult) || (ObjectUtils.isNotEmpty(insProductResult) && !insProductResult.getInsValue().equals(result.getInsValue()))) { auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours); } } } } inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -373,21 +373,16 @@ insProduct.setManHourGroup(product.getManHourGroup()); insProduct.setInspectionItemType("0"); insProduct.setInspectionValueType("1"); if (product.getInspectionItem().equals("热循环")) { insProduct.setInspectionItemClass("直流电阻");//检验子子项--直流电阻 insProduct.setInspectionItemClassEn("DC resistance");//检验子子项英文--直流电阻 insProduct.setUnit("Ω/km");//单位 } insProducts.add(insProduct); insProductes.add(insProduct); insProductess.add(insProduct); } //热循环才有多次循环次数 if (product.getInspectionItem().equals("热循环")) { //热循环还要加上直流电阻 for (InsProduct insProduct : insProducts) { InsProduct insProduct1 = new InsProduct(); BeanUtils.copyProperties(insProduct, insProduct1); insProduct1.setInspectionItemClass("直流电阻");//检验子子项--直流电阻 insProduct1.setInspectionItemClassEn("DC resistance");//检验子子项英文--直流电阻 insProduct1.setUnit("Ω/km");//单位 insProductes.add(insProduct1); insProductess.add(insProduct1); } } if (count > 1) { //循环超过1次 for (int j = 2; j <= count; j++) { inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -237,9 +237,13 @@ CompletableFuture.supplyAsync(() -> { System.out.println("开始开始开始开始!!!!!!!!!!"); if (trees.length == 5) { standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).eq(StandardProductList::getTree, tree)); standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate() .eq(StandardProductList::getStandardMethodListId, id) .eq(StandardProductList::getTree, tree)); } else { standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id).like(StandardProductList::getTree, tree)); standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate() .eq(StandardProductList::getStandardMethodListId, id) .like(StandardProductList::getTree, tree)); } standardProductListService2.saveBatch(list.stream().map(a -> { a.setFactory(trees[0]); performance-server/src/main/java/com/yuanchu/mom/controller/ShiftTimeController.java
@@ -23,7 +23,7 @@ * @author 江苏鵷雏网络科技有限公司 * @since 2024-07-24 11:22:17 */ @Api(tags = "绩效管理-班次") @Api(tags = "绩效管理-班次排班") @RestController @RequestMapping("/shiftTime") public class ShiftTimeController { performance-server/src/main/resources/mapper/AuxiliaryOutputWorkingHoursMapper.xml
@@ -39,7 +39,8 @@ date_time, week, week_day, name name, sample FROM auxiliary_output_working_hours aowh left join user on user.id=aowh.`check` WHERE 1=1
