Forráskód Böngészése

优化天数错误问题

java110 3 éve%!(EXTRA string=óta)
szülő
commit
92aae5b7ee

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

@@ -1440,6 +1440,7 @@
         <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
+        and t.amount_owed > 0
         group by t.fee_name,t.payer_obj_id,t.payer_obj_name
         HAVING oweAmount > 0
         ) t
@@ -1491,6 +1492,7 @@
         <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
+        and t.amount_owed > 0
         group by t.fee_name,t.payer_obj_id,t.payer_obj_name,pfa.`value`,br.built_up_area
         HAVING oweAmount > 0
         order by t.payer_obj_name

+ 2 - 0
service-report/src/main/java/com/java110/report/bmo/reportFeeMonthStatistics/impl/GetReportFeeMonthStatisticsBMOImpl.java

@@ -1227,6 +1227,8 @@ public class GetReportFeeMonthStatisticsBMOImpl implements IGetReportFeeMonthSta
         }
     }
 
+
+
     private void freshReportDeadlineDay(List<ReportFeeMonthStatisticsDto> reportFeeMonthStatisticsDtos) {
 
         Date nowDate = DateUtil.getCurrentDate();

+ 5 - 0
service-report/src/main/java/com/java110/report/cmd/reportCustom/SaveReportCustomCmd.java

@@ -27,11 +27,14 @@ import com.java110.po.reportCustom.ReportCustomPo;
 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.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 
+import java.text.ParseException;
+
 /**
  * 类表述:保存
  * 服务编码:reportCustom.saveReportCustom
@@ -74,4 +77,6 @@ Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
+
+
 }

+ 2 - 0
service-user/src/main/java/com/java110/user/cmd/login/PcUserLoginCmd.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
+import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -116,4 +117,5 @@ public class PcUserLoginCmd extends Cmd {
             throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR, "系统内部错误,请联系管理员");
         }
     }
+
 }