From 3620453ef3ebf3ba1542c180d942443a4a934d67 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 六月 2025 18:05:04 +0800
Subject: [PATCH] zjh20250625
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 36 +++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java | 23 ++++++++++-
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 4 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java | 14 +++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java | 3 +
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java | 5 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 17 +++++---
ltkj-hosp/src/main/resources/mapper/hosp/TjFlowingWaterMapper.xml | 18 ++++++++
8 files changed, 109 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index d3b5cb4..13344b5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -87,6 +87,10 @@
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
if(null !=water){
water.setPayStasus(1L);
+ water.setSfjs("1");
+ water.setJsrq(new Date());
+ water.setJsrxm("his鍥炶皟");
+ water.setJsrdm("999");
if (tjFlowingWaterService.updateById(water)) {
String jxbz = water.getJxbz();
if(StringUtil.isNotBlank(jxbz)){
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index 69cd4cd..f4aee0e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -1340,7 +1340,7 @@
list2.add(tjConsumables);
}
}
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
ArrayList<TjConsumables> collectw = list2.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TjConsumables::getId))), ArrayList::new));
for (TjConsumables tjConsumables : collectw) {
LambdaQueryWrapper<TjChargingStandard> wqq = new LambdaQueryWrapper<>();
@@ -1365,4 +1365,38 @@
}
return AjaxResult.error();
}
+
+
+
+ @GetMapping("/gettuantijiesuanrenyuan")
+ @ApiOperation(value = "鑾峰彇鍥綋缁撶畻浜哄憳")
+ public AjaxResult gettuantijiesuanrenyuan(@RequestParam(required = false) @ApiParam("鍗曚綅ID") String dwId,
+ @RequestParam(required = false) @ApiParam("鐧昏寮�濮嬫椂闂�") String djkssj,
+ @RequestParam(required = false) @ApiParam("鐧昏缁撴潫鏃堕棿") String djjssj,
+ @RequestParam(required = false) @ApiParam("缁撶畻寮�濮嬫椂闂�") String jskssj,
+ @RequestParam(required = false) @ApiParam("缁撶畻缁撴潫鏃堕棿") String jsjssj,
+ @RequestParam(required = false) @ApiParam("浣撴鍙�") String tjh,
+ @RequestParam(required = false) @ApiParam("缁撶畻浜篿d") String jsrid,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page) {
+
+ if (StringUtil.isNotBlank(dwId)) dwId = "";
+ if (StringUtil.isNotBlank(djkssj)) djkssj = "";
+ if (StringUtil.isNotBlank(djjssj)) djjssj = "";
+ if (StringUtil.isNotBlank(jskssj)) jskssj = "";
+ if (StringUtil.isNotBlank(jsjssj)) jsjssj = "";
+ if (StringUtil.isNotBlank(tjh)) tjh = "";
+ if (StringUtil.isNotBlank(jsrid)) jsrid = "";
+ return AjaxResult.success(tjFlowingWaterService.gettuantijiesuanrenyuan(page, pageSize,dwId,djkssj, djjssj, jskssj, jsjssj, tjh, jsrid));
+ }
+
+
+
+ @PostMapping("/tuantijiesuan")
+ @ApiOperation(value = "鍥綋缁撶畻")
+ public AjaxResult tuantijiesuan(@RequestParam(required = false) @ApiParam("鍗曚綅ID") List<String> dwId) {
+
+ return AjaxResult.success();
+ }
+
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 51d0401..727eaf4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -245,13 +245,16 @@
TjCustomer customer = customerService.getById(tjSampling.getCusId());
if(null !=customer){
TjOrder order = orderService.getOrderByTjNum(tjSampling.getTjNum());
- customer.setCompName(order.getFirmName());
- customer.setCusName(customer.getCusName());
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjSampling.getTjNum());
- customer.setApplicationTime(tjSampling.getApplicationTime());
- tjCustomers.add(customer);
+ if(null !=order){
+ customer.setCompName(order.getFirmName());
+ customer.setCusName(customer.getCusName());
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjSampling.getTjNum());
+ customer.setApplicationTime(tjSampling.getApplicationTime());
+ tjCustomers.add(customer);
+ }
+
}
}
HashMap<String, Object> hashMap = new HashMap<>();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
index e9cf4b4..9b257cd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
@@ -184,6 +184,20 @@
@ApiModelProperty(value = "鑷垂宸ヨ垂")
private String zfgf;
+ @ApiModelProperty(value = "鏄惁缁撶畻 0鏈� 1宸� ")
+ private String sfjs;
+
+ @ApiModelProperty(value = "缁撶畻鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date jsrq;
+
+ @ApiModelProperty(value = "缁撶畻浜轰唬鐮�")
+ private String jsrdm;
+
+ @ApiModelProperty(value = "缁撶畻浜哄鍚�")
+ private String jsrxm;
+
/**
* 鏀惰垂id
*/
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
index 95e3f7d..caeeb27 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java
@@ -2,6 +2,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjFlowingWater;
@@ -107,4 +108,8 @@
@Select("call tj_bl(#{tjh,mode=IN})")
void getTjBlCall(@Param("tjh") String tjh);
+
+
+ //瀛樺偍杩囩▼涓撶敤鎺ュ彛(鑾峰彇鍥綋缁撶畻浜哄憳鎯呭喌淇℃伅)
+ List<List<?>> gettuantijiesuanrenyuan(Map<String,Object> map);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
index f8d2634..d2f465c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjFlowingWaterService.java
@@ -2,6 +2,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjFlowingWater;
@@ -77,4 +78,6 @@
void deleteTjOrderDetailByjxbz(String bldh);
void getTjBlCall(String tjh);
+
+ Map<String,Object> gettuantijiesuanrenyuan(Integer page, Integer pageSize, String dwId, String djkssj, String djjssj, String jskssj, String jsjssj, String tjh, String jsrid);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
index 5749bfe..f5fd8f4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjFlowingWaterServiceImpl.java
@@ -1,7 +1,6 @@
package com.ltkj.hosp.service.impl;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.common.utils.DateUtils;
@@ -128,4 +127,24 @@
public void getTjBlCall(String tjh) {
tjFlowingWaterMapper.getTjBlCall(tjh);
}
+
+ @Override
+ public Map<String, Object> gettuantijiesuanrenyuan(Integer page, Integer pageSize,
+ String dwId, String djkssj, String djjssj, String jskssj, String jsjssj, String tjh, String jsrid) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("page",page);
+ map.put("pageSize",pageSize);
+ map.put("dwId",dwId);
+ map.put("djkssj",djkssj);
+ map.put("djjssj",djjssj);
+ map.put("jskssj",jskssj);
+ map.put("jsjssj",jsjssj);
+ map.put("tjh",tjh);
+ map.put("jsrid",jsrid);
+ List<List<?>> list = tjFlowingWaterMapper.gettuantijiesuanrenyuan(map);
+ Map<String,Object> map1=new HashMap<>();
+ map1.put("customers",list);
+ map1.put("total",map.get("total"));
+ return map1;
+ }
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjFlowingWaterMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjFlowingWaterMapper.xml
index c2fb406..fdf461a 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjFlowingWaterMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjFlowingWaterMapper.xml
@@ -132,4 +132,20 @@
#{tj_serial_number}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+
+
+ <select id="gettuantijiesuanrenyuan" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
+ {call gettuantijiesuanrenyuan(
+ #{page,mode=IN,jdbcType=INTEGER},
+ #{pageSize,mode=IN,jdbcType=INTEGER},
+ #{dwId,mode=IN,jdbcType=VARCHAR},
+ #{djkssj,mode=IN,jdbcType=VARCHAR},
+ #{djjssj,mode=IN,jdbcType=VARCHAR},
+ #{jskssj,mode=IN,jdbcType=VARCHAR},
+ #{jsjssj,mode=IN,jdbcType=VARCHAR},
+ #{tjh,mode=IN,jdbcType=VARCHAR},
+ #{jsrid,mode=IN,jdbcType=VARCHAR},
+ #{total,mode=OUT,jdbcType=INTEGER}
+ )}
+ </select>
+</mapper>
--
Gitblit v1.8.0