霍煤鸿骏报告生成增加重复项目 自选项目生成报告

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustSampleController.java

@@ -302,6 +302,15 @@ public class EntrustSampleController extends ServiceController {
 
 
 
+    @ApiOperation("选择检测项目生成样品报告")
+    @PostMapping("/make_single_report")
+    public RestResult<Boolean> makeReport(@RequestParam("sampleId")Long sampleId, @RequestParam("itemIds")Long[] itemIds,@RequestParam("templateId")Long templateId) {
+        return success(entrustSampleService.makeSingleReport(sampleId,itemIds,templateId,getAccount()));
+    }
+
+
+
+
     @ApiOperation("质量判定样品分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemMapper.java

@@ -33,6 +33,8 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
 
     List<EntrustSampleItemVO> selectVOListBySampleIds(@Param("ids")Long[] ids);
 
+    List<EntrustSampleItemVO> selectVOListBySampleIdsAndIds(@Param("sampleIds")Long[] sampleIds,@Param("ids")Long[] ids);
+
     List<EntrustSampleItemVO> selectVOListByIds(@Param("ids")Long[] ids);
 
     List<EntrustSampleItemVO> selectByEntrustSampleId(@Param("sampleId")Long sampleId);

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemService.java

@@ -51,6 +51,8 @@ public interface IEntrustSampleItemService extends IBaseService<EntrustSampleIte
 
     List<EntrustSampleItemVO> listBySampleIds(Long[] ids);
 
+    List<EntrustSampleItemVO> listBySampleIdsAndIds(Long[] ids,Long [] itemIds);
+
 
     OriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account);
 

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleService.java

@@ -81,4 +81,6 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean updateSample(EntrustSample entrustSample, String source, Account account);
 
     boolean addTestItemInInput(EntrustSampleADDDTO dto, Account account);
+
+    boolean makeSingleReport(Long sampleId, Long[] itemIds, Long templateId, Account account);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -452,6 +452,12 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
     }
 
     @Override
+    public List<EntrustSampleItemVO> listBySampleIdsAndIds(Long[] sampleIds,Long[] ids) {
+        return baseMapper.selectVOListBySampleIdsAndIds(sampleIds,ids);
+    }
+
+
+    @Override
     public OriginalRecord saveExcelOriginalRecord(Long[] ids, Long templateId, Account account) {
         RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择试验项目!");
         RestAssert.fail(null == templateId, "请选择原始记录模板");

src/main/resources/mapper/hmhj/EntrustSampleItemMapper.xml

@@ -189,6 +189,27 @@
         ORDER BY s.code , i.name
     </select>
 
+    <select id="selectVOListBySampleIdsAndIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
+        SELECT i.id,i.name,i.agreed_value,i.test_value,i.entrust_sample_id,i.standard,s.code AS "sampleCode"
+        FROM
+        entrust_sample_item i
+        JOIN entrust_sample s ON i.entrust_sample_id = s.ID
+
+        WHERE i.deleted = 0 AND s.deleted = 0
+        AND i.entrust_sample_id IN
+        <foreach collection="sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
+            #{sampleId}
+        </foreach>
+
+        AND  i.id IN
+        <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+
+        ORDER BY s.code , i.name
+    </select>
+
+
 
     <select id="selectByItemDeviate" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
         SELECT i.id,i.name,i.agreed_value,i.test_value,i.standard,COALESCE(s.third_code,s.code) AS "sampleCode",