20250122 更新

src/main/java/digital/laboratory/platform/entrustment/service/impl/EntrustmentServiceImpl.java

@@ -987,7 +987,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
                 break;
         }
         try {
-            if (!ossFile.objectExist(retBookName) || entrustment.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
+            if (!ossFile.objectExist(retBookName) || entrustment.getStatus() <= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
                 //不存在就生成一个
                 if ((whatBook.equals("identItemBook") || whatBook.equals("identfyBook")) && this.generateIdentifyItemsBook(entrustId)) {
                     return retBookName;
@@ -1546,7 +1546,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         // 审核任务已经提交了, 转到新的环节
         int newStatus = -1;     // 新的状态(环节)
         String currentAcceptNo = "";
-        {
+
         newStatus = ProcessFlowMapper.getNextStatus(entrustment.getStatus(), opCode);
 
         if (opCode == 1 && StrUtil.isBlank(entrustment.getAcceptNo())) {
@@ -1565,7 +1565,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             entrustmentIdentificationMaterialService.setEntrustmentIdentificationMaterialStatusByEntrustment(im, entrustment.getId());
         }
 
-        }
+
         //退回后需标记
         if (opCode == -1) {
             entrustment.setReturnOrNot(-1);
@@ -2084,7 +2084,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
         String pdfFilePath = OSSDirectoryConstants.DOCUMENT_ENTRUSTMENT_DIRECTORY + "/" + ev.getId() + "/" + entrustmentLetterFileName + ".docx";
         try {
             //这里加一下判断条件，由于贵阳市局这里的情况是审核的时候就需要查看委托书，所以为了保证每一次提交过来的委托都是最新的，所以在受理通过以前应该每次查看都是重新生成
-            if (!ossFile.objectExist(pdfFilePath) || ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
+            if (!ossFile.objectExist(pdfFilePath) || ev.getStatus() <= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
                 GenerateEntrustmentLetterPDF(ev);
                 return pdfFilePath;
             }
@@ -2620,7 +2620,7 @@ public class EntrustmentServiceImpl extends ServiceImpl<EntrustmentMapper, Entru
             //如果文件不存在，则生成，否则直接从OSS中获取
             //if (!ossFile.objectExist(pdfFilePath)) {
             //这里加一个判断，由于贵阳市局的确认书需要在审核的时候就能打印出来，为了保证每一次生成的确认书都是委托单位提交过来的最新版，所以我们在审核通过之前，每一次生成委托书都应该重新生成，审核成功以后就不用再重新生成了
-            if (!ossFile.objectExist(downFile) || ev.getStatus() < EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
+            if (!ossFile.objectExist(downFile) || ev.getStatus() <= EntrustmentStatusConstants.ENTRUSTMENT_STATUS_WAITING_ACCEPT.getStatus()) {
 
                 if (this.generateIdentifyItemsBook(ev.getId())) {
                     ossFile.fileGet(downFile, httpServletResponse.getOutputStream());

src/main/java/digital/laboratory/platform/entrustment/vo/CaseEventVO.java

@@ -25,6 +25,9 @@ public class CaseEventVO extends CaseEvent {
 	int caseEvidenceCount;
 	List<CaseEvidence> caseEvidenceList;
 
+	@ApiModelProperty("受理编号")
+	private String acceptNo;
+
 	@ApiModelProperty(value="委托类型: 0=常规毒品, 1=生物样本")
 	private Integer entrustmentType;
 }

src/main/resources/mapper/CaseEventMapper.xml

@@ -83,38 +83,27 @@
 
   <select id="getCaseVoPage" resultType="digital.laboratory.platform.entrustment.vo.CaseEventVO">
       SELECT cj.*,
-
              org.name  AS case_org_name,
              org.alias AS case_org_short_name,
-
-           (
-             SELECT user.name
+             e.accept_no,
+             (SELECT user.name
               FROM dlp_base.sys_user user
       WHERE user.user_id=cj.create_by
-           ) AS case_create_user_name,
-           (
+          ) AS case_create_user_name
+          , (
       SELECT user.name
       FROM dlp_base.sys_user user
       WHERE user.user_id=cj.update_by
-           ) AS case_update_user_name,
-           (
+          ) AS case_update_user_name
+          , (
       SELECT area.name
       FROM dlp_base.b_area area
       WHERE area.id=cj.case_area
-           ) AS case_area_name,
+          ) AS case_area_name
 
-    (
-    SELECT COUNT(*)
-    FROM b_entrustment e
-    WHERE e.case_id=cj.id
-    ) AS case_entrustment_count,
-    (
-    SELECT COUNT(*)
-    FROM b_case_evidence ce
-    WHERE ce.case_id=cj.id
-    ) AS case_evidence_count
       FROM b_case_event cj
-    LEFT JOIN dlp_base.sys_org org on org.org_id=cj.case_own_org_id
+          LEFT JOIN dlp_base.sys_org org ON org.org_id=cj.case_own_org_id
+          LEFT JOIN b_entrustment e ON cj.id=e.case_id
           ${ew.customSqlSegment}
   </select>