登记日期修改

precision-effect-system/src/main/java/com/zehong/system/domain/TDebitCredit.java

 package com.zehong.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zehong.common.annotation.Excel;
-import com.zehong.common.core.domain.BaseEntity;
-
 /**
  * 借贷对象 t_debit_credit
  * 
@@ -123,6 +123,10 @@ public class TDebitCredit extends BaseEntity
 
     private Long queryLendDeptId;
 
+    private String beginRegisterTime;
+
+    private String endRegisterTime;
+
     public void setDebitId(Long debitId) 
     {
         this.debitId = debitId;
@@ -374,6 +378,22 @@ public class TDebitCredit extends BaseEntity
         this.queryLendDeptId = queryLendDeptId;
     }
 
+    public String getBeginRegisterTime() {
+        return beginRegisterTime;
+    }
+
+    public void setBeginRegisterTime(String beginRegisterTime) {
+        this.beginRegisterTime = beginRegisterTime;
+    }
+
+    public String getEndRegisterTime() {
+        return endRegisterTime;
+    }
+
+    public void setEndRegisterTime(String endRegisterTime) {
+        this.endRegisterTime = endRegisterTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

precision-effect-system/src/main/resources/mapper/business/TDebitCreditMapper.xml

@@ -81,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="lendDeptId != null "> and lend_dept_id = #{lendDeptId}</if>
             </if>
             <if test="registerTime != null "> and register_time = #{registerTime}</if>
+            <if test="beginRegisterTime != null and endRegisterTime != null"> and register_time BETWEEN #{beginRegisterTime} and #{endRegisterTime}</if>
             <if test="useDescribe != null  and useDescribe != ''"> and use_describe = #{useDescribe}</if>
             <if test="useId != null "> and use_id = #{useId}</if>
             <if test="capitalTotal != null "> and capital_total = #{capitalTotal}</if>

precision-effect-web/src/layout/components/Message/Message.vue

@@ -33,7 +33,7 @@
                 <el-dropdown-item class="region-item-style">{{ item.noticeTitle }}</el-dropdown-item>
               </el-col>
               <el-col :span="6">
-                <el-dropdown-item class="region-item-style" v-text="item.noticeTitle" />
+                <el-dropdown-item class="region-item-style" v-html="item.noticeContent" />
               </el-col>
               <el-col :span="6">
                 <el-dropdown-item v-if="item.noticeType == '1'">通知</el-dropdown-item>

precision-effect-web/src/views/debit/index.vue

@@ -19,14 +19,17 @@
           style="width: 200px"
         />
       </el-form-item>
-<!--      <el-form-item label="登记日期" prop="registerTime">-->
-<!--        <el-date-picker clearable size="small"-->
-<!--          v-model="queryParams.registerTime"-->
-<!--          type="datetime"-->
-<!--          value-format="yyyy-MM-dd HH:mm:ss"-->
-<!--          placeholder="选择登记日期">-->
-<!--        </el-date-picker>-->
-<!--      </el-form-item>-->
+      <el-form-item label="登记日期" prop="registerTime">
+        <el-date-picker clearable size="small"
+          v-model="registerTime"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="timeChange">
+        </el-date-picker>
+      </el-form-item>
       <!--<el-form-item label="使用人" prop="useId">
         <el-select v-model="queryParams.useId" placeholder="请选择使用人">
           <el-option v-for="item in usersList"
@@ -330,8 +333,11 @@ export default {
         isDel: null,
         queryType: "all",
         queryDebitDeptId: null,
-        queryLendDeptId: null
+        queryLendDeptId: null,
+        beginRegisterTime: null,
+        endRegisterTime: null
       },
+      registerTime: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -425,6 +431,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.beginRegisterTime = null;
+      this.queryParams.endRegisterTime = null;
+      this.registerTime = [];
       this.handleQuery();
     },
     // 多选框选中数据
@@ -655,6 +664,13 @@ export default {
       }
       this.getList();
     },
+    //时间切换
+    timeChange(value){
+      if(value){
+        this.queryParams.beginRegisterTime = value[0];
+        this.queryParams.endRegisterTime = value[1];
+      }
+    }
 
   }
 };