From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 30 七月 2024 20:04:10 +0800 Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有 --- framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java index 0b4faff..c5ee8ce 100644 --- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java +++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java @@ -13,19 +13,31 @@ @Resource private SystemLogMapper systemLogMapper; - public String giveCode(String code, String tableName, String symbol, String patten){ + public String giveCode(String code, String tableName, String symbol, String patten) { String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten)); int num; - if (tableName.equals("ins_order")){ + if (tableName.equals("ins_order")) { num = systemLogMapper.countRowsByNow2(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1; - }else { - num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1; + } else { + num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1; } String nums = num + ""; - if(nums.length() == 1) nums = "00" + num; - else if(nums.length() == 2) nums = "0" + num; - return code + (date2==null?date:date2) + symbol + nums; + if (nums.length() == 1) nums = "00" + num; + else if (nums.length() == 2) nums = "0" + num; + return code + (date2 == null ? date : date2) + symbol + nums; + } + + //妫�楠屽崟濮旀墭鍗曞彿鐨勭敓鎴愯鍒� + public String giveCode2(String code, Long companyId, String laboratory, String tableName, String symbol, String patten) { + String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); + String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten)); + int num; + num = systemLogMapper.countRowsByNow3(tableName, companyId, laboratory, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))) + 1; + String nums = num + ""; + if (nums.length() == 1) nums = "00" + num; + else if (nums.length() == 2) nums = "0" + num; + return code + (date2 == null ? date : date2) + symbol + nums; } } -- Gitblit v1.9.3