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

feat:报告编制

Browse Source
This commit is contained in:
FCL
2025-10-28 15:14:56 +08:00
parent 6353b71192
commit 41cbab20e3
33 changed files with 1056 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java
View File

@@ -106,7 +106,8 @@ public interface ErrorCodeConstants {
//检测报告
ErrorCode REPORT_DOCUMENT_MAIN_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告业务不存在");
ErrorCode REPORT_DOCUMENT_DATA_NOT_EXISTS = new ErrorCode(1_032_100_000, "检测报告明细不存在");
ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报告类型配置不存在");
ErrorCode REPORT_DOCUMENT_TYPE_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告类型配置不存在");
ErrorCode REPORT_DOCUMENT_MAIN_CORRELATION_NOT_EXISTS = new ErrorCode(1_032_100_000, "报告主数据关系不存在");
/*=================================resource 资源管理 1_032_150_000 ~ 1_032_199_999 ==================================*/
ErrorCode DEVICE_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "设备_设备信息不存在");

7
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/controller/admin/BusinessSampleEntrustRegistrationController.java
View File

@@ -107,4 +107,11 @@ public class BusinessSampleEntrustRegistrationController implements BusinessCont
BeanUtils.toBean(list, BusinessSampleEntrustRegistrationRespVO.class));
}
@GetMapping("/queryWaitingDataForReport")
@Operation(summary = "查询待编制数据")
public CommonResult<PageResult<BusinessSampleEntrustRegistrationExtendRespVO>> queryWaitingDataForReport(@Valid BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
PageResult<BusinessSampleEntrustRegistrationExtendRespVO> result = businessSampleEntrustRegistrationService.queryWaitingDataForReport(pageReqVO);
return success(result);
}
}

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

@@ -65,4 +65,6 @@ public class BusinessAssayReportDataPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] baseSampleCreateTime;
@Schema(description = "委托id列表")
private List<Long> businessSampleEntrustRegistrationIdList;
}

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessAssayReportDataDO.java
View File

@@ -102,6 +102,10 @@ public class BusinessAssayReportDataDO extends BusinessBaseDO {
@TableField(exist = false)
private String sampleName;
//样品大类名称
@TableField(exist = false)
private String baseSampleName;
//样品创建时间
@TableField(exist = false)
private LocalDateTime baseSampleCreateTime;

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/dataobject/BusinessSampleEntrustRegistrationDO.java
View File

@@ -252,4 +252,10 @@ public class BusinessSampleEntrustRegistrationDO extends BusinessBaseDO {
@TableField("RMK")
private String remark;
//================扩展字段====================
//委托来源
@TableField(exist = false)
private String configEntrustSourceName;
}

6
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustRegistrationMapper.java
View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.qms.business.bus.dal.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zt.plat.framework.common.pojo.PageResult;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX;
@@ -10,6 +12,7 @@ import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustR
import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigEntrustSourceDO;
import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 委检登记业务 Mapper
@@ -72,4 +75,7 @@ public interface BusinessSampleEntrustRegistrationMapper extends BaseMapperX<Bus
.orderByDesc(BusinessSampleEntrustRegistrationDO::getId));
}
//查询报告待编制数据
Page<BusinessSampleEntrustRegistrationDO> queryWaitingDataForReport(IPage<?> page, @Param("param") BusinessSampleEntrustRegistrationPageReqVO param);
}

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

@@ -64,4 +64,10 @@ public interface BusinessSampleEntrustRegistrationService {
*/
PageResult<BusinessSampleEntrustRegistrationExtendRespVO> getBusinessSampleEntrustRegistrationPage(BusinessSampleEntrustRegistrationPageReqVO pageReqVO);
/**
* 查询待编制数据*/
PageResult<BusinessSampleEntrustRegistrationExtendRespVO> queryWaitingDataForReport(BusinessSampleEntrustRegistrationPageReqVO pageReqVO);
}

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

@@ -1,6 +1,8 @@
package com.zt.plat.module.qms.business.bus.service;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationPageReqVO;
import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationRespVO;
@@ -91,4 +93,12 @@ public class BusinessSampleEntrustRegistrationServiceImpl implements BusinessSam
return businessSampleEntrustRegistrationMapper.selectPage(pageReqVO);
}
//查询待编制数据
@Override
public PageResult<BusinessSampleEntrustRegistrationExtendRespVO> queryWaitingDataForReport(BusinessSampleEntrustRegistrationPageReqVO pageReqVO) {
IPage<BusinessSampleEntrustRegistrationDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
Page<BusinessSampleEntrustRegistrationDO> pageList = businessSampleEntrustRegistrationMapper.queryWaitingDataForReport(page, pageReqVO);
PageResult<BusinessSampleEntrustRegistrationDO> pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal());
return BeanUtils.toBean(pageResult, BusinessSampleEntrustRegistrationExtendRespVO.class);
}
}

20
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentDataController.java
View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.qms.business.reportdoc.controller.admin;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog;
import com.zt.plat.framework.business.annotation.FileUploadController;
import com.zt.plat.framework.business.controller.AbstractFileUploadController;
@@ -55,10 +57,26 @@ public class ReportDocumentDataController extends AbstractFileUploadController i
@Resource private ReportDocumentMainService reportDocumentMainService;
@Resource private ReportDocumentTypeService reportDocumentTypeService;
/*
* 查询报告明细数据，返回结果包含报表字段配置、组装后的报告明细数据*/
@GetMapping("/queryReportDetail")
@Operation(summary = "查询报告明细数据")
@Parameter(name = "mainId", description = "报告id", required = true, example = "1024")
public CommonResult<List<JSONObject>> queryReportDetail(@RequestParam("mainId") Long mainId) {
ReportDocumentMainDO mainDO = reportDocumentMainService.getReportDocumentMain(mainId);
Long typeId = mainDO.getReportDocumentTypeId();
ReportDocumentTypeDO typeDO = reportDocumentTypeService.getReportDocumentType(typeId);
Long confId = typeDO.getConfigReportTypeId();
// Map<String, Object> param = new HashMap<>();
// List<ReportDocumentDataDO> list = reportDocumentDataService.listByMainDataId(mainId).getData();
// return success(BeanUtils.toBean(list, ReportDocumentDataRespVO.class));
CommonResult<List<JSONObject>> result = reportDocumentDataService.assembleDynamicData(mainDO, typeDO);
return result;
}
@GetMapping("/queryAddedData")
@Operation(summary = "已编制报表数据查询")
@Operation(summary = "查询已编制报表数据")
@Parameter(name = "mainId", description = "报告id", required = true, example = "1024")
public CommonResult<List<ReportDocumentDataRespVO>> queryAddedData(@RequestParam("mainId") Long mainId) {

14
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/reportdoc/controller/admin/ReportDocumentMainController.java
View File

@@ -85,10 +85,16 @@ public class ReportDocumentMainController extends AbstractFileUploadController i
return reportDocumentMainService.createProcessInstance(createReqVO);
}
@PostMapping("/execAddData")
@Operation(summary = "增加数据")
public CommonResult<String> execAddData(@RequestBody ReportDocumentMainSaveReqVO vo) {
return reportDocumentMainService.execAddData(vo);
@PostMapping("/execAddDataBySample")
@Operation(summary = "增加数据（按样品）")
public CommonResult<String> execAddDataBySample(@RequestBody ReportDocumentMainSaveReqVO vo) {
return reportDocumentMainService.execAddDataBySample(vo);
}
@PostMapping("/execAddDataByEntrust")
@Operation(summary = "增加数据（按委托）")
public CommonResult<String> execAddDataByEntrust(@RequestBody ReportDocumentMainSaveReqVO vo) {
return reportDocumentMainService.execAddDataByEntrust(vo);
}
@PostMapping("/execRemoveData")

Some files were not shown because too many files have changed in this diff Show More