优化代码

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

@@ -36,6 +36,8 @@ public class FeeManualCollectionDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String totalFee;
+
 
     public String getSquarePrice() {
         return squarePrice;
@@ -149,4 +151,12 @@ public class FeeManualCollectionDto extends PageDto implements Serializable {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getTotalFee() {
+        return totalFee;
+    }
+
+    public void setTotalFee(String totalFee) {
+        this.totalFee = totalFee;
+    }
 }

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

@@ -141,5 +141,17 @@
 
 
     </select>
+    <select id="queryFeeManualCollectionDetailTotalFee" parameterType="Map" resultType="Map">
+        select sum(t.amount) totalFee
+        from fee_manual_collection_detail t
+        where 1 =1
+        <if test="collectionId !=null and collectionId != ''">
+            and t.collection_id= #{collectionId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+    </select>
+
 
 </mapper>

java110-interface/src/main/java/com/java110/intf/fee/IFeeManualCollectionDetailInnerServiceSMO.java

@@ -42,6 +42,16 @@ public interface IFeeManualCollectionDetailInnerServiceSMO {
     @RequestMapping(value = "/queryFeeManualCollectionDetails", method = RequestMethod.POST)
     List<FeeManualCollectionDetailDto> queryFeeManualCollectionDetails(@RequestBody FeeManualCollectionDetailDto feeManualCollectionDetailDto);
 
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param feeManualCollectionDetailDto 数据对象分享
+     * @return FeeManualCollectionDetailDto 对象数据
+     */
+    @RequestMapping(value = "/queryFeeManualCollectionDetailTotalFee", method = RequestMethod.POST)
+    double queryFeeManualCollectionDetailTotalFee(@RequestBody FeeManualCollectionDetailDto feeManualCollectionDetailDto);
+
     /**
      * 查询<p>小区楼</p>总记录数
      *

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -414,4 +414,16 @@ public class DateUtil {
 
         return c.getTime();
     }
+
+    public static String dateTimeToDate(String dateTime) {
+        String dateStr = "";
+        try {
+            Date date = getDateFromString(dateTime, DATE_FORMATE_STRING_A);
+            dateStr = getFormatTimeString(date, DATE_FORMATE_STRING_B);
+        } catch (ParseException e) {
+            dateStr = dateTime;
+        }
+
+        return dateStr;
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.java110.fee.bmo.feeManualCollection.impl;
 
 import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
+import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
 import com.java110.fee.bmo.feeManualCollection.IGetFeeManualCollectionBMO;
+import com.java110.intf.IFeeManualCollectionDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@ public class GetFeeManualCollectionBMOImpl implements IGetFeeManualCollectionBMO
     @Autowired
     private IFeeManualCollectionInnerServiceSMO feeManualCollectionInnerServiceSMOImpl;
 
+    @Autowired
+    private IFeeManualCollectionDetailInnerServiceSMO feeManualCollectionDetailInnerServiceSMOImpl;
+
     /**
      * @param feeManualCollectionDto
      * @return 订单服务能够接受的报文
@@ -30,6 +35,7 @@ public class GetFeeManualCollectionBMOImpl implements IGetFeeManualCollectionBMO
         List<FeeManualCollectionDto> feeManualCollectionDtos = null;
         if (count > 0) {
             feeManualCollectionDtos = feeManualCollectionInnerServiceSMOImpl.queryFeeManualCollections(feeManualCollectionDto);
+            freshTotalFee(feeManualCollectionDtos);
         } else {
             feeManualCollectionDtos = new ArrayList<>();
         }
@@ -41,4 +47,15 @@ public class GetFeeManualCollectionBMOImpl implements IGetFeeManualCollectionBMO
         return responseEntity;
     }
 
+    private void freshTotalFee(List<FeeManualCollectionDto> feeManualCollectionDtos) {
+
+        for (FeeManualCollectionDto feeManualCollectionDto : feeManualCollectionDtos) {
+            FeeManualCollectionDetailDto feeManualCollectionDetailDto = new FeeManualCollectionDetailDto();
+            feeManualCollectionDetailDto.setCollectionId(feeManualCollectionDto.getCollectionId());
+            feeManualCollectionDetailDto.setCommunityId(feeManualCollectionDto.getCommunityId());
+            double totalFee = feeManualCollectionDetailInnerServiceSMOImpl.queryFeeManualCollectionDetailTotalFee(feeManualCollectionDetailDto);
+            feeManualCollectionDto.setTotalFee(totalFee + "");
+        }
+    }
+
 }

service-fee/src/main/java/com/java110/fee/bmo/feeManualCollectionDetail/impl/GetCollectionBMOImpl.java

@@ -9,6 +9,7 @@ import com.java110.fee.bmo.feeManualCollectionDetail.IGetExportCollectionBMO;
 import com.java110.intf.IFeeManualCollectionDetailInnerServiceSMO;
 import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
 import com.java110.intf.fee.IFeeManualCollectionInnerServiceSMO;
+import com.java110.utils.util.DateUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -101,7 +102,8 @@ public class GetCollectionBMOImpl implements IGetExportCollectionBMO {
 
             dataObj.put(feeConfigDto.getFeeName(), tmpFeeManualCollectionDetailDto.getAmount());
             dataObj.put(feeConfigDto.getFeeName() + "_起止日期",
-                    tmpFeeManualCollectionDetailDto.getStartTime() + "至" + tmpFeeManualCollectionDetailDto.getEndTime());
+                    DateUtil.dateTimeToDate(tmpFeeManualCollectionDetailDto.getStartTime())
+                            + "至" + DateUtil.dateTimeToDate(tmpFeeManualCollectionDetailDto.getEndTime()));
         }
 
         dataObj.put("应交款总额", totalFee.setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());

service-fee/src/main/java/com/java110/fee/dao/IFeeManualCollectionDetailServiceDao.java

@@ -2,11 +2,6 @@ package com.java110.fee.dao;
 
 
 import com.java110.utils.exception.DAOException;
-import com.java110.entity.merchant.BoMerchant;
-import com.java110.entity.merchant.BoMerchantAttr;
-import com.java110.entity.merchant.Merchant;
-import com.java110.entity.merchant.MerchantAttr;
-
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +10,7 @@ import java.util.Map;
  * 托收明细组件内部之间使用，没有给外围系统提供服务能力
  * 托收明细服务接口类，要求全部以字符串传输，方便微服务化
  * 新建客户，修改客户，删除客户，查询客户等功能
- *
+ * <p>
  * Created by wuxw on 2016/12/27.
  */
 public interface IFeeManualCollectionDetailServiceDao {
@@ -23,17 +18,17 @@ public interface IFeeManualCollectionDetailServiceDao {
 
     /**
      * 保存 托收明细信息
+     *
      * @param info
      * @throws DAOException DAO异常
      */
     void saveFeeManualCollectionDetailInfo(Map info) throws DAOException;
 
 
-
-
     /**
      * 查询托收明细信息（instance过程）
      * 根据bId 查询托收明细信息
+     *
      * @param info bId 信息
      * @return 托收明细信息
      * @throws DAOException DAO异常
@@ -41,9 +36,9 @@ public interface IFeeManualCollectionDetailServiceDao {
     List<Map> getFeeManualCollectionDetailInfo(Map info) throws DAOException;
 
 
-
     /**
      * 修改托收明细信息
+     *
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
@@ -58,4 +53,6 @@ public interface IFeeManualCollectionDetailServiceDao {
      */
     int queryFeeManualCollectionDetailsCount(Map info);
 
+    double queryFeeManualCollectionDetailTotalFee(Map info);
+
 }

service-fee/src/main/java/com/java110/fee/dao/impl/FeeManualCollectionDetailServiceDaoImpl.java

@@ -95,4 +95,22 @@ public class FeeManualCollectionDetailServiceDaoImpl extends BaseServiceDao impl
     }
 
 
+
+    /**
+     * 查询托收明细数量
+     * @param info 托收明细信息
+     * @return 托收明细数量
+     */
+    @Override
+    public double queryFeeManualCollectionDetailTotalFee(Map info) {
+        logger.debug("查询托收明细数据 入参 info : {}",info);
+
+        List<Map> businessFeeManualCollectionDetailInfos = sqlSessionTemplate.selectList("feeManualCollectionDetailServiceDaoImpl.queryFeeManualCollectionDetailTotalFee", info);
+        if (businessFeeManualCollectionDetailInfos.size() < 1) {
+            return 0;
+        }
+
+        return Double.parseDouble(businessFeeManualCollectionDetailInfos.get(0).get("totalFee").toString());
+    }
+
 }

service-fee/src/main/java/com/java110/fee/smo/impl/FeeManualCollectionDetailInnerServiceSMOImpl.java

@@ -10,6 +10,8 @@ import com.java110.po.feeManualCollectionDetail.FeeManualCollectionDetailPo;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -68,6 +70,17 @@ public class FeeManualCollectionDetailInnerServiceSMOImpl extends BaseServiceSMO
     }
 
 
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param feeManualCollectionDetailDto 数据对象分享
+     * @return FeeManualCollectionDetailDto 对象数据
+     */
+    public double queryFeeManualCollectionDetailTotalFee(@RequestBody FeeManualCollectionDetailDto feeManualCollectionDetailDto){
+        return feeManualCollectionDetailServiceDaoImpl.queryFeeManualCollectionDetailTotalFee(BeanConvertUtil.beanCovertMap(feeManualCollectionDetailDto));
+    }
+
     @Override
     public int queryFeeManualCollectionDetailsCount(@RequestBody FeeManualCollectionDetailDto feeManualCollectionDetailDto) {
         return feeManualCollectionDetailServiceDaoImpl.queryFeeManualCollectionDetailsCount(BeanConvertUtil.beanCovertMap(feeManualCollectionDetailDto));

service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java

@@ -10,11 +10,7 @@ import com.java110.front.smo.assetExport.IExportFeeManualCollectionSMO;
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
@@ -30,7 +26,6 @@ import org.springframework.web.client.RestTemplate;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.math.BigDecimal;
 
 /**
  * @ClassName AssetImportSmoImpl
@@ -168,9 +163,17 @@ public class ExportFeeManualCollectionSMOImpl extends BaseComponentSMO implement
                 row.createCell(dataKeyIndex).setCellValue(dataObj.getString(key));
                 dataKeyIndex++;
             }
-            row.createCell(dataKeyIndex+2).setCellValue("");
+            row.createCell(dataKeyIndex + 2).setCellValue("");
         }
 
+        row = sheet.createRow(rooms.size() + 2);
+        cell0 = row.createCell(0);
+        cell0.setCellValue("注：此《欠费统计表》交由厦门维度智临科技有限公司进行催收");
+        cs = workbook.createCellStyle();
+        cs.setWrapText(true);  //关键
+        cell0.setCellStyle(cs);
+        row.setHeight((short) (200 * 10));
+
         CellRangeAddress region = new CellRangeAddress(0, 0, 0, dataKeyIndex);
         sheet.addMergedRegion(region);
     }