From 9ac01b48ef00a0855306d72e8c680b912a9a8d03 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 07 八月 2025 08:44:50 +0800
Subject: [PATCH] zjh20250807

---
 ltkj-admin/src/test/java/zjhTest.java                                            |   39 ++++++++-----
 ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java      |   68 ++++++++++++++++++++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java       |   10 +++
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java         |    2 
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java            |    7 ++
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java |    5 +
 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java                  |   13 ++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java               |    4 +
 8 files changed, 133 insertions(+), 15 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
index 248de0f..3e5f0f0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/WxloginController.java
@@ -16,9 +16,12 @@
 import com.ltkj.framework.config.UserHoder;
 import com.ltkj.hosp.domain.GetPhone;
 import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.domain.TjOrder;
 import com.ltkj.hosp.domain.Wxuser;
 import com.ltkj.hosp.service.IAbucoderWxuserService;
 import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.hosp.service.ITjOrderRemarkService;
+import com.ltkj.hosp.service.ITjOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,6 +31,7 @@
 import okhttp3.Response;
 import org.aspectj.bridge.MessageWriter;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -65,6 +69,11 @@
 
     @Resource
     private IAbucoderWxuserService wxuserService;
+    @Autowired
+    private ITjOrderService orderService;
+
+    @Resource
+    private ITjOrderRemarkService remarkService;
 
     @Value("${xcx.appid}")
     private String appid;
@@ -212,6 +221,65 @@
         return AjaxResult.error();
     }
 
+
+    @PostMapping("/wx/wenzhenxinxi")
+    @ApiOperation("灏忕▼搴忛棶璇婁俊鎭�")
+    public AjaxResult wenzhenxinxi(@RequestBody String json) {
+        cn.hutool.json.JSONObject entries = JSONUtil.parseObj(json);
+        String idCard = entries.getStr("idCard");
+        TjCustomer tjCustomer = customerService.getTjCustomerByCusIdCard(idCard);
+        if(null != tjCustomer){
+            List<Map<String, Object>> mapList = new ArrayList<>();
+            LambdaQueryWrapper<TjOrder> wq=new LambdaQueryWrapper<>();
+            wq.eq(TjOrder::getUserId, tjCustomer.getCusId());
+            List<TjOrder> list = orderService.list(wq);
+            if(null != list && !list.isEmpty()){
+                for (TjOrder order : list) {
+                    Map<String, Object> map = new HashMap<>();
+                    if(order.getPacId().equals("0")){
+                        map.put("pacName","鏅�氫綋妫�");
+                    }else {
+                        map.put("pacName",orderService.getpacName(order.getPacId()));
+                    }
+                    map.put("zjq",orderService.gettjzj(order.getOrderId()));
+                    map.put("tjsj",order.getCreateTime());
+                    map.put("tjxm",remarkService.getTjxm(order.getTjNumber()));
+                    int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+                    int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+                    Date checkTime = order.getCheckTime();
+                    Date reportTime = order.getReportTime();
+                    Integer heshouStatus = order.getHeshouStatus();
+                    Date lastTime = order.getPrintLastTime();
+                    if (czwj == 0) {
+                        map.put("tjzt","鏈");
+                    }
+                    if (czwj > 0) {
+                        map.put("tjzt","鍦ㄦ");
+                    }
+                    if (sfwc == 0) {
+                        map.put("tjzt","宸插畬鎴�");
+                    }
+                    if (null != checkTime) {
+                        map.put("tjzt","宸插鏍�");
+                    }
+                    if (null != reportTime) {
+                        map.put("tjzt","鐢熸垚鎶ュ憡");
+                    }
+                    if (1 == heshouStatus) {
+                        map.put("tjzt","鎶ュ憡鏍告敹");
+                    }
+                    if (null != lastTime) {
+                        map.put("tjzt","宸叉墦鍗�");
+                    }
+                    mapList.add(map);
+                }
+                return AjaxResult.success(mapList);
+            }
+        }
+
+        return AjaxResult.error("鏆傛棤闂瘖璁板綍");
+    }
+
     /**
      * 鍙戦�佽姹傜敤code鎹㈠彇sessionKey鍜岀浉鍏充俊鎭�
      *
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 4294610..4f48657 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -3,6 +3,7 @@
 import com.ltkj.LtkjApplication;import com.ltkj.framework.config.MatchUtils;
 import com.ltkj.hosp.domain.TjJcycxm;
 import com.ltkj.hosp.idutil.IdUtils;
+import com.ltkj.system.service.ISysConfigService;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -50,24 +51,32 @@
 
     @Value("${token.secret_key}")
     private String secret;
+
+    @Autowired
+    private ISysConfigService configService;
     @Test
     public void test() throws InterruptedException {
+//
+//        ExecutorService executorService = Executors.newFixedThreadPool(20); // 20涓嚎绋嬫睜
+//        Set<String> numbers = Collections.synchronizedSet(new HashSet<>()); // 绾跨▼瀹夊叏鐨凷et锛屽瓨鏀剧敓鎴愮殑缂栧彿
+//        // 骞跺彂鎵ц
+//        for (int i = 0; i < 20; i++) {
+//            executorService.execute(() -> {
+//                try {
+//                    String number = idUtils.getNewTjNumberRedisLock(); // 璋冪敤鑾峰彇缂栧彿鐨勬柟娉�
+//                    numbers.add(number); // 娣诲姞鍒� Set
+//                } catch (RuntimeException e) {
+//                    throw new RuntimeException(e);
+//                }
+//            });
+//        }
+//        System.out.println(numbers);
+//        executorService.shutdown(); // 鍏抽棴绾跨▼姹�
 
-        ExecutorService executorService = Executors.newFixedThreadPool(20); // 20涓嚎绋嬫睜
-        Set<String> numbers = Collections.synchronizedSet(new HashSet<>()); // 绾跨▼瀹夊叏鐨凷et锛屽瓨鏀剧敓鎴愮殑缂栧彿
-        // 骞跺彂鎵ц
-        for (int i = 0; i < 20; i++) {
-            executorService.execute(() -> {
-                try {
-                    String number = idUtils.getNewTjNumberRedisLock(); // 璋冪敤鑾峰彇缂栧彿鐨勬柟娉�
-                    numbers.add(number); // 娣诲姞鍒� Set
-                } catch (RuntimeException e) {
-                    throw new RuntimeException(e);
-                }
-            });
-        }
-        System.out.println(numbers);
-        executorService.shutdown(); // 鍏抽棴绾跨▼姹�
+//        String regex = configService.selectConfigByKey("jcycxmzz");
+//        String input = "鍙充晶棰堟�诲姩鑴夊彲瑙佽寖鍥�4.2x1.3mm鏂戝潡锛涘乏渚ч鍐呭姩鑴夊彲瑙佽寖鍥�7.8x1.5mm鏂戝潡锛屼綑绠¤厰鍐呮湭瑙佹槑鏄惧紓甯稿洖澹帮紝CDFI锛氬叾鍐呭僵鑹茶娴佸厖鐩堣壇濂斤紝琛�娴侀�熷害姝e父";
+//        String[] split = input.replaceAll("\n", "").split(regex);
+//        System.out.println(split);
 
     }
 
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index e51251c..17a9ede 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -445,4 +445,17 @@
     @Select("SELECT COUNT(*) FROM tj_order a WHERE a.deleted=0 AND " +
             "(a.firm_id=#{compId} OR a.team_no=#{teamNo}) AND a.pac_id=#{pacId}")
     Integer getTjTeamSelectRecordCount(@Param("teamNo") String teamNo,@Param("compId") String compId,@Param("pacId") String pacId);
+
+    @Select(" SELECT aa.pacname pacname FROM (\n" +
+            " SELECT TRIM(a.pac_name) pacname FROM tj_package a WHERE a.pac_id=#{pacId}\n" +
+            " \n" +
+            " UNION \n" +
+            " \n" +
+            " SELECT TRIM(b.dw_dept_name) pacname FROM tj_dw_grouping b WHERE b.id=#{pacId}) aa  GROUP BY aa.pacname\n" +
+            " ")
+    String getpacName(String pacId);
+
+
+    @Select("  SELECT SUM(a.paid_in) FROM tj_flowing_water a WHERE a.deleted=0 AND a.pay_stasus=1 AND a.order_id=#{orderId} ")
+    String gettjzj(Long orderId);
 }
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 696482c..f59e9e2 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
@@ -327,4 +327,11 @@
 
     @Select("call newpacsJianChaData(#{tjnumber,mode=IN},0)")
     List<TjOrderRemark> newpacsJianChaData(String tjnumber);
+
+
+    @Select(" SELECT CONCAT(CONCAT('鍏�',COUNT(*),'椤�'),': '," +
+            "TRIM(GROUP_CONCAT(b.pro_name ORDER BY b.pro_name SEPARATOR ' | '))) AS xmm" +
+            " FROM tj_order_remark a LEFT JOIN tj_project b ON b.pro_id=a.pro_id" +
+            " WHERE a.tj_number=#{tjNumber} AND a.type !=2 AND a.deleted=0")
+    String getTjxm(String tjNumber);
 }
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 93d1277..94b9b21 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
@@ -108,4 +108,6 @@
     void csymxmxzqtyybcjk(String tjNum, String proId, String yy, String orgType, String czy, String czydm);
 
     List<TjOrderRemark> newpacsJianChaData(String tjNumber);
+
+    String getTjxm(String tjNumber);
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
index b91e437..64b845d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java
@@ -205,4 +205,8 @@
 
 
     Integer getTjTeamSelectRecordCount(String teamNo, String compId, String pacId);
+
+    String getpacName(String pacId);
+
+    String gettjzj(Long orderId);
 }
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 6fae210..40a370d 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
@@ -224,4 +224,9 @@
         return mapper.newpacsJianChaData(tjNumber);
     }
 
+    @Override
+    public String getTjxm(String tjNumber) {
+        return mapper.getTjxm(tjNumber);
+    }
+
 }
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
index a64a61c..836109f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -519,4 +519,14 @@
     public Integer getTjTeamSelectRecordCount(String teamNo, String compId, String pacId) {
         return tjOrderMapper.getTjTeamSelectRecordCount(teamNo, compId, pacId);
     }
+
+    @Override
+    public String getpacName(String pacId) {
+        return  tjOrderMapper.getpacName( pacId);
+    }
+
+    @Override
+    public String gettjzj(Long orderId) {
+        return  tjOrderMapper.gettjzj(orderId);
+    }
 }

--
Gitblit v1.8.0