From 53d149f491dba554ee035599059a1bf65ea92df2 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 12 二月 2025 17:36:13 +0800
Subject: [PATCH] 增加手动同步lis接口
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 5c0ca9c..c489848 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.IdUtils;
@@ -164,6 +165,12 @@
private ITjXdPictureService xdPictureService;
@Autowired
private TjOutpinmedicXmService tjOutpinmedicXmService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
+ @Autowired
+ private ITjRulesService rulesService;
+ @Autowired
+ private ITjProAdvicerulesService tjProAdvicerulesService;
@@ -578,17 +585,69 @@
@Override
@Async("async")
- public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order) {
- for (TjOrderDetail detail : tjOrderDetailList) {
- detail.setTjStatus(1L);
- LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjStandard::getProId, detail.getProId());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.updateById(detail);
+ public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order,TjOrderRemark orderRemark) {
+ String deptname="";
+ TjProject tjProject = projectService.getById(orderRemark.getProId());
+ if(null !=tjProject){
+ SysDept dept = deptService.getById(tjProject.getDeptId());
+ if(dept.getParentId()!=100L){
+ deptname= deptService.getprentks(dept.getParentId().toString());
+ }else {
+ deptname=dept.getDeptName();
+ }
+
+
+ for (TjOrderDetail detail : tjOrderDetailList) {
+ detail.setTjStatus(1L);
+ LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjStandard::getProId, detail.getProId());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.updateById(detail);
+ try {
+ LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh,order.getTjNumber());
+ wq.eq(TjOrderYcxm::getJcxm,detail.getProName());
+ TjOrderYcxm ycxm = ycxmService.getOne(wq);
+ if(null !=ycxm){
+ ycxm.setJcjg(detail.getProResult());
+ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
+ ,"","",order.getTjNumber()
+ ,detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇","")
+ ,detail.getProResult());
+
+ String[] split = detail.getProResult().split("銆倈,|锛�");
+ List<Map<String,Object>> mapList=new ArrayList<>();
+ for (String s : split) {
+ s = s.replaceAll("\n", "");
+// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
+ Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0");
+ if(null !=mapss && !mapss.isEmpty()){
+ Object bt = mapss.get("bt");
+ Object nr = mapss.get("nr");
+ if(null !=bt || null !=nr){
+
+ } mapList.add(mapss);
+ }
+ }
+
+ if(null != maps && !maps.isEmpty()){
+ ycxm.setJynr(JSONUtil.toJsonStr(maps));
+ }
+ if( !mapList.isEmpty()){
+ ycxm.setJynr(JSONUtil.toJsonStr(mapList));
+ }
+ ycxmService.updateById(ycxm);
+ if(detail.getExceptionDesc()==0)ycxmService.remove(wq);
+ }
+ } catch (Exception e) {
+ }
+ }
}
+
}
@Override
@@ -1750,7 +1809,7 @@
if (samplings.size() >= 2){
// 杩涜鍚堝苟
List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
- log.info("鎻愬彇id ->{}",stringList);
+// log.info("鎻愬彇id ->{}",stringList);
for (int i = 0; i < stringList.size(); i++) {
String s = stringList.get(i);
if (tjSamplingService.isMergeItem(s) != 0) {
--
Gitblit v1.8.0