Merge remote-tracking branch 'origin/test' into test

zt-module-qms/zt-module-qms-server/pom.xml

@@ -110,6 +110,12 @@
         <dependency>
             <groupId>com.zt.plat</groupId>
             <artifactId>zt-spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.vaadin.external.google</groupId>
+                    <artifactId>android-json</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- 工具类相关 -->

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

@@ -13,6 +13,7 @@ import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDataRe
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDataDO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSubSampleDO;
 import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodDO;
+import com.zt.plat.module.qms.enums.QmsCommonConstant;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,11 +26,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTaskDataDO> {
 	
-	
-	List<BusinessAssayTaskDataGroupRespVO> selectUnAssayTaskGroupList(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO);
-
-	List<BusinessAssayTaskDataGroupRespVO> selectUnAuditTaskGroupList(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO);
-	
 	default List<BusinessAssayTaskDataExtendRespVO> selectList(BusinessAssayTaskDataReqVO reqVO) {
 		return selectJoinList(BusinessAssayTaskDataExtendRespVO.class, new MPJLambdaWrapperX<BusinessAssayTaskDataDO>()
         		.leftJoin(ConfigAssayMethodDO.class, ConfigAssayMethodDO::getId, BusinessAssayTaskDataDO::getConfigAssayMethodId)
@@ -101,5 +97,45 @@ public interface BusinessAssayTaskDataMapper extends BaseMapperX<BusinessAssayTa
                 .eqIfPresent(BusinessAssayTaskDataDO::getRemark, reqVO.getRemark())
                 .orderByDesc(BusinessAssayTaskDataDO::getId));
     }
+	
+	/**
+	 * 查询未指派的分析任务分组
+	 * @param reqVO
+	 * @return
+	 */
+	List<BusinessAssayTaskDataGroupRespVO> selectUnAssayTaskGroupList(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO);
+
+	/**
+	 * 查询未审核的分析任务分组
+	 * @param reqVO
+	 * @return
+	 */
+	List<BusinessAssayTaskDataGroupRespVO> selectUnAuditTaskGroupList(@Param("reqVO") BusinessAssayTaskDataReqVO reqVO);
+
+    /**
+     * 根据任务分配单id查询分析任务
+     * @param businessAssayTaskId 任务分配单id
+     * @return
+     */
+	default List<BusinessAssayTaskDataDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.eq(BusinessAssayTaskDataDO::getBusinessAssayTaskId, businessAssayTaskId));
+	}
+
+	/**
+	 * 查询是否上报的分析任务
+	 * @param excludeIds 排除的id列表
+	 * @param businessSubSampleId 子样id
+	 * @param configAssayMethodId 分析方法id
+	 * @param isReported 是否上报
+	 * @return
+	 */
+	default List<BusinessAssayTaskDataDO> selectIsReportedList(List<Long> excludeIds, Long businessSubSampleId, Long configAssayMethodId, Integer isReported) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDataDO>()
+				.notIn(BusinessAssayTaskDataDO::getId, excludeIds)
+				.eq(BusinessAssayTaskDataDO::getBusinessSubSampleId, businessSubSampleId)
+				.eq(BusinessAssayTaskDataDO::getConfigAssayMethodId, configAssayMethodId)
+				.eq(BusinessAssayTaskDataDO::getIsReported, isReported));
+	}
 
 }

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

@@ -3,9 +3,11 @@ package com.zt.plat.module.qms.business.bus.dal.mapper;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.qms.business.bus.controller.vo.*;
-import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayTaskDetailPageReqVO;
 import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayTaskDetailDO;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
+
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -33,4 +35,9 @@ public interface BusinessAssayTaskDetailMapper extends BaseMapperX<BusinessAssay
                 .orderByDesc(BusinessAssayTaskDetailDO::getId));
     }
 
+	default List<BusinessAssayTaskDetailDO> selectByBusinessAssayTaskId(Long businessAssayTaskId) {
+		return selectList(new LambdaQueryWrapperX<BusinessAssayTaskDetailDO>()
+                .eqIfPresent(BusinessAssayTaskDetailDO::getBusinessAssayTaskId, businessAssayTaskId));
+	}
+
 }

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

@@ -0,0 +1,35 @@
+package com.zt.plat.module.qms.business.bus.liteflow.sample.analysisaudit;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.yomahub.liteflow.annotation.LiteflowComponent;
+import com.yomahub.liteflow.core.NodeComponent;
+import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigAssayMethodProjectAssessmentDO;
+import com.zt.plat.module.qms.business.config.dal.mapper.ConfigAssayMethodProjectAssessmentMapper;
+
+import jakarta.annotation.Resource;
+
+@LiteflowComponent(id = "sampleAnalysisProjectAssessmentCmp", name = "样品分析项目判定")
+public class SampleAnalysisProjectAssessmentCmp extends NodeComponent {
+	
+	@Resource
+	private ConfigAssayMethodProjectAssessmentMapper configAssayMethodProjectAssessmentMapper;
+
+	@Override
+	public void process() throws Exception {
+		
+		List<ConfigAssayMethodProjectAssessmentDO> configAssayMethodProjectAssessmentList = configAssayMethodProjectAssessmentMapper.selectList();
+
+        BigDecimal min_yc = BigDecimal.ZERO;//最小允差
+        BigDecimal max_yc = BigDecimal.ZERO;//最大允差
+        BigDecimal min_va = BigDecimal.ZERO;//最小值
+        BigDecimal max_va = BigDecimal.ZERO;//最大值
+        BigDecimal k = BigDecimal.ZERO;//斜率k
+        BigDecimal b = BigDecimal.ZERO;//纵截距b
+        BigDecimal c = BigDecimal.ZERO;//调整参数
+        BigDecimal yc_value = BigDecimal.ZERO;//允差值
+        
+	}
+
+}

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson2.JSON;
+import com.ql.util.express.ExpressRunner;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;
 
@@ -24,6 +25,9 @@ public class SampleSubProcessUpdateCmp extends NodeComponent {
 //	@Resource
 //	private ConfigSubSampleService configSubSampleService;
 	
+	@Resource
+	private ExpressRunner expressRunner;
+	
 	@Resource
 	private ConfigSampleFlowService configSampleFlowService;