优化

ruoyi-admin/src/main/resources/application.yml

@@ -96,7 +96,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 4320
 
 # MyBatis配置
 mybatis:

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseContractInfo.java

@@ -107,8 +107,8 @@ public class BaseContractInfo extends BaseEntity
     private String htnr;
 
     /** 签约时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "签约时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss HH:mm:ss")
+    @Excel(name = "签约时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss HH:mm:ss")
     private Date qysj;
 
     /** 合同状态 */
@@ -120,13 +120,13 @@ public class BaseContractInfo extends BaseEntity
     private Long fkfs;
 
     /** 合同生效时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "合同生效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "合同生效时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date htsxsj;
 
     /** 合同终止时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "合同终止时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "合同终止时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date htzzsj;
 
     /** 期数 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseCustomFollowRecord.java

@@ -37,8 +37,8 @@ public class BaseCustomFollowRecord extends BaseEntity
     private String gjr;
 
     /** 跟进时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "跟进时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "跟进时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date gjTime;
 
     /** 备注 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/business/BaseInvoiceInfo.java

@@ -122,8 +122,8 @@ public class BaseInvoiceInfo extends BaseEntity
     private String sqr;
 
     /** 开票时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开票时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开票时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date kpsj;
 
     /** 代付款协议 */

ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseCustomFollowRecordServiceImpl.java

@@ -55,7 +55,6 @@ public class BaseCustomFollowRecordServiceImpl implements IBaseCustomFollowRecor
     public int insertBaseCustomFollowRecord(BaseCustomFollowRecord baseCustomFollowRecord)
     {
         baseCustomFollowRecord.setCreateTime(DateUtils.getNowDate());
-        baseCustomFollowRecord.setGjTime(DateUtils.getNowDate());
         return baseCustomFollowRecordMapper.insertBaseCustomFollowRecord(baseCustomFollowRecord);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/business/impl/BaseCustomInfoServiceImpl.java

@@ -52,7 +52,7 @@ public class BaseCustomInfoServiceImpl implements IBaseCustomInfoService {
     @Override
     public int insertBaseCustomInfo(BaseCustomInfo baseCustomInfo) {
         baseCustomInfo.setCreateTime(DateUtils.getNowDate());
-        baseCustomInfo.setKhgs(baseCustomInfo.getKhgs() == null ? "无" : baseCustomInfo.getKhgs());
+        baseCustomInfo.setKhgs(baseCustomInfo.getKhgs() == null ? "未知" : baseCustomInfo.getKhgs());
         baseCustomInfo.setKhgs(baseCustomInfo.getKhxm() == null ? "未知" : baseCustomInfo.getKhxm());
         return baseCustomInfoMapper.insertBaseCustomInfo(baseCustomInfo);
     }

ruoyi-system/src/main/resources/mapper/business/BaseCustomInfoMapper.xml

@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sjh != null  and sjh != ''"> and sjh = #{sjh}</if>
             <if test="wx != null  and wx != ''"> and wx = #{wx}</if>
             <if test="khdz != null  and khdz != ''"> and khdz = #{khdz}</if>
-            <if test="khxq != null  and khxq != ''"> and khxq = #{khxq}</if>
+            <if test="khxq != null  and khxq != ''"> and khxq like concat('%', #{khxq}, '%')</if>
             <if test="customTrade != null ">
                 and khhy in
                 <foreach collection="customTrade" item="hy" open="(" separator="," close=")">
@@ -78,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fzr != null  and fzr != ''"> and fzr = #{fzr}</if>
             <if test="bz != null  and bz != ''"> and bz = #{bz}</if>
             <if test="deleteFlag != null "> and delete_flag = #{deleteFlag}</if>
+            <if test="startTime != null and endTime != null"> and create_time between #{startTime} and #{endTime}</if>
         </where>
     </select>