2022年11月24 18:01

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -523,7 +523,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			}
 		} else {
 			if (stockGoods.getLockingQuantity().compareTo(deliveryItems.getActualQuantity()) < 0) {
-				throw new RuntimeException("更新库存总账失败，锁定库存不足");
+				throw new RuntimeException(stockGoods.getCode() + "更新库存总账失败，锁定库存不足");
 			}
 			stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().subtract(deliveryItems.getActualQuantity()));
 		}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -60,10 +60,10 @@
             <if test="biding.deadlineBeginTime != null and biding.deadlineBeginTime != ''">
                 and BB.deadline_time >= #{biding.deadlineBeginTime}
             </if>
-            <if test="biding.deadlineBeginTime != null and biding.deadlineBeginTime != ''">
+            <if test="biding.releaseBeginTime != null and biding.releaseBeginTime != ''">
                 and BB.release_time  >= #{biding.releaseBeginTime}
             </if>
-            <if test="biding.deadlineBeginTime != null and biding.deadlineBeginTime != ''">
+            <if test="biding.releaseEndTime != null and biding.releaseEndTime != ''">
                 and BB.release_time  &lt;= #{biding.releaseEndTime}
             </if>
         </where>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingItemsServiceImpl.java

@@ -125,15 +125,11 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 	 */
 	@Override
 	public List<BidingItems> getBidingItems(Biding biding, Integer distinguish){
-
-		CorpsAttn corpsAttn = corpsAttnClient.getUser(AuthUtil.getUserId());
-
 		List<BidingItems> list = baseMapper.selectList(new LambdaQueryWrapper<BidingItems>()
 			.eq(BidingItems::getPid, biding.getId())
 			.eq(BidingItems::getDistinguish, distinguish)
 			.eq(BidingItems::getIsDeleted, 0)
-			.eq(BidingItems::getTenantId, AuthUtil.getTenantId())
-			.eq(BidingItems::getCorpsAttnId, corpsAttn.getPid()));
+			.eq(BidingItems::getTenantId, AuthUtil.getTenantId()));
 
 		if (distinguish.equals(1)){
 			if (ObjectUtil.isNotEmpty(list)){
@@ -258,4 +254,5 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 		items.setStatus(6);
 		baseMapper.updateById(items);
 	}
+
 }

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -2455,10 +2455,6 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 					item.setSalaryWithdrawalStandard(item.getSalaryWithdrawalStandard().multiply(zeroPointEight));//工资拨付标准
 					item.setRankWithdrawalStandard(item.getRankWithdrawalStandard().multiply(zeroPointEight));//职级拨付标准
 					item.setPerformanceAward(item.getPerformanceAward().multiply(zeroPointEight));//履约奖
-					item.setSchoolAgeSalary(item.getSchoolAgeSalary().multiply(zeroPointEight));//校龄工资
-					item.setCapitalIncrease(item.getCapitalIncrease().multiply(zeroPointEight));//增资
-					item.setEducationSalary(item.getEducationSalary().multiply(zeroPointEight));//学历工资
-					item.setRankSalary(item.getRankSalary().multiply(zeroPointEight));//职级工资
 					item.setSalaryBaseName(item.getSalaryBaseName().multiply(zeroPointEight));//工资基数标准
 					item.setWorkloadSalaryCritertion(item.getWorkloadSalaryCritertion().multiply(zeroPointEight));//工作量工资标准
 					item.setVirtualWorkloadSalary(item.getVirtualWorkloadSalary().multiply(zeroPointEight));//虚拟工作量工资标准
@@ -2466,7 +2462,18 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 					item.setVirtualDoubleCease(item.getVirtualDoubleCease().multiply(zeroPointEight));//虚拟双休日工作量工资标准
 					item.setVirtualDailyAssessmentCriteria(item.getVirtualDailyAssessmentCriteria().multiply(zeroPointEight));//虚拟日常考核标准
 					item.setTermPerformanceSalaryName(item.getTermPerformanceSalaryName().multiply(zeroPointEight));//绩效工资标准
+					item.setDailyAssessmentCriteria(item.getDailyAssessmentCriteria().multiply(zeroPointEight));//日常考核标准
+					item.setCustomEight(item.getCustomEight().multiply(zeroPointEight));//学期绩效工资标准
+					item.setLeadingCadreSubsidyName(item.getLeadingCadreSubsidyName().multiply(zeroPointEight));//领导干部补贴标准
+					item.setAssessLeadingCadreSubsidyName(item.getAssessLeadingCadreSubsidyName().multiply(zeroPointEight));//领导干部考核补贴标准
+					item.setPrepareLessonsName(item.getPrepareLessonsName().multiply(zeroPointEight));//备课组长补贴标准
+					item.setAssessPrepareLessonsName(item.getAssessPrepareLessonsName().multiply(zeroPointEight));//备课组长考核补贴标准
+					item.setTeachingResearchName(item.getTeachingResearchName().multiply(zeroPointEight));//教研组长补贴标准
+					item.setAssessTeachingResearchName(item.getAssessTeachingResearchName().multiply(zeroPointEight));//教研组长考核补贴标准
+					item.setTeacherSubsidy(item.getTeacherSubsidy().multiply(zeroPointEight));//班主任补贴标准
+					item.setTeacherAssessSubsidy(item.getTeacherAssessSubsidy().multiply(zeroPointEight));//班主任考核津贴标准
 					item.setAppropriationProportion("80%");
+					item.setSalaryBase(item.getSalaryBaseName());//工资基数
 				}else if (item.getAttendanceType().equals("在校")){//在校
 					BigDecimal absenceDays = item.getRequiredAttendanceDays().subtract(item.getActualAttendanceDays());//缺勤天数 = 应出勤天数-实际出勤天数
 					BigDecimal allotment = item.getActualAttendanceDays().divide(item.getRequiredAttendanceDays(), MathContext.DECIMAL32).setScale(8,BigDecimal.ROUND_HALF_UP);//拨付比例
@@ -2474,10 +2481,6 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 						item.setSalaryWithdrawalStandard(item.getSalaryWithdrawalStandard().multiply(allotment));//工资拨付标准
 						item.setRankWithdrawalStandard(item.getRankWithdrawalStandard().multiply(allotment));//职级拨付标准
 						item.setPerformanceAward(item.getPerformanceAward().multiply(allotment));//履约奖
-						item.setSchoolAgeSalary(item.getSchoolAgeSalary().multiply(allotment));//校龄工资
-						item.setCapitalIncrease(item.getCapitalIncrease().multiply(allotment));//增资
-						item.setEducationSalary(item.getEducationSalary().multiply(allotment));//学历工资
-						item.setRankSalary(item.getRankSalary().multiply(allotment));//职级工资
 						item.setSalaryBaseName(item.getSalaryBaseName().multiply(allotment));//工资基数标准
 						item.setWorkloadSalaryCritertion(item.getWorkloadSalaryCritertion().multiply(allotment));//工作量工资标准
 						item.setVirtualWorkloadSalary(item.getVirtualWorkloadSalary().multiply(allotment));//虚拟工作量工资标准
@@ -2485,6 +2488,17 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 						item.setVirtualDoubleCease(item.getVirtualDoubleCease().multiply(allotment));//虚拟双休日工作量工资标准
 						item.setVirtualDailyAssessmentCriteria(item.getVirtualDailyAssessmentCriteria().multiply(allotment));//虚拟日常考核标准
 						item.setTermPerformanceSalaryName(item.getTermPerformanceSalaryName().multiply(allotment));//绩效工资标准
+						item.setDailyAssessmentCriteria(item.getDailyAssessmentCriteria().multiply(allotment));//日常考核标准
+						item.setCustomEight(item.getCustomEight().multiply(allotment));//学期绩效工资标准
+						item.setLeadingCadreSubsidyName(item.getLeadingCadreSubsidyName().multiply(allotment));//领导干部补贴标准
+						item.setAssessLeadingCadreSubsidyName(item.getAssessLeadingCadreSubsidyName().multiply(allotment));//领导干部考核补贴标准
+						item.setPrepareLessonsName(item.getPrepareLessonsName().multiply(allotment));//备课组长补贴标准
+						item.setAssessPrepareLessonsName(item.getAssessPrepareLessonsName().multiply(allotment));//备课组长考核补贴标准
+						item.setTeachingResearchName(item.getTeachingResearchName().multiply(allotment));//教研组长补贴标准
+						item.setAssessTeachingResearchName(item.getAssessTeachingResearchName().multiply(allotment));//教研组长考核补贴标准
+						item.setTeacherSubsidy(item.getTeacherSubsidy().multiply(allotment));//班主任补贴标准
+						item.setTeacherAssessSubsidy(item.getTeacherAssessSubsidy().multiply(allotment));//班主任考核津贴标准
+						item.setSalaryBase(item.getSalaryBaseName());//工资基数
 					}
 					item.setAppropriationProportion(allotment.toString());
 				}