修改 remark 字段

java110-bean/src/main/java/com/java110/dto/feeCollectionOrder/FeeCollectionOrderDto.java

@@ -32,7 +32,7 @@ public class FeeCollectionOrderDto extends PageDto implements Serializable {
     private String communityId;
     private String collectionWay;
     private String staffId;
-    private String remarks;
+    private String remark;
     private String collectionName;
 
 
@@ -89,12 +89,12 @@ public class FeeCollectionOrderDto extends PageDto implements Serializable {
         this.staffId = staffId;
     }
 
-    public String getRemarks() {
-        return remarks;
+    public String getRemark() {
+        return remark;
     }
 
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
     public String getCollectionName() {

java110-bean/src/main/java/com/java110/po/feeCollectionOrder/FeeCollectionOrderPo.java

@@ -1,74 +1,90 @@
 package com.java110.po.feeCollectionOrder;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class FeeCollectionOrderPo implements Serializable {
 
     private String orderId;
-private String staffName;
-private String statusCd = "0";
-private String state;
-private String communityId;
-private String collectionWay;
-private String staffId;
-private String remarks;
-private String collectionName;
-public String getOrderId() {
+    private String staffName;
+    private String statusCd = "0";
+    private String state;
+    private String communityId;
+    private String collectionWay;
+    private String staffId;
+    private String remark;
+    private String collectionName;
+
+    public String getOrderId() {
         return orderId;
     }
-public void setOrderId(String orderId) {
+
+    public void setOrderId(String orderId) {
         this.orderId = orderId;
     }
-public String getStaffName() {
+
+    public String getStaffName() {
         return staffName;
     }
-public void setStaffName(String staffName) {
+
+    public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getCollectionWay() {
+
+    public String getCollectionWay() {
         return collectionWay;
     }
-public void setCollectionWay(String collectionWay) {
+
+    public void setCollectionWay(String collectionWay) {
         this.collectionWay = collectionWay;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
-public String getRemarks() {
-        return remarks;
+
+    public String getRemark() {
+        return remark;
     }
-public void setRemarks(String remarks) {
-        this.remarks = remarks;
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
-public String getCollectionName() {
+
+    public String getCollectionName() {
         return collectionName;
     }
-public void setCollectionName(String collectionName) {
+
+    public void setCollectionName(String collectionName) {
         this.collectionName = collectionName;
     }
 
 
-
 }

java110-db/src/main/resources/mapper/fee/FeeCollectionOrderServiceDaoImplMapper.xml

@@ -5,129 +5,126 @@
 <mapper namespace="feeCollectionOrderServiceDaoImpl">
 
 
-
-
-
     <!-- 保存催缴单信息 add by wuxw 2018-07-03 -->
     <insert id="saveFeeCollectionOrderInfo" parameterType="Map">
         insert into fee_collection_order(
-order_id,staff_name,state,community_id,collection_way,staff_id,remarks,collection_name
-) values (
-#{orderId},#{staffName},#{state},#{communityId},#{collectionWay},#{staffId},#{remarks},#{collectionName}
-)
+        order_id,staff_name,state,community_id,collection_way,staff_id,remark,collection_name
+        ) values (
+        #{orderId},#{staffName},#{state},#{communityId},#{collectionWay},#{staffId},#{remark},#{collectionName}
+        )
     </insert>
 
 
-
     <!-- 查询催缴单信息 add by wuxw 2018-07-03 -->
     <select id="getFeeCollectionOrderInfo" parameterType="Map" resultType="Map">
-        select  t.order_id,t.order_id orderId,t.staff_name,t.staff_name staffName,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.collection_way,t.collection_way collectionWay,t.staff_id,t.staff_id staffId,t.remarks,t.collection_name,t.collection_name collectionName 
-from fee_collection_order t 
-where 1 =1 
-<if test="orderId !=null and orderId != ''">
-   and t.order_id= #{orderId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="collectionWay !=null and collectionWay != ''">
-   and t.collection_way= #{collectionWay}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="remarks !=null and remarks != ''">
-   and t.remarks= #{remarks}
-</if> 
-<if test="collectionName !=null and collectionName != ''">
-   and t.collection_name= #{collectionName}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.order_id,t.order_id orderId,t.staff_name,t.staff_name staffName,t.status_cd,t.status_cd
+        statusCd,t.state,t.community_id,t.community_id communityId,t.collection_way,t.collection_way
+        collectionWay,t.staff_id,t.staff_id staffId,t.remark,t.collection_name,t.collection_name collectionName
+        from fee_collection_order t
+        where 1 =1
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="collectionWay !=null and collectionWay != ''">
+            and t.collection_way= #{collectionWay}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="collectionName !=null and collectionName != ''">
+            and t.collection_name= #{collectionName}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改催缴单信息 add by wuxw 2018-07-03 -->
     <update id="updateFeeCollectionOrderInfo" parameterType="Map">
-        update  fee_collection_order t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-, t.staff_name= #{staffName}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="collectionWay !=null and collectionWay != ''">
-, t.collection_way= #{collectionWay}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
-<if test="remarks !=null and remarks != ''">
-, t.remarks= #{remarks}
-</if> 
-<if test="collectionName !=null and collectionName != ''">
-, t.collection_name= #{collectionName}
-</if> 
- where 1=1 <if test="orderId !=null and orderId != ''">
-and t.order_id= #{orderId}
-</if> 
+        update fee_collection_order t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            , t.staff_name= #{staffName}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="collectionWay !=null and collectionWay != ''">
+            , t.collection_way= #{collectionWay}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="collectionName !=null and collectionName != ''">
+            , t.collection_name= #{collectionName}
+        </if>
+        where 1=1
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
 
     </update>
 
     <!-- 查询催缴单数量 add by wuxw 2018-07-03 -->
-     <select id="queryFeeCollectionOrdersCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from fee_collection_order t 
-where 1 =1 
-<if test="orderId !=null and orderId != ''">
-   and t.order_id= #{orderId}
-</if> 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="collectionWay !=null and collectionWay != ''">
-   and t.collection_way= #{collectionWay}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-<if test="remarks !=null and remarks != ''">
-   and t.remarks= #{remarks}
-</if> 
-<if test="collectionName !=null and collectionName != ''">
-   and t.collection_name= #{collectionName}
-</if> 
+    <select id="queryFeeCollectionOrdersCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from fee_collection_order t
+        where 1 =1
+        <if test="orderId !=null and orderId != ''">
+            and t.order_id= #{orderId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="collectionWay !=null and collectionWay != ''">
+            and t.collection_way= #{collectionWay}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="collectionName !=null and collectionName != ''">
+            and t.collection_name= #{collectionName}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>