From 672ce84d5ce6545a0e81709ea736c69cbbef8c1a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 24 四月 2025 18:12:47 +0800
Subject: [PATCH] zjh20250424
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 90 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 36 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 4687148..fa466d4 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,5 +1,9 @@
package com.ltkj.web.controller.system;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.security.Security;
import java.util.*;
import java.util.stream.Collectors;
@@ -318,6 +322,28 @@
Long deptId = SecurityUtils.getDeptId();
log.info("褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛褰撳墠鐧诲綍浜虹瀹�"+deptId);
List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
+ if(null !=list && !list.isEmpty()){
+ for (CsProVo vo : list) {
+ LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjXdtgmdjg::getTjh,tjNumber);
+ wq.eq(TjXdtgmdjg::getProId,vo.getProId());
+ TjXdtgmdjg xdtgmdjg = xdtgmdjgService.getOne(wq);
+ if(null !=xdtgmdjg){
+ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
+ Path path = Paths.get(xdtgmdjg.getUrl());
+ byte[] data = null;
+ try {
+ data = Files.readAllBytes(path);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ String base64 = Base64.getEncoder().encodeToString(data);
+ if(StringUtil.isNotBlank(base64)) vo.setImageUrl(base64);
+ }
+ }
+ }
+
+ }
return AjaxResult.success(list);
}
@@ -327,7 +353,8 @@
public AjaxResult addYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
@ApiParam (value = "椤圭洰id") @RequestParam String proId,
@ApiParam (value = "妫�鏌ユ墍瑙�") @RequestParam String jcsj,
- @ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl) {
+ @ApiParam (value = "妫�鏌ョ粨璁�") @RequestParam String jcjl,
+ @ApiParam (value = "鍥剧墖鍦板潃") @RequestParam(required = false) String url) {
try {
SysUser user = SecurityUtils.getLoginUser().getUser();
TjOrder order = orderService.getOrderByTjNum(tjNumber);
@@ -360,6 +387,7 @@
xdtgmdjg.setJcjl(jcjl);
xdtgmdjg.setCreateBy(user.getNickName());
xdtgmdjg.setCreateId(user.getUserId().toString());
+ if(StringUtil.isNotBlank(url)) xdtgmdjg.setUrl(url);
xdtgmdjgService.save(xdtgmdjg);
saveTjXdtgmdjgByJcbgd(xdtgmdjg);
}
@@ -369,7 +397,6 @@
}
return AjaxResult.error("鏆傛棤浣撴璁板綍");
} catch (Exception e) {
- e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�"+e.getMessage());
throw new RuntimeException("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�");
@@ -390,45 +417,22 @@
jcbgd.setXmdm(xdtgmdjg.getProId());
jcbgd.setXmmc(xdtgmdjg.getProName());
jcbgd.setBgNr(xdtgmdjg.getJcsj());
- jcbgd.setBgUrl("");
+ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
+ jcbgd.setBgUrl(xdtgmdjg.getUrl());
+ }else {
+ jcbgd.setBgUrl("");
+ }
jcbgd.setShysxm(xdtgmdjg.getCreateBy());
jcbgd.setShysdm(xdtgmdjg.getCreateId());
jcbgd.setYxzd(xdtgmdjg.getJcjl());
- jcbgd.setYxbx(xdtgmdjg.getJcjl());
+ jcbgd.setYxbx("鏈寮傚父");
jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
jcbgd.setJcbw("");
jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
- jcbgd.setLx("1");
jcbgd.setCreateTime(date);
jcbgdService.save(jcbgd);
- jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());
- jcsqdService.saveLtkjExamJcsqdxdt(xdtgmdjg.getCardId());
-
- 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[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("銆倈锛泑;|,|锛�");
- for (String jg : split) {
- if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父")
- && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈")
- && !jg.contains("鏈鏄庢樉")&& !jg.contains("姝ｅ父")&& !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);
- }
- }
- }
-
-
+ jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
} catch (Exception e) {
- e.printStackTrace();
throw new RuntimeException(e);
}
}
@@ -438,7 +442,7 @@
@ApiOperation (value = "鑾峰彇褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
@Transactional
public AjaxResult getYxJcXxJg(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
- @ApiParam (value = "椤圭洰id") @RequestParam String proId) {
+ @ApiParam (value = "椤圭洰id") @RequestParam String proId) {
TjOrder order = orderService.getOrderByTjNum(tjNumber);
if(null !=order){
LambdaQueryWrapper<TjXdtgmdjg> wq=new LambdaQueryWrapper<>();
@@ -447,13 +451,27 @@
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);
+ map.put("jcsj",xdtgmdjg.getJcsj());
+ map.put("jcjl",xdtgmdjg.getJcjl());
+ if(StringUtil.isNotBlank(xdtgmdjg.getUrl())){
+ Path path = Paths.get(xdtgmdjg.getUrl());
+ byte[] data = null;
+ try {
+ data = Files.readAllBytes(path);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ String base64 = Base64.getEncoder().encodeToString(data);
+ map.put("tp",base64);
+ }else {
+ map.put("tp",null);
+ }
+ return AjaxResult.success(map);
}else {
TjProject tjProject = projectService.getById(proId);
map.put("jcsj","");
map.put("jcjl",tjProject.getProDefault()==null ? "":tjProject.getProDefault());
+ map.put("tp",null);
}
return AjaxResult.success(map);
}
--
Gitblit v1.8.0