20230314 17:59

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/excel/AnnualBudgetItemExcel.java

@@ -52,7 +52,7 @@ public class AnnualBudgetItemExcel implements Serializable {
 	/**
 	 * 艾特路
 	 */
-	@ExcelProperty(value = "艾特路")
+	@ExcelProperty(value = "爱特路")
 	private BigDecimal xcentway;
 
 	/**

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/controller/AnnualBudgetItemController.java

@@ -144,7 +144,7 @@ public class AnnualBudgetItemController extends BladeController {
 	}
 
 	/**
-	 * 导入聘用模板
+	 * 导入模板
 	 */
 	@GetMapping("/export/employ")
 	@ApiOperationSupport(order = 11)
@@ -161,16 +161,6 @@ public class AnnualBudgetItemController extends BladeController {
 	@ApiOperationSupport(order = 12)
 	@ApiOperation(value = "年度预算明细导入", notes = "传入excel")
 	public R importItem(@RequestParam("file") MultipartFile file, @RequestParam("id") Long id) {
-		//校验模板
-		String excelPattern = null;
-		try {
-			excelPattern = ExcelCheck.checkExcelPattern(file, new AnnualBudgetItemExcel());
-		} catch (Exception e) {
-			throw new SecurityException("校验Excel失败");
-		}
-		if (StringUtils.isNotBlank(excelPattern)){
-			throw new SecurityException(excelPattern);
-		}
 		//导入数据
 		List<AnnualBudgetItemExcel> excelList = ExcelUtil.read(file, AnnualBudgetItemExcel.class);
 		if(CollectionUtils.isEmpty(excelList))

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/annualBudget/service/impl/AnnualBudgetItemServiceImpl.java

@@ -230,10 +230,7 @@ public class AnnualBudgetItemServiceImpl extends ServiceImpl<AnnualBudgetItemMap
 
 			AnnualBudgetItem selectItem = baseMapper.selectOne(lambdaQueryWrapper);
 			if (ObjectUtil.isNotEmpty(selectItem)){//存在更新
-				item.setUpdateTime(new Date());
-				item.setUpdateUser(AuthUtil.getUserId());
-				item.setId(selectItem.getId());
-				baseMapper.updateById(item);
+				throw new RuntimeException(item.getYear() + "年" + item.getMonth() + "月" + detail.getData().getCname() + "明细已存在");
 			}else {//不存在新增
 				item.setCreateUser(AuthUtil.getUserId());
 				item.setCreateTime(new Date());