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

fix:增加报告编号

Browse Source
This commit is contained in:
FCL
2026-03-12 09:49:56 +08:00
parent 00e793ebcf
commit 8823952bad
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentAssistService.java
View File

@@ -56,10 +56,9 @@ public class ReportDocumentAssistService {
@Resource private ReportDocumentTypeService reportDocumentTypeService;
@Resource private ReportDocumentFileService reportDocumentFileService;
@Resource private DataTemplateService dataTemplateService;
@Resource private SequenceUtil sequenceUtil;
@Resource private FileApi fileApi;
private String sequenceKey = "QMS_REPORT_IWORK_CODE";
// private String sequenceKey = "QMS_REPORT_IWORK_CODE";
// todo 判断是否更新pdf
public boolean checkUpdateDocFile(JSONObject variables){
@@ -105,7 +104,7 @@ public class ReportDocumentAssistService {
dto.setYysy("检测报告用印");
dto.setYysx("检测报告用印");
dto.setXyywjUrl(docFile.getUrl());
dto.setYwxtdjbh(sequenceUtil.genCode(sequenceKey));
dto.setYwxtdjbh(entity.getDocumentCode());
dto.setBizCallbackKey(ReportDocListenerConstant.IWORK_BIZ_CALL_BACK_KEY); //业务回调标识，回调分发使用
return iWorkIntegrationApi.createWorkflow(dto);
}

5
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainService.java
View File

@@ -6,8 +6,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayReportDat
import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO;
import com.zt.plat.module.qms.business.reportdoc.controller.vo.*;
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO;
import com.zt.plat.module.system.api.iwork.dto.IWorkOperationRespDTO;
import com.zt.plat.module.system.api.iwork.dto.IWorkWorkflowCreateReqDTO;
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentTypeDO;
import jakarta.validation.Valid;
import java.util.List;
@@ -31,7 +30,7 @@ public interface ReportDocumentMainService {
//移除数据
CommonResult<String> execRemoveData(ReportDocumentMainSaveReqVO reqVO);
void updateCommonField(ReportDocumentMainDO reportDocumentMainDO);
void updateCommonField(ReportDocumentMainDO reportDocumentMainDO, ReportDocumentTypeDO typeDO);
//保存报告
void doSave(@Valid ReportDocumentMainSaveReqVO updateReqVO);

15
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/service/ReportDocumentMainServiceImpl.java
View File

@@ -29,6 +29,7 @@ import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentTy
import com.zt.plat.module.qms.business.reportdoc.dal.mapper.ReportDocumentMainMapper;
import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO;
import com.zt.plat.module.qms.common.data.service.DataKeyCheckService;
import com.zt.plat.module.qms.core.code.SequenceUtil;
import com.zt.plat.module.qms.enums.QmsBpmConstant;
import com.zt.plat.module.qms.enums.QmsCommonConstant;
import jakarta.annotation.Resource;
@@ -70,6 +71,7 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
@Resource private BusinessSampleEntrustRegistrationService businessSampleEntrustRegistrationService;
@Resource private ReportDocumentAssistService reportDocumentAssistService;
@Resource private DataKeyCheckService dataKeyCheckService;
@Resource private SequenceUtil sequenceUtil;
/*
* 测试异步执行
@@ -190,14 +192,15 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
if(!insertList.isEmpty())
reportDocumentDataService.insertBatch(insertList);
ReportDocumentMainDO reportDocumentMainDO = reportDocumentMainMapper.selectById(id);
updateCommonField(reportDocumentMainDO);
ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(reportDocumentMainDO.getReportDocumentTypeId());
updateCommonField(reportDocumentMainDO, typeDO);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String formData = reportDocumentMainDO.getFormData();
JSONObject formDataJson = new JSONObject();
if(!ObjectUtils.isEmpty(formData))
formDataJson = JSONObject.parseObject(formData);
ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(reportDocumentMainDO.getReportDocumentTypeId());
String customConfig = typeDO.getCustomConfig();
String defaultConclusion = "";
if(!ObjectUtils.isEmpty(customConfig)){
@@ -262,9 +265,15 @@ public class ReportDocumentMainServiceImpl implements ReportDocumentMainService,
}
@Override
public void updateCommonField(ReportDocumentMainDO reportDocumentMainDO) {
public void updateCommonField(ReportDocumentMainDO reportDocumentMainDO, ReportDocumentTypeDO typeDO) {
if(reportDocumentMainDO == null)
return;
String documentCode = reportDocumentMainDO.getDocumentCode();
if(ObjectUtils.isEmpty(documentCode)){
String codeRule = typeDO.getCodeRule();
documentCode = sequenceUtil.genCode(codeRule);
reportDocumentMainDO.setDocumentCode(documentCode);
}
if(reportDocumentMainDO.getCancelFlag() == null || reportDocumentMainDO.getCancelFlag().equals("-1"))
reportDocumentMainDO.setCancelFlag("0");
}