From d76577743763c668a9ebe4ea481e03b62af17596 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 六月 2025 17:46:00 +0800
Subject: [PATCH] zjh20250606
---
ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java | 2 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 44 +++++++++------------
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 12 +++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 33 ++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5 ++
6 files changed, 71 insertions(+), 27 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index fbb30fa..3710a7c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -165,34 +165,10 @@
return AjaxResult.error("璇疯緭鍏ョ瀹d");
}
//鏍规嵁褰撳墠鐧婚檰鐨勪汉鐨勭瀹d锛岃幏鍙栬绉戝涓嬬殑鎵�鏈夐」鐩�
- List<Long> postIds = sysUser.getPostIds();
- List<Long> ksproList = null;
String byKey =null;
-// if (postIds != null) {
-// for (Long postId : postIds) {
-// LambdaQueryWrapper<SysUserPost> wq111 = new LambdaQueryWrapper<>();
-// wq111.eq(SysUserPost::getPostId, postId);
-// SysUserPost one = userPostService.getOne(wq111);
-// if (one != null) {
-// SysPost byId = postService.getById(one.getPostId());
-// if (byId.getPostName().equals("褰曞叆鍛�")) {
-// ksproList = projectService.getKsTjProjectIdListBydeptId(String.valueOf(ksId));
-// }
-// if (byId.getPostName().equals("鍓嶅彴")) {
-// byKey = configService.selectConfigByKey("qt_kjksid");
-//
-// }
-// }
-// }
-// } else {
-// ksproList = projectService.getKsTjProjectIdList();
-// }
-//
-// if (ksproList == null || ksproList.isEmpty()) {
-// return AjaxResult.error("璇峰畬鍠勭瀹ら」鐩俊鎭�");
-// }
+ SysDept dept = deptService.getById(ksId);
List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
if (null != roles && !roles.isEmpty()) {
@@ -208,6 +184,14 @@
if ( StringUtil.isNotBlank(byKey)) {
ksId+=(","+byKey);
}
+
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ ksId+=(","+dept.getSjks());
+ }
+ }
+
+
if (type == 0) {
map = deptService.getSysDeptYjWjCustomerList13(ksId, name, tjNumber, 0, page, pageSize);
}
@@ -594,6 +578,7 @@
}
ksId = Math.toIntExact(sysUser.getDeptId());
}
+ SysDept dept = deptService.getById(ksId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
// 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
@@ -660,6 +645,15 @@
}
}
}
+ if(null !=dept){
+ if(StringUtil.isNotBlank(dept.getSjks())){
+ String[] arr = dept.getSjks().split(","); // 鏍规嵁閫楀彿杩涜鍒囧壊
+ for (String s : arr) {
+ int num = Integer.parseInt(s); // 灏嗘瘡涓瓙瀛楃涓茶浆鎹负integer绫诲瀷
+ split.add(num); // 娣诲姞鍒板垪琛ㄤ腑
+ }
+ }
+ }
log.info("鏌ヨ鍏宠仈绉戝闆嗗悎 ->{}",split);
List<TjOrderRemark> list;
if (null != sysUser && sysUser.getUserName().equals("10001")) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 232b3b4..bd54ce1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
@@ -1941,4 +1942,36 @@
return AjaxResult.success(list);
}
+
+
+ @GetMapping("/csymxmxzqtyybcjk")
+ @ApiOperation(value = "鍒濆椤甸潰椤圭洰閫夋嫨鍏朵粬鍘熷洜淇濆瓨鎺ュ彛")
+ @Transactional
+ public AjaxResult csymxmxzqtyybcjk(@RequestParam @ApiParam("浣撴鍙�") String tjNum,@RequestParam @ApiParam("椤圭洰ID") String proId,
+ @RequestParam @ApiParam("鍘熷洜") String yy) {
+
+ try {
+ String czydm = SecurityUtils.getUsername();
+ String czy = SecurityUtils.getLoginUser().getUser().getNickName();
+ TjProject tjProject = projectService.getById(proId);
+ if(null != tjProject){
+ SysDept dept = deptService.getById(tjProject.getDeptId());
+
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNum);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = orderRemarkService.getOne(wq);
+ remark.setType(1);
+ if (orderRemarkService.updateById(remark)) {
+ orderRemarkService.csymxmxzqtyybcjk(tjNum,proId,yy,dept.getOrgType(),czy,czydm);
+ return AjaxResult.success();
+ }
+ }
+ } catch (Exception ex) {
+ log.error(ex.getMessage());
+ throw new RuntimeException(ex);
+ }
+ return AjaxResult.error();
+ }
+
}
diff --git a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
index 07668f9..7777d16 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/core/domain/entity/SysDept.java
@@ -196,6 +196,8 @@
private String hisksmc;
+ private String sjks;
+
//浠ヤ笂
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index fe32a38..1542ff9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -288,8 +288,16 @@
List<CsProVo> getYxJcXx(@Param("tjh") String tjNumber, @Param("ks") String ks);
- @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
- " WHERE b.need_report='Y' AND b.pro_delivery=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} ")
+// @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +
+// " WHERE b.need_report='Y' AND b.pro_delivery=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} ")
+
+ @Select("call yiShengJianChaGetPrentProWs(#{tjnumber,mode=IN})")
List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber);
+
+ @Select("call csymxmxzqtyybcjk(#{tjh,mode=IN},#{xmid,mode=IN},#{yy,mode=IN},#{kslx,mode=IN},#{czy,mode=IN}," +
+ "#{czydm,mode=IN}) ")
+ void csymxmxzqtyybcjk(@Param("tjh")String tjNum,@Param("xmid") String proId,@Param("yy") String yy,
+ @Param("kslx") String orgType,@Param("czy") String czy,@Param("czydm") String czydm);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
index a7c678f..b29b123 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -100,4 +100,6 @@
List<TjOrderRemark> yiShengJianChaGetPrentProWs(String tjNumber);
+
+ void csymxmxzqtyybcjk(String tjNum, String proId, String yy, String orgType, String czy, String czydm);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
index 526aab0..22382cc 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -205,4 +205,9 @@
return mapper.yiShengJianChaGetPrentProWs(tjNumber);
}
+ @Override
+ public void csymxmxzqtyybcjk(String tjNum, String proId, String yy, String orgType, String czy, String czydm) {
+ mapper.csymxmxzqtyybcjk( tjNum, proId, yy, orgType, czy, czydm);
+ }
+
}
--
Gitblit v1.8.0