diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcModifylog.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcModifylog.java new file mode 100644 index 0000000..2e179c7 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/QcModifylog.java @@ -0,0 +1,22 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class QcModifylog { + private Integer id; + private String yq; + private Date zkrq; + private Integer zkph; + private Integer zkcs; + private Date changedt; + private String changeman; + private String changetype; + private String changetxt; +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/QcValMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/QcValMapper.java index 551944d..b8a5283 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/QcValMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/QcValMapper.java @@ -1,5 +1,6 @@ package com.czlis.liswork.mapper; +import com.czlis.common.core.domain.entity.lis.QcModifylog; import com.czlis.common.core.domain.entity.lis.QcVal; import java.util.List; @@ -16,4 +17,5 @@ public interface QcValMapper { List> queryvalmonth(QcVal qcVal); List> queryvalitem(QcVal qcVal); List> queryitem(String yq); + void insertQcModifylog(QcModifylog qcModifylog); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java index 10b860b..6c9f8d0 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcValServiceImpl.java @@ -1,6 +1,7 @@ package com.czlis.liswork.service.impl.qc; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.QcModifylog; import com.czlis.common.core.domain.entity.lis.QcVal; import com.czlis.common.utils.DateUtils; import com.czlis.common.utils.SecurityUtils; @@ -125,6 +126,8 @@ public class QcValServiceImpl implements QcValService { if (zkjg==null){ if (qcVal1 != null) { qcValMapper.deleteById(qcVal1.getQcValid()); + String logdata="质控结果删除: 项目 ["+qcVal1.getXmdh()+"] 结果 "+qcVal1.getZkjg()+"!"; + qcmodifylog(qcVal1,"1",logdata); } }else { if (qcVal1 == null) { @@ -138,10 +141,15 @@ public class QcValServiceImpl implements QcValService { qcValMapper.insert(qcVal1); } else { BigDecimal zkjgs = new BigDecimal(zkjg); - qcVal1.setZkjg(zkjgs); - qcVal1.setYhdh(yhdh); - qcVal1.setInputdt(new Date()); - qcValMapper.update(qcVal1); + BigDecimal zkjg0 = qcVal1.getZkjg(); + if (zkjgs != zkjg0) { + qcVal1.setZkjg(zkjgs); + qcVal1.setYhdh(yhdh); + qcVal1.setInputdt(new Date()); + qcValMapper.update(qcVal1); + String logdata = "质控结果修改: 项目 ["+qcVal1.getXmdh()+"] 结果: "+zkjg0+" 修改为: "+zkjgs+" !"; + qcmodifylog(qcVal1, "2", logdata); + } } } } @@ -149,8 +157,18 @@ public class QcValServiceImpl implements QcValService { } return new Result("0","保存数据成功!"); } - - public int qcmodifylog(){ + @Transactional(rollbackFor = Exception.class) + public int qcmodifylog(QcVal qcVal,String logtype,String logdata){ + QcModifylog qcModifylog=new QcModifylog(); + qcModifylog.setYq(qcVal.getYq()); + qcModifylog.setZkph(Integer.getInteger(qcVal.getZkph())); + qcModifylog.setZkcs(qcVal.getCs()); + qcModifylog.setZkrq(qcVal.getZkrq()); + qcModifylog.setChangeman(SecurityUtils.getLoginUser().getUsername()); + qcModifylog.setChangetype(logtype); + qcModifylog.setChangedt(new Date()); + qcModifylog.setChangetxt(logdata); + qcValMapper.insertQcModifylog(qcModifylog); return 0; } } diff --git a/liswork/src/main/resources/mapper/QcValMapper.xml b/liswork/src/main/resources/mapper/QcValMapper.xml index 7f8ca2a..6808274 100644 --- a/liswork/src/main/resources/mapper/QcValMapper.xml +++ b/liswork/src/main/resources/mapper/QcValMapper.xml @@ -156,4 +156,8 @@ and qc_val.cs=ss.cs WHERE ( xm_info.yq = #{yq} ) AND ( xm_info.zkxm = 'Y' ) AND ( xm_info.xmdh = #{xmdh}) order by ss.cs,sx.daynum + + insert into qc_modifylog (yq, zkrq,zkph, zkcs, changedt,changeman, changetype, changetxt) + values (#{yq}, #{zkrq},#{zkph}, #{zkcs}, #{changedt},#{changeman}, #{changetype}, #{changetxt}) +