Переглянути джерело

样本送检流程审核限制

陈长荣 2 місяців тому
батько
коміт
e9f6671981

+ 0 - 4
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SamplePathologicalServiceImpl.java

@@ -31,7 +31,6 @@ import com.github.jfcloud.gene.sample.service.SamplePathologicalService;
 import com.github.jfcloud.gene.sample.vo.PreExperimentVo;
 import com.github.jfcloud.gene.sample.vo.SamplePathologicalVo;
 import com.github.jfcloud.gene.sample.vo.SampleSubmitVo;
-import com.github.jfcloud.gene.util.LocalWord;
 import com.github.jfcloud.gene.util.WordDataService;
 import com.github.jfcloud.rich.vo.HtmlParseVo;
 import com.github.jfcloud.rich.word.WordNodeFactory;
@@ -198,9 +197,6 @@ public class SamplePathologicalServiceImpl extends ServiceImpl<SamplePathologica
         }
 
         String modelName = "animalPathological.ftl";
-        if (LocalWord.exportWord(modelName, dataMap, fileName)) {
-            return;
-        }
         fileInfoService.uploadFileWithFileName(modelName, fileName, sampleInfo.getId(), sampleInfo.getStatus(), dataMap);
     }
 

+ 2 - 2
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -234,11 +234,11 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         GeneStatusEnum statusEnum = Objects.requireNonNull(GeneStatusEnum.getByStatus(sampleInfo.getStatus()));
         switch (statusEnum) {
             case DEPART_LEADER:
-//                Assert.isTrue(UserUtil.getUserId().equals(sampleInfo.getDepartLeaderId()), "抱歉,您不能审核本条记录");
+                Assert.isTrue(UserUtil.getUserId().equals(sampleInfo.getDepartLeaderId()), "抱歉,您不能审核本条记录");
                 nextStatus = GeneStatusEnum.PROJECT_MANAGEMENT.getStatus();
                 break;
             case PROJECT_MANAGEMENT:
-//                Assert.isTrue(UserUtil.getUserId().equals(sampleInfo.getProjectManageId()), "抱歉,您不能审核本条记录");
+                Assert.isTrue(UserUtil.getUserId().equals(sampleInfo.getProjectManageId()), "抱歉,您不能审核本条记录");
                 nextStatus = GeneStatusEnum.COMPLETED.getStatus();
                 break;
             default: