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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
tangw 2026-03-17 17:36:12 +08:00
commit 4c7a5ab963
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lis-interfaceCommon/src/main/resources/mapper/LabReqsteplogMapper.xml
View File

@ -14,9 +14,11 @@
<insert id="insertLabReqsteplog" parameterType="com.czlis.common.core.domain.entity.lis.LabReqsteplog">
insert into lab_reqsteplog (sqh, xh, zt, userid,
changedate, logdate, comname,
<if test="logdate != null">logdate,</if>
comip, bz)
values (#{sqh}, #{xh}, #{zt}, #{userid},
#{changedate}, #{logdate}, #{comname},
<if test="logdate != null">#{logdate},</if>
#{comip}, #{bz})
</insert>

20
zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java
View File

@ -8,16 +8,14 @@ import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.LabIntersendList;
import com.czlis.common.core.domain.entity.lis.LabReqdetail;
import com.czlis.common.core.domain.entity.lis.LabReqmain;
import com.czlis.common.core.domain.entity.lis.LabReqsteplog;
import com.czlis.common.utils.SecurityUtils;
import com.czlis.common.utils.ip.IpUtils;
import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
import com.czlis.interfaceCommon.pojo.entity.ReportParam;
import com.czlis.interfaceCommon.pojo.inter.GetReqInterface;
import com.czlis.interfaceCommon.pojo.inter.SetReqStatus;
import com.czlis.interfaceCommon.utils.CommonUtil;
import com.czlis.interfaceCommon.utils.LisInterfaceUtil;
import com.czlis.interfaceCommon.utils.LisUtil;
import com.czlis.interfaceCommon.utils.ReportUtil;
import com.czlis.interfaceCommon.utils.*;
import com.czlis.interfaceCommon.websocket.ChatWebSocketServer;
import com.czlis.interfaceCommon.websocket.WebSocketInstrComm;
import com.czlis.interfaceCommon.websocket.WebSocketMessage;
@ -50,6 +48,8 @@ public class ZycxServiceImpl implements ZycxService {
private ReportUtil reportUtil;
@Autowired
LabIntersendListMapper labIntersendListMapper;
@Autowired
LisWorkBase lisWorkBase;
@Value("${lisinterface.sp:}")
String sp;
@ -151,6 +151,8 @@ public class ZycxServiceImpl implements ZycxService {
labReqmain.setZt("11");
labReqmain.setSqh(sqhOne);
commonUtil.updateLabReqmain(labReqmain);
//写日志表
lisWorkBase.setlabReqsteplog(sqhOne, "11", userid);
}
}
@ -159,8 +161,12 @@ public class ZycxServiceImpl implements ZycxService {
if(zt.equals("1") || zt.equals("8") || zt.equals("11")){
LabReqmain labReqmain = new LabReqmain();
labReqmain.setZt("12");
labReqmain.setCysj(commonUtil.getCurrentTime());
labReqmain.setCyr(userid);
labReqmain.setSqh(sqhOne);
commonUtil.updateLabReqmain(labReqmain);
//写日志表
lisWorkBase.setlabReqsteplog(sqhOne, "12", userid);
}
}
@ -169,8 +175,12 @@ public class ZycxServiceImpl implements ZycxService {
if(zt.equals("1") || zt.equals("8") || zt.equals("11") || zt.equals("12")){
LabReqmain labReqmain = new LabReqmain();
labReqmain.setZt("13");
labReqmain.setBbsjr(userid);
labReqmain.setBbsjsj(commonUtil.getCurrentTime());
labReqmain.setSqh(sqhOne);
commonUtil.updateLabReqmain(labReqmain);
//写日志表
lisWorkBase.setlabReqsteplog(sqhOne, "13", userid);
}
}
@ -182,6 +192,8 @@ public class ZycxServiceImpl implements ZycxService {
labReqmain.setZt("9");
labReqmain.setSqh(sqhOne);
commonUtil.updateLabReqmain(labReqmain);
//写日志表
lisWorkBase.setlabReqsteplog(sqhOne, "9", userid);
}
}