项目、合同、运单、预结算、正式结算、付款对接mk

blade-service/blade-transport/src/main/java/org/springblade/transport/mk/MkProcessBizHandlers.java

@@ -73,7 +73,7 @@ public final class MkProcessBizHandlers {
 
 		@Override
 		public Object publicDetail(Long id) {
-			return service.detail(id);
+			return service.publicDetail(id);
 		}
 
 		@Override
@@ -143,7 +143,7 @@ public final class MkProcessBizHandlers {
 
 		@Override
 		public Object publicDetail(Long id) {
-			return service.detail(id);
+			return service.publicDetail(id);
 		}
 
 		@Override

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IContractManageService.java

@@ -40,6 +40,14 @@ public interface IContractManageService extends BaseService<ContractManage> {
 
 	IPage<ContractManageVO> selectContractManagePage(IPage<ContractManage> page, ContractManageVO contractManage);
 	ContractManageVO detail(Long id);
+
+	/**
+	 * 公开详情，不校验当前用户所属组织
+	 *
+	 * @param id 主键
+	 * @return 合同详情
+	 */
+	ContractManageVO publicDetail(Long id);
 	boolean saveDraft(ContractManage contractManage);
 	boolean submit(ContractManage contractManage);
 	boolean toTemporary(Long id);

blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectApplyService.java

@@ -40,6 +40,14 @@ public interface IProjectApplyService extends BaseService<ProjectApply> {
 
 	IPage<ProjectApplyVO> selectProjectApplyPage(IPage<ProjectApply> page, ProjectApplyVO projectApply);
 	ProjectApplyVO detail(Long id);
+
+	/**
+	 * 公开详情，不校验当前用户所属组织
+	 *
+	 * @param id 主键
+	 * @return 项目立项详情
+	 */
+	ProjectApplyVO publicDetail(Long id);
 	Map<String, Integer> fundRiskStats(ProjectApplyVO projectApply);
 	Map<String, Object> changeRecordDetail(Long id, Integer recordIndex);
 	boolean saveDraft(ProjectApply projectApply);

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java

@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -97,6 +98,15 @@ public class ContractManageServiceImpl extends BaseServiceImpl<ContractManageMap
 		return contractManageVO;
 	}
 
+	@Override
+	@TenantIgnore
+	public ContractManageVO publicDetail(Long id) {
+		ContractManageVO contractManageVO = ContractManageWrapper.build().entityVO(loadExists(id));
+		normalizeOptionalIntegerFields(contractManageVO);
+		contractManageVO.setReadonly(true);
+		return contractManageVO;
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean saveDraft(ContractManage contractManage) {

blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectApplyServiceImpl.java

@@ -29,6 +29,7 @@ import lombok.RequiredArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -109,6 +110,15 @@ public class ProjectApplyServiceImpl extends BaseServiceImpl<ProjectApplyMapper,
 		return projectApplyVO;
 	}
 
+	@Override
+	@TenantIgnore
+	public ProjectApplyVO publicDetail(Long id) {
+		ProjectApplyVO projectApplyVO = ProjectApplyWrapper.build().entityVO(loadExists(id));
+		normalizeOptionalFields(projectApplyVO);
+		projectApplyVO.setReadonly(true);
+		return projectApplyVO;
+	}
+
 	@Override
 	public Map<String, Integer> fundRiskStats(ProjectApplyVO projectApply) {
 		projectApply.setFundUseRisk(null);