优化代码

java110-bean/src/main/java/com/java110/dto/reportFee/ReportFeeMonthStatisticsDto.java

@@ -50,6 +50,9 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     private String contractCode;
     private String payerObjType;
     private String payerObjId;
+    private String payerObjName;
+
+
     private String ownerName;
     private String ownerId;
     private String detailId;
@@ -1017,4 +1020,12 @@ public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable
     public void setLateAmount(String lateAmount) {
         this.lateAmount = lateAmount;
     }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1709,11 +1709,11 @@
     <select id="queryPayFeeDetail" parameterType="Map" resultType="Map">
         select pfc.fee_name feeName,pf.payer_obj_type payerObjType,t.start_time startTime,t.end_time
         endTime,t.create_time createTime,t.receivable_amount receivableAmount,t.received_amount receivedAmount,
-        t.prime_rate,d.name primeRate,pfa2.`value` ownerName,t.pay_order_id oId,d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,
+        t.prime_rate,d.name primeRate,pfa2.`value` ownerName,pfa3.`value` payerObjName,t.pay_order_id oId,d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,
         t.state,d3.name stateName,t.fee_id feeId,t.detail_id detailId,pf.payer_obj_id payerObjId,
         t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount,pfc.fee_flag feeFlag,
         t.acct_amount acctAmount, t.discount_amount discountAmount, t.deduction_amount deductionAmount, t.late_amount lateAmount,
-        t.gift_amount giftAmount
+        t.gift_amount giftAmount,t.remark
         from pay_fee_detail t
         left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
         left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'

service-job/src/main/java/com/java110/job/export/adapt/ReportPayFeeDetailAdapt.java

@@ -58,28 +58,20 @@ public class ReportPayFeeDetailAdapt implements IExportDataAdapt {
         row.createCell(13).setCellValue("减免金额");
         row.createCell(14).setCellValue("赠送金额");
         row.createCell(15).setCellValue("滞纳金");
-        row.createCell(16).setCellValue("空置房打折金额");
-        row.createCell(17).setCellValue("空置房减免金额");
-        row.createCell(18).setCellValue("面积");
-        row.createCell(19).setCellValue("车位");
-        row.createCell(20).setCellValue("账户抵扣");
-        row.createCell(21).setCellValue("收银员");
-        row.createCell(22).setCellValue("备注");
+        row.createCell(16).setCellValue("面积");
+        row.createCell(17).setCellValue("车位");
+        row.createCell(18).setCellValue("账户抵扣");
+        row.createCell(19).setCellValue("收银员");
+        row.createCell(20).setCellValue("备注");
         JSONObject reqJson = exportDataDto.getReqJson();
 
         String endTime = reqJson.getString("endTime");
 
-        if (!StringUtil.isEmpty(endTime)) {
+        if (!StringUtil.isEmpty(endTime) && !endTime.contains(":")) {
             endTime += " 23:59:59";
             reqJson.put("endTime", endTime);
         }
         ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = BeanConvertUtil.covertBean(reqJson, ReportFeeMonthStatisticsDto.class);
-        if (reqJson.containsKey("roomName") && !StringUtil.isEmpty(reqJson.getString("roomName"))) {
-            String[] roomNameArray = reqJson.getString("roomName").split("-", 3);
-            reportFeeMonthStatisticsDto.setFloorNum(roomNameArray[0]);
-            reportFeeMonthStatisticsDto.setUnitNum(roomNameArray[1]);
-            reportFeeMonthStatisticsDto.setRoomNum(roomNameArray[2]);
-        }
         //查询数据
         getRepairPayFeeDetail(sheet, reportFeeMonthStatisticsDto);
         return workbook;
@@ -114,16 +106,12 @@ public class ReportPayFeeDetailAdapt implements IExportDataAdapt {
             dataObj = reportFeeMonthStatisticsDtos.getJSONObject(roomIndex);
 //            dataObj = JSONObject.parseObject(JSONObject.toJSONString(reportFeeMonthStatisticsDtos.get(roomIndex)));
             row.createCell(0).setCellValue(dataObj.getString("oId"));
-            if (!StringUtil.isEmpty(dataObj.getString("payerObjType")) && dataObj.getString("payerObjType").equals("3333")) { //房屋
-                row.createCell(1).setCellValue(dataObj.getString("floorNum") + "-" + dataObj.getString("unitNum") + "-" + dataObj.getString("roomNum"));
-            } else {
-                row.createCell(1).setCellValue(dataObj.getString("objName"));
-            }
-            endDate =  DateUtil.getDateFromStringB(dataObj.getString("endTime"));
+            row.createCell(1).setCellValue(dataObj.getString("payerObjName"));
+            endDate = DateUtil.getDateFromStringB(dataObj.getString("endTime"));
             //todo 如果不是一次性费用结束时间建1
-            if(!StringUtil.isEmpty(dataObj.getString("feeFlag"))
-                    && !FeeDto.FEE_FLAG_ONCE.equals(dataObj.getString("feeFlag"))){
-                endDate = DateUtil.stepDay(endDate,-1);
+            if (!StringUtil.isEmpty(dataObj.getString("feeFlag"))
+                    && !FeeDto.FEE_FLAG_ONCE.equals(dataObj.getString("feeFlag"))) {
+                endDate = DateUtil.stepDay(endDate, -1);
             }
 
             row.createCell(2).setCellValue(dataObj.getString("ownerName"));
@@ -141,13 +129,11 @@ public class ReportPayFeeDetailAdapt implements IExportDataAdapt {
             row.createCell(13).setCellValue(dataObj.getDouble("deductionAmount"));
             row.createCell(14).setCellValue(dataObj.getDouble("giftAmount"));
             row.createCell(15).setCellValue(dataObj.getDouble("lateFee"));
-            row.createCell(16).setCellValue(dataObj.getDouble("vacantHousingDiscount"));
-            row.createCell(17).setCellValue(dataObj.getDouble("vacantHousingReduction"));
-            row.createCell(18).setCellValue(dataObj.getString("builtUpArea"));
-            row.createCell(19).setCellValue(dataObj.getString("psName"));
-            row.createCell(20).setCellValue(dataObj.getString("withholdAmount"));
-            row.createCell(21).setCellValue(dataObj.getString("cashierName"));
-            row.createCell(22).setCellValue(dataObj.getString("remark"));
+            row.createCell(16).setCellValue(dataObj.getString("builtUpArea"));
+            row.createCell(17).setCellValue(dataObj.getString("psName"));
+            row.createCell(18).setCellValue(dataObj.getString("withholdAmount"));
+            row.createCell(19).setCellValue(dataObj.getString("cashierName"));
+            row.createCell(20).setCellValue(dataObj.getString("remark"));
         }
     }
 }

service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryPayFeeDetailCmd.java

@@ -13,6 +13,7 @@ import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -37,6 +38,11 @@ public class QueryPayFeeDetailCmd extends Cmd {
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         super.validatePageInfo(reqJson);
         Assert.hasKeyAndValue(reqJson,"communityId","为包含小区");
+        String endTime = reqJson.getString("endTime");
+        if (!StringUtil.isEmpty(endTime) && !endTime.contains(":")) {
+            endTime += " 23:59:59";
+            reqJson.put("endTime", endTime);
+        }
     }
 
     @Override
@@ -47,6 +53,8 @@ public class QueryPayFeeDetailCmd extends Cmd {
         reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
         reportFeeMonthStatisticsDto.setFeeMonth(DateUtil.getMonth() + "");
 
+
+
         ResultVo resultVo =queryPayFeeDetailInnerServiceSMOImpl.query(reportFeeMonthStatisticsDto);
 
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);