Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/WorkerWaitBuckleVO.java

@@ -0,0 +1,43 @@
+package com.gree.mall.manager.bean.settle.repair;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel
+@ZfireField(tbName = "a")
+public class WorkerWaitBuckleVO {
+
+    @ApiModelProperty("费用发生时间")
+    private Date createTime;
+
+    @ApiModelProperty("服务人员姓名")
+    private String workerName;
+
+    @ApiModelProperty("服务人员编号")
+    private String workerNumber;
+
+    @ApiModelProperty("身份证")
+    private String idcard;
+
+    @ApiModelProperty("联系方式")
+    private String mobile;
+
+    @ApiModelProperty("费用项目名称")
+    private String costType;
+
+    @ApiModelProperty("费用金额")
+    private BigDecimal buckleAmount;
+
+    @ApiModelProperty("状态")
+    private Boolean isBuckle;
+
+    @ApiModelProperty("扣除时间")
+    private Date updateTime;
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -684,4 +684,12 @@ public interface CommonMapper {
      * @return
      */
     IPage<DailyReduceCostVO> reduceList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
+
+    /**
+     * 师傅待扣费用列表
+     * @param page
+     * @param zfireParamBean
+     * @return
+     */
+    IPage<WorkerWaitBuckleVO> buckleList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/settle/repair/DailyImportSummaryController.java

@@ -312,4 +312,27 @@ public class DailyImportSummaryController {
         return ResponseHelper.success();
     }
 
+    @ZfireList
+    @PostMapping("/buckle/list")
+    @ApiOperation(value = "师傅待扣费用-列表")
+    public ResponseHelper<IPage<WorkerWaitBuckleVO>> buckleList(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) {
+        IPage<WorkerWaitBuckleVO> page = dailyImportSummaryLogic.buckleList(zfireParamBean);
+        return ResponseHelper.success(page, new TypeReference<WorkerWaitBuckleVO>() {
+        });
+    }
+
+    @PostMapping("/buckle/export")
+    @ApiOperation("师傅待扣费用-导出")
+    public void buckleListExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //2.查询要导出的内容
+        IPage<WorkerWaitBuckleVO> page = dailyImportSummaryLogic.buckleList(zfireParamBean);
+        //3.导出
+        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyImportSummaryLogic.java

@@ -1170,4 +1170,11 @@ public class DailyImportSummaryLogic {
         }
         summaryReduce(reduceList, opName, null, ids, adminUser);
     }
+
+    public IPage<WorkerWaitBuckleVO> buckleList(ZfireParamBean zfireParamBean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        FieldUtils.supplyParam(zfireParamBean, WorkerWaitBuckleVO.class, adminUser);
+
+        return commonMapper.buckleList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
+    }
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1178,5 +1178,29 @@
         ${ex.orderBy}
     </select>
 
+    <select id="buckleList" resultType="com.gree.mall.manager.bean.settle.repair.WorkerWaitBuckleVO">
+        SELECT
+            ${ex.selected}
+        FROM
+            settle_daily_remaine_buckle a
+            JOIN (
+                SELECT
+                    u.id_card,
+                    wb.worker_number
+                FROM
+                    user u, websit_user wb
+                WHERE
+                    u.user_id = wb.user_id
+                    AND u.apply_type = 'WORKER'
+                    AND wb.examine_status = 'OK'
+            ) aa ON a.worker_number = aa.worker_number
+            JOIN settle_daily_bank_account b ON aa.id_card = b.idcard
+        ${ex.query}
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
+
 
 </mapper>