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

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDetectionController.java

@@ -43,7 +43,6 @@ import javax.validation.Valid;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialMaterialMobilizationExcel.java

@@ -39,10 +39,10 @@ public class TrialMaterialMobilizationExcel implements Serializable {
     private String materialNumber;
 
     @ExcelProperty(value = "材料单价")
-    private BigDecimal materialPrice;
+    private String materialPrice;
 
     @ExcelProperty(value = "材料数量")
-    private Integer materialCount;
+    private String materialCount;
 
     @ExcelProperty(value = "计算单位")
     private String calculationUnit;

blade-service/blade-business/src/main/java/org/springblade/business/excel/TrialSampleInfoExcel.java

@@ -38,10 +38,10 @@ public class TrialSampleInfoExcel implements Serializable {
     private String specificationNumber;
 
     @ExcelProperty(value = "试样数量")
-    private Integer materialCount;
+    private String materialCount;
 
     @ExcelProperty(value = "代表数量")
-    private Integer representativeCount;
+    private String representativeCount;
 
     @ExcelProperty(value = "计算单位")
     private String calculationUnit;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TrialClassificationConfigurationController.java

@@ -59,13 +59,13 @@ public class TrialClassificationConfigurationController extends BladeController
     @ApiOperation(value = "删除节点", notes = "传入节点id")
     @RequestMapping(value = "/remove", method = RequestMethod.GET)
     public R<Object> remove(@Valid @RequestParam Long id, Long contractId) {
+        TrialClassificationConfiguration obj = iTrialClassificationConfigurationService.getBaseMapper().selectById(id);
         if (ObjectUtil.isNotEmpty(contractId)) {
             //客户端删除
             List<TrialDetectionData> query = jdbcTemplate.query("select id from m_trial_detection_data where is_deleted = 0 and node_id = " + id + " and contract_id = " + contractId, new BeanPropertyRowMapper<>(TrialDetectionData.class));
             if (query.size() > 0) {
                 throw new ServiceException("当前节点下存在数据，删除失败");
             }
-            TrialClassificationConfiguration obj = iTrialClassificationConfigurationService.getBaseMapper().selectById(id);
             if (obj != null && ObjectUtil.isEmpty(obj.getContractId())) {
                 throw new ServiceException("公共节点无法删除，请联系管理员");
             }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/ITrialClassificationConfigurationService.java

@@ -11,5 +11,4 @@ public interface ITrialClassificationConfigurationService extends BaseService<Tr
     boolean submit(TrialClassificationConfiguration obj);
 
     TrialClassificationConfigurationTreeVO treeAll(String contractId);
-
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/TrialClassificationConfigurationServiceImpl.java

@@ -2,8 +2,10 @@ package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
@@ -17,6 +19,7 @@ import org.springblade.manager.vo.TrialClassificationConfigurationTreeVO;
 import org.springframework.stereotype.Service;
 
 import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;