Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskPageReqVO.java

@@ -59,9 +59,6 @@ public class BusinessAssayTaskPageReqVO extends PageParam {
     @Schema(description = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交", example = "1")
     private String taskStatus;
 
-    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", example = "1")
-    private String synchronousStatus;
-
     @Schema(description = "标样业务ID", example = "11493")
     private Long standardSampleId;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskRespVO.java

@@ -70,10 +70,6 @@ public class BusinessAssayTaskRespVO {
     @ExcelProperty("指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交")
     private String taskStatus;
 
-    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步")
-    private String synchronousStatus;
-
     @Schema(description = "标样业务ID", example = "11493")
     @ExcelProperty("标样业务ID")
     private Long standardSampleId;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessAssayTaskSaveReqVO.java

@@ -64,10 +64,6 @@ public class BusinessAssayTaskSaveReqVO {
     @NotEmpty(message = "指派单状态,【字典】【jy_assay_task_status】0-初始状态，1-已提交不能为空")
     private String taskStatus;
 
-    @Schema(description = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotEmpty(message = "同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步不能为空")
-    private String synchronousStatus;
-
     @Schema(description = "标样业务ID", example = "11493")
     private Long standardSampleId;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayTaskDO.java

@@ -107,11 +107,6 @@ public class BusinessAssayTaskDO extends BusinessBaseDO {
     @TableField("TSK_STS")
     private String taskStatus;
     /**
-    * 同步状态,【字典】【jy_assay_task_syn_status】0-未同步，1-已同步
-    */
-    @TableField("SYNC_STS")
-    private String synchronousStatus;
-    /**
     * 标样业务ID
     */
     @TableField("STD_SMP_ID")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.java

@@ -40,7 +40,6 @@ public interface BusinessAssayTaskMapper extends BaseMapperX<BusinessAssayTaskDO
                 .eqIfPresent(BusinessAssayTaskDO::getReportOperator, reqVO.getReportOperator())
                 .betweenIfPresent(BusinessAssayTaskDO::getSubmitTime, reqVO.getSubmitTime())
                 .eqIfPresent(BusinessAssayTaskDO::getTaskStatus, reqVO.getTaskStatus())
-                .eqIfPresent(BusinessAssayTaskDO::getSynchronousStatus, reqVO.getSynchronousStatus())
                 .eqIfPresent(BusinessAssayTaskDO::getStandardSampleId, reqVO.getStandardSampleId())
                 .eqIfPresent(BusinessAssayTaskDO::getStandardSampleCode, reqVO.getStandardSampleCode())
                 .eqIfPresent(BusinessAssayTaskDO::getStandardSampleTypeId, reqVO.getStandardSampleTypeId())

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/liteflow/sample/entrust/SampleEntrustGenSampleDataCmp.java

@@ -1,7 +1,5 @@
 package com.zt.plat.module.qms.business.bus.liteflow.sample.entrust;
 
-import static org.hamcrest.CoreMatchers.nullValue;
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/core/liteflow/parser/QmsXmlFlowELParser.java

@@ -65,7 +65,7 @@ public class QmsXmlFlowELParser extends ClassXmlFlowELParser {
                 
             }
             //当还未配置时，添加一个默认的规则，否则启动会报错
-            if (chainResult.size() <= 0) {            	
+            if (chainResult.size() <= 0) {
 				chainResult.add(StrUtil.format(QmsXmlFlowElParserConstant.CHAIN_XML_PATTERN, "default-demo", "SER()"));
 			}
             String chainsContent = CollUtil.join(chainResult, StrUtil.EMPTY);