liurunyu
2024-12-12 d61a829414ed87d1d5279cccbf0ada80d235fc28
改类名Intake*为Intaker*,因为有重名现象发生
3 文件已重命名
18 ■■■■ 已修改文件
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerCtrl.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerQo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerSv.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerCtrl.java
File was renamed from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeCtrl.java
@@ -25,12 +25,12 @@
@RestController
@RequestMapping(path="intake")
@RequiredArgsConstructor
public class IntakeCtrl {
public class IntakerCtrl {
    private IntakeSv sv;
    private IntakerSv sv;
    @Autowired
    public void setSv(IntakeSv sv){
    public void setSv(IntakerSv sv){
        this.sv = sv ;
    }
@@ -41,7 +41,7 @@
     */
    @GetMapping(path = "/amountOfDay")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoDayIntakeAmount>>> amountOfDay(IntakeQo qo) throws Exception {
    public BaseResponse<QueryResultVo<List<VoDayIntakeAmount>>> amountOfDay(IntakerQo qo) throws Exception {
        String yearMonth = qo.getYearMonth();
        if(yearMonth == null || yearMonth.trim().equals("")) {
            return BaseResponseUtils.buildErrorMsg("查询条件年月不能为空");
@@ -63,7 +63,7 @@
     */
    @GetMapping(path = "/amountOfMonth")
    @SsoAop()
    public BaseResponse<QueryResultVo<List<VoMonthAmount>>> amountOfMonth(IntakeQo qo) throws Exception {
    public BaseResponse<QueryResultVo<List<VoMonthAmount>>> amountOfMonth(IntakerQo qo) throws Exception {
        if(qo.getYear() == null) {
            return BaseResponseUtils.buildErrorMsg("查询条件年度不能为空");
        }
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerQo.java
File was renamed from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeQo.java
@@ -13,7 +13,7 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class IntakeQo  extends QueryConditionVo {
public class IntakerQo extends QueryConditionVo {
    /**
     * 统计年月
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakerSv.java
File was renamed from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intaker/IntakeSv.java
@@ -22,7 +22,7 @@
 */
@Slf4j
@Service
public class IntakeSv {
public class IntakerSv {
    @Autowired
    private RmIntakeAmountDayMapper dayDao ;
@@ -36,7 +36,7 @@
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoDayIntakeAmount>> amountOfDay(IntakeQo qo) throws ParseException {
    public QueryResultVo<List<VoDayIntakeAmount>> amountOfDay(IntakerQo qo) throws ParseException {
        QueryResultVo<List<VoDayIntakeAmount>> rsVo = new QueryResultVo<>() ;
        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
@@ -138,7 +138,7 @@
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoMonthAmount>> amountOfMonth(IntakeQo qo) throws ParseException {
    public QueryResultVo<List<VoMonthAmount>> amountOfMonth(IntakerQo qo) throws ParseException {
        QueryResultVo<List<VoMonthAmount>> rsVo = new QueryResultVo<>() ;
        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;