新增审核意见

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsTaskingEntity.java

@@ -191,5 +191,11 @@ public class DsTaskingEntity extends BaseEntity {
 	@Schema(description = "返工原因")
 	private String reworkReason;
 
+	/**
+	 * 审理意见
+	 */
+	@Schema(description = "审理意见")
+	private String dispose;
+
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java

@@ -45,6 +45,7 @@ import org.springblade.desk.dashboard.service.*;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -78,6 +79,7 @@ public class DsCraftServiceImpl extends BaseServiceImpl<DsCraftMapper, DsCraftEn
 	DsCraftMapper craftMapper;
 
 	@Autowired
+	@Lazy
 	IYieldOrderService yieldOrderService;
 
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -1284,9 +1284,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 
 		dsTasking.setVersion(partVersion);
 		// 查审理单 获取返修原因
-		String reworkMemo = getReworkMemo(reworkOrder);
+		PpmReportDetailDTO reworkMemo = getReworkMemo(reworkOrder);
-		if (!StringUtils.isEmpty(reworkMemo)) {
+		if (null != reworkMemo) {
-			dsTasking.setReworkReason(reworkMemo);
+			dsTasking.setReworkReason(reworkMemo.getMemo());
+			dsTasking.setDispose(reworkMemo.getDispose());
 		}
 
 		// 2. 保存任务信息
@@ -2602,7 +2603,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 	 * @param reworkOrder 返修单号
 	 * @return 返修原因，查询失败时返回 null
 	 */
-	private String getReworkMemo(String reworkOrder) {
+	private PpmReportDetailDTO getReworkMemo(String reworkOrder) {
 		if (StringUtils.isEmpty(reworkOrder)) {
 			log.warn("返修单号为空");
 			return null;
@@ -2635,12 +2636,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 				return null;
 			}
 
-			String memo = detail.getMemo();
+			return detail;
-			if (StringUtils.isEmpty(memo)) {
-				log.warn("返修单 {} 的返修原因为空", reworkOrder);
-			}
-
-			return memo;
 
 		} catch (Exception e) {
 			log.error("查询返修单 {} 的审理单信息异常", reworkOrder, e);