优化人工托收

java110-bean/src/main/java/com/java110/dto/feeManualCollection/FeeManualCollectionDto.java

@@ -24,6 +24,7 @@ public class FeeManualCollectionDto extends PageDto implements Serializable {
     private String roomArea;
     private String remark;
     private String state;
+    private String stateName;
     private String ownerId;
     private String communityId;
     private String collectionId;
@@ -140,4 +141,12 @@ public class FeeManualCollectionDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/feeManualCollectionDetail/FeeManualCollectionDetailDto.java

@@ -16,9 +16,9 @@ import java.util.Date;
 public class FeeManualCollectionDetailDto extends PageDto implements Serializable {
 
     //1010 托收中，2020 已缴费 3030 作废
-    public static final String STATE_COLLECTION ="1010";
-    public static final String STATE_PAY_FEE ="2020";
-    public static final String STATE_DELETE ="3030";
+    public static final String STATE_COLLECTION = "1010";
+    public static final String STATE_PAY_FEE = "2020";
+    public static final String STATE_DELETE = "3030";
 
     private String amount;
     private String feeName;
@@ -26,6 +26,7 @@ public class FeeManualCollectionDetailDto extends PageDto implements Serializabl
     private String startTime;
     private String endTime;
     private String state;
+    private String stateName;
     private String communityId;
     private String collectionId;
     private String feeId;
@@ -124,4 +125,12 @@ public class FeeManualCollectionDetailDto extends PageDto implements Serializabl
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

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

@@ -19,8 +19,9 @@
     <select id="getFeeManualCollectionDetailInfo" parameterType="Map" resultType="Map">
         select t.amount,t.fee_name,t.fee_name feeName,t.detail_id,t.detail_id detailId,t.start_time,t.start_time
         startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id
-        communityId,t.collection_id,t.collection_id collectionId,t.fee_id,t.fee_id feeId
+        communityId,t.collection_id,t.collection_id collectionId,t.fee_id,t.fee_id feeId,td.name stateName
         from fee_manual_collection_detail t
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'fee_manual_collection_detail' and td.table_columns = 'state'
         where 1 =1
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}
@@ -94,6 +95,9 @@
         <if test="detailId !=null and detailId != ''">
             and t.detail_id= #{detailId}
         </if>
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
 
     </update>
 

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

@@ -21,8 +21,9 @@
         ownerName,t.link,t.room_area,t.room_area roomArea,t.remark,t.status_cd,t.status_cd
         statusCd,t.state,t.owner_id,t.owner_id ownerId,t.community_id,t.community_id
         communityId,t.collection_id,t.collection_id collectionId,t.room_id,t.room_id roomId,t.room_name,t.room_name
-        roomName
+        roomName,td.name stateName
         from fee_manual_collection t
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'fee_manual_collection' and td.table_columns = 'state'
         where 1 =1
 
         <if test="ownerName !=null and ownerName != ''">

service-fee/src/main/java/com/java110/fee/bmo/feeManualCollection/impl/DeleteFeeManualCollectionBMOImpl.java

@@ -1,9 +1,12 @@
 package com.java110.fee.bmo.feeManualCollection.impl;
 
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
 import com.java110.fee.bmo.feeManualCollection.IDeleteFeeManualCollectionBMO;
+import com.java110.intf.IFeeManualCollectionDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;
 import com.java110.po.feeManualCollection.FeeManualCollectionPo;
+import com.java110.po.feeManualCollectionDetail.FeeManualCollectionDetailPo;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -14,6 +17,8 @@ public class DeleteFeeManualCollectionBMOImpl implements IDeleteFeeManualCollect
 
     @Autowired
     private IFeeManualCollectionInnerServiceSMO feeManualCollectionInnerServiceSMOImpl;
+    @Autowired
+    private IFeeManualCollectionDetailInnerServiceSMO feeManualCollectionDetailInnerServiceSMOImpl;
 
     /**
      * @param feeManualCollectionPo 数据
@@ -22,6 +27,11 @@ public class DeleteFeeManualCollectionBMOImpl implements IDeleteFeeManualCollect
     @Java110Transactional
     public ResponseEntity<String> delete(FeeManualCollectionPo feeManualCollectionPo) {
 
+        FeeManualCollectionDetailPo feeManualCollectionDetailPo = new FeeManualCollectionDetailPo();
+        feeManualCollectionDetailPo.setCollectionId(feeManualCollectionPo.getCollectionId());
+
+        feeManualCollectionDetailInnerServiceSMOImpl.deleteFeeManualCollectionDetail(feeManualCollectionDetailPo);
+
         int flag = feeManualCollectionInnerServiceSMOImpl.deleteFeeManualCollection(feeManualCollectionPo);
 
         if (flag > 0) {