From 3779da90aeb2392b85bf721900bfb6f07bee1021 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 12 七月 2024 17:22:12 +0800
Subject: [PATCH] zjh 2024/07/12-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java  |    1 
 ltkj-system/src/main/java/com/ltkj/system/service/impl/SysConfigServiceImpl.java     |    5 +
 ltkj-common/src/main/java/com/ltkj/common/excelConfig/ExcelUtils.java                |    5 
 ltkj-system/src/main/resources/mapper/system/SysConfigMapper.xml                     |    6 +
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java     |    9 +
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java |    8 +
 ltkj-system/src/main/java/com/ltkj/system/mapper/SysConfigMapper.java                |    8 +
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java    |  234 ++++++++++++++++------------------------------
 ltkj-admin/src/main/resources/application.yml                                        |    2 
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java      |    8 +
 ltkj-system/src/main/java/com/ltkj/system/service/ISysConfigService.java             |    3 
 11 files changed, 129 insertions(+), 160 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
index 3fe97d8..4e42584 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
@@ -91,9 +91,11 @@
     @Log(title = "浣撴鍗曚綅淇℃伅缁存姢", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DictComp dictComp) {
-        String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
-        dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
-        dictComp.setEnName(firstLetter);
+        if(null !=dictComp.getCnName()){
+            String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
+            dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
+            dictComp.setEnName(firstLetter);
+        }
         return toAjax(dictCompService.save(dictComp));
     }
 
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index be93d61..3d55962 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -178,4 +178,13 @@
         return AjaxResult.error();
     }
 
+
+
+    @GetMapping ("/tbhisproprice")//鍚屾his椤圭洰鍗曚环淇℃伅
+    @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')")
+    public AjaxResult tbhisproprice() {
+         configService.tbhisproprice();
+        return AjaxResult.success();
+    }
+
 }
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 03f17cd..4dbdc3a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -151,13 +151,9 @@
 //                    return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
 //                }
 //            }
-            //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-            LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
-            TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
-            if (null == tjCustomerServiceOne) {
-                return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
-            }
+            Date dates = new Date();
+            final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
+
             final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
             if ("Y".equals(getInfoFromSqlData)) {
                 //鏍规嵁韬唤璇佸彿浠巋is鏌ヤ俊鎭�
@@ -208,48 +204,7 @@
             }
 
             String key = sysConfigService.selectConfigByKey("sfkqdyhis");
-            if (null != key && key.equals("Y")) {
-                String cardId = tjCustomerServiceOne.getCardId();
-                if (null != cardId && !cardId.equals("0")) {
-                    int i = tjOrderService.selectTjOrderByCardId(cardId);
-                    if (i > 0) {
-                        return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
-                    }
-                }
 
-//                controller.Outpincreateapply(tjCustomer);
-
-/*                Date dates = new Date();
-                final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
-                OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
-                outpinregapplyDto.setPationid(tjCustomerServiceOne.getPationId());
-                outpinregapplyDto.setSqysbm("00029");
-                outpinregapplyDto.setMzksbm("0101");
-                outpinregapplyDto.setCzybm("00029");
-                outpinregapplyDto.setSfjz("0");
-                outpinregapplyDto.setGhzlbm("01");
-                outpinregapplyDto.setYwckbm("0001");
-                outpinregapplyDto.setSflstd("0");
-                outpinregapplyDto.setGhrq(date);
-                //闂ㄨ瘖鎸傚彿
-                AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
-                String result2 = getAjaxResult(ajaxResult);
-                JSONObject object1 = getJSONObject(result2);
-                String code1 = object1.getStr("ResultCode");
-                if (code1.equals("0")) {
-                    JSONArray resultDatas = object1.getJSONArray("ResultData");
-                    if (null != resultDatas && resultDatas.size() > 0) {
-                        Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
-                        String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
-                        //闂ㄨ瘖鍖荤敓鎺ヨ瘖
-                        controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
-//                        tjCustomerServiceOne.setCardId(hisRegistrationId);
-//                        tjCustomerServiceOne.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomerServiceOne.getCusIdcard()),"yyyy-MM-dd"));
-//                        tjCustomerService.updateById(tjCustomerServiceOne);
-                        tjCustomerService.updateCardId(tjCustomerServiceOne.getCusId(),hisRegistrationId);
-                    }
-                }*/
-            }
 
             //end====2023.12.12
             LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -265,43 +220,10 @@
                     tjReservationService.updateById(tjReservation);
                     return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
                 }
-
-
                 LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
                 qw.eq(TjCustomer::getCusIdcard, cusIdcard);
                 TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
                 if (tjCustomer1 != null) {
-         /*           String key = sysConfigService.selectConfigByKey("sfkqdyhis");
-                    if (null != key && key.equals("Y")) {
-                        Date dates = new Date();
-                        final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
-                        OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
-                        outpinregapplyDto.setPationid(tjCustomer1.getPationId());
-                        outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
-                        outpinregapplyDto.setMzksbm("0101");
-                        outpinregapplyDto.setCzybm("00029");
-                        outpinregapplyDto.setSfjz("0");
-                        outpinregapplyDto.setGhzlbm("01");
-                        outpinregapplyDto.setYwckbm("0001");
-                        outpinregapplyDto.setSflstd("0");
-                        outpinregapplyDto.setGhrq(date);
-                        //闂ㄨ瘖鎸傚彿
-                        AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
-                        String result2 = getAjaxResult(ajaxResult);
-                        JSONObject object1 = getJSONObject(result2);
-                        String code1 = object1.getStr("ResultCode");
-                        if (code1.equals("0")) {
-                            JSONArray resultDatas = object1.getJSONArray("ResultData");
-                            if (null != resultDatas && resultDatas.size() > 0) {
-                                Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
-                                String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
-                                //闂ㄨ瘖鍖荤敓鎺ヨ瘖
-                                controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
-                                tjCustomer1.setCardId(hisRegistrationId);
-                            }
-                        }
-                    }*/
-
                     tjCustomer1.setTjType(tjReservation.getTjType());
                     tjCustomer1.setCusName(tjReservation.getName());
                     tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
@@ -324,45 +246,87 @@
                     tjCustomer1.setDiscount(tjReservation.getDiscount());
                     tjCustomer1.setGroupingId(tjReservation.getGroupingId());
                     return success(tjCustomer1);
+                }else {
+                    TjCustomer tjCustomer = new TjCustomer();
+                    tjCustomer.setCusIdcard(tjReservation.getIdCard());
+                    tjCustomer.setCusName(tjReservation.getName());
+                    tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
+                    tjCustomer.setCusBrithday(tjReservation.getBirthday());
+                    tjCustomer.setCusPhone(tjReservation.getPhoe());
+                    tjCustomer.setCusEmail(tjReservation.getEmail());
+                    tjCustomer.setCusAddr(tjReservation.getAddress());
+                    tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+                    tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+
+                    tjCustomer.setIdType(tjReservation.getIdType());
+                    tjCustomer.setAge(tjReservation.getAge());
+                    tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
+                    tjCustomer.setCareer(tjReservation.getCareer());
+                    tjCustomer.setDwPhone(tjReservation.getDwPhone());
+                    tjCustomer.setCardId(tjReservation.getCardId());
+                    tjCustomer.setIndexCard(tjReservation.getIndexCard());
+                    //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
+                    String substring = cusIdcard.substring(cusIdcard.length() - 6);
+                    substring = DigestUtils.md5DigestAsHex(substring.getBytes());
+                    tjCustomer.setCusPassword(substring);
+                    tjCustomer.setTjType(tjReservation.getTjType());
+                    tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
+                    tjCustomerService.save(tjCustomer);
+                    if (null != key && key.equals("Y"))
+                    {
+                        AjaxResult result = controller.Outpincreateapply(tjCustomer);
+                        String result1 = getAjaxResult(result);
+                        JSONObject object = getJSONObject(result1);
+                        String code = object.getStr("ResultCode");
+                        if (code.equals("0")) {
+                            JSONArray resultDatass = object.getJSONArray("ResultData");
+                            Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
+                            if (null != resultData && resultData.size() > 0) {
+                                String pationid = resultData.get("PationId").toString();
+                                if (null != pationid) {
+                                    tjCustomer.setPationId(pationid);
+                                    tjCustomerService.updateById(tjCustomer);
+                                    //淇濆瓨娉ㄥ唽鍏ュ弬鍑哄弬
+                                    resultData.put("cardId",pationid);
+                                    JSONObject object4 = JSONUtil.parseObj(resultData);
+                                    LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                                    lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
+                                    HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
+                                    hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
+                                }
+                            }
+                        }
+                    }
+                    tjCustomer.setTeamNo(tjReservation.getTeamNo());
+                    tjCustomer.setCompId(tjReservation.getCompanyId());
+                    tjCustomer.setReservationId(tjReservation.getId());
+                    tjCustomer.setDiscount(tjReservation.getDiscount());
+                    tjCustomer.setGroupingId(tjReservation.getGroupingId());
+                    return success(tjCustomer);
                 }
-                TjCustomer tjCustomer = new TjCustomer();
-                tjCustomer.setCusIdcard(tjReservation.getIdCard());
-                tjCustomer.setCusName(tjReservation.getName());
-                tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
-                tjCustomer.setCusBrithday(tjReservation.getBirthday());
-                tjCustomer.setCusPhone(tjReservation.getPhoe());
-                tjCustomer.setCusEmail(tjReservation.getEmail());
-                tjCustomer.setCusAddr(tjReservation.getAddress());
-                tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
-                tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
 
-                tjCustomer.setIdType(tjReservation.getIdType());
-                tjCustomer.setAge(tjReservation.getAge());
-                tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
-                tjCustomer.setCareer(tjReservation.getCareer());
-                tjCustomer.setDwPhone(tjReservation.getDwPhone());
-                tjCustomer.setCardId(tjReservation.getCardId());
-                tjCustomer.setIndexCard(tjReservation.getIndexCard());
-
-                //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
-                String substring = cusIdcard.substring(cusIdcard.length() - 6);
-                substring = DigestUtils.md5DigestAsHex(substring.getBytes());
-                tjCustomer.setCusPassword(substring);
-                tjCustomer.setTjType(tjReservation.getTjType());
-                tjCustomer.setPym(PinyinUtil.getFirstLetter(tjReservation.getName(),""));
-                tjCustomerService.save(tjCustomer);
-                tjCustomer.setTeamNo(tjReservation.getTeamNo());
-                tjCustomer.setCompId(tjReservation.getCompanyId());
-                tjCustomer.setReservationId(tjReservation.getId());
-                tjCustomer.setDiscount(tjReservation.getDiscount());
-                tjCustomer.setGroupingId(tjReservation.getGroupingId());
-                return success(tjCustomer);
-            } else {
-                LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
-                customerLambdaQueryWrapper1.eq(TjCustomer::getCusIdcard, cusIdcard);
-                TjCustomer one = tjCustomerService.getOne(customerLambdaQueryWrapper1);
-                return AjaxResult.success("鏆傛棤棰勭害淇℃伅", tjCustomerServiceOne);
             }
+
+            //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+            LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
+            TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
+            if (null == tjCustomerServiceOne) {
+                return AjaxResult.error("璇ヤ汉鍛樹俊鎭笉瀛樺湪璇峰厛杩涜鐧昏!!!");
+            }
+            if (null != key && key.equals("Y")) {
+                String cardId = tjCustomerServiceOne.getCardId();
+                if (null != cardId && !cardId.equals("0")) {
+                    int i = tjOrderService.selectTjOrderByCardId(cardId);
+                    if (i > 0) {
+                        return AjaxResult.error("涓嶅彲閲嶅绛惧埌");
+                    }
+                }
+
+            }
+
+            return AjaxResult.success(tjCustomerServiceOne);
+
         }
         return error("韬唤璇佸彿涓嶅瓨鍦�");
     }
@@ -526,42 +490,6 @@
                     lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
                     HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                     hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
-                    /*                        OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
-                        outpinregapplyDto.setPationid(pationid);
-                        outpinregapplyDto.setSqysbm("00029");
-                        outpinregapplyDto.setMzksbm("0101");
-                        outpinregapplyDto.setCzybm("00029");
-                        outpinregapplyDto.setSfjz("0");
-                        outpinregapplyDto.setGhzlbm("01");
-                        outpinregapplyDto.setYwckbm("0001");
-                        outpinregapplyDto.setSflstd("0");
-                        outpinregapplyDto.setGhrq(date);
-                        //闂ㄨ瘖鎸傚彿
-                        AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
-                        String result2 = getAjaxResult(ajaxResult);
-                        JSONObject object1 = getJSONObject(result2);
-                        String code1 = object1.getStr("ResultCode");
-                        if (code1.equals("0")) {
-                            JSONArray resultDatas = object1.getJSONArray("ResultData");
-                            if (null != resultDatas && resultDatas.size() > 0) {
-                                Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
-                                String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
-                                if (null != hisRegistrationId) {
-                                    //闂ㄨ瘖鍖荤敓鎺ヨ瘖
-                                    AjaxResult result3 = controller.Outpinconapply(hisRegistrationId, date,"00029");
-                                    String result4 = getAjaxResult(result3);
-                                    JSONObject object2 = getJSONObject(result4);
-                                    String code2 = object2.getStr("ResultCode");
-                                    if (code2.equals("0")) {
-                                        Map<String, Object> data = object2.getJSONObject("ResultData");
-                                        String hisRegistrationId1 = data.get("his_registration_id").toString();
-                                        tjCustomer.setPationId(pationid);
-                                        tjCustomer.setCardId(hisRegistrationId1);
-//                                        tjCustomerService.updateById(tjCustomer);
-                                    }
-                                }
-                            }
-                        }*/
                 }
 
             }
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index e3a20bd..badce48 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -108,6 +108,7 @@
         if(i>0){
             return AjaxResult.error("璇ユ�у埆鍒嗙粍宸插瓨鍦ㄤ笉鍙噸澶嶅垱寤�");
         }
+        if(null ==tjDwGrouping.getPayType()|| tjDwGrouping.getPayType().equals(""))return AjaxResult.error("璇烽�夋嫨缁撶畻鏂瑰紡!!!");
         tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName());
         if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
             if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 26fafeb..f5b106c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -251,9 +251,15 @@
             String idCard = tjReservation.getIdCard();
             String phoe = tjReservation.getPhoe();
             if (null != idCard && null != phoe) {
-                if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
+//                if (!MatchUtils.isIdCard(idCard) || !MatchUtils.isMobileNO(phoe)) {
+                if (idCard.isEmpty() || phoe.isEmpty()) {
                     wrongList.add(tjReservation.getName());
                 } else {
+                    //骞撮緞
+                    tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
+                    //鍑虹敓鏃ユ湡
+                    tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()),"yyyy-MM-dd"));
+
                     if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex()))) {
 
                         tjReservation.setGroupingId(groupingMan.getId());
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 5e5f277..7fbd094 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -4,4 +4,4 @@
 #test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
 spring:
   profiles:
-    active: prod
\ No newline at end of file
+    active: dev
\ No newline at end of file
diff --git a/ltkj-common/src/main/java/com/ltkj/common/excelConfig/ExcelUtils.java b/ltkj-common/src/main/java/com/ltkj/common/excelConfig/ExcelUtils.java
index 4d08bfa..8c49cf0 100644
--- a/ltkj-common/src/main/java/com/ltkj/common/excelConfig/ExcelUtils.java
+++ b/ltkj-common/src/main/java/com/ltkj/common/excelConfig/ExcelUtils.java
@@ -22,6 +22,7 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -365,8 +366,8 @@
         }
         // String绫诲瀷
         if (cell.getCellTypeEnum() == CellType.STRING) {
-            String val = cell.getStringCellValue();
-            if (val == null || val.trim().length() == 0) {
+            String val = new String(cell.getStringCellValue().getBytes(StandardCharsets.UTF_8));
+            if (val.trim().length() == 0) {
                 return "";
             }
             return val.trim();
diff --git a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysConfigMapper.java b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysConfigMapper.java
index 48bf7a5..dd5c305 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysConfigMapper.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysConfigMapper.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.ltkj.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 鍙傛暟閰嶇疆 鏁版嵁灞�
@@ -65,4 +66,11 @@
      * @return 缁撴灉
      */
     public int deleteConfigByIds(Long[] configIds);
+
+
+
+
+
+
+    void tbhisproprice();
 }
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/ISysConfigService.java b/ltkj-system/src/main/java/com/ltkj/system/service/ISysConfigService.java
index 34f024e..c44ce92 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/ISysConfigService.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/ISysConfigService.java
@@ -86,4 +86,7 @@
      * @return 缁撴灉
      */
     public String checkConfigKeyUnique(SysConfig config);
+
+
+    void tbhisproprice();
 }
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysConfigServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysConfigServiceImpl.java
index 2d58ca9..6e67ae5 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysConfigServiceImpl.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysConfigServiceImpl.java
@@ -195,6 +195,11 @@
         return UserConstants.UNIQUE;
     }
 
+    @Override
+    public void tbhisproprice() {
+        configMapper.tbhisproprice();
+    }
+
     /**
      * 璁剧疆cache key
      *
diff --git a/ltkj-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ltkj-system/src/main/resources/mapper/system/SysConfigMapper.xml
index e516f2d..6ae0348 100644
--- a/ltkj-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ltkj-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -120,4 +120,10 @@
         </foreach>
     </delete>
 
+
+
+    <select id="tbhisproprice">
+        {call tb_hisprodj()}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0