Sfoglia il codice sorgente

fix: 页面去除【提供技术支持】 时间返回值友好处理 验证码模板替换

Signed-off-by: sunshihao <sunshihaoemail>
sunshihao 4 giorni fa
parent
commit
057f66ea8d

+ 5 - 0
xinkeaboard-server/b2b2c-investment/src/main/java/com/slodon/b2b2c/investment/bean/analysis/vo/CompanyEntity.java

@@ -33,6 +33,11 @@ public class CompanyEntity {
     private LocalDateTime createTime;
 
     /**
+     * 创建时间
+     */
+    private String reportTime;
+
+    /**
      * 查询月(格式:YYYYMM,如202310)
      */
     private String queryMonth;

+ 2 - 1
xinkeaboard-server/b2b2c-investment/src/main/resources/mapper/BusinessAnalysisMapper.xml

@@ -9,6 +9,7 @@
     <result column="company_name" property="companyName" jdbcType="VARCHAR"/>
     <result column="phone" property="phone" jdbcType="VARCHAR"/>
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="report_time" property="reportTime" jdbcType="VARCHAR"/>
     <result column="pdf_url" property="pdfUrl" jdbcType="VARCHAR"/>
     <result column="query_month" property="queryMonth" jdbcType="VARCHAR"/>
   </resultMap>
@@ -28,7 +29,7 @@
 
   <select id="aiList" resultMap="BaseResultMap">
     SELECT
-    id, company_name, phone, create_time, query_month, usedCount,leftCount,pdf_url
+    id, company_name, phone, create_time, query_month, usedCount,leftCount,pdf_url,DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') AS report_time
     FROM business_analysis_record
     <where>
       <if test="dto.companyName != null">

+ 1 - 1
xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/front/VerifyController.java

@@ -188,7 +188,7 @@ public class VerifyController extends BaseController {
     private JsonResult sendSms(String mobile, SmsCode code, long expireTime) {
         SmsRequest smsRequest = new SmsRequest();
         smsRequest.setSmsType(SMSConst.VERIFY_SMS);
-        String templateId = stringRedisTemplate.opsForValue().get("notification_sms_ali_forget_sms_template");
+        String templateId = stringRedisTemplate.opsForValue().get("notification_sms_ali_register_sms_template");
         smsRequest.setTemplateId(templateId);
         smsRequest.setMobile(mobile);
         //根据系统配置的发送方式,获取短信发送对象

+ 13 - 2
xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/admin/AdminSettingController.java

@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Api(tags = "admin-配置管理")
 @RestController
@@ -327,8 +328,18 @@ public class AdminSettingController extends BaseController {
 
 
         AssertUtil.notNull(list, "请输入正确的参数");
-        list.forEach(setting -> {
-            //翻译
+
+        List<Setting> validList = list.stream()
+                .filter(setting -> {
+                    if (setting == null) {
+                        return false;
+                    }
+                    String value = setting.getValue();
+                    return value != null && !value.trim().isEmpty();
+                })
+                .collect(Collectors.toList());
+
+        validList.forEach(setting -> {
             String title = Language.translate(setting.getTitle(), languageType);
             String description = Language.translate(setting.getDescription(), languageType);
             setting.setTitle(title);