2022年8月10日18点17分

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

@@ -282,11 +282,10 @@ public class ProjectController {
 
 						 @RequestParam(name = "cornId", required = false) Long cornId,
 						 @RequestParam(name = "corpName", required = false) String corpName,
-						 @RequestParam(name = "deptName", required = false) String deptName,
 
+						 @RequestParam(name = "userName", required = false) String userName,
 
 						 @RequestParam(name = "actualDate", required = false) String actualDate,
-						 @RequestParam(name = "userName", required = false) String userName,
 						 @RequestParam(name = "deptid", required = false) Long deptid,
 						 @RequestParam(name = "status", required = true) String status,
 						 @RequestParam(name = "payStartTime", required = false) String payStartTime,
@@ -309,8 +308,8 @@ public class ProjectController {
 			.between(StringUtils.isNotBlank(createStartTime) && StringUtils.isNotBlank(createEndTime), ServiceProjectItem::getCreateTime, createStartTime, createEndTime)
 			.between(StringUtils.isNotBlank(payStartTime) && StringUtils.isNotBlank(payEndTime), ServiceProjectItem::getPayTime, payStartTime, payEndTime)
 			.like(StringUtils.isNotBlank(pName), ServiceProjectItem::getPName, pName)
-			.apply(StringUtils.isNotBlank(beginTime), "date_format(begin_time,'%Y-%m-%d') = '" + beginTime + "'")
-			.apply(StringUtils.isNotBlank(actualDate), "date_format(actual_date,'%Y-%m-%d') = '" + actualDate + "'");
+			.apply(StringUtils.isNotBlank(beginTime), "date_format(begin_time,'%Y-%m-%d') >= '" + beginTime + "'")
+			.apply(StringUtils.isNotBlank(actualDate), "date_format(actual_date,'%Y-%m-%d') <= '" + actualDate + "'");
 
 		LambdaQueryWrapper<ServiceProject> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		//客户名称
@@ -342,6 +341,12 @@ public class ProjectController {
 		{
 		return R.data(Collections.EMPTY_LIST);
 		}*/
+		// 承做人
+		if(StringUtils.isNotBlank(corpName)) {
+			List<User> userList = userClient.userInfoByName(corpName,AuthUtil.getTenantId());
+			List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList());
+			itemLambdaQueryWrapper.in(ServiceProjectItem::getUserid,userIds);
+		}
 		itemLambdaQueryWrapper.orderByDesc(ServiceProjectItem::getCreateTime)
 			.eq(deptid != null, ServiceProjectItem::getDeptid, deptid)
 			 .eq(ServiceProjectItem::getIsDeleted,0)

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -56,7 +56,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 		List<ServiceProjectFiles> filesList = serviceProject.getFilesList();
 		//新增操作,不用考虑子项问题,子项必然是新增
 		if (serviceProject.getId() == null) {
-			serviceProject.setDebitAmount(serviceProject.getDebitAmount() == null?new BigDecimal(0):serviceProject.getAdvanceAmount());
+			serviceProject.setDebitAmount(serviceProject.getDebitAmount() == null?new BigDecimal(0):serviceProject.getDebitAmount());
 			serviceProject.setSettlmentAmount(serviceProject.getSettlmentAmount() == null?new BigDecimal(0):serviceProject.getSettlmentAmount());
 			serviceProject.setBalanceAmount(serviceProject.getBalanceAmount() == null?new BigDecimal(0):serviceProject.getBalanceAmount());
 			BigDecimal debitAmount = serviceProject.getDebitAmount();//合同总金额
@@ -545,7 +545,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 			BigDecimal matMoney = ls.getMatMoney().divide(new BigDecimal(ls.getSecond()));
 			//提成
 			if (ObjectUtils.isNotNull(ls.getCommission())) {
-				ls.setCommission(ls.getAmount().multiply(ls.getCommission()).divide(new BigDecimal(ls.getSecond())));
+				ls.setCommission(ls.getAmount().multiply(ls.getCommission().divide(new BigDecimal(100))).divide(new BigDecimal(ls.getSecond())));
 			} else {
 				ls.setCommission(new BigDecimal(0));
 			}
@@ -578,7 +578,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 				ls.setCreateTime(new Date());
 				ls.setCreateUser(SecureUtil.getUserId());
 				ls.setCreateUserName(SecureUtil.getUser().getUserName());
-				ls.setStatus(4);
+				ls.setStatus(ls.getStatus());
 				ls.setBranch("Y");
 				ls.setItemPid(up.getId());
 				ls.setId(null);