feat:报告编制

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

@@ -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);
+    }
+
 }

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

@@ -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;
 }

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

@@ -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;

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

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

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

@@ -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);
 }

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

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

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

@@ -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);
+    }
 }

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

@@ -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) {
 

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

@@ -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")