From 027c1328165a0d37a778ec7f58760bb0fe1ffebb Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 30 七月 2025 17:00:01 +0800 Subject: [PATCH] zjh20250730-1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java index b9a4e42..b8545f3 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java @@ -74,8 +74,10 @@ private LtkjExamJcbgdService jcbgdService; @Resource private LtkjExamJcsqdService jcsqdService; - @Value("${path.xdtfilePath}") - private String value; + @Autowired + private TjJcycxmService jcycxmService; + @Autowired + private SysConfigController configController; /** * 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛� */ @@ -252,7 +254,7 @@ for (CsProVo vo : list) { LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>(); wq.eq(TjXdtgmdjg::getTjh,tjNumber); - wq.eq(TjXdtgmdjg::getProId,vo.getProId()); + wq.eq(TjXdtgmdjg::getProId,vo.getProId().toString()); TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq); if(null !=xdtgmdjg){ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){ @@ -351,13 +353,52 @@ jcbgd.setShysxm(xdtgmdjg.getCreateBy()); jcbgd.setShysdm(xdtgmdjg.getCreateId()); jcbgd.setYxzd(xdtgmdjg.getJcjl()); - jcbgd.setYxbx("鏈寮傚父"); + jcbgd.setYxbx(xdtgmdjg.getJcjl()); jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd")); jcbgd.setJcbw(""); + jcbgd.setLx("1"); jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd")); jcbgd.setCreateTime(date); jcbgdService.save(jcbgd); - jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId()); + jcsqdService.saveXdtLtkjExamJcsqd(xdtgmdjg.getCardId(),jcbgd.getTmh()); + + LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>(); + wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh()); + wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId()); + jcycxmService.remove(wq); + if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){ + String regex = configService.selectConfigByKey("jcycxmzz"); + if(StringUtil.isBlank(regex)) regex= "銆倈锛泑;|,|锛�"; + String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split(regex); +// String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("銆倈锛泑;|,|锛�"); + for (String jg : split) { + if(StringUtil.isNotBlank(jg)){ + boolean b = configController.apiJcycpdgjz(jg); + if(!b){ + TjJcycxm jcycxm=new TjJcycxm(); + jcycxm.setTjh(xdtgmdjg.getTjh()); + jcycxm.setYqid(""); + jcycxm.setProId(xdtgmdjg.getProId()); + jcycxm.setProName(xdtgmdjg.getProName()); + jcycxm.setCreateTime(new Date()); + jcycxm.setJcjg(jg); + jcycxmService.save(jcycxm); + } + } + /* if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父") + && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈") + && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝e父")&& !jg.contains("鍙屼晶妞庨棿瀛旀棤鐙獎")){ + TjJcycxm jcycxm=new TjJcycxm(); + jcycxm.setTjh(xdtgmdjg.getTjh()); + jcycxm.setYqid(""); + jcycxm.setProId(xdtgmdjg.getProId()); + jcycxm.setProName(xdtgmdjg.getProName()); + jcycxm.setCreateTime(new Date()); + jcycxm.setJcjg(jg); + jcycxmService.save(jcycxm); + }*/ + } + } } catch (Exception e) { throw new RuntimeException(e); } -- Gitblit v1.8.0