Merge remote-tracking branch 'origin/master'

This commit is contained in:
king
2026-04-22 09:33:59 +08:00

View File

@@ -16,6 +16,8 @@ import com.lideeyunji.service.system.api.IApiDeptApi;
import com.lideeyunji.service.system.dto.DeptRespDTO;
import com.lideeyunji.tool.framework.common.constant.ByglConstant;
import com.lideeyunji.tool.framework.common.util.object.BeanUtils;
import com.lideeyunji.tool.framework.security.core.LoginUser;
import com.lideeyunji.tool.framework.security.core.util.SecurityFrameworkUtils;
import com.lideeyunji.tool.framework.yunji.enums.AcceptanceStatusEnum;
import com.lideeyunji.tool.framework.yunji.utils.lideeYunJiUtils;
import org.springframework.stereotype.Service;
@@ -116,6 +118,12 @@ public class ByglByfaServiceImpl implements IByglByfaService {
}
order.setWbcjzrUserId(wbcjzrUserId);
//生成工单创建人变更为当前登录人
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
Long userId = loginUser.getId();
order.setCreateUser(userId);
order.setCreateTime(LocalDateTime.now());
//找到planUpkeepTime最近的一条工单
Optional<ByManagementGd> latestCompleted = byManagementGds.stream()
.filter(gd -> gd.getPlanUpkeepTime() != null && !gd.getPlanUpkeepTime().isEmpty())