ioioio 3 rokov pred
rodič
commit
0c88b74468

+ 1 - 0
blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -126,6 +126,7 @@ public class CorpsDescController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入corpsDesc")
 	public R update(@Valid @RequestBody CorpsDesc corpsDesc) {
+		// 
 		if (corpsDesc.getId() == null) {
 			return R.data(500, "请选择要删除的数据", "error");
 		}

+ 2 - 2
blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -428,7 +428,7 @@ public class ProjectController {
 			itemList.forEach(e->{
 				//统计此制单人多少个客户
 				LambdaQueryWrapper<ServiceProjectItem> count=new LambdaQueryWrapper<>();
-				count
+				count.apply(" year(pay_time) = '"+year+"'")
 					.eq(ServiceProjectItem::getUserName,e.getUserName())
 					.eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
 					.eq(ServiceProjectItem::getIsDeleted,0);
@@ -645,7 +645,7 @@ public class ProjectController {
 			ipage.getRecords().forEach(e->{
 				//统计此制单人多少个客户
 				LambdaQueryWrapper<ServiceProjectItem> count=new LambdaQueryWrapper<>();
-				count
+				count.apply(" year(pay_time) = '"+year+"'")
 					.eq(ServiceProjectItem::getUserName,e.getUserName())
 					.eq(ServiceProjectItem::getTenantId,AuthUtil.getTenantId())
 					.eq(ServiceProjectItem::getIsDeleted,0);