bug修改

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();

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'
+        <if test = "agreementId!=null and agreementId!=''" >
+           AND sai.agreement_id = #{agreementId}
+        </if>
+        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