Skip to content

P
patzn-cloud-service-hmhj
Commit ddef03e8 by lijingjing
Options

修改验收台账查询；

parent e1539172
Showing with 68 additions and 41 deletions
src/main/java/com/patzn/cloud/service/lims/hmhj/mapper/EntrustSampleItemIndexMapper.java
......@@ -19,6 +19,8 @@ import java.util.List;
*/
public interface EntrustSampleItemIndexMapper extends BatchMapper<EntrustSampleItemIndex> {
List<EntrustSampleItemIndex> listItemBySampleIds(@Param("sampleIds") List<Long> sampleIds);
List<EntrustSampleItemIndexVO> listVOByExpIds(@Param("expIds") List<Long> expIdsList);
List<EntrustSampleItemIndexVO> listBySampleIds(@Param("sampleIds") List<Long> sampleIdList);
......@@ -27,4 +29,5 @@ public interface EntrustSampleItemIndexMapper extends BatchMapper<EntrustSampleI
List<EntrustSampleItemIndex> getInReportItemIndex(@Param("sampleId") Long sampleId);
List<EntrustSampleItemIndexVO> selectIndexWithItem(RowBounds rowBounds, @Param("vo") EntrustSampleItemIndexVO entrustSampleItemIndexVO);
}
src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustSampleItemIndexService.java
......@@ -21,7 +21,7 @@ public interface IEntrustSampleItemIndexService extends IBaseService<EntrustSamp
List<EntrustSampleItemIndexVO> listVOByExpIds(List<Long> expIdsList);
List<EntrustSampleItemIndex> listBySampleId(Long id);
List<EntrustSampleItemIndex> listItemBySampleIds(List<Long> sampleIds);
List<EntrustSampleItemIndex> listBySampleIds(List<Long> sampleIds);
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/ContractSampleServiceImpl.java
......@@ -6,18 +6,20 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.toolkit.IdWorker;
import com.google.common.collect.Maps;
import com.patzn.cloud.commons.api.RestAssert;
import com.patzn.cloud.commons.controller.Account;
import com.patzn.cloud.commons.exception.PatznException;
import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
import com.patzn.cloud.commons.toolkit.MapMergeUtils;
import com.patzn.cloud.feign.base.client.SysUserClient;
import com.patzn.cloud.service.base.entity.SysUser;
import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
import com.patzn.cloud.service.hmhj.dto.ContractSampleVODTO;
import com.patzn.cloud.service.hmhj.entity.*;
import com.patzn.cloud.service.hmhj.enums.*;
import com.patzn.cloud.service.hmhj.vo.ContractLedgerVO;
import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
import com.patzn.cloud.service.lims.common.BeanUtils;
import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
......@@ -767,14 +769,17 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
if (CollectionUtils.isEmpty(voList)) {
return page.setRecords(voList);
}
List<Long> sampleIds = voList.stream().map(ContractLedgerVO::getSampleId).distinct().collect(Collectors.toList());
List<EntrustSampleItemIndexVO> indexList = entrustSampleItemIndexService.listVOBySampleIds(sampleIds);
Map<Long, List<EntrustSampleItemIndex>> indexMap = Maps.newHashMapWithExpectedSize(sampleIds.size());
// map处理
if (CollectionUtils.isNotEmpty(indexList)) {
indexList.forEach(index -> MapMergeUtils.getorCreateMapArrayList(index.getSampleId(), indexMap, index));
}
// 根据 xxx 获取检测项目指标
voList.forEach(t -> {
if (null != t.getSamplerId()) {
SysUser sysUser = sysUserClient.get(t.getSamplerId()).servcieData();
t.setSampler(sysUser.getRealname());
}
if (null != t.getSampleId()) {
t.setIndexList(entrustSampleItemIndexService.listBySampleId(t.getSampleId()));
t.setIndexList(indexMap.get(t.getSampleId()));
}
});
return page.setRecords(voList);
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemIndexServiceImpl.java
......@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
* 服务实现类
......@@ -56,28 +55,13 @@ public class EntrustSampleItemIndexServiceImpl extends BaseServiceImpl<EntrustSa
}
@Override
public List<EntrustSampleItemIndex> listBySampleId(Long id) {
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().eq("entrust_sample_id", id));
if (CollectionUtils.isEmpty(itemList)) {
return null;
}
List<Long> itemIds = itemList.stream().map(s -> {
return s.getId();
}).collect(Collectors.toList());
return list(Condition.create().in("entrust_sample_item_id", itemIds));
public List<EntrustSampleItemIndex> listItemBySampleIds(List<Long> sampleIds) {
return baseMapper.listItemBySampleIds(sampleIds);
}
@Override
public List<EntrustSampleItemIndex> listBySampleIds(List<Long> sampleIds) {
List<EntrustSampleItem> itemList = entrustSampleItemService.list(Condition.create().in("entrust_sample_id", sampleIds));
if (CollectionUtils.isEmpty(itemList)) {
return null;
}
List<Long> itemIds = itemList.stream().map(s -> {
return s.getId();
}).collect(Collectors.toList());
return list(Condition.create().in("entrust_sample_item_id", itemIds));
return baseMapper.listItemBySampleIds(sampleIds);
}
@Override
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java
......@@ -637,7 +637,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
List<EntrustSampleVO> sampleVOList = new ArrayList<>(sampleList.size());
for (EntrustSample sample : sampleList) {
EntrustSampleVO vo = sample.convert(EntrustSampleVO.class);
vo.setIndexList(entrustSampleItemIndexService.listBySampleId(sample.getId()));
vo.setIndexList(entrustSampleItemIndexService.listItemBySampleIds(Collections.singletonList(sample.getId())));
sampleVOList.add(vo);
}
......@@ -769,7 +769,7 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
List<EntrustSampleVO> sampleVOList = new ArrayList<>(sampleList.size());
for (EntrustSample sample : sampleList) {
EntrustSampleVO vo = sample.convert(EntrustSampleVO.class);
vo.setIndexList(entrustSampleItemIndexService.listBySampleId(sample.getId()));
vo.setIndexList(entrustSampleItemIndexService.listItemBySampleIds(Collections.singletonList(sample.getId())));
sampleVOList.add(vo);
}
......
src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleServiceImpl.java
......@@ -1042,7 +1042,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
List<EntrustSampleVO> sampleVOListIndex = listList.get(k);
for (EntrustSampleVO vo : sampleVOListIndex) {
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
List<EntrustSampleItemIndex> indexList = getIndexList(vo.getId());
vo.setIndexList(indexList);
XSSFSheet sheetOneIndex = xssfWorkbook.getSheetAt(k);
......@@ -1085,7 +1085,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
int sn = 1;
for (EntrustSampleVO vo : sampleVOList) {
XSSFRow xssfRow = sheetOne.getRow(beginRow);
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
List<EntrustSampleItemIndex> indexList = getIndexList(vo.getId());
vo.setIndexList(indexList);
for (EntrustReportTemplateConfig config : configList) {
if (null != config.getSheetNum() && config.getSheetNum() != k) {
......@@ -1290,7 +1290,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
if (templateSampleNum >= sampleVOList.size()) {
Integer beginRow = sysFileTemplate.getSampleBeginRow();
for (EntrustSampleVO vo : sampleVOList) {
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
List<EntrustSampleItemIndex> indexList = getIndexList(vo.getId());
vo.setIndexList(indexList);
XSSFRow xssfRow = sheetOne.getRow(beginRow);
for (EntrustReportTemplateConfig config : configList) {
......@@ -1350,7 +1350,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
List<EntrustSampleVO> sampleVOListIndex = listList.get(k);
for (EntrustSampleVO vo : sampleVOListIndex) {
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
List<EntrustSampleItemIndex> indexList = getIndexList(vo.getId());
vo.setIndexList(indexList);
XSSFSheet sheetOneIndex = xssfWorkbook.getSheetAt(k);
......@@ -1395,7 +1395,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
int sn = 1;
for (EntrustSampleVO vo : sampleVOList) {
XSSFRow xssfRow = sheetOne.getRow(beginRow);
List<EntrustSampleItemIndex> indexList = entrustSampleItemIndexService.listBySampleId(vo.getId());
List<EntrustSampleItemIndex> indexList = getIndexList(vo.getId());
vo.setIndexList(indexList);
for (EntrustReportTemplateConfig config : configList) {
if (null == config.getColumnPlace()) {
......@@ -2032,7 +2032,7 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
List<EntrustSampleVO> sampleVOList = sampleList.stream().map(t -> {
EntrustSampleVO vo = new EntrustSampleVO();
BeanUtils.copyProperties(t, vo);
vo.setIndexList(entrustSampleItemIndexService.listBySampleId(t.getId()));
vo.setIndexList(getIndexList(t.getId()));
return vo;
}).collect(Collectors.toList());
......@@ -2227,4 +2227,12 @@ public class EntrustSampleServiceImpl extends BaseServiceImpl<EntrustSampleMappe
return baseMapper.isRepeatSampleCode(sample) > 0;
}
private List<EntrustSampleItemIndex> getIndexList(Long sampleId) {
if(null == sampleId){
return new ArrayList<>();
}
return entrustSampleItemIndexService.listItemBySampleIds(Collections.singletonList(sampleId));
}
}
\ No newline at end of file
src/main/resources/mapper/hmhj/ContractSampleMapper.xml
......@@ -117,7 +117,7 @@
SELECT
distinct
cs.code,cs.supplier,cs.contract_id,cs.contract_code,cs.inspect_conclusion,cs.arrival_quantity,
cg.ctime "sampling_time",cg.uid "sampler_id", er.report_send_time, er.id "report_id",
cg.ctime "sampling_time",cg.uid "sampler_id",u.realname "sampler", er.report_send_time, er.id "report_id",
es.entrust_id,es.id "sample_id",es.code "sample_code",es.name "sample_name",es.sample_from,
e.code "entrust_code",e.assignor
FROM
......@@ -126,6 +126,7 @@
left join entrust_sample es on es.contract_sample_id = cs.id and es.deleted = 0
left join entrust e on e.id = es.entrust_id and e.deleted = 0
left join entrust_report er on er.entrust_id = es.entrust_id and er.deleted = 0
left join v_sys_user u on u.user_id = cg.uid
WHERE
cs.deleted = 0
<if test="null != vo.contractCode">
......
src/main/resources/mapper/hmhj/EntrustSampleItemIndexMapper.xml
......@@ -2,6 +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.EntrustSampleItemIndexMapper">
<select id="listItemBySampleIds" resultType="com.patzn.cloud.service.hmhj.entity.EntrustSampleItemIndex">
select
ii.id,ii.name,ii.main_type,ii.small_type,ii.unit,ii.test_value,ii.status,ii.progress,
ii.company_id,ii.uid,ii.ctime,ii.lid,ii.ltime,ii.deleted,ii.entrust_sample_item_id
from entrust_sample_item_index ii
join entrust_sample_item i on i.id = ii.entrust_sample_item_id and i.deleted = 0
where ii.deleted = 0
<foreach collection="sampleIds" index="index" item="sampleId" open=" and i.entrust_sample_id in (" separator="," close=")">
#{sampleId}
</foreach>
</select>
<select id="listVOByExpIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO">
SELECT i.id,i.name,i.test_value,i.entrust_sample_item_id,s.code AS "sampleCode",s.id AS "sampleId" FROM entrust_sample_item_index i JOIN
......@@ -19,7 +31,8 @@
<select id="listBySampleIds" resultType="com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO">
select
ii.*,
ii.id,ii.name,ii.main_type,ii.small_type,ii.unit,ii.test_value,ii.status,ii.progress,
ii.company_id,ii.uid,ii.ctime,ii.lid,ii.ltime,ii.deleted,ii.entrust_sample_item_id,
i.name "item_name",
i.id "item_id",
i.compose_judge "item_compose_judge",
......@@ -27,11 +40,10 @@
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 IN
<foreach collection="sampleIds" index="index" item="sampleId" open="(" separator="," close=")">
join entrust_sample_item i on ii.entrust_sample_item_id = i.id and i.deleted = 0
JOIN entrust_sample s ON i.entrust_sample_id = s.id and s.deleted = 0
WHERE ii.deleted = 0
<foreach collection="sampleIds" index="index" item="sampleId" open="AND s.id IN (" separator="," close=")">
#{sampleId}
</foreach>
</select>
......
src/test/java/resources/db_sql/hmhj/v172/20220125新增视图.sql 0 → 100644
/** created by meazty on 2022/1/25 10:48 **/
/** created by meazty on 2022/1/25 10:48 **/
-- 用户信息视图
create or replace view v_sys_user
as
SELECT
u.user_id,
u.username,
u.realname,
u.company_id
FROM
dblink ( func_db_info ( 'pc_base' :: CHARACTER VARYING ) :: TEXT, 'select id,username,realname,company_id from sys_user u ' :: TEXT ) u ( user_id BIGINT, username CHARACTER VARYING, realname CHARACTER VARYING, company_id BIGINT )
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment