楚江erp：样品反馈单相关接口开发

@@ -61,7 +61,7 @@ public class GetSampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
      * 订单编号
      */
     @ApiModelProperty("订单编号")
-    private String orderCode;
+    private String orderNo;
 
     /**
      * 明细数据

@@ -61,7 +61,7 @@ public class QuerySampleResultFeedbackBo extends BaseBo<SampleResultFeedback> {
      * 订单编号
      */
     @ApiModelProperty("订单编号")
-    private String orderCode;
+    private String orderNo;
 
     /**
      * 明细数据

@@ -31,16 +31,34 @@ public class SampleResultFeedback extends BaseEntity implements BaseDto {
     private String customerId;
 
     /**
-     * 所属分厂
+     * 客户名称
+     */
+    @TableField(exist = false)
+    private String customerName;
+
+    /**
+     * 所属分厂ID
      */
     private String workshopId;
 
     /**
+     * 所属分厂名称
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
      * 订单ID
      */
     private String orderId;
 
     /**
+     * 订单编号
+     */
+    @TableField(exist = false)
+    private String orderNo;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

+package com.lframework.xingyun.sc.impl.sample;
+
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.lframework.xingyun.sc.mappers.SampleFeedbackTrackingDetailMapper;
+import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class SampleFeedbackTrackingDetailServiceImpl extends BaseMpServiceImpl<SampleFeedbackTrackingDetailMapper, SampleFeedbackTrackingDetail> implements SampleFeedbackTrackingDetailService {
+
+    @Override
+    public SampleFeedbackTrackingDetail findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "删除样品反馈和追踪明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteById(String id) {
+
+        getBaseMapper().deleteById(id);
+    }
+
+    @Override
+    public List<SampleFeedbackTrackingDetail> listByFeedbackIds(List<String> feedbackIds) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<SampleFeedbackTrackingDetail> listByTrackingIds(List<String> trackingIds) {
+        return Collections.emptyList();
+    }
+}

 package com.lframework.xingyun.sc.impl.sample;
 
 import com.github.pagehelper.PageInfo;
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.entity.SampleResultFeedback;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -9,17 +10,27 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.xingyun.sc.service.sample.SampleFeedbackTrackingDetailService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.SampleResultFeedbackMapper;
 import com.lframework.xingyun.sc.service.sample.SampleResultFeedbackService;
 import com.lframework.xingyun.sc.vo.sample.feedback.QuerySampleResultFeedbackVo;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleResultFeedbackMapper, SampleResultFeedback> implements SampleResultFeedbackService {
 
+
+    @Resource
+    private SampleFeedbackTrackingDetailService sampleFeedbackTrackingDetailService;
+
+
     @Override
     public PageResult<SampleResultFeedback> query(Integer pageIndex, Integer pageSize, QuerySampleResultFeedbackVo vo) {
         Assert.greaterThanZero(pageIndex);
@@ -33,6 +44,12 @@ public class SampleResultFeedbackServiceImpl extends BaseMpServiceImpl<SampleRes
 
     @Override
     public List<SampleResultFeedback> query(QuerySampleResultFeedbackVo vo) {
+        List<SampleResultFeedback> feedbackList = getBaseMapper().query(vo);
+        if (CollectionUtils.isEmpty(feedbackList)) {
+            return Collections.emptyList();
+        }
+        List<String> feedbackIds = feedbackList.stream().map(SampleResultFeedback::getId).collect(Collectors.toList());
+        List<SampleFeedbackTrackingDetail> detailList = sampleFeedbackTrackingDetailService.listByFeedbackIds(feedbackIds);
 
         return getBaseMapper().query(vo);
     }

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.starter.web.core.mapper.BaseMapper;
+
+
+/**
+ * <p>
+ * 样品反馈和追踪明细 Mapper 接口
+ * </p>
+ *
+ */
+public interface SampleFeedbackTrackingDetailMapper extends BaseMapper<SampleFeedbackTrackingDetail> {
+
+}

@@ -17,6 +17,7 @@ public interface SampleResultFeedbackMapper extends BaseMapper<SampleResultFeedb
 
 	/**
      * 查询列表
+     *
      * @param vo    查询条件
      * @return      List<SampleResultFeedback>
      */

+package com.lframework.xingyun.sc.service.sample;
+
+import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
+import com.lframework.starter.web.core.service.BaseMpService;
+
+import java.util.List;
+
+/**
+ * 样品反馈和追踪明细 Service
+ */
+public interface SampleFeedbackTrackingDetailService extends BaseMpService<SampleFeedbackTrackingDetail> {
+
+    /**
+     * 根据ID查询
+     *
+     * @param id    主键ID
+     * @return      SampleFeedbackTrackingDetail
+     */
+    SampleFeedbackTrackingDetail findById(String id);
+
+    /**
+     * 根据ID删除
+     *
+     * @param id    主键ID
+     */
+    void deleteById(String id);
+
+    /**
+     * 根据反馈单ID获取明细数据
+     *
+     * @param feedbackIds   反馈单ID集合
+     * @return              List<SampleFeedbackTrackingDetail>
+     */
+    List<SampleFeedbackTrackingDetail> listByFeedbackIds(List<String> feedbackIds);
+
+    /**
+     * 根据反馈单ID获取明细数据
+     *
+     * @param trackingIds   追踪单ID集合
+     * @return              List<SampleFeedbackTrackingDetail>
+     */
+    List<SampleFeedbackTrackingDetail> listByTrackingIds(List<String> trackingIds);
+}

@@ -17,13 +17,19 @@
         SELECT
             tb.id,
             tb.customer_id,
+            c.name as customer_name,
             tb.workshop_id,
+            w.name as workshop_name,
             tb.order_id,
+            o.order_no,
             tb.create_by_id,
             tb.update_by_id,
             tb.create_time,
             tb.update_time
         FROM sample_result_feedback AS tb
+        LEFT JOIN base_data_customer c ON tb.customer_id = c.id
+        LEFT JOIN base_data_workshop w ON tb.workshop_id = w.id
+        LEFT JOIN purchase_order_info o ON tb.order_id = o.id
     </sql>
 
     <select id="query" resultMap="SampleResultFeedback">