Просмотр исходного кода

催款日志新增创建时间

anderx лет назад: 4
Родитель
Сommit
68c21f2369

+ 19 - 6
src/main/java/com/goafanti/common/mapper/TDunLogMapper.xml

@@ -10,9 +10,10 @@
     <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, dun_id, dum_by, dum_time, remarks, attachment_url, `type`, order_no
+    id, dun_id, dum_by, dum_time, remarks, attachment_url, `type`, order_no, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -27,10 +28,12 @@
   <insert id="insert" parameterType="com.goafanti.common.model.TDunLog">
     insert into t_dun_log (id, dun_id, dum_by, 
       dum_time, remarks, attachment_url, 
-      `type`, order_no)
+      `type`, order_no, create_time
+      )
     values (#{id,jdbcType=VARCHAR}, #{dunId,jdbcType=VARCHAR}, #{dumBy,jdbcType=VARCHAR}, 
       #{dumTime,jdbcType=DATE}, #{remarks,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, 
-      #{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR})
+      #{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TDunLog">
     insert into t_dun_log
@@ -59,6 +62,9 @@
       <if test="orderNo != null">
         order_no,
       </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -85,6 +91,9 @@
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TDunLog">
@@ -111,6 +120,9 @@
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -122,7 +134,8 @@
       remarks = #{remarks,jdbcType=VARCHAR},
       attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=INTEGER},
-      order_no = #{orderNo,jdbcType=VARCHAR}
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByDunId" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TDunLogListBo">
@@ -133,8 +146,8 @@
   </select>
   <select id="selectByOrderNo" resultType="com.goafanti.order.bo.TDunLogListBo">
     select a.id, a.dun_id as dunId, b.name as dumBy, a.dum_time as dumTime, a.remarks,a.type,
-           a.attachment_url attachmentUrl, c.order_no orderNo,c.buyer_name userName
+           a.attachment_url attachmentUrl, c.order_no orderNo,c.buyer_name userName,a.create_time
     from t_dun_log a left join admin b on a.dum_by=b.id left join t_order_mid c on a.order_no =c.order_no
-    where c.order_no = #{orderNo}
+    where c.order_no = #{orderNo} order by a.create_time
   </select>
 </mapper>

+ 11 - 54
src/main/java/com/goafanti/common/model/TDunLog.java

@@ -45,6 +45,11 @@ public class TDunLog implements Serializable {
      */
     private String orderNo;
 
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
     private static final long serialVersionUID = 1L;
 
     public String getId() {
@@ -111,59 +116,11 @@ public class TDunLog implements Serializable {
         this.orderNo = orderNo;
     }
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        TDunLog other = (TDunLog) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getDunId() == null ? other.getDunId() == null : this.getDunId().equals(other.getDunId()))
-            && (this.getDumBy() == null ? other.getDumBy() == null : this.getDumBy().equals(other.getDumBy()))
-            && (this.getDumTime() == null ? other.getDumTime() == null : this.getDumTime().equals(other.getDumTime()))
-            && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks()))
-            && (this.getAttachmentUrl() == null ? other.getAttachmentUrl() == null : this.getAttachmentUrl().equals(other.getAttachmentUrl()))
-            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
-            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getDunId() == null) ? 0 : getDunId().hashCode());
-        result = prime * result + ((getDumBy() == null) ? 0 : getDumBy().hashCode());
-        result = prime * result + ((getDumTime() == null) ? 0 : getDumTime().hashCode());
-        result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode());
-        result = prime * result + ((getAttachmentUrl() == null) ? 0 : getAttachmentUrl().hashCode());
-        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
-        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", dunId=").append(dunId);
-        sb.append(", dumBy=").append(dumBy);
-        sb.append(", dumTime=").append(dumTime);
-        sb.append(", remarks=").append(remarks);
-        sb.append(", attachmentUrl=").append(attachmentUrl);
-        sb.append(", type=").append(type);
-        sb.append(", orderNo=").append(orderNo);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
 }

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputOrderListBo.java

@@ -7,6 +7,7 @@ public class InputOrderListBo {
     private String aid;
     private String depId;
     private String depName;
+    private String aName;
     private String startTime;
     private String endTime;
     /**
@@ -17,6 +18,14 @@ public class InputOrderListBo {
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getaName() {
+        return aName;
+    }
+
+    public void setaName(String aName) {
+        this.aName = aName;
+    }
+
     public Integer getStatus() {
         return status;
     }

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/LegalAffairsServiceImpl.java

@@ -205,6 +205,7 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
         if (in.getLegalAffairs()!=null)sb=sb.append("转交法务:").append(in.getLegalAffairs()==0?"未转交":"已转交").append(",");
         if (in.getContractNo()!=null)sb=sb.append("合同编号:").append(in.getContractNo()).append(",");
         if (in.getDepName()!=null)sb=sb.append("订单部门:").append(in.getDepName()).append(",");
+        if (in.getaName()!=null)sb=sb.append("营销员:").append(in.getaName()).append(",");
         if (in.getStartTime()!=null&&in.getEndTime()!=null){
             if (in.getType()==0)sb=sb.append("催款启动时间:");
             if (in.getType()==1||in.getType()==2||in.getType()==3)sb=sb.append("法务时间:");

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,11 +1,11 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20