no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/settle/repair/DailyReportBean.java

@@ -0,0 +1,43 @@
+package com.gree.mall.miniapp.bean.settle.repair;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel
+@Data
+public class DailyReportBean {
+
+    @ApiModelProperty(value = "工资条编号")
+    private String salaryNo;
+
+    @ApiModelProperty(value = "发放月份")
+    private String issueMonth;
+
+    @ApiModelProperty(value = "发放时间")
+    private Date issueTime;
+
+    @ApiModelProperty(value = "维修结算费用")
+    private BigDecimal repairTotalAmount;
+
+    @ApiModelProperty(value = "工伤残保扣除")
+    private BigDecimal totalEmpCost;
+
+    @ApiModelProperty(value = "暂扣比例")
+    private BigDecimal withholdRate;
+
+    @ApiModelProperty(value = "暂扣费用")
+    private BigDecimal withholdCost;
+
+    @ApiModelProperty(value = "需扣回费用")
+    private BigDecimal reduceCost;
+
+    @ApiModelProperty(value = "增减费用")
+    private BigDecimal inCrDecrCost;
+
+    @ApiModelProperty(value = "应发费用")
+    private BigDecimal issueCost;
+}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/settle/repair/DailyWorkerIssueSalaryBean.java

@@ -0,0 +1,41 @@
+package com.gree.mall.miniapp.bean.settle.repair;
+
+import com.gree.mall.miniapp.plus.entity.SettleDailyImportSummaryItem;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel
+@Data
+public class DailyWorkerIssueSalaryBean extends SettleDailyImportSummaryItem {
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankAccount;
+
+    @ApiModelProperty(value = "户名")
+    private String bankAccountName;
+
+    @ApiModelProperty(value = "开户行")
+    private String depositBank;
+
+    @ApiModelProperty(value = "发放状态 1.待发放 2.已发放")
+    private Integer issueStatus;
+
+    @ApiModelProperty(value = "发放时间")
+    private String issueTime;
+
+    @ApiModelProperty(value = "发放人")
+    private String issueBy;
+
+    @ApiModelProperty(value = "是否扣减 1是 2否")
+    private Integer reduceStatus;
+
+    @ApiModelProperty(value = "结算时间 reduceStatus=1取")
+    private Date reduceTime;
+
+    @ApiModelProperty(value = "1.已发放 2.未发放 3.暂不结算 4.已扣回")
+    private String tStatus;
+
+}

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

@@ -0,0 +1,40 @@
+package com.gree.mall.miniapp.commonmapper;
+
+import com.baomidou.mybatisplus.annotation.SqlParser;
+import com.gree.mall.miniapp.bean.settle.repair.DailyReportBean;
+import com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DailyReportMapper {
+
+    @SqlParser(filter = true)
+    List<DailyReportBean> issueDayList(@Param("workerNumber") String workerNumber,
+                                       @Param("date")  String date,
+                                       @Param("status") Integer status,
+                                       @Param("install") Boolean install
+    );
+
+    List<DailyWorkerIssueSalaryBean> queryMyOrderList(@Param("workerNumber") String workerNumber,
+                                                      @Param("salaryNo") String salaryNo,
+                                                      @Param("id") Integer id,
+                                                      @Param("q") String q
+    );
+
+    List<DailyWorkerIssueSalaryBean> queryMyOrderMonthList(@Param("workerNumber") String workerNumber,
+                                                           @Param("summaryBatchNo") String summaryBatchNo,
+                                                           @Param("id") Integer id,
+                                                           @Param("q") String q
+    );
+
+    @SqlParser(filter = true)
+    List<DailyWorkerIssueSalaryBean> notIssueList(@Param("workerNumber") String workerNumber,
+                                                  @Param("id") Integer id,
+                                                  @Param("q") String q,
+                                                  @Param("status") List<Integer> status,
+                                                  @Param("install") Boolean install
+    );
+}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/constant/DailyConstant.java

@@ -0,0 +1,71 @@
+package com.gree.mall.miniapp.constant;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class DailyConstant {
+
+    /**
+     * 汇总状态 1.已汇总 2.未汇总 3.暂不结算 4.驳回
+     */
+    public final static Integer SUMMARY_STATUS_HAS = 1;
+
+    public final static Integer SUMMARY_STATUS_NOT = 2;
+
+    public final static Integer SUMMARY_STATUS_WAIT = 3;
+
+    public final static Integer SUMMARY_STATUS_REJECT = 4;
+
+    public static List<Integer>   SUMMARY_STATUS_CAN_DO = Arrays.asList(2, 4);
+
+    public static List<Integer>   SUMMARY_STATUS_CAN_DEL = Arrays.asList(2,3,4);
+
+    /**
+     * 发放状态 1.未发放 2.已发放 3.银行受理中 4.发放失败 5.驳回
+     */
+    public final static Integer ISSUE_STATUS_NOT = 1;
+    public final static Integer ISSUE_STATUS_SUCCESS = 2;
+    public final static Integer ISSUE_STATUS_BANK_DO = 3;
+    public final static Integer ISSUE_STATUS_FAILED = 4;
+    public final static Integer ISSUE_STATUS_REJECT = 5;
+
+    //app展示未发放
+    public static List<Integer>   ISSUE_STATUS_APP_NOT = Arrays.asList(1,3,4);
+
+    public static List<Integer>   ISSUE_STATUS_SUCCESS_ARRY = Arrays.asList(2);
+
+
+    public final static String TRANSFER_RESP_WAIT[] = {"W"};
+    public final static String TRANSFER_RESP_SUCCESS[] = {"S"};
+    public final static String TRANSFER_RESP_FAILED[] = {"E"};
+
+    // 调用银行接口返回数据
+    public final static String CMC_RESPONSE_FAIL_CODE = "201";
+    public final static String CMC_RESPONSE_SUCCESS_CODE = "200";
+
+    public final static String CMC_BUS_MOD = "00002";
+
+    //执行状态
+    public final static Integer DO_STATUS_HAS = 1;
+
+    public final static Integer DO_STATUS_NOT = 2;
+
+    public final static List<String> SUMMARY_STATUS_ARRAY = new ArrayList<String>(){
+        {
+            add("已转结算待汇总");
+            add("待退旧件");
+            add("待总部日审");
+            add("待总部审批");
+            add("待总部日结审批");
+            add("已汇总");
+        }
+    };
+
+
+    public static List<String>   WARN_COMPANY = Arrays.asList("广州嘉讯茂机电工程有限公司","广东家盛茂科技有限公司");
+
+
+    public final static  String WARN_TEMPLEATE = "SMS_250916318";
+
+}

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

@@ -0,0 +1,88 @@
+package com.gree.mall.miniapp.controller.settle;
+
+import com.gree.mall.miniapp.bean.settle.repair.DailyReportBean;
+import com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean;
+import com.gree.mall.miniapp.helper.ResponseHelper;
+import com.gree.mall.miniapp.logic.settle.DailyMyWalletLogic;
+import com.gree.mall.miniapp.plus.entity.SettleDailyIssueSummaryMonthRecord;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@Api(value = "维修日结算我的钱包", tags = {"维修日结算我的钱包"})
+@RequestMapping(value = "/daily/mywallet", produces = "application/json; charset=utf-8")
+public class DailyMyWalletController {
+
+    @Autowired
+    DailyMyWalletLogic dailyMyWalletLogic;
+
+    @GetMapping("/issue/list")
+    @ApiOperation(value = "已发放-日报")
+    public ResponseHelper<List<DailyReportBean>> issueList(
+            @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
+    ) {
+        List<DailyReportBean> list = dailyMyWalletLogic.issueList(workerNumber, date,install);
+        return ResponseHelper.success(list);
+    }
+
+    @GetMapping("/repair/detail")
+    @ApiOperation(value = "维修费用明细/详情")
+    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
+    ) {
+        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.queryMyOrderList(workerNumber, salaryNo,id, q);
+        return ResponseHelper.success(list);
+    }
+
+    @GetMapping("/issue/monthlist")
+    @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
+    ) {
+        List<SettleDailyIssueSummaryMonthRecord> list = dailyMyWalletLogic.issueMonthList(workerNumber, date);
+        return ResponseHelper.success(list);
+    }
+
+    @GetMapping("/not/issue/list")
+    @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
+
+    ) {
+        List<DailyWorkerIssueSalaryBean> list = dailyMyWalletLogic.notIssueList(workerNumber, id,q,install);
+        return ResponseHelper.success(list);
+    }
+
+    @GetMapping("/repair/month/detail")
+    @ApiOperation(value = "维修费用月结明细/详情")
+    public ResponseHelper<List<DailyWorkerIssueSalaryBean>> queryMyOrderList(
+            @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
+    ) {
+        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

@@ -0,0 +1,60 @@
+package com.gree.mall.miniapp.logic.settle;
+
+import com.gree.mall.miniapp.bean.settle.repair.DailyReportBean;
+import com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean;
+import com.gree.mall.miniapp.commonmapper.DailyReportMapper;
+import com.gree.mall.miniapp.constant.DailyConstant;
+import com.gree.mall.miniapp.plus.entity.SettleDailyIssueSummaryMonthRecord;
+import com.gree.mall.miniapp.plus.service.SettleDailyIssueSummaryMonthRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+public class DailyMyWalletLogic {
+
+    @Resource
+    DailyReportMapper dailyReportMapper;
+
+    @Autowired
+    SettleDailyIssueSummaryMonthRecordService settleDailyIssueSummaryMonthRecordService;
+
+
+    public List<DailyReportBean> issueList(String workerNumber, String date, Boolean install) {
+        if (StringUtils.isNotEmpty(date)) {
+            date = date.replaceAll("-", "");
+        }
+        Integer status = DailyConstant.ISSUE_STATUS_SUCCESS;
+        List<DailyReportBean> list = dailyReportMapper.issueDayList(workerNumber, date, status,install);
+        return list;
+    }
+
+    public List<DailyWorkerIssueSalaryBean> queryMyOrderList(String workerNumber, String salaryNo, Integer id, String q) {
+        return dailyReportMapper.queryMyOrderList(workerNumber, salaryNo, id, q);
+    }
+
+    public List<DailyWorkerIssueSalaryBean> queryMyOrderMonthList(String workerNumber, String summaryBatchNo, Integer id, String q) {
+        return dailyReportMapper.queryMyOrderMonthList(workerNumber, summaryBatchNo, id, q);
+    }
+
+    public List<SettleDailyIssueSummaryMonthRecord> issueMonthList(String workerNumber, String month) {
+        if (StringUtils.isNotEmpty(month)) {
+            month = month.replaceAll("-", "");
+        }
+        List<SettleDailyIssueSummaryMonthRecord> list = settleDailyIssueSummaryMonthRecordService.lambdaQuery()
+                .eq(StringUtils.isNotEmpty(month), SettleDailyIssueSummaryMonthRecord::getMonth, month)
+                .eq(SettleDailyIssueSummaryMonthRecord::getStatus, DailyConstant.ISSUE_STATUS_SUCCESS)
+                .eq(SettleDailyIssueSummaryMonthRecord::getServiceNumber, workerNumber).list();
+        return list;
+    }
+
+    public List<DailyWorkerIssueSalaryBean> notIssueList(String workerNumber, Integer id, String q,Boolean install) {
+        List<DailyWorkerIssueSalaryBean> list = dailyReportMapper.notIssueList(workerNumber, id, q, DailyConstant.ISSUE_STATUS_APP_NOT,install);
+        return list;
+    }
+}

mall-miniapp-service/src/main/resources/mapper/DailyReportMapper.xml

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gree.mall.miniapp.commonmapper.DailyReportMapper">
+
+
+    <select id="issueDayList" resultType="com.gree.mall.miniapp.bean.settle.repair.DailyReportBean">
+         select
+            salary_no,
+            month 'issueMonth',
+            issue_time ,
+            repair_total_amount ,
+            residual_insurance_cost + emp_insurance_cost 'totalEmpCost',
+            withhold_total_cost ,
+            withhold_cost ,
+            reduce_cost ,
+            incr_decr_cost ,
+            issue_cost
+        from
+	        settle_daily_issue_summary_record
+        <where>
+
+            <if test="workerNumber !='' and workerNumber !=null">
+                and service_number = #{workerNumber}
+            </if>
+
+            <if test="date !='' and date !=null">
+                and  issue_time_fmt = #{date}
+            </if>
+
+            <if test="status !=null and status !=''">
+                and  status = #{status}
+            </if>
+            <if test="install != null">
+                and install = #{install}
+            </if>
+
+        </where>
+
+
+    </select>
+
+
+    <select id="queryMyOrderList" resultType="com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean">
+        select
+          c.*,b.bank_account ,b.bank_account_name,deposit_bank,a.issue_time ,a.issue_by,a.salary_no,a.status 'issueStatus'
+        from settle_daily_issue_summary_record a
+        join (
+            SELECT
+                u.id_card,
+                wb.worker_number,
+                u.nick_name
+            FROM
+                user u, websit_user wb
+            WHERE
+                u.company_wechat_id = wb.company_wechat_id
+                AND u.user_id = wb.user_id
+                AND u.apply_type = 'WORKER'
+                AND wb.examine_status = 'OK'
+            GROUP BY wb.worker_number
+        ) aa on a.service_number = aa.worker_number
+        join settle_daily_bank_account b  on  aa.id_card = b.idcard
+        join settle_daily_import_summary_item c  on a.id  = c.issue_salary_id
+
+        <where>
+
+            <if test="id != null and id != ''">
+                 and  c.id = #{id}
+            </if>
+
+            <if test="workerNumber != null and workerNumber != ''">
+                and  a.service_number = #{workerNumber}
+            </if>
+            <if test="salaryNo != null and salaryNo != ''">
+                and  a.salary_no = #{salaryNo}
+            </if>
+
+            <if test="q != null and q != ''">
+                and (c.user_name like concat('%',#{q},'%') or c.dispatch_order_no like concat('%',#{q},'%') )
+            </if>
+        </where>
+
+    </select>
+
+    <select id="queryMyOrderMonthList" resultType="com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean">
+        select
+        c.*,b.bank_account ,b.bank_account_name,deposit_bank,a.issue_time ,a.issue_by,a.salary_no,a.status 'issueStatus'
+        from settle_daily_issue_summary_record a
+        join (
+            SELECT
+                u.id_card,
+                wb.worker_number,
+                u.nick_name
+            FROM
+                user u, websit_user wb
+            WHERE
+                u.company_wechat_id = wb.company_wechat_id
+                AND u.user_id = wb.user_id
+                AND u.apply_type = 'WORKER'
+                AND wb.examine_status = 'OK'
+            GROUP BY wb.worker_number
+        ) aa on a.service_number = aa.worker_number
+        join settle_daily_bank_account b  on  aa.id_card = b.idcard
+        join settle_daily_import_summary_item c  on a.id  = c.issue_salary_id
+
+        <where>
+            <if test="id != null and id != ''">
+                and  c.id = #{id}
+            </if>
+
+            <if test="workerNumber != null and workerNumber != ''">
+                and  a.service_number = #{workerNumber}
+            </if>
+            <if test="summaryBatchNo != null and summaryBatchNo != ''">
+                and  a.summary_month_batch_no = #{summaryBatchNo}
+            </if>
+
+            <if test="q != null and q != ''">
+                and (c.user_name like concat('%',#{q},'%') or c.dispatch_order_no like concat('%',#{q},'%') )
+            </if>
+        </where>
+
+    </select>
+
+    <select id="notIssueList" resultType="com.gree.mall.miniapp.bean.settle.repair.DailyWorkerIssueSalaryBean">
+        select
+            c.*,b.bank_account ,b.bank_account_name,deposit_bank,a.issue_time ,a.issue_by,a.salary_no,if(a.status = 2,2,1) 'issueStatus'
+        from settle_daily_issue_summary_record a
+        join (
+            SELECT
+                u.id_card,
+                wb.worker_number,
+                u.nick_name
+            FROM
+                user u, websit_user wb
+            WHERE
+                u.company_wechat_id = wb.company_wechat_id
+                AND u.user_id = wb.user_id
+                AND u.apply_type = 'WORKER'
+                AND wb.examine_status = 'OK'
+                GROUP BY wb.worker_number
+        ) aa on a.service_number = aa.worker_number
+        join settle_daily_bank_account b  on  aa.id_card = b.idcard
+        join settle_daily_import_summary_item c  on a.id  = c.issue_salary_id
+       <where>
+        <if test="install != null">
+            and a.install = #{install}
+        </if>
+        <if test="status != null and status.size()> 0">
+            and a.status in
+            <foreach collection="status" item="statusItem" index="index"
+                     open="(" close=")" separator=",">
+                #{statusItem}
+            </foreach>
+        </if>
+
+        <if test="id != null and id != ''">
+            and  c.id = #{id}
+        </if>
+        <if test="workerNumber != null and workerNumber != ''">
+            and  c.worker_number = #{workerNumber}
+        </if>
+
+        <if test="q != null and q != ''">
+            and (c.user_name like concat('%',#{q},'%') or c.dispatch_order_no like concat('%',#{q},'%') )
+        </if>
+            and c.summary_status = 1
+       </where>
+
+        UNION
+        select
+            c.*,
+            b.bank_account ,
+            b.bank_account_name,
+            deposit_bank,
+            '' issue_time ,
+            '' issue_by,
+            '' salary_no,
+            1 'issueStatus'
+        from
+            settle_daily_import_summary_item c
+        join (
+            SELECT
+                u.id_card,
+                wb.worker_number,
+                u.nick_name
+            FROM
+                user u, websit_user wb
+            WHERE
+                u.company_wechat_id = wb.company_wechat_id
+                AND u.user_id = wb.user_id
+                AND u.apply_type = 'WORKER'
+                AND wb.examine_status = 'OK'
+                GROUP BY wb.worker_number
+        ) aa on c.worker_number = aa.worker_number
+        join settle_daily_bank_account b  on  aa.id_card = b.idcard
+        where
+            c.summary_status != 1
+        <if test="id != null and id != ''">
+            and  c.id = #{id}
+        </if>
+        <if test="workerNumber != null and workerNumber != ''">
+            and  c.worker_number = #{workerNumber}
+        </if>
+
+        <if test="q != null and q != ''">
+            and (c.user_name like concat('%',#{q},'%') or c.dispatch_order_no like concat('%',#{q},'%') )
+        </if>
+
+    </select>
+
+
+</mapper>

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

@@ -698,6 +698,7 @@ public class DailyImportSummaryLogic {
 
     /**
      * 删除结算导入明细
+     *
      * @param ids
      */
     @Transactional
@@ -1235,7 +1236,8 @@ public class DailyImportSummaryLogic {
                 .eq(SettleDailyIssueSummaryRecord::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
                 .eq(SettleDailyIssueSummaryRecord::getSummaryBatchNo, summaryBatchNo)
                 .in(CollectionUtil.isNotEmpty(summaryWebsiteNumber), SettleDailyIssueSummaryRecord::getSummaryNumber, summaryWebsiteNumber)
-                .eq(SettleDailyIssueSummaryRecord::getStatus, DailyConstant.SUMMARY_STATUS_HAS).update();
+                .eq(SettleDailyIssueSummaryRecord::getStatus, DailyConstant.SUMMARY_STATUS_HAS)
+                .update();
 
         settleDailyImportSummaryItemService.lambdaUpdate()
                 .set(SettleDailyImportSummaryItem::getSummaryStatus, DailyConstant.SUMMARY_STATUS_REJECT)
@@ -1246,11 +1248,11 @@ public class DailyImportSummaryLogic {
         settleDailyResidualInsuranceService.lambdaUpdate().eq(SettleDailyResidualInsurance::getSummaryBatchNo, summaryBatchNo).remove();
 
         //删掉新产生的历史数据
-        settleDailyRemaineBuckleService.lambdaUpdate().eq(SettleDailyRemaineBuckle::getSummaryBatchNo,Constant.DAILY_PREFIX + summaryBatchNo).remove();
+        settleDailyRemaineBuckleService.lambdaUpdate().eq(SettleDailyRemaineBuckle::getSummaryBatchNo, Constant.DAILY_PREFIX + summaryBatchNo).remove();
         //将本次批次号处理的数据还原
         settleDailyRemaineBuckleService.lambdaUpdate()
-                .set(SettleDailyRemaineBuckle::getIsBuckle,false)
-                .eq(SettleDailyRemaineBuckle::getSummaryBatchNo,summaryBatchNo)
+                .set(SettleDailyRemaineBuckle::getIsBuckle, false)
+                .eq(SettleDailyRemaineBuckle::getSummaryBatchNo, summaryBatchNo)
                 .update();
     }
 
@@ -1361,8 +1363,8 @@ public class DailyImportSummaryLogic {
         return page;
     }
 
-    public ExcelData workerDetailExport(List<DailyWorkerIssueSalaryBean> list){
-        String[] titles = new String[]{"序号", "状态","发放月份","发放时间","银行卡账号","户名","开户行","派工序号", "自编号码", "工单状态", "新结算单位号", "旧结算单位号", "结算单位名", "维修类型", "内外机",
+    public ExcelData workerDetailExport(List<DailyWorkerIssueSalaryBean> list) {
+        String[] titles = new String[]{"序号", "状态", "发放月份", "发放时间", "银行卡账号", "户名", "开户行", "派工序号", "自编号码", "工单状态", "新结算单位号", "旧结算单位号", "结算单位名", "维修类型", "内外机",
                 "机器条码", "外机型", "外机型描述", "内机条码", "内机型", "内机型描述", "用户姓名", "区号", "移动电话", "电话号码",
                 "省份", "市县", "区县", "用户地址", "GPS定位", "邮政编码", "销售单位号", "销售单位", "发票编号", "购买日期", "安装日期",
                 "报修日期", "修复日期", "维修工ID", "维修工姓名", "维修工电话", "维修费用", "交通费", "住宿费用", "吊装费用", "其他费用", "总费用",
@@ -1370,9 +1372,9 @@ public class DailyImportSummaryLogic {
                 "备注", "转结算时间"
         };
         List<List<Object>> rows = new ArrayList<>();
-        for(DailyWorkerIssueSalaryBean bean : list){
+        for (DailyWorkerIssueSalaryBean bean : list) {
             List<Object> row = new ArrayList<>();
-            row.add(list.indexOf(bean) +1);
+            row.add(list.indexOf(bean) + 1);
             row.add(CommonUtils.getIssueStatus(bean.getIssueStatus()));
             row.add(bean.getMonth());
             row.add(bean.getIssueTime());