导出功能调整以及定时任务调整

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/sfgl/controller/YyWyjtzController.java

@@ -91,7 +91,7 @@ public class YyWyjtzController {
             yyWyjtzVo.setYhbh("合计");
             yyWyjtzVo.setTzje(list.stream().map(YyWyjtzVo::getTzje).reduce(BigDecimal.ZERO, BigDecimal::add));
             list.add(yyWyjtzVo);
-            ExcleFileUtil.exportExcel(response, list, YySspjxxSelect.class, String.format("%s.xlsx", "违约金减免记录"), filter.getExportFields());
+            ExcleFileUtil.exportExcel(response, list, YyWyjtzVo.class, String.format("%s.xlsx", "违约金减免记录"), filter.getExportFields());
         }
     }
 

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/sfgl/entity/vo/YySspjxxSelect.java

@@ -233,6 +233,7 @@ public class YySspjxxSelect {
     @ApiModelProperty(value = "票据号")
     private String fph2;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "水价名称")
     private String sjmc;
 }

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/sfgl/entity/vo/YyWyjtzVo.java

@@ -24,6 +24,7 @@ import java.util.Date;
 @ApiModel("违约金调整参数Vo")
 public class YyWyjtzVo extends Model<YyWyjtzVo> {
 
+    @ExcelIgnore
     @ApiModelProperty(value = "调整记录ID")
     private String id;
 
@@ -43,15 +44,19 @@ public class YyWyjtzVo extends Model<YyWyjtzVo> {
     @ApiModelProperty(value = "用水月份")
     private String ysyf;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "抄表日期")
     private String cbrq;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "应收水量")
     private BigDecimal yssl;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "应收水费")
     private BigDecimal yssf;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "调整前金额")
     private BigDecimal tzqje;
 
@@ -63,15 +68,19 @@ public class YyWyjtzVo extends Model<YyWyjtzVo> {
     @ApiModelProperty(value = "违约金减免类型")
     private JmlxEnum type;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "调整原因")
     private String tzyy;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "减免依据")
     private String jmyj;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "工单编号")
     private String gdbh;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "欠费id")
     private String qfid;
 
@@ -89,12 +98,15 @@ public class YyWyjtzVo extends Model<YyWyjtzVo> {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date czsj;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "违约金")
     private BigDecimal znj;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "工单流水编号")
     private String gdlsbh;
 
+    @ExcelIgnore
     @ApiModelProperty(value = "汇总数量")
     private String countnum;
 }

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/sfgl/service/impl/YyQfmxServiceImpl.java

@@ -1005,19 +1005,22 @@ public class YyQfmxServiceImpl extends ServiceImpl<YyQfmxMapper, YyQfmx> impleme
                 .eq(YyCblr::getJsbz, JsbzEnum.未算费)
                 .eq(YyCblr::getShbz, ShbzEnum.审核通过)
                 .eq(YyCblr::getCbbz, CbbzEnum.已抄表)
-                .eq(YyCblr::getJfzt, "1")
                 .gt(YyCblr::getSl, BigDecimal.ZERO)
-                .apply("not exists (select 1 from yh_bjfl_fb fb left join yh_bjfl_zb zb on " +
-                        "fb.zb_id=zb.id where fb.zb_id<>fb.id and zb.isdisabled='1' and " +
-                        "fb.yhbh||fb.cbkh)=a.cbkid)")
+                .notExists("select 1 from yh_bjfl_fb fb left join yh_bjfl_zb zb on fb.zb_id=zb.id " +
+                        "where fb.zb_id<>fb.id and zb.isdisabled='1' and (fb.yhbh||fb.cbkh)=cbkid")
                 .list();
-        int count = this.Tasksf(cblrs);
         Syscommlog syscommlog = new Syscommlog();
         syscommlog.setTablename("yy_qfmx");
         syscommlog.setMstext("自动算费suanfeiTask");
         syscommlog.setAddate(LocalDateTime.now().format(DateTimeFormatter.ISO_DATE_TIME));
-        syscommlog.setRemark(String.format("调用算费，成功%s条，失败%s条", count, cblrs.size() - count));
-        syscommlog.setUserid(SecurityUtils.getUserId().toString());
+        if (!cblrs.isEmpty()) {
+            int count = this.Tasksf(cblrs);
+            syscommlog.setRemark(String.format("调用算费，成功%s条，失败%s条", count, cblrs.size() - count));
+
+        } else {
+            syscommlog.setRemark("调用算费：无未算费数据");
+        }
+        syscommlog.setUserid("3");
         syscommlogService.save(syscommlog);
     }
 

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/sfgl/service/impl/YySspjxxServiceImpl.java

@@ -3281,7 +3281,7 @@ public class YySspjxxServiceImpl extends ServiceImpl<YySspjxxMapper, YySspjxx> i
             }
             String msg = "";
             if (StringUtil.isNotEmpty(yhbhs.toString())) {
-                msg = String.format("，扣减失败户号：%s！", yhbhs);
+                msg = String.format("扣减失败户号：%s！", yhbhs);
             }
             Syscommlog syscommlog = new Syscommlog();
             syscommlog.setTablename("yy_sspjxx");

collect-fees/fees-px-api/src/main/java/com/tofly/feesapi/task/SfTask.java

@@ -50,19 +50,26 @@ public class SfTask {
     }
 
     /**
-     * 每月26号-31号0点执行一次
+     * 每月26号-31号0点执行一次（算费）
+     */
+//    @Scheduled(cron = "${sf.cron_expression:-}")
+//    //@Scheduled(cron = "${cron_expression:15 01 16 * * ?}")
+//    public void task() {
+//        qfmxService.sf();
+//    }
+
+    /**
+     * 算费任务（每天23点执行一次）
      */
-    @Scheduled(cron = "${sf.cron_expression:-}")
-    //@Scheduled(cron = "${cron_expression:15 01 16 * * ?}")
-    public void task() {
-        qfmxService.sf();
-    }
     @Scheduled(cron = "${suanfeiTask.cron_expression:-}")
     //@Scheduled(cron = "${cron_expression:30 23 11 * * ?}")
     public void suanfeiTask() {
         qfmxService.suanfeiTask();
     }
 
+    /**
+     * 预付费扣减（每天2点执行一次）
+     */
     @Scheduled(cron = "${yyfkj.cron_expression:-}")
     //@Scheduled(cron = "${cron_expression:30 07 17 * * ?}")
     public void yyfkjTask() {