From dc23d54849571d2bd38f6f8e1dfdb849047532f6 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 06 三月 2024 11:43:50 +0800
Subject: [PATCH] zjh 本地 2024/03/6 -2
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java | 17 ++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java | 3 +
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 16 +++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 4 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 7 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java | 2 +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java | 8 ++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java | 5 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java | 5 ++
12 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
index 0fb1db2..a881d73 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java
@@ -196,4 +196,21 @@
log.error("涓嬭浇鏂囦欢澶辫触", e);
}
}
+
+
+ @DeleteMapping("/deletedFile")
+ @ApiOperation(value = "閫氱敤鏂囦欢鍒犻櫎鎺ュ彛")
+ public AjaxResult deletedFile(@RequestParam String url) {
+ //鏂囦欢鍚庣紑
+ File files=new File(url);
+ String name = files.getName();
+ File file=new File(photoPath+name);
+ if (file.exists()) {
+ if(file.delete()){
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
+ return AjaxResult.error("鍒犻櫎澶辫触");
+ }
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index dcf20d4..f94fe09 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -398,16 +398,20 @@
wq1.eq(TjProject::getProId, tjOrderDetail.getProId());
TjProject one = projectService.getOne(wq1);
if (one != null) {
- if (one.getProParentId() != 0) {
+// if (one.getProParentId() != 0) {
tjOrderDetail.setTjStatus(2L);
tjOrderDetail.setProResult("寮冩");
tjOrderDetail.setUpdateTime(new DateTime());
tjOrderDetailService.updateById(tjOrderDetail);
- } else {
- tjOrderDetail.setTjStatus(1L);
- tjOrderDetail.setUpdateTime(new DateTime());
- tjOrderDetailService.updateById(tjOrderDetail);
- }
+// } else {
+// tjOrderDetail.setTjStatus(1L);
+// tjOrderDetail.setUpdateTime(new DateTime());
+// tjOrderDetailService.updateById(tjOrderDetail);
+// }
+// LambdaQueryWrapper<TjOrderRemark> wq=new LambdaQueryWrapper<>();
+// wq.eq(TjOrderRemark::getTjNumber,tjNumber);
+// wq.eq(TjOrderRemark::getProId,tjOrderDetail.getProId());
+ orderRemarkService.updateTjOrderRemark(tjNumber, String.valueOf(tjOrderDetail.getProId()));
//缁欏純妫�琛ㄦ坊鍔犺褰�
TjDiscardInspection td = new TjDiscardInspection();
td.setProId(String.valueOf(one.getProId()));
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 a453965..74c5d82 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
@@ -317,7 +317,12 @@
List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
if (one != null && one.size() > 0) {
for (LtkjHysqd ltkjHysqd : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+// LambdaQueryWrapper<LtkjHysqd> wq0=new LambdaQueryWrapper<>();
+// wq0.eq(LtkjHysqd::getTjh,ltkjHysqd.getTjh());
+// wq0.eq(LtkjHysqd::getTmh,ltkjHysqd.getTmh());
+// ltkjHysqdService.remove(wq0);
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
if (hysqd == null) {
ltkjHysqdService.save(ltkjHysqd);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
index 1b04fe1..62c7346 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -5,6 +5,7 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -15,4 +16,8 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjHybgdMapper extends BaseMapper<LtkjHybgd> {
+
+
+ @Delete("DELETE FROM ltkj_hybgd WHERE tmh=#{tmh} ")
+ void deletedLtkjHybgdByTjhAndTmh(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
index da70f28..aab30a7 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
@@ -5,6 +5,7 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -20,4 +21,8 @@
@Select("SELECT * FROM ltkj_hysqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
LtkjHysqd getLtkjHysqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh") String tmh);
+
+
+ @Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
+ void deletedLtkjHysqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
}
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 f02edaf..e05e048 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
@@ -113,4 +113,8 @@
@Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
// @Select("select * from test_remark")
List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);
+
+
+ @Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
+ void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);
}
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 deddca0..a9b18fe 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
@@ -45,4 +45,7 @@
List<TjOrderRemark> addHuaYanTable(String tjnumber);
+
+ void updateTjOrderRemark(String tjnumber,String proId);
+
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
index 29cd569..fedc90a 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java
@@ -10,4 +10,6 @@
* @Date: 2023/12/11 17:57
*/
public interface LtkjHybgdService extends IService<LtkjHybgd> {
+
+ void deletedLtkjHybgdByTjhAndTmh(String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
index 10a4451..e212286 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
@@ -12,4 +12,7 @@
public interface LtkjHysqdService extends IService<LtkjHysqd> {
LtkjHysqd getLtkjHysqdByTjhAndTmh(String tjh,String tmh);
+
+
+ void deletedLtkjHysqdByTjhAndTmh(String tjh,String tmh);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
index 039c427..ea45b4f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java
@@ -9,6 +9,8 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+
/**
* 鐥呯+鎰忚Service涓氬姟灞傚鐞�
*
@@ -17,5 +19,11 @@
*/
@Service
public class LtkjHybgdServiceImpl extends ServiceImpl<LtkjHybgdMapper, LtkjHybgd> implements LtkjHybgdService {
+ @Resource
+ private LtkjHybgdMapper mapper;
+ @Override
+ public void deletedLtkjHybgdByTjhAndTmh(String tmh) {
+ mapper.deletedLtkjHybgdByTjhAndTmh(tmh);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
index c493b74..31c15fe 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
@@ -27,4 +27,9 @@
public LtkjHysqd getLtkjHysqdByTjhAndTmh(String tjh, String tmh) {
return mapper.getLtkjHysqdByTjhAndTmh(tjh,tmh);
}
+
+ @Override
+ public void deletedLtkjHysqdByTjhAndTmh(String tjh, String tmh) {
+ mapper.deletedLtkjHysqdByTjhAndTmh(tjh,tmh);
+ }
}
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 6564d6b..d823c62 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
@@ -87,4 +87,9 @@
return mapper.addHuaYanTable(tjnumber);
}
+ @Override
+ public void updateTjOrderRemark(String tjnumber, String proId) {
+ mapper.updateTjOrderRemark(tjnumber,proId);
+ }
+
}
--
Gitblit v1.8.0