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

QC

Browse Source
This commit is contained in:
tangw 2026-01-15 17:48:34 +08:00
parent ab838e43ba
commit cfdb768a27
5 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcVal.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
public class QcVal {
private Integer qcValid;
private Long qc_valid;
private String yq;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date zkrq;

4
liswork/src/main/java/com/czlis/liswork/controller/qc/QcValController.java
View File

@ -44,12 +44,12 @@ public class QcValController extends BaseController {
public Result saveQcVal(@RequestBody List<QcVal> qcVal){
return qcValService.saveQcVal(qcVal);
}
@ApiOperation("保存质控数据(当天所有项目)")
@ApiOperation("保存质控数据(单项目一个月)")
@PostMapping("/saveqcvalmonth")
public Result saveQcValmonth(@RequestBody Map<String,Object> qcVal){
return qcValService.saveQcValmonth(qcVal);
}
@ApiOperation("保存质控数据(单项目一个月)")
@ApiOperation("保存质控数据(当天所有项目)")
@PostMapping("/saveqcvalitem")
public Result saveQcValitem(@RequestBody List<Map<String,Object>> qcVal){
return qcValService.saveQcValitem(qcVal);

4
liswork/src/main/java/com/czlis/liswork/mapper/QcValMapper.java
View File

@ -10,8 +10,8 @@ public interface QcValMapper {
void insert(QcVal qcVal);
void update(QcVal qcVal);
void delete(QcVal qcVal);
void deleteById(Integer qcValid);
QcVal queryById(Integer qcValid);
void deleteById(Long qc_valid);
QcVal queryById(Long qc_valid);
QcVal queryOne(QcVal qcVal);
List<QcVal> query(QcVal qcVal);
List<Map<String,Object>> queryvalmonth(QcVal qcVal);

46
liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.czlis.interfaceCommon.utils.LisUtil;
import com.czlis.liswork.mapper.QcBatchnoMapper;
import com.czlis.liswork.mapper.QcValMapper;
import com.czlis.liswork.service.QcValService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@Service
public class QcValServiceImpl implements QcValService {
@Autowired
@ -32,24 +33,7 @@ public class QcValServiceImpl implements QcValService {
@Transactional(rollbackFor = Exception.class)
@Override
public Result saveQcVal(List<QcVal> qcValList) {
if(qcValList != null && !qcValList.isEmpty()){
for (QcVal qcVal : qcValList) {
BigDecimal zkjg= qcVal.getZkjg();
QcVal qcVal1 = qcValMapper.queryOne(qcVal);
if (zkjg==null){
if (qcVal1 != null) {
qcValMapper.deleteById(qcVal1.getQcValid());
}
}else {
if (qcVal1 == null) {
qcValMapper.insert(qcVal);
} else {
qcVal.setQcValid(qcVal.getQcValid());
qcValMapper.update(qcVal);
}
}
}
}
return new Result("0","保存数据成功！");
}
@Override
@ -105,32 +89,36 @@ public class QcValServiceImpl implements QcValService {
QcVal qcVal0=new QcVal();
qcVal0.setYq(qcVallist.get(0).get("yq").toString());
qcVal0.setZkph(qcVallist.get(0).get("zkph").toString());
qcVal0.setZkrq(DateUtils.dateTime("yyy-mm-dd",qcVallist.get(0).get("zkrq").toString()));
qcVal0.setZkrq(DateUtils.dateTime("yyy-MM-dd",qcVallist.get(0).get("zkrq").toString()));
List<QcVal> qcValall=qcValMapper.query(qcVal0);
for (int j = 0; j <qcVallist.size(); j++) {
Map<String,Object> map0=qcVallist.get(j);
String yq=map0.get("yq").toString();
String xmdh=map0.get("xmdh").toString();
String zkph=map0.get("zkph").toString();
Date zkrq= DateUtils.dateTime("yyy-mm-dd",map0.get("zkrq").toString());
Date zkrq= DateUtils.dateTime("yyy-MM-dd",map0.get("zkrq").toString());
for (int i = 0; i <7; i++) {
Long cs=i+1L;
Integer cs0=i+1;
String xh="cs"+cs;
if (!map0.containsKey(xh))continue;
String zkjg=(String)map0.get(xh);
String zkjg=map0.get(xh).toString();
if(!LisUtil.isNumber(zkjg))continue;
Optional<QcVal> qcvalfind= qcValall.stream().filter(aa ->aa.getCs()==cs0).findAny();
QcVal qcVal1=new QcVal();
if(qcvalfind.isPresent())qcVal1=qcvalfind.get();
QcVal qcVal1=null;
if(qcValall!=null&&qcValall.size()>0) {
Optional<QcVal> qcvalfind = qcValall.stream().filter(aa -> aa.getCs() == cs0 && xmdh.equals(aa.getXmdh())).findAny();
if (qcvalfind.isPresent()) qcVal1 = qcvalfind.get();
}
// log.info("qcVal1:",qcVal1);
if (zkjg==null){
if (qcVal1 != null) {
qcValMapper.deleteById(qcVal1.getQcValid());
qcValMapper.deleteById(qcVal1.getQc_valid());
String logdata="质控结果删除: 项目 ["+qcVal1.getXmdh()+"] 结果 "+qcVal1.getZkjg()+"!";
qcmodifylog(qcVal1,"1",logdata);
}
}else {
if (qcVal1 == null) {
qcVal1=new QcVal();
qcVal1.setYq(yq);
qcVal1.setZkph(zkph);
qcVal1.setZkrq(zkrq);
@ -138,8 +126,12 @@ public class QcValServiceImpl implements QcValService {
qcVal1.setCs(cs0);
qcVal1.setYhdh(yhdh);
qcVal1.setInputdt(new Date());
BigDecimal zkjgs = new BigDecimal(zkjg);
qcVal1.setZkjg(zkjgs);
qcValMapper.insert(qcVal1);
} else {
// log.info("qcVal1:",qcVal1);
// log.info("getQcValid:",qcVal1.getQc_valid());
BigDecimal zkjgs = new BigDecimal(zkjg);
BigDecimal zkjg0 = qcVal1.getZkjg();
if (zkjgs != zkjg0) {
@ -161,7 +153,7 @@ public class QcValServiceImpl implements QcValService {
public int qcmodifylog(QcVal qcVal,String logtype,String logdata){
QcModifylog qcModifylog=new QcModifylog();
qcModifylog.setYq(qcVal.getYq());
qcModifylog.setZkph(Integer.getInteger(qcVal.getZkph()));
qcModifylog.setZkph(Integer.parseInt(qcVal.getZkph()));
qcModifylog.setZkcs(qcVal.getCs());
qcModifylog.setZkrq(qcVal.getZkrq());
qcModifylog.setChangeman(SecurityUtils.getLoginUser().getUsername());

6
liswork/src/main/resources/mapper/QcValMapper.xml
View File

@ -61,7 +61,7 @@
outresult = #{outresult},
skjg = #{skjg},
zkjg_s = #{zkjgS}
where qc_valid = #{qcValid}
where qc_valid = #{qc_valid}
</update>
<delete id="delete">
@ -82,13 +82,13 @@
</where>
</delete>
<delete id="deleteById">
delete from qc_val where qc_valid = #{qcValid}
delete from qc_val where qc_valid = #{qc_valid}
</delete>
<select id="queryOne" resultType="com.czlis.common.core.domain.entity.lis.QcVal">
select * from qc_val where yq = #{yq} and xmdh = #{xmdh} and zkph = #{zkph} and zkrq = #{zkrq} and cs = #{cs}
</select>
<select id="queryById" resultType="com.czlis.common.core.domain.entity.lis.QcVal">
select * from qc_val where qc_valid = #{qcValid}
select * from qc_val where qc_valid = #{qc_valid}
</select>
<select id="query" resultType="com.czlis.common.core.domain.entity.lis.QcVal">
select * from qc_val