试样订单:跟踪单-试样结果

@@ -1185,11 +1185,8 @@ create table if not exists sample_result_tracking(
     packaging text comment '包装描述',
     weight text comment '件重描述',
     other text comment '其它描述',
-    sample_success boolean DEFAULT FALSE COMMENT '试样成功',
-    bulk_order boolean DEFAULT FALSE COMMENT '批量订货',
-    sample_failure boolean DEFAULT FALSE COMMENT '试样不成功',
-    continue_sample boolean DEFAULT FALSE COMMENT '继续试样',
-    stop_sample boolean DEFAULT FALSE COMMENT '停止再试样',
+    sample_result varchar (50) COMMENT '试样结果',
+    sample_result_sub varchar (50) COMMENT '试样结果子数据',
     customer_reviews_file_id varchar(100) comment '客户评价依据文件ID',
     customer_reviews_file_name varchar(200) comment '客户评价依据文件名称',
     status varchar(20) comment '审核状态',

@@ -113,34 +113,16 @@ public class GetSampleResultTrackingBo extends BaseBo<SampleResultTracking> {
     private List<SampleFeedbackTrackingDetail> detailList;
 
     /**
-     * 试样成功
+     * 试样结果
      */
-    @ApiModelProperty("试样成功")
-    private boolean sampleSuccess;
+    @ApiModelProperty("试样结果")
+    private String sampleResult;
 
     /**
-     * 批量订货
+     * 试样结果子结果
      */
-    @ApiModelProperty("批量订货")
-    private boolean bulkOrder;
-
-    /**
-     * 试样不成功
-     */
-    @ApiModelProperty("试样不成功")
-    private boolean sampleFailure;
-
-    /**
-     * 继续试样
-     */
-    @ApiModelProperty("继续试样")
-    private boolean continueSample;
-
-    /**
-     * 停止再试样
-     */
-    @ApiModelProperty("停止再试样")
-    private boolean stopSample;
+    @ApiModelProperty("试样结果子结果")
+    private String sampleResultSub;
 
     /**
      * 客户评价依据文件ID

@@ -119,34 +119,16 @@ public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> {
     private List<SampleFeedbackTrackingDetail> detailList;
 
     /**
-     * 试样成功
+     * 试样结果
      */
-    @ApiModelProperty("试样成功")
-    private boolean sampleSuccess;
+    @ApiModelProperty("试样结果")
+    private String sampleResult;
 
     /**
-     * 批量订货
+     * 试样结果子结果
      */
-    @ApiModelProperty("批量订货")
-    private boolean bulkOrder;
-
-    /**
-     * 试样不成功
-     */
-    @ApiModelProperty("试样不成功")
-    private boolean sampleFailure;
-
-    /**
-     * 继续试样
-     */
-    @ApiModelProperty("继续试样")
-    private boolean continueSample;
-
-    /**
-     * 停止再试样
-     */
-    @ApiModelProperty("停止再试样")
-    private boolean stopSample;
+    @ApiModelProperty("试样结果子结果")
+    private String sampleResultSub;
 
 
     /**

@@ -248,11 +248,37 @@ public class SampleResultTrackingController extends DefaultBaseController {
                     dataMap.put("packaging", data.getPackaging() == null ? "" : data.getPackaging());
                     dataMap.put("weight", data.getWeight() == null ? "" : data.getWeight());
                     dataMap.put("other", data.getOther() == null ? "" : data.getOther());
-                    dataMap.put("sampleSucces", data.isSampleSuccess() ? "☑试样成功" : "□试样成功");
-                    dataMap.put("bulkOrder", data.isBulkOrder() ? "☑批量订货" : "□批量订货");
-                    dataMap.put("sampleFailure", data.isSampleFailure() ? "☑试样不成功" : "□试样不成功");
-                    dataMap.put("continueSample", data.isContinueSample() ? "☑继续试样" : "□继续试样");
-                    dataMap.put("stopSample", data.isStopSample() ? "☑停止再试样" : "□停止再试样");
+                    if (StringUtils.isNotEmpty(data.getSampleResult())) {
+                        if ("SUCCESS".equals(data.getSampleResult())) {
+                            dataMap.put("sampleSucces", "☑试样成功");
+                            dataMap.put("sampleFailure", "□试样不成功");
+                        } else {
+                            dataMap.put("sampleSucces", "□试样成功");
+                            dataMap.put("sampleFailure", "☑试样不成功");
+                        }
+                    } else {
+                        dataMap.put("sampleSucces", "□试样成功");
+                        dataMap.put("sampleFailure", "□试样不成功");
+                    }
+                    if (StringUtils.isNotEmpty(data.getSampleResultSub())) {
+                        if (data.getSampleResultSub().equals("SUCCESS_BULK_ORDER")) {
+                            dataMap.put("bulkOrder", "☑批量订货");
+                            dataMap.put("continueSample", "□继续试样");
+                            dataMap.put("stopSample", "□停止再试样");
+                        } else if (data.getSampleResultSub().equals("FAILURE_CONTINUE")) {
+                            dataMap.put("bulkOrder", "□批量订货");
+                            dataMap.put("continueSample", "☑继续试样");
+                            dataMap.put("stopSample", "□停止再试样");
+                        } else {
+                            dataMap.put("bulkOrder", "□批量订货");
+                            dataMap.put("continueSample", "□继续试样");
+                            dataMap.put("stopSample", "☑停止再试样");
+                        }
+                    } else {
+                        dataMap.put("bulkOrder", "□批量订货");
+                        dataMap.put("continueSample", "□继续试样");
+                        dataMap.put("stopSample", "□停止再试样");
+                    }
                     dataMap.put("customerReviewsFileName", data.getCustomerReviewsFileName() == null ? "" : data.getCustomerReviewsFileName());
                     dataMap.put("officeSupervisorOpinion", data.getOfficeSupervisorOpinion() == null ? "" : data.getOfficeSupervisorOpinion());
                     dataMap.put("qualitySupervisorOpinion", data.getQualitySupervisorOpinion() == null ? "" : data.getQualitySupervisorOpinion());

@@ -112,29 +112,14 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
     private String other;
 
     /**
-     * 试样成功
+     * 试样结果
      */
-    private boolean sampleSuccess;
+    private String sampleResult;
 
     /**
-     * 批量订货
+     * 试样结果子结果
      */
-    private boolean bulkOrder;
-
-    /**
-     * 试样不成功
-     */
-    private boolean sampleFailure;
-
-    /**
-     * 继续试样
-     */
-    private boolean continueSample;
-
-    /**
-     * 停止再试样
-     */
-    private boolean stopSample;
+    private String sampleResultSub;
 
     /**
      * 客户评价依据文件ID

@@ -9,7 +9,6 @@ import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
-import com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip;
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.entity.SampleResultTracking;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -130,11 +129,8 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
                 .set(SampleResultTracking::getPackaging, StringUtil.isBlank(vo.getPackaging()) ? null : vo.getPackaging())
                 .set(SampleResultTracking::getWeight, StringUtil.isBlank(vo.getWeight()) ? null : vo.getWeight())
                 .set(SampleResultTracking::getOther, StringUtil.isBlank(vo.getOther()) ? null : vo.getOther())
-                .set(SampleResultTracking::isSampleSuccess, vo.isSampleSuccess())
-                .set(SampleResultTracking::isBulkOrder, vo.isBulkOrder())
-                .set(SampleResultTracking::isSampleFailure, vo.isSampleFailure())
-                .set(SampleResultTracking::isContinueSample, vo.isContinueSample())
-                .set(SampleResultTracking::isStopSample, vo.isStopSample())
+                .set(SampleResultTracking::getSampleResult, StringUtil.isBlank(vo.getSampleResult()) ? null : vo.getSampleResult())
+                .set(SampleResultTracking::getSampleResultSub, StringUtil.isBlank(vo.getSampleResultSub()) ? null : vo.getSampleResultSub())
                 .set(SampleResultTracking::getCustomerReviewsFileId, StringUtil.isBlank(vo.getCustomerReviewsFileId()) ? null : vo.getCustomerReviewsFileId())
                 .set(SampleResultTracking::getCustomerReviewsFileName, StringUtil.isBlank(vo.getCustomerReviewsFileName()) ? null : vo.getCustomerReviewsFileName())
                 .set(SampleResultTracking::getStatus, "AUDIT")

@@ -63,39 +63,16 @@ public class UpdateSampleResultTrackingVo implements BaseVo, Serializable {
     private String other;
 
     /**
-     * 试样成功
+     * 试样结果
      */
-    @ApiModelProperty("试样成功")
-    @TypeMismatch(message = "试样成功格式有误！")
-    private boolean sampleSuccess;
+    @ApiModelProperty("试样结果")
+    private String sampleResult;
 
     /**
-     * 批量订货
+     * 试样结果子结果
      */
-    @ApiModelProperty("批量订货")
-    @TypeMismatch(message = "批量订货格式有误！")
-    private boolean bulkOrder;
-
-    /**
-     * 试样不成功
-     */
-    @ApiModelProperty("试样不成功")
-    @TypeMismatch(message = "试样不成功格式有误！")
-    private boolean sampleFailure;
-
-    /**
-     * 继续试样
-     */
-    @ApiModelProperty("继续试样")
-    @TypeMismatch(message = "继续试样格式有误！")
-    private boolean continueSample;
-
-    /**
-     * 停止再试样
-     */
-    @ApiModelProperty("停止再试样")
-    @TypeMismatch(message = "停止再试样格式有误！")
-    private boolean stopSample;
+    @ApiModelProperty("试样结果子结果")
+    private String sampleResultSub;
 
     /**
      * 客户评价依据文件ID

@@ -20,11 +20,8 @@
         <result column="packaging" property="packaging"/>
         <result column="weight" property="weight"/>
         <result column="other" property="other"/>
-        <result column="sample_success" property="sampleSuccess"/>
-        <result column="bulk_order" property="bulkOrder"/>
-        <result column="sample_failure" property="sampleFailure"/>
-        <result column="continue_sample" property="continueSample"/>
-        <result column="stop_sample" property="stopSample"/>
+        <result column="sample_result" property="sampleResult"/>
+        <result column="sample_result_sub" property="sampleResultSub"/>
         <result column="customer_reviews_file_id" property="customerReviewsFileId"/>
         <result column="customer_reviews_file_name" property="customerReviewsFileName"/>
         <result column="status" property="status"/>
@@ -58,11 +55,8 @@
             tb.packaging,
             tb.weight,
             tb.other,
-            tb.sample_success,
-            tb.bulk_order,
-            tb.sample_failure,
-            tb.continue_sample,
-            tb.stop_sample,
+            tb.sample_result,
+            tb.sample_result_sub,
             tb.customer_reviews_file_id,
             tb.customer_reviews_file_name,
             tb.status,