浏览代码

优化代码

Your Name 2 年之前
父节点
当前提交
2d038449c4

+ 1 - 1
java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml

@@ -343,7 +343,7 @@
                 #{item}
             </foreach>
         </if>
-        order by t.payer_obj_name
+        order by t.payer_obj_name,t.end_time
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

+ 6 - 0
service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java

@@ -23,6 +23,7 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Java110Cmd(serviceCode = "fee.updateFee")
@@ -83,6 +84,11 @@ public class UpdateFeeCmd extends Cmd {
         payFeeMonthImpl.deleteFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
         payFeeMonthImpl.doGeneratorOrRefreshFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
 
+        // todo 欠费重新生成
+        List<String> feeIds= new ArrayList<>();
+        feeIds.add(payFeePo.getFeeId());
+        payFeeMonthImpl.doGeneratorOweFees(feeIds,payFeePo.getCommunityId());
+
 
         if (reqJson.containsKey("maxEndTime") && !StringUtil.isEmpty(reqJson.getString("maxEndTime"))) {
             FeeAttrDto feeAttrDto = new FeeAttrDto();

+ 1 - 0
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java

@@ -188,6 +188,7 @@ public class GetReportOweFeeBMOImpl implements IGetReportOweFeeBMO {
         }
         ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
         reportOweFeeDto.setPayerObjIds(payObjIds.toArray(new String[payObjIds.size()]));
+        reportOweFeeDto.setConfigIds(configIds);
         List<ReportOweFeeDto> allReportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
         List<ReportOweFeeDto> reportOweFeeDtos = new ArrayList<>();
         for (ReportOweFeeDto reportOweFee : allReportOweFeeDtos) {