From cf84e1347914b92e46c6a63155fff74282490890 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 四月 2025 18:02:03 +0800
Subject: [PATCH] zjh20250402
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 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 cd429dd..d229676 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
@@ -1,18 +1,20 @@
package com.ltkj.web.controller.system;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.unit.DataUnit;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.system.service.ISysConfigService;
import io.swagger.annotations.Api;
@@ -54,7 +56,12 @@
private ITjOrderRemarkService remarkService;
@Resource
private ITjProjectService projectService;
-
+ @Resource
+ private TjXdtgmdjgService xdtgmdjgService;
+ @Resource
+ private LtkjExamJcbgdService jcbgdService;
+ @Resource
+ private LtkjExamJcsqdService jcsqdService;
/**
* 鏌ヨ浣撴蹇冪數鍥剧鐞嗗垪琛�
*/
@@ -198,7 +205,8 @@
@GetMapping ("/getYxJcList")
@ApiOperation (value = "褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)")//0寰�1宸�
@Transactional
- public AjaxResult getYxJcList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
+ public AjaxResult getYxJcList(@ApiParam (value = "瀹℃牳鐘舵�� 0寰呭鏍� 1宸插鏍�") @RequestParam Integer checkStatus,
+ @ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer page,
@ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
@ApiParam (value = "浣撴鍗曞彿") @RequestParam (required = false) String tjNumber,
@ApiParam (value = "鍗曚綅") @RequestParam (required = false) Long compId,
@@ -290,7 +298,7 @@
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
if (tcm == null) tcm = "";
- return AjaxResult.success(orderService.getYxJcList(tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
+ return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
}
@GetMapping ("/getYxJcXx")
@@ -307,6 +315,7 @@
@ApiParam (value = "椤圭洰id") @RequestParam String proId,
@ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
@ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if(null !=order){
TjProject project = projectService.getById(proId);
@@ -327,6 +336,18 @@
if(null !=orderRemark){
orderRemark.setType(1);
remarkService.updateById(orderRemark);
+ xdtgmdjgService.deletedByTJhAndProId(tjNumber, proId);
+ TjXdtgmdjg xdtgmdjg=new TjXdtgmdjg();
+ xdtgmdjg.setTjh(tjNumber);
+ xdtgmdjg.setCardId(order.getCardId());
+ xdtgmdjg.setProId(proId);
+ xdtgmdjg.setProName(project.getProName());
+ xdtgmdjg.setJcsj(jcsj);
+ xdtgmdjg.setJcjl(jcjl);
+ xdtgmdjg.setCreateBy(user.getNickName());
+ xdtgmdjg.setCreateId(user.getUserId().toString());
+ xdtgmdjgService.save(xdtgmdjg);
+ saveTjXdtgmdjgByJcbgd(xdtgmdjg);
}
}
}
@@ -335,6 +356,31 @@
return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
+ public void saveTjXdtgmdjgByJcbgd(TjXdtgmdjg xdtgmdjg) {
+ int length = xdtgmdjg.getProId().length();
+ // 纭繚瀛楃涓查暱搴﹁嚦灏戜负6
+ String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
+
+ LtkjExamJcbgd jcbgd=new LtkjExamJcbgd();
+ jcsqdService.deletedLtkjJcsqdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+ jcbgdService.deletedLtkjJcbgdByTjhandtmh(xdtgmdjg.getCardId(),xdtgmdjg.getTjh()+last6);
+ jcbgd.setTjh(xdtgmdjg.getCardId());
+ jcbgd.setTmh(xdtgmdjg.getTjh()+last6);
+ jcbgd.setXmdm(xdtgmdjg.getProId());
+ jcbgd.setXmmc(xdtgmdjg.getProName());
+ jcbgd.setBgNr(xdtgmdjg.getJcsj());
+ jcbgd.setBgUrl("");
+ jcbgd.setShysxm(xdtgmdjg.getCreateBy());
+ jcbgd.setShysdm(xdtgmdjg.getCreateId());
+ jcbgd.setYxzd(xdtgmdjg.getJcjl());
+ jcbgd.setYxbx("鏈寮傚父");
+ jcbgd.setZdsj(DateUtil.format(new Date(),"yyyy-MM-dd"));
+ jcbgd.setJcbw("");
+ jcbgd.setSqsj(DateUtil.format(new Date(),"yyyy-MM-dd"));
+ jcbgd.setCreateTime(new Date());
+ jcbgdService.save(jcbgd);
+ jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+ }
@GetMapping ("/getYxJcXxJg")
@@ -344,20 +390,17 @@
@ApiParam (value = "椤圭洰id") @RequestParam String proId) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if(null !=order){
- TjProject project = projectService.getById(proId);
- if(null !=project){
- List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
- LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
- wq1.eq(TjOrderDetail::getProId,projects.get(0).getProParentId());
- wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
- TjOrderDetail detail = detailService.getOne(wq1);
- if(null !=detail && StringUtil.isNotBlank(detail.getProResult())){
- Map<String,Object> map=new HashMap<>();
- String string = detail.getProResult();
-
- }
+ LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjXdtgmdjg::getTjh,tjNumber);
+ wq.eq(TjXdtgmdjg::getProId,proId);
+ TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
+ Map<String,Object>map=new HashMap<>();
+ if(null !=xdtgmdjg ){
+ map.put("jcsj",xdtgmdjg.getJcsj());
+ map.put("jcjl",xdtgmdjg.getJcjl());
+ return AjaxResult.success(map);
}
- return AjaxResult.success();
+ return AjaxResult.success(map);
}
return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
--
Gitblit v1.8.0