zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.will-way.cn/zgty/zt-qms into test

Browse Source
This commit is contained in:
王兴荣
2025-11-26 10:43:01 +08:00
parent 984ae17431 c7fe2db73c
commit 821ce6a7cf
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/vo/BusinessSampleDispatchRespVO.java
View File

@@ -1,5 +1,6 @@
package com.zt.plat.module.qms.business.bus.controller.vo; package com.zt.plat.module.qms.business.bus.controller.vo;
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
@@ -65,6 +66,7 @@ public class BusinessSampleDispatchRespVO {
@Schema(description = "流程审批状态", example = "1") @Schema(description = "流程审批状态", example = "1")
@ExcelProperty("流程审批状态") @ExcelProperty("流程审批状态")
@Dict(dicCode = "flow_status")
private String flowStatus; private String flowStatus;
@Schema(description = "完成状态", example = "1") @Schema(description = "完成状态", example = "1")

12
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/BusinessSampleDispatchServiceImpl.java
View File

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -63,7 +64,7 @@ public class BusinessSampleDispatchServiceImpl implements BusinessSampleDispatch
Long id = paramVo.getId(); Long id = paramVo.getId();
List<Long> addSubSampleIds = paramVo.getAddSubSampleIds(); List<Long> addSubSampleIds = paramVo.getAddSubSampleIds();
List<Long> removeDetailIds = paramVo.getRemoveDetailIds(); List<Long> removeDetailIds = paramVo.getRemoveDetailIds();
BusinessSampleDispatchDO entity = getBusinessSampleDispatch(id);
//处理移除 //处理移除
if(removeDetailIds != null && !removeDetailIds.isEmpty()){ if(removeDetailIds != null && !removeDetailIds.isEmpty()){
businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetailListByIds(removeDetailIds); businessSampleDispatchDetailService.deleteBusinessSampleDispatchDetailListByIds(removeDetailIds);
@@ -81,9 +82,16 @@ public class BusinessSampleDispatchServiceImpl implements BusinessSampleDispatch
detail.setParentId(id); detail.setParentId(id);
insertList.add(detail); insertList.add(detail);
} }
if(!insertList.isEmpty()) if(!insertList.isEmpty()){
businessSampleDispatchDetailService.insertBatch(insertList); businessSampleDispatchDetailService.insertBatch(insertList);
if("-1".equals(entity.getCancelStatus())){
//如果有新增，修改临时数据状态
entity.setCancelStatus("0");
businessSampleDispatchMapper.updateById(entity);
}
}
} }
} }
@Override @Override

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/vo/ReportDocumentMainRespVO.java
View File

@@ -72,6 +72,7 @@ public class ReportDocumentMainRespVO {
@Schema(description = "审批状态,【字典】【jy_doc_main_status】待编制、审批中、已结束", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @Schema(description = "审批状态,【字典】【jy_doc_main_status】待编制、审批中、已结束", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("审批状态,【字典】【jy_doc_main_status】待编制、审批中、已结束") @ExcelProperty("审批状态,【字典】【jy_doc_main_status】待编制、审批中、已结束")
@Dict(dicCode = "flow_status")
private String flowStatus; private String flowStatus;
@Schema(description = "作废标识：0-有效；1-作废") @Schema(description = "作废标识：0-有效；1-作废")