From e3bb90bf7a3761009c8583c6231f5482f87d4b2d Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期五, 08 三月 2024 10:47:00 +0800
Subject: [PATCH] 1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 243 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 174 insertions(+), 69 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index 2402a43..a1ca1bb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -9,8 +9,10 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
+import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.bean.BeanUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
@@ -61,17 +63,54 @@
private ITjRulesService tjRulesService;
@Resource
private TestMapper testMapper;
+ @Resource
+ private RedisCache redisCache;
@GetMapping("/getTjHyBgList")
@ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
- public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
- @RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark) {
- List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+ public AjaxResult getTjHyBgList(@RequestParam(required = false) String pacCode,
+ @RequestParam(required = false) String pacName,
+ @RequestParam(required = false) String pacRemark) {
+ List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode, pacName, pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
return AjaxResult.success(maps);
}
+
+ /**
+ * 閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�
+ */
+ @GetMapping("/getDxList")
+ @ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
+ public AjaxResult getDxList() {
+// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+// wq0.eq(TjProject::getProParentId, 0);
+
+ List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
+
+ //涓婇潰鐨勬崲sql
+// final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
+
+ if (tjProjects != null) {
+ for (TjProject project : tjProjects) {
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+ project.setTjProjectList(projectList);
+
+// SysDept sysDept = deptService.selectDeptById(project.getDeptId());
+// if (sysDept!=null){
+// project.setDeptName(sysDept.getDeptName());
+// }
+ }
+ }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String,Object> map=new HashMap<>();
+ map.put("list",tjProjects);
+ map.put("key",key);
+ return AjaxResult.success(map);
+ }
+
+
+
/**
@@ -85,29 +124,70 @@
//涓婇潰鐨勬崲sql
final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
+// if (tjProjects != null) {
+// for (TjProject project : tjProjects) {
+// List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
+// project.setTjProjectList(projectList);
+// SysDept sysDept = deptService.selectDeptById(project.getDeptId());
+// if (sysDept != null) {
+// project.setDeptName(sysDept.getDeptName());
+// }
+//
+// }
+// }
+ String key = configService.selectConfigByKey("is_open_sfxm");
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", tjProjects);
+ map.put("key", key);
+ return AjaxResult.success(map);
+ }
+
+
+ /**
+ * 鏌ヨ椤圭洰瀛愰」
+ */
+ @GetMapping("/getAllChildListById")
+ @ApiOperation(value = "鏌ヨ椤圭洰瀛愰」")
+ public AjaxResult getAllChildListById(@RequestParam(required = false)String proId,
+ @RequestParam(required = false) String proName,
+ @RequestParam(required = false) String checkType) {
+ LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
+ if (proId!=null){
+ wq.eq(TjProject::getProParentId,proId);
+ }
+ if (proName!=null){
+ wq.like(TjProject::getProName,proName);
+ }
+ if (checkType!=null){
+ wq.eq(TjProject::getProCheckType,checkType);
+ }
+ List<TjProject> tjProjects = tjProjectService.list(wq);
+// List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
if (tjProjects != null) {
for (TjProject project : tjProjects) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId, project.getProId());
- if(null !=proName) {
- wq1.like(TjProject::getProName, proName);
- }
- List<TjProject> projectList = tjProjectService.list(wq1);
- project.setTjProjectList(projectList);
-
-
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
- if (sysDept!=null){
+ if (sysDept != null) {
project.setDeptName(sysDept.getDeptName());
}
+
}
}
String key = configService.selectConfigByKey("is_open_sfxm");
- Map<String,Object> map=new HashMap<>();
- map.put("list",tjProjects);
- map.put("key",key);
+ Map<String, Object> map = new HashMap<>();
+ map.put("list", tjProjects);
+ map.put("key", key);
return AjaxResult.success(map);
+
}
+
+
+ @GetMapping("/getPacTjProjectList")
+ @ApiOperation(value = "缁存姢濂楅椤甸潰鏂板椤圭洰鏃惰皟鐢�")
+ public AjaxResult getPacTjProjectList() {
+ List<TjProject> tjProjects = tjProjectService.getPacTjProjectList();
+ return AjaxResult.success(tjProjects);
+ }
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -115,21 +195,32 @@
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
public AjaxResult list() {
- LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId, 0);
- wq.eq(TjProject::getProStatus, 0);
- List<TjProject> tjProjects = tjProjectService.list(wq);
+// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+// wq.eq(TjProject::getProParentId, 0);
+// wq.eq(TjProject::getProStatus, 0);
+ List<TjProject> tjProjects = tjProjectService.getTjProjectList();
if (tjProjects != null) {
for (TjProject project : tjProjects) {
- LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjProject::getProParentId,project.getProId());
- List<TjProject> projectList = tjProjectService.list(wq1);
+ List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
project.setTjProjectList(projectList);
}
return AjaxResult.success(tjProjects);
}
return AjaxResult.success(null);
}
+
+
+ @GetMapping("/getPacProList")
+ @ApiOperation(value = "鏌ヨ浣撴椤圭洰鍒楄〃")
+ public AjaxResult getPacProList() {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId, 0);
+ wq.eq(TjProject::getProStatus, 0);
+ List<TjProject> tjProjects = tjProjectService.list(wq);
+ return AjaxResult.success(tjProjects);
+ }
+
+
/**
* 瀵煎嚭浣撴椤圭洰鍒楄〃
@@ -152,12 +243,12 @@
@ApiOperation(value = "鑾峰彇浣撴椤圭洰璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("proId") @ApiParam(value = "浣撴椤圭洰id") Long proId) {
TjProject tjProject = tjProjectService.getById(proId);
- if(null !=tjProject){
- if(tjProject.getProParentId()==0){
+ if (null != tjProject) {
+ if (tjProject.getProParentId() == 0) {
LambdaQueryWrapper<TjProConsumables> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProConsumables::getProId, tjProject.getProId());
List<TjProConsumables> list = proConsumablesService.list(wrapper);
- if(null !=list && list.size()>0){
+ if (null != list && list.size() > 0) {
List<TjConsumables> list1 = new ArrayList<>();
for (TjProConsumables tjProConsumables : list) {
TjConsumables byId = consumablesService.getById(tjProConsumables.getConsumablesId());
@@ -165,14 +256,14 @@
}
tjProject.setConsumablesList(list1);
}
- }else {
+ } else {
LambdaQueryWrapper<TjStandard> wq = new LambdaQueryWrapper<>();
wq.eq(TjStandard::getProId, proId);
tjProject.setTjStandardList(tjStandardService.list(wq));
}
//鏍规嵁姣忎釜椤圭洰鐨刣eptId鎷垮埌name 2023/2/7
SysDept sysDept = deptService.selectDeptById(tjProject.getDeptId());
- if (sysDept!=null){
+ if (sysDept != null) {
tjProject.setDeptName(sysDept.getDeptName());
}
return AjaxResult.success(tjProject);
@@ -195,9 +286,9 @@
if (null != tjProject.getTjStandardList() && tjProject.getTjStandardList().size() > 0) {
tjProject.setProStandard(1);
}
- if(tjProjectService.save(tjProject)){
- if(null != tjProject.getSfxmId()){
- DictProSfxm proSfxm=new DictProSfxm();
+ if (tjProjectService.save(tjProject)) {
+ if (null != tjProject.getSfxmId()) {
+ DictProSfxm proSfxm = new DictProSfxm();
proSfxm.setSfxmId(tjProject.getSfxmId());
proSfxm.setProId(tjProject.getProId());
dictProSfxmService.save(proSfxm);
@@ -220,28 +311,28 @@
tjStandardService.save(tjStandard1);
}
tjProject.setProStandard(1);
- if(null ==tjProject.getProPrice()){
+ if (null == tjProject.getProPrice()) {
tjProject.setProPrice(BigDecimal.valueOf(0.00));
}
Long proParentId = tjProject.getProParentId();
- if(null !=proParentId&&proParentId!=0){
- LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId,proParentId);
+ if (null != proParentId && proParentId != 0) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId, proParentId);
List<TjProject> projectList = tjProjectService.list(wq);
- if(null !=projectList && projectList.size()>0){
- BigDecimal bigDecimal=new BigDecimal("0.00");
+ if (null != projectList && projectList.size() > 0) {
+ BigDecimal bigDecimal = new BigDecimal("0.00");
for (TjProject project : projectList) {
- if (project.getProPrice()!=null){
- bigDecimal=bigDecimal.add(project.getProPrice());
+ if (project.getProPrice() != null) {
+ bigDecimal = bigDecimal.add(project.getProPrice());
}
}
- if (tjProject.getProPrice()!=null){
+ if (tjProject.getProPrice() != null) {
bigDecimal.add(tjProject.getProPrice());
}
TjProject byId = tjProjectService.getById(proParentId);
tjProject.setIsSampling(byId.getIsSampling());
tjProjectService.updateById(tjProject);
- byId.setProPrice(bigDecimal.setScale(2,BigDecimal.ROUND_DOWN));
+ byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN));
tjProjectService.updateById(byId);
}
}
@@ -269,9 +360,9 @@
}
if (tjProject.getProParentId() == 0) {
if (tjProjectService.updateById(tjProject)) {
- if(dictProSfxmService.deletedProSfxm(tjProject.getProId())){
- if(null != tjProject.getSfxmId()){
- DictProSfxm proSfxm=new DictProSfxm();
+ if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
+ if (null != tjProject.getSfxmId()) {
+ DictProSfxm proSfxm = new DictProSfxm();
proSfxm.setSfxmId(tjProject.getSfxmId());
proSfxm.setProId(tjProject.getProId());
dictProSfxmService.save(proSfxm);
@@ -280,6 +371,7 @@
List<TjProject> list = tjProjectService.getTjProjectListBySoneId(String.valueOf(tjProject.getProId()));
if (null != list && list.size() > 0) {
for (TjProject project : list) {
+ project.setDeptId(tjProject.getDeptId());
project.setProType(tjProject.getProType());
project.setProCheckMethod(tjProject.getProCheckMethod());
project.setProStatus(tjProject.getProStatus());
@@ -289,8 +381,8 @@
}
List<TjConsumables> consumablesList = tjProject.getConsumablesList();
if (null != consumablesList && consumablesList.size() > 0) {
- LambdaQueryWrapper<TjProConsumables>wq=new LambdaQueryWrapper<>();
- wq.eq(TjProConsumables::getProId,tjProject.getProId());
+ LambdaQueryWrapper<TjProConsumables> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProConsumables::getProId, tjProject.getProId());
proConsumablesService.remove(wq);
for (TjConsumables tjConsumables : consumablesList) {
TjProConsumables proConsumables = new TjProConsumables();
@@ -304,44 +396,47 @@
}
}
TjProject byId1 = tjProjectService.selectTjProjectByProId(tjProject.getProParentId());
- if(null !=byId1){
+ if (null != byId1 && !tjProject.getDeptId().equals(byId1.getDeptId())) {
+ return AjaxResult.error("涓嶅彲鏇存敼鐖堕」鐩瀹�!");
+ }
+ if (null != byId1) {
tjProject.setIsSampling(byId1.getIsSampling());
}
if (tjProjectService.updateById(tjProject)) {
- if(dictProSfxmService.deletedProSfxm(tjProject.getProId())){
- if(null != tjProject.getSfxmId()){
- DictProSfxm proSfxm=new DictProSfxm();
+ if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
+ if (null != tjProject.getSfxmId()) {
+ DictProSfxm proSfxm = new DictProSfxm();
proSfxm.setSfxmId(tjProject.getSfxmId());
proSfxm.setProId(tjProject.getProId());
dictProSfxmService.save(proSfxm);
}
}
List<TjStandard> tjStandardList = tjProject.getTjStandardList();
- if(null !=tjStandardList && tjStandardList.size()>0){
+ if (null != tjStandardList && tjStandardList.size() > 0) {
for (TjStandard tjStandard : tjStandardList) {
- if(null ==tjStandard.getTjSex()){
+ if (null == tjStandard.getTjSex()) {
tjStandard.setTjSex(null);
}
tjStandard.setProId(tjProject.getProId());
tjStandardService.saveOrUpdate(tjStandard);
}
}
- if(null ==tjProject.getProPrice()){
+ if (null == tjProject.getProPrice()) {
tjProject.setProPrice(BigDecimal.valueOf(0.00));
}
Long proParentId = tjProject.getProParentId();
- if(null !=proParentId){
- LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
- wq.eq(TjProject::getProParentId,proParentId);
+ if (null != proParentId) {
+ LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProject::getProParentId, proParentId);
List<TjProject> projectList = tjProjectService.list(wq);
- if(null !=projectList && projectList.size()>0){
- BigDecimal bigDecimal=new BigDecimal("0.00");
+ if (null != projectList && projectList.size() > 0) {
+ BigDecimal bigDecimal = new BigDecimal("0.00");
for (TjProject project : projectList) {
- bigDecimal=bigDecimal.add(project.getProPrice());
+ bigDecimal = bigDecimal.add(project.getProPrice());
}
bigDecimal.add(tjProject.getProPrice());
TjProject byId = tjProjectService.getById(proParentId);
- byId.setProPrice(bigDecimal.setScale(2,BigDecimal.ROUND_DOWN));
+ byId.setProPrice(bigDecimal.setScale(2, BigDecimal.ROUND_DOWN));
tjProjectService.updateById(byId);
}
}
@@ -374,15 +469,15 @@
if (null != list1 && list1.size() > 0) {
return AjaxResult.error("璇ラ」鐩鍦ㄥ椁愪腑浣跨敤,鏆傛椂涓嶈兘鍒犻櫎");
}
- LambdaQueryWrapper<TjPackageProject> wq2 = new LambdaQueryWrapper<>();
- wq2.eq(TjPackageProject::getProId, proId);
+ LambdaQueryWrapper<TjPackageProject> wq2 = new LambdaQueryWrapper<>();
+ wq2.eq(TjPackageProject::getProId, proId);
LambdaQueryWrapper<TjProConsumables> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjProConsumables::getProId, proId);
- proConsumablesService.remove(wq3);
- ppservice.remove(wq2);
- tjProjectService.removeByIds(list.stream().map(TjProject::getProId).collect(Collectors.toList()));
- tjProjectService.removeById(project1.getProId());
+ proConsumablesService.remove(wq3);
+ ppservice.remove(wq2);
+ tjProjectService.removeByIds(list.stream().map(TjProject::getProId).collect(Collectors.toList()));
+ tjProjectService.removeById(project1.getProId());
} else {
LambdaQueryWrapper<TjStandard> wq = new LambdaQueryWrapper<>();
wq.eq(TjStandard::getProId, proId);
@@ -429,14 +524,24 @@
public AjaxResult getSonsList(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName) {
LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
wq0.ne(TjProject::getProParentId, 0);
- if(null !=proName){
- wq0.like(TjProject::getProName,proName);
+ if (null != proName) {
+ wq0.like(TjProject::getProName, proName);
}
List<TjProject> tjProjects = tjProjectService.list(wq0);
return AjaxResult.success(tjProjects);
}
+
+ /**
+ * 鑾峰彇浣撴椤圭洰璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/getInfoByProId")
+ @ApiOperation(value = "鑾峰彇浣撴椤圭洰璇︾粏淇℃伅")
+ public AjaxResult getInfoByProId(@RequestParam Long proId) {
+ TjProject tjProject = tjProjectService.getById(proId);
+ return AjaxResult.success(tjProject);
+ }
// /**
// * 鑾峰彇閮ㄩ棬鏍戝垪琛�
// */
--
Gitblit v1.8.0