2022年8月17日12点06分

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

@@ -196,9 +196,9 @@ public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover> i
 	@Override
 	public boolean confirm(Long id) {
 		Handover handover = baseMapper.selectById(id);
-		if (!handover.getHandingUser().equals(AuthUtil.getUserId())) {
+		/*if (!handover.getHandingUser().equals(AuthUtil.getUserId())) {
 			throw new RuntimeException("当前登录用户非交接人，禁止确认！");
-		}
+		}*/
 
 		handover.setConfirmStatus(1);
 		handover.setConfirmTime(new Date());

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

@@ -3,6 +3,7 @@ package org.springblade.project.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ibm.icu.math.MathContext;
 import lombok.AllArgsConstructor;
 import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils;
 import org.springblade.check.dto.AuditProecessDTO;
@@ -94,7 +95,9 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 					e.setCreateTime(new Date());
 					e.setCreateUser(SecureUtil.getUserId());
 					e.setCreateUserName(SecureUtil.getUser().getUserName());
-					e.setTaskStatus(10);
+					if(ObjectUtils.isNull(e.getTaskStatus())){
+						e.setTaskStatus(10);
+					}
 					serviceProjectItemMapper.insert(e);
 				});
 			}
@@ -126,7 +129,9 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 			if (!CollectionUtils.isEmpty(itemList)) {
 				//判断新增或者修改操作
 				itemList.forEach(ls -> {
-					ls.setTaskStatus(10);
+					if(ObjectUtils.isNull(ls.getTaskStatus())){
+						ls.setTaskStatus(10);
+					}
 					//修改
 					if (null != ls.getId()) {
 						if (ls.getProjectType() == 2) {
@@ -292,6 +297,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 
 			serviceProjectItem.setEndTime(new Date());
 			serviceProjectItem.setTaskStatus(30);
+			serviceProjectItem.setActualDate(new Date());
 
 			ServiceProject targetServiceProject = serviceProjectMapper.selectById(serviceProjectItem.getPId());
 			//主表已收款项增加
@@ -326,6 +332,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 				serviceProjectItem1.setUpdateTime(new Date());
 				serviceProjectItem1.setUpdateUser(SecureUtil.getUserId());
 				serviceProjectItem1.setId(serviceProjectItem.getItemPid());
+				serviceProjectItem.setActualDate(new Date());
 				serviceProjectItem.setPayTime(new Date());
 				serviceProjectItem.setEndTime(new Date());
 				serviceProjectItem1.setTaskStatus(30);
@@ -350,6 +357,7 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 			serviceProjectItem.setPayTime(payTime);
 
 			serviceProjectItem.setEndTime(new Date());
+			serviceProjectItem.setActualDate(new Date());
 			serviceProjectItem.setTaskStatus(30);
 			serviceProjectItem.setStatus(status);
 		}
@@ -542,14 +550,14 @@ public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper,
 				ls.setSecond(1);
 			}
 			//服务费
-			BigDecimal serviceCharge = ls.getServiceCharge().divide(new BigDecimal(ls.getSecond()));
+			BigDecimal serviceCharge = ls.getServiceCharge().divide(new BigDecimal(ls.getSecond()), MathContext.ENGINEERING);
 			//合计金额
-			BigDecimal amount = ls.getAmount().divide(new BigDecimal(ls.getSecond()));
+			BigDecimal amount = ls.getAmount().divide(new BigDecimal(ls.getSecond()), MathContext.ENGINEERING);
 			//成本
-			BigDecimal matMoney = ls.getMatMoney().divide(new BigDecimal(ls.getSecond()));
+			BigDecimal matMoney = ls.getMatMoney().divide(new BigDecimal(ls.getSecond()), MathContext.ENGINEERING);
 			//提成
 			if (ObjectUtils.isNotNull(ls.getCommission())) {
-				ls.setCommission(ls.getAmount().multiply(ls.getCommission().divide(new BigDecimal(100))).divide(new BigDecimal(ls.getSecond())));
+				ls.setCommission(ls.getAmount().multiply(ls.getCommission().divide(new BigDecimal(100), MathContext.ENGINEERING)).divide(new BigDecimal(ls.getSecond()), MathContext.ENGINEERING));
 			} else {
 				ls.setCommission(new BigDecimal(0));
 			}