refactor getComponentId

cirs-biz/src/main/java/com/cirs/biz/controller/FactoryScoreController.java

@@ -5,8 +5,6 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
-import com.cirs.biz.domain.SysTrain;
-import com.cirs.biz.domain.TrainReturn;
 import com.cirs.common.utils.DictUtils;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;

cirs-biz/src/main/java/com/cirs/biz/service/impl/TVerificationTaskDetailServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 import com.cirs.biz.mapper.TVerificationTaskDetailMapper;
 import com.cirs.biz.domain.TVerificationTaskDetail;
 import com.cirs.biz.service.ITVerificationTaskDetailService;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.Validator;
 
@@ -115,6 +116,7 @@ public class TVerificationTaskDetailServiceImpl implements ITVerificationTaskDet
     }
 
     @Override
+    @Transactional
     public String importTaskDetail(List<TVerificationTaskDetail> taskDetailList, boolean updateSupport, String operName, String fileName) {
         if (StringUtils.isNull(taskDetailList) || taskDetailList.size() == 0)
         {

cirs-biz/src/main/resources/mapper/biz/SysTrainMapper.xml

@@ -87,9 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
     <select id="getComponentId" resultType="java.lang.Long">
-        select id from t_electron_component where t_electron_component.component_name=#{attr}
-                                              AND t_electron_component.component_model=#{attr1}
-                                              AND t_electron_component.quality_grade=#{attr2}
+        select id from t_electron_component where t_electron_component.component_model=#{attr}
+        <if test="result1 != null  and result1 != ''"> AND t_electron_component.quality_grade=#{attr1}</if>
+        <if test="result1 != null  and result1 != ''"> AND t_electron_component.component_name=#{attr2}</if>
+        LIMIT 1
     </select>