jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

通道号维护

Browse Source
This commit is contained in:
tangw 2025-12-19 16:23:42 +08:00
parent a5dd0a25d7
commit 1b233ead12
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoVs.java
View File

@ -26,4 +26,5 @@ public class XmInfoVs {
private String ckxx; private String ckxx;
private String dyckz; private String dyckz;
private String xmmc; private String xmmc;
private String xmdh;
} }

2
liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java
View File

@ -215,7 +215,7 @@ public class ReportItemController extends BaseController {
public Result saveitemtdh(@RequestBody List<XmInter> XmInterList){ public Result saveitemtdh(@RequestBody List<XmInter> XmInterList){
return reportItemService.saveitemtdh(XmInterList); return reportItemService.saveitemtdh(XmInterList);
} }
@ApiOperation("保存检验项目通道号") @ApiOperation("删除检验项目通道号")
@GetMapping("/delitemtdh") @GetMapping("/delitemtdh")
public Result delitemtdh(String yq,String tdh){ public Result delitemtdh(String yq,String tdh){
return reportItemService.delitemtdh(yq,tdh); return reportItemService.delitemtdh(yq,tdh);

15
liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java
View File

@ -11,10 +11,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Collections; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@ -451,9 +448,19 @@ public class ReportItemServiceImpl implements ReportItemService {
@Override @Override
public Result saveitemtdh(List<XmInter> list){ public Result saveitemtdh(List<XmInter> list){
List<XmInter> list0=list.stream().filter(st->st.getYq()!=null&&st.getTdh()!=null&&!"".equals(st.getYq())&&!"".equals(st.getTdh())).collect(Collectors.toList()); List<XmInter> list0=list.stream().filter(st->st.getYq()!=null&&st.getTdh()!=null&&!"".equals(st.getYq())&&!"".equals(st.getTdh())).collect(Collectors.toList());
if(list0.isEmpty()||list0==null)return new Result("0","成功！");
List<XmInfoVs> XmInfoVslist=reportItemMapper.queryXmInfoVsDYXH(list0.get(0).getYq());
for(XmInter xmInter:list0){ for(XmInter xmInter:list0){
String yq=xmInter.getYq(); String yq=xmInter.getYq();
String tdh=xmInter.getTdh(); String tdh=xmInter.getTdh();
String xmdh=xmInter.getXmdh();
if(!"".equals(xmdh)&&xmdh!=null){
Optional<XmInfoVs> XmInfoVslist0= XmInfoVslist.stream().filter(ss->xmdh.equals(ss.getXmdh())).findFirst();
if(XmInfoVslist0.isPresent()) {
Integer xmid =XmInfoVslist0.get().getXmid();
xmInter.setXmid(xmid);
}
}
XmInter xmInter0 =reportItemMapper.getXmInter(yq,tdh); XmInter xmInter0 =reportItemMapper.getXmInter(yq,tdh);
if(xmInter0==null){ if(xmInter0==null){
reportItemMapper.addXmInterRow(xmInter); reportItemMapper.addXmInterRow(xmInter);

2
liswork/src/main/resources/mapper/ReportItemMapper.xml
View File

@ -70,7 +70,7 @@
</where> </where>
</select> </select>
<select id="queryXmInfoVsDYXH" resultType="com.czlis.common.core.domain.entity.lis.XmInfoVs"> <select id="queryXmInfoVsDYXH" resultType="com.czlis.common.core.domain.entity.lis.XmInfoVs">
select xm_info_vs.*,xm_info_new.xmmc from xm_info_vs join xm_info_new on xm_info_new.xmid=xm_info_vs.xmid select xm_info_vs.*,xm_info_new.xmmc,xm_info_new.xmdh from xm_info_vs join xm_info_new on xm_info_new.xmid=xm_info_vs.xmid
where xm_info_vs.yq = #{yq} where xm_info_vs.yq = #{yq}
</select> </select>
<select id="queryXmTextresultNew" resultType="com.czlis.common.core.domain.entity.lis.XmTextresultNew"> <select id="queryXmTextresultNew" resultType="com.czlis.common.core.domain.entity.lis.XmTextresultNew">