优化代码

java110-bean/src/main/java/com/java110/dto/feeReceipt/FeeReceiptDto.java

@@ -21,6 +21,7 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     private String objName;
     private String communityId;
     private String receiptId;
+    private String[] receiptIds;
     private String objType;
     private String feeTypeCd;
 
@@ -121,4 +122,12 @@ public class FeeReceiptDto extends PageDto implements Serializable {
     public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
+
+    public String[] getReceiptIds() {
+        return receiptIds;
+    }
+
+    public void setReceiptIds(String[] receiptIds) {
+        this.receiptIds = receiptIds;
+    }
 }

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

@@ -54,7 +54,6 @@
     </select>
 
 
-
     <!-- 查询收据信息 add by wuxw 2018-07-03 -->
     <select id="getFeeReceiptInfoNew" parameterType="Map" resultType="Map">
         SELECT
@@ -86,7 +85,7 @@
         tt.amount amount,
         uu.NAME AS userName,
         t.create_time AS createTime,
-        p.remark  as remark
+        p.remark as remark
         FROM
         fee_receipt t
         LEFT JOIN fee_receipt_detail tt ON t.receipt_id = tt.receipt_id
@@ -169,23 +168,23 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-           AND bo.owner_type_cd = '1001'
+        AND bo.owner_type_cd = '1001'
         ) AS t
         WHERE 1=1
         <if test="type !=null and type == 1 ">
-          AND  feeName in ('预交物业管理费','装修垃圾清运费','装修电梯使用费','水费','电费')
+            AND feeName in ('预交物业管理费','装修垃圾清运费','装修电梯使用费','水费','电费')
         </if>
         <if test="type !=null and type == 2">
-            AND  feeName in ('装修保证金','施工进入证')
+            AND feeName in ('装修保证金','施工进入证')
         </if>
         <if test="type !=null and type == 3">
-            AND  feeName in ('预交物业管理费','水费','电费','地下停车费','地上停车费')
+            AND feeName in ('预交物业管理费','水费','电费','地下停车费','地上停车费')
         </if>
         <if test="type !=null and type == 4">
-            AND  feeName in ('地上停车费','地下停车费')
+            AND feeName in ('地上停车费','地下停车费')
         </if>
         <if test="type !=null and type == 5">
-            AND  feeName in ('公共区域公摊电费','生活水泵公摊电费','走廊楼道应急公摊电费','电梯公摊电费')
+            AND feeName in ('公共区域公摊电费','生活水泵公摊电费','走廊楼道应急公摊电费','电梯公摊电费')
         </if>
         <if test="qstartTime !=null and qstartTime != ''">
             AND DATE_FORMAT(t.createTime, '%Y-%m-%d') &gt;= DATE_FORMAT( #{qstartTime}, '%Y-%m-%d' )
@@ -219,7 +218,6 @@
     </select>
 
 
-
     <!-- 修改收据信息 add by wuxw 2018-07-03 -->
     <update id="updateFeeReceiptInfo" parameterType="Map">
         update fee_receipt t set t.status_cd = #{statusCd}
@@ -277,6 +275,12 @@
         <if test="receiptId !=null and receiptId != ''">
             and t.receipt_id= #{receiptId}
         </if>
+        <if test="receiptIds !=null">
+            and t.receipt_id in
+            <foreach collection="receiptIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
         </if>

service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -18,6 +18,7 @@ import com.java110.po.feeReceipt.FeeReceiptPo;
 import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -125,6 +126,7 @@ public class FeeReceiptApi {
                                                   @RequestParam(value = "objId", required = false) String objId,
                                                   @RequestParam(value = "roomId", required = false) String roomId,
                                                   @RequestParam(value = "receiptId", required = false) String receiptId,
+                                                  @RequestParam(value = "receiptIds", required = false) String receiptIds,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row,
                                                   @RequestHeader(value = "user_id") String userId) {
@@ -141,6 +143,9 @@ public class FeeReceiptApi {
         feeReceiptDto.setRow(row);
         feeReceiptDto.setCommunityId(communityId);
         feeReceiptDto.setReceiptId(receiptId);
+        if (!StringUtil.isEmpty(receiptIds)) {
+            feeReceiptDto.setReceiptIds(receiptIds.split(","));
+        }
         feeReceiptDto.setObjType(objType);
         feeReceiptDto.setObjName(roomId);
         feeReceiptDto.setObjId(objId);