From 696380cec65b6f060e6c8039f20f3e9d6dc30765 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Tue, 26 Mar 2024 17:31:06 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/auth/service/SysLoginService.java | 2 +- .../resources/mapper/material/BackApplyMapper.xml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index 461d85aa..b78e3d28 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -268,7 +268,7 @@ public class SysLoginService { } - // 生成一个随时length位数密码 + // 生成一个随机length位数密码 public static String generateRandomPassword(int length) { String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; Random random = new Random(); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index d727237e..8e25b0ef 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -703,7 +703,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bagi.agreement_id as agreementId, bai.`status` as `status`, bad.id as detailsId, - bad.pre_num AS num + bad.pre_num AS num, + IFNULL( aa.num, 0 ) AS useNum FROM back_apply_details bad LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id @@ -713,6 +714,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bm_project_lot lot ON lot.lot_id = bagi.project_id LEFT JOIN bm_unit_info unit ON unit.unit_id = bagi.unit_id LEFT JOIN ma_type mt ON mt.type_id = bad.type_id + LEFT JOIN ( + SELECT + SUM( sai.num ) AS num, sai.type_id FROM slt_agreement_info sai + WHERE + sai.`status` = '0' + + AND sai.agreement_id = #{agreementId} + + GROUP BY sai.type_id + ) aa ON aa.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id