no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/DailyReportMapper.java

@@ -20,19 +20,19 @@ public interface DailyReportMapper {
 
     List<DailyWorkerIssueSalaryBean> queryMyOrderList(@Param("workerNumber") String workerNumber,
                                                       @Param("salaryNo") String salaryNo,
-                                                      @Param("id") Integer id,
+                                                      @Param("id") String id,
                                                       @Param("q") String q
     );
 
     List<DailyWorkerIssueSalaryBean> queryMyOrderMonthList(@Param("workerNumber") String workerNumber,
                                                            @Param("summaryBatchNo") String summaryBatchNo,
-                                                           @Param("id") Integer id,
+                                                           @Param("id") String id,
                                                            @Param("q") String q
     );
 
     @SqlParser(filter = true)
     List<DailyWorkerIssueSalaryBean> notIssueList(@Param("workerNumber") String workerNumber,
-                                                  @Param("id") Integer id,
+                                                  @Param("id") String id,
                                                   @Param("q") String q,
                                                   @Param("status") List<Integer> status,
                                                   @Param("install") Boolean install

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/settle/DailyMyWalletController.java

@@ -33,7 +33,7 @@ public class DailyMyWalletController {
             @ApiParam(required = false, value = "查询日期") @RequestParam(required = false) String date,
             @ApiParam(required = false, value = "false=维修费用 true=安装费用") @RequestParam(required = false) Boolean install
     ) {
-        List<DailyReportBean> list = dailyMyWalletLogic.issueList(workerNumber, date,install);
+        List<DailyReportBean> list = dailyMyWalletLogic.issueList(workerNumber, date, install);
         return ResponseHelper.success(list);
     }
 
@@ -42,10 +42,10 @@ public class DailyMyWalletController {
     public ResponseHelper<List<DailyWorkerIssueSalaryBean>> queryMyOrderList(
             @ApiParam(required = true, value = "师傅编号") @RequestParam String workerNumber,
             @ApiParam(required = true, value = "工资条编号") @RequestParam String salaryNo,
-            @ApiParam(required = false, value = "工单号、用户名称(模糊)")@RequestParam(required = false) String q,
-            @ApiParam(required = false, value = "id") @RequestParam(required = false) Integer id
+            @ApiParam(value = "工单号、用户名称(模糊)") @RequestParam(required = false) String q,
+            @ApiParam(value = "id") @RequestParam(required = false) String id
     ) {
-        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.queryMyOrderList(workerNumber, salaryNo,id, q);
+        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.queryMyOrderList(workerNumber, salaryNo, id, q);
         return ResponseHelper.success(list);
     }
 
@@ -53,8 +53,8 @@ public class DailyMyWalletController {
     @ApiOperation(value = "已发放-月结")
     public ResponseHelper<List<SettleDailyIssueSummaryMonthRecord>> issueMonthList(
             @ApiParam(required = true, value = "师傅编号") @RequestParam String workerNumber,
-            @ApiParam(required = false, value = "查询月份") @RequestParam(required = false) String date,
-            @ApiParam(required = false, value = "false=维修费用 true=安装费用") @RequestParam(required = false) Boolean install
+            @ApiParam(value = "查询月份") @RequestParam(required = false) String date,
+            @ApiParam(value = "false=维修费用 true=安装费用") @RequestParam(required = false) Boolean install
     ) {
         List<SettleDailyIssueSummaryMonthRecord> list = dailyMyWalletLogic.issueMonthList(workerNumber, date);
         return ResponseHelper.success(list);
@@ -64,24 +64,24 @@ public class DailyMyWalletController {
     @ApiOperation(value = "未发放明细/详情-日报")
     public ResponseHelper<List<DailyWorkerIssueSalaryBean>> notIssueList(
             @ApiParam(required = true, value = "师傅编号") @RequestParam String workerNumber,
-            @ApiParam(required = false, value = "id") @RequestParam(required = false) Integer id,
-            @ApiParam(required = false, value = "工单号、用户名称") @RequestParam(required = false) String q,
-            @ApiParam(required = false, value = "false=维修费用 true=安装费用") @RequestParam(required = false) Boolean install
+            @ApiParam(value = "id") @RequestParam(required = false) String id,
+            @ApiParam(value = "工单号、用户名称") @RequestParam(required = false) String q,
+            @ApiParam(value = "false=维修费用 true=安装费用") @RequestParam(required = false) Boolean install
 
     ) {
-        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.notIssueList(workerNumber, id,q,install);
+        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.notIssueList(workerNumber, id, q, install);
         return ResponseHelper.success(list);
     }
 
     @GetMapping("/repair/month/detail")
     @ApiOperation(value = "维修费用月结明细/详情")
-    public ResponseHelper<List<DailyWorkerIssueSalaryBean>> queryMyOrderList(
+    public ResponseHelper<List<DailyWorkerIssueSalaryBean>> queryMyOrderMonthList(
             @ApiParam(required = true, value = "师傅编号") @RequestParam String workerNumber,
             @ApiParam(required = true, value = "月度汇总批次号") @RequestParam String summaryBatchNo,
-            @ApiParam(required = false, value = "id") @RequestParam(required = false) Integer id,
-            @ApiParam(required = false, value = "工单号、用户名称") @RequestParam(required = false) String q
+            @ApiParam(value = "id") @RequestParam(required = false) String id,
+            @ApiParam(value = "工单号、用户名称") @RequestParam(required = false) String q
     ) {
-        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.queryMyOrderMonthList(workerNumber, summaryBatchNo,id, q);
+        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.queryMyOrderMonthList(workerNumber, summaryBatchNo, id, q);
         return ResponseHelper.success(list);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/settle/DailyMyWalletLogic.java

@@ -34,11 +34,11 @@ public class DailyMyWalletLogic {
         return list;
     }
 
-    public List<DailyWorkerIssueSalaryBean> queryMyOrderList(String workerNumber, String salaryNo, Integer id, String q) {
+    public List<DailyWorkerIssueSalaryBean> queryMyOrderList(String workerNumber, String salaryNo, String id, String q) {
         return dailyReportMapper.queryMyOrderList(workerNumber, salaryNo, id, q);
     }
 
-    public List<DailyWorkerIssueSalaryBean> queryMyOrderMonthList(String workerNumber, String summaryBatchNo, Integer id, String q) {
+    public List<DailyWorkerIssueSalaryBean> queryMyOrderMonthList(String workerNumber, String summaryBatchNo, String id, String q) {
         return dailyReportMapper.queryMyOrderMonthList(workerNumber, summaryBatchNo, id, q);
     }
 
@@ -53,7 +53,7 @@ public class DailyMyWalletLogic {
         return list;
     }
 
-    public List<DailyWorkerIssueSalaryBean> notIssueList(String workerNumber, Integer id, String q,Boolean install) {
+    public List<DailyWorkerIssueSalaryBean> notIssueList(String workerNumber, String id, String q,Boolean install) {
         List<DailyWorkerIssueSalaryBean> list = dailyReportMapper.notIssueList(workerNumber, id, q, DailyConstant.ISSUE_STATUS_APP_NOT,install);
         return list;
     }