同步修改合同检测值

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

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.google.common.collect.Lists;
 import com.patzn.cloud.service.hmhj.dto.*;
 import com.patzn.cloud.service.hmhj.entity.EntrustSample;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleItemStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSamplePrepareStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
-import com.patzn.cloud.service.hmhj.enums.EntrustStatusEnum;
+import com.patzn.cloud.service.hmhj.enums.*;
 import com.patzn.cloud.service.hmhj.vo.AlTasteStatsVO;
 import com.patzn.cloud.service.hmhj.vo.ElectrolyteRatioStatsVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleVO;
 import com.patzn.cloud.service.hmhj.vo.PMakeFeStatsVO;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +25,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -98,6 +97,25 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.pageVOForMake(getPage(), entrustSample));
     }
 
+    @ApiOperation("报告编制样品历史分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_report_make_his")
+    public RestResult<Page<EntrustSampleVO>> getPageReportMakeHis(EntrustSampleVO entrustSample) {
+        entrustSample.setStatusList(Lists.newArrayList(
+                EntrustSampleStatusEnum.REPORT_CHECK,
+                EntrustSampleStatusEnum.REPORT_ALLOW,
+                EntrustSampleStatusEnum.REPORT_ISSUE,
+                EntrustSampleStatusEnum.REPORT_SEND,
+                EntrustSampleStatusEnum.END
+        ));
+        return success(entrustSampleService.pageVOForMakeHis(getPage(), entrustSample));
+    }
+
     @ApiOperation("报告审核样品分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
@@ -288,16 +306,20 @@ public class EntrustSampleController extends ServiceController {
         return success(entrustSampleService.makeReport(dto, getAccount()));
     }
 
+    @ApiOperation("样品生成报告")
+    @PostMapping("/make_report_from_his")
+    public RestResult<Boolean> makeReportFromHis(@RequestBody ReportDTO dto) {
+        return success(entrustSampleService.makeReportFromHis(dto, getAccount()));
+    }
 
 
     @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()));
+    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/EntrustReportMapper.java

 package com.patzn.cloud.service.lims.hmhj.mapper;
 
+import com.baomidou.mybatisplus.annotations.SqlParser;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.mapper.BatchMapper;
 import com.patzn.cloud.service.hmhj.entity.EntrustReport;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@ import com.patzn.cloud.service.hmhj.entity.EntrustReport;
  */
 public interface EntrustReportMapper extends BatchMapper<EntrustReport> {
 
+    @SqlParser(filter = true)
+    List<EntrustReport> selectPageList(Page<EntrustReport> page, @Param("vo") EntrustReport report);
+
 }

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

@@ -34,21 +34,21 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
 
     List<EntrustSampleItemVO> selectVOList(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO entrustSampleItem);
 
-    List<EntrustSampleItemVO> selectVOListBySampleIds(@Param("ids")Long[] ids);
+    List<EntrustSampleItemVO> selectVOListBySampleIds(@Param("ids") Long[] ids);
 
-    List<EntrustSampleItemVO> selectVOListBySampleIdsAndIds(@Param("sampleIds")Long[] sampleIds,@Param("ids")Long[] ids);
+    List<EntrustSampleItemVO> selectVOListBySampleIdsAndIds(@Param("sampleIds") Long[] sampleIds, @Param("ids") Long[] ids);
 
-    List<EntrustSampleItemVO> selectVOListByIds(@Param("ids")Long[] ids);
+    List<EntrustSampleItemVO> selectVOListByIds(@Param("ids") Long[] ids);
 
-    List<EntrustSampleItemVO> selectByEntrustSampleId(@Param("sampleId")Long sampleId);
+    List<EntrustSampleItemVO> selectByEntrustSampleId(@Param("sampleId") Long sampleId);
 
-    List<EntrustSampleItemVO> selectByItemDeviate(RowBounds rowBounds, @Param("vo")EntrustSampleItemVO entrustSampleItem);
+    List<EntrustSampleItemVO> selectByItemDeviate(RowBounds rowBounds, @Param("vo") EntrustSampleItemVO entrustSampleItem);
 
-    List<EntrustSampleItemVO> selectListVOByIds(@Param("ids")List<Long> expIdsList);
+    List<EntrustSampleItemVO> selectListVOByIds(@Param("ids") List<Long> expIdsList);
 
     List<EntrustSampleItemVO> selectByOriginalRecordId(@Param("originalRecordId") Long originalRecordId);
 
-    List<EntrustSampleItemVO> selectMinStatusBySampleIds(@Param("sampleIds")List<Long> sampleIds);
+    List<EntrustSampleItemVO> selectMinStatusBySampleIds(@Param("sampleIds") List<Long> sampleIds);
 
     List<EntrustSampleItemVO> selectByEntrustId(@Param("entrustId") Long entrustId);
 
@@ -64,4 +64,6 @@ public interface EntrustSampleItemMapper extends BatchMapper<EntrustSampleItem>
     boolean updateItemJudgeByEntrustId(@Param("entrustId") Long entrustId);
 
     List<SampleItemStatsVO> selectSampleItemStats(@Param("vo") SampleItemDTO sampleItemDTO);
+
+    List<EntrustSampleItemVO> listIndexReplaceItemBySampleId(@Param("sampleId") Long sampleId);
 }

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

@@ -69,4 +69,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean addJudgementType(Long[] ids, String judgement, Account account);
 
     Page<ContractSample> pageOutReg(Page<ContractSample> page, ContractSample contractSample);
+
+    boolean isOutEntrustData(Long contractSampleId);
 }

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

@@ -21,6 +21,8 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
 
     Page<EntrustReport> page(Page<EntrustReport> page, EntrustReport entrustReport);
 
+    Page<EntrustReport> pageHis(Page<EntrustReport> page, EntrustReport entrustReport);
+
     boolean removeByIds(List<Long> ids);
 
     void uploadReportGenerateDocx(Entrust entrust, Long[] ids, Account account, String name, String remark, File file);
@@ -50,4 +52,6 @@ public interface IEntrustReportService extends IBaseService<EntrustReport> {
     Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport);
 
     Page<EntrustReport> pageBranchReport(Page<EntrustReport> page, EntrustReportVO entrustReportVO, Account account);
+
+    boolean updateLastFlowCheckByEntrustId(Long entrustId, Account account);
 }

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

@@ -101,4 +101,8 @@ public interface IEntrustSampleService extends IBaseService<EntrustSample> {
     boolean isRequireJudgeGrading(Long entrustId);
 
     boolean updateJudgeStatus(Long entrustId,Integer judgeStatus);
+
+    Page<EntrustSampleVO> pageVOForMakeHis(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample);
+
+    boolean makeReportFromHis(ReportDTO dto, Account account);
 }

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

@@ -360,22 +360,22 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         RestAssert.fail(CollectionUtils.isEmpty(voList), "请选择通过的数据！");
 
         for (ContractSampleVO sampleVO : voList) {
-            RestAssert.fail(null == sampleVO.getId(), "数据有误！");
-            RestAssert.fail(null == sampleVO.getEntrustId(), "数据有误！");
+            RestAssert.fail(null == sampleVO.getId(), "合同数据为空！");
+            RestAssert.fail(null == sampleVO.getEntrustSampleId(), "样品数据为空！");
         }
 
         List<Long> idsList = new ArrayList<>();
-        List<Long> entrustIdsList = new ArrayList<>();
+        List<Long> entrustSampleIdsList = new ArrayList<>();
         for (ContractSampleVO sampleVO : voList) {
             idsList.add(sampleVO.getId());
-            entrustIdsList.add(sampleVO.getEntrustSampleId());
+            entrustSampleIdsList.add(sampleVO.getEntrustSampleId());
         }
 
         EntrustSample sample = new EntrustSample();
         sample.setStatus(EntrustSampleStatusEnum.END);
         sample.setProgress(EntrustSampleStatusEnum.END);
         sample.setJudgeStatus(0);
-        entrustSampleService.update(sample, Condition.create().in("id", entrustIdsList));
+        entrustSampleService.update(sample, Condition.create().in("id", entrustSampleIdsList));
         return true;
     }
 
@@ -416,5 +416,14 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return this.page(page, wrapper);
     }
 
+    @Override
+    public boolean isOutEntrustData(Long contractSampleId) {
+        if (null == contractSampleId) {
+            return false;
+        }
+        ContractSample contractSample = getById(contractSampleId);
+        return null != contractSample && null != contractSample.getType() && 1 == contractSample.getType().intValue() ? true : false;
+    }
+
 
 }

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

@@ -64,6 +64,9 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     @Autowired
     private SysUserClient sysUserClient;
 
+    @Autowired
+    private IEntrustReportRecordService entrustReportRecordService;
+
     @Value("${libreOffice.url}")
     private String libreOfficeUrl;
 
@@ -75,6 +78,11 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Override
+    public Page<EntrustReport> pageHis(Page<EntrustReport> page, EntrustReport entrustReport) {
+        return page.setRecords(baseMapper.selectPageList(page, entrustReport));
+    }
+
+    @Override
     public Page<EntrustReport> pageStatus(Page<EntrustReport> page, List<EntrustReportStatusEnum> reportStatusList, EntrustReport entrustReport) {
         Wrapper wrapper = new EntityWrapper<>(entrustReport);
         if (CollectionUtils.isNotEmpty(reportStatusList)) {
@@ -97,6 +105,22 @@ public class EntrustReportServiceImpl extends BaseServiceImpl<EntrustReportMappe
     }
 
     @Override
+    public boolean updateLastFlowCheckByEntrustId(Long entrustId, Account account) {
+        if (null == entrustId) {
+            return false;
+        }
+        // 根据委托编号获取生成的委托报告
+        List<EntrustReport> list = list(Condition.create().eq("entrust_id", entrustId).orderBy("id", false));
+        if (CollectionUtils.isEmpty(list)) {
+            return false;
+        }
+        EntrustReport report = list.get(0);
+        report.setStatus(EntrustReportStatusEnum.CHECK).setProgress(EntrustReportStatusEnum.CHECK);
+        entrustRecordService.record(Collections.singletonList(report.getEntrustId()), "历史提交", EntrustReportStatusEnum.CHECK.getDisplay(), 0, account, "从历史中重新生成报告提交至报告审核");
+        return updateById(report);
+    }
+
+    @Override
     public boolean removeByIds(List<Long> ids) {
         entrustReportRelSampleService.remove(Condition.create().in("report_id", ids));
         return baseMapper.deleteBatchIds(ids) > 0;

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

@@ -1775,4 +1775,28 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
         entrustSample.setJudgeStatus(judgeStatus).setJudgeProgress(judgeStatus);
         return update(entrustSample, Condition.create().eq("entrust_id", entrustId));
     }
+
+    @Override
+    public Page<EntrustSampleVO> pageVOForMakeHis(Page<EntrustSampleVO> page, EntrustSampleVO entrustSample) {
+        return page.setRecords(baseMapper.selectVOList(page, entrustSample));
+    }
+
+    @Override
+    public boolean makeReportFromHis(ReportDTO dto, Account account) {
+        Long[] sampleIds = dto.getSampleIds();
+        RestAssert.fail(null == sampleIds, "样品ID数据为空");
+        RestAssert.fail(null == dto.getEntrustId(), "委托ID数据为空");
+        // 从历史中生成报告，会自动删除之前的报告
+        entrustReportService.update(new EntrustReport().setDeleted(1), Condition.create().eq("entrust_id", dto.getEntrustId()));
+        // 删除样品与报告关联
+        entrustReportRelSampleService.remove(Condition.create().in("sample_id", sampleIds));
+
+        EntrustSample entrustSample = new EntrustSample();
+        entrustSample.setStatus(EntrustSampleStatusEnum.REPORT_MAKE);
+        entrustSample.setProgress(EntrustSampleStatusEnum.REPORT_MAKE);
+        entrustSample.setJudgeStatus(null).setJudgeProgress(null);
+        update(entrustSample, Condition.create().in("id", dto.getSampleIds()));
+        makeReport(dto, account);
+        return entrustReportService.updateLastFlowCheckByEntrustId(dto.getEntrustId(), account);
+    }
 }
\ No newline at end of file

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

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustReportMapper">
 
+    <select id="selectPageList" resultType="com.patzn.cloud.service.hmhj.vo.EntrustReportVO">
+        select * from entrust_report r
+        <where>
+            <if test="null == vo.deleted">
+                AND r.deleted = 0
+            </if>
+            <if test="null != vo.deleted">
+                AND r.deleted = #{vo.deleted}
+            </if>
+            <if test="null != vo.entrustId">
+                AND r.entrust_id = #{vo.entrustId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -555,4 +555,18 @@
         GROUP BY S.CODE
         order by S.CODE asc
     </select>
+
+    <!--旨在质量判定时统一结构使用，其他位置勿用-->
+    <select id="listIndexReplaceItemBySampleId" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO">
+        select
+        ii.*,
+        i.compose_judge,
+        s.code "sample_code",
+        s.entrust_id
+        FROM entrust_sample_item_index ii
+        JOIN entrust_sample_item i on ii.entrust_sample_item_id = i.id
+        JOIN entrust_sample s ON i.entrust_sample_id = s.id
+        WHERE ii.deleted =0 AND i.deleted = 0 AND s.deleted = 0
+        AND s.id = #{sampleId}
+    </select>
 </mapper>

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

@@ -57,6 +57,13 @@
             )
         </if>
 
+        <if test="null != vo.statusList">
+            and s.status IN
+            <foreach collection="vo.statusList" index="index" item="status" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
+
         <if test="null != vo.itemStatusList">
             AND exists (
                 select 1 from entrust_sample_item i where i.deleted = 0