From 6d09c6301492d3095ff64dba2336f0d0b69638e6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 10 四月 2025 18:04:44 +0800
Subject: [PATCH] zjh20250410
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 144 +++++++++++++++++++++++++++--------------------
1 files changed, 82 insertions(+), 62 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 d229676..8a38e4d 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,6 @@
package com.ltkj.web.controller.system;
+import java.security.Security;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -21,9 +22,13 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import jodd.util.StringUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -41,6 +46,7 @@
@RestController
@RequestMapping("/picture/picture")
@Api(tags = "浣撴蹇冪數鍥剧鐞�")
+@Slf4j
public class TjXdPictureController extends BaseController {
@Resource
private ITjXdPictureService tjXdPictureService;
@@ -291,6 +297,8 @@
// orderList = orderService.getCsTjOrderList(tjNumber, checkStatus, compId, beginTimes, endTimes);
// return getResult(page, pageSize, orderList, customerList, map);
// }
+ Long deptId = SecurityUtils.getDeptId();
+ log.info("褰卞儚妫�鏌ュ垪琛�(楠ㄥ瘑搴﹀拰蹇冪數鍥�)鎺ュ彛 褰撳墠鐧诲綍浜虹瀹�"+deptId);
String value = String.valueOf(compId);
if (tjNumber == null) tjNumber = "";
if (compId == null) value = "";
@@ -298,88 +306,100 @@
if (beginTime == null) beginTime = "";
if (endTime == null) endTime = "";
if (tcm == null) tcm = "";
- return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm));
+ return AjaxResult.success(orderService.getYxJcList(checkStatus,tjNumber, page, pageSize, value, beginTime, endTime, name,tcm,deptId.toString()));
}
@GetMapping ("/getYxJcXx")
@ApiOperation (value = "褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛")
public AjaxResult getYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber) {
- List<CsProVo> list = remarkService.getYxJcXx(tjNumber);
+ Long deptId = SecurityUtils.getDeptId();
+ log.info("褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥鹃〉闈㈢偣鍑讳綋妫�浜哄憳灞曠ず浣撴椤圭洰鎺ュ彛褰撳墠鐧诲綍浜虹瀹�"+deptId);
+ List<CsProVo> list = remarkService.getYxJcXx(tjNumber,deptId.toString());
return AjaxResult.success(list);
}
@GetMapping ("/addYxJcXx")
@ApiOperation (value = "鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�")
- @Transactional
+ @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
public AjaxResult addYxJcXx(@ApiParam (value = "浣撴鍙�") @RequestParam String tjNumber,
@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);
- 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){
- detail.setProResult(jcjl+"銆�"+jcsj);
- detail.setTjStatus(1L);
- detailService.updateById(detail);
- LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
- wq2.eq(TjOrderRemark::getProId,proId);
- wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
- TjOrderRemark orderRemark = remarkService.getOne(wq2);
- 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);
+ try {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ 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){
+ detail.setProResult(jcjl+"銆�"+jcsj);
+ detail.setTjStatus(1L);
+ detailService.updateById(detail);
+ LambdaQueryWrapper<TjOrderRemark>wq2=new LambdaQueryWrapper<>();
+ wq2.eq(TjOrderRemark::getProId,proId);
+ wq2.eq(TjOrderRemark::getTjNumber,tjNumber);
+ TjOrderRemark orderRemark = remarkService.getOne(wq2);
+ 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);
+ }
}
}
+ return AjaxResult.success();
}
- return AjaxResult.success();
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�"+e.getMessage());
+ throw new RuntimeException("鎻愪氦褰卞儚妫�鏌ラ瀵嗗害蹇冪數鍥剧粨鏋滄帴鍙�");
}
- return AjaxResult.error("鏆傛棤浣撴璁板綍");
}
-
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
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());
+ try {
+ int length = xdtgmdjg.getProId().length();
+ // 纭繚瀛楃涓查暱搴﹁嚦灏戜负6
+ String last6 = length >= 6 ? xdtgmdjg.getProId().substring(length - 6) : xdtgmdjg.getProId();
+ Date date = new Date();
+ 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(date,"yyyy-MM-dd"));
+ jcbgd.setJcbw("");
+ jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
+ jcbgd.setCreateTime(date);
+ jcbgdService.save(jcbgd);
+ jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
--
Gitblit v1.8.0