no message

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

@@ -0,0 +1,212 @@
+package com.gree.mall.manager.bean.settle.repair;
+
+import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.repair.settle.IssueSummaryStatusEnum;
+import com.gree.mall.manager.enums.repair.settle.SummaryStatusEnum;
+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 AllDailyImportSummaryItemVO {
+
+    @ZfireField(hide = true)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "所属商户")
+    private String companyWechatName;
+
+    @ApiModelProperty(value = "导入批次号")
+    private String importBatchNo;
+
+    @ApiModelProperty(value = "派工序号")
+    private String dispatchOrderNo;
+
+    @ApiModelProperty(value = "自编编号")
+    private String selfNo;
+
+    @ZfireField(tbName = "c")
+    @ApiModelProperty(value = "发放状态")
+    private IssueSummaryStatusEnum status;
+
+    @ApiModelProperty(value = "汇总批次号")
+    private String summaryBatchNo;
+
+    @ZfireField(tbName = "sdrc")
+    @ApiModelProperty(value = "结算费用时间")
+    private Date doTime;
+
+    @ZfireField(tbName = "c")
+    @ApiModelProperty(value = "发放月份")
+    private String month;
+
+    @ZfireField(tbName = "c")
+    @ApiModelProperty(value = "发放时间")
+    private String issueTime;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "银行卡账号")
+    private String bankAccount;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "户名")
+    private String bankAccountName;
+
+    @ZfireField(tbName = "b")
+    @ApiModelProperty(value = "开户行")
+    private String depositBank;
+
+    @ApiModelProperty(value = "工单状态")
+    private SummaryStatusEnum summaryStatus;
+
+    @ApiModelProperty(value = "新结算单位号")
+    private String summaryNumber;
+
+    @ApiModelProperty(value = "旧结算单位号")
+    private String oldSummaryNumber;
+
+    @ApiModelProperty(value = "结算单位名称")
+    private String summaryName;
+
+    @ApiModelProperty(value = "维修类型")
+    private String repairType;
+
+    @ApiModelProperty(value = "内外机")
+    private String inOutMachine;
+
+    @ApiModelProperty(value = "机器条码")
+    private String machineCode;
+
+    @ApiModelProperty(value = "外机型")
+    private String outMachineType;
+
+    @ApiModelProperty(value = "外机型描述")
+    private String outMachineDescribe;
+
+    @ApiModelProperty(value = "内机条码")
+    private String inMachineCode;
+
+    @ApiModelProperty(value = "内机类型")
+    private String inMachineType;
+
+    @ApiModelProperty(value = "内机型描述")
+    private String inMachineDescribe;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    @ApiModelProperty(value = "区号")
+    private String areaCode;
+
+    @ApiModelProperty(value = "移动电话")
+    private String mobile;
+
+    @ApiModelProperty(value = "电话号码")
+    private String tel;
+
+    @ApiModelProperty(value = "省份")
+    private String province;
+
+    @ApiModelProperty(value = "市县")
+    private String city;
+
+    @ApiModelProperty(value = "区县")
+    private String county;
+
+    @ApiModelProperty(value = "用户地址")
+    private String userAddr;
+
+    @ApiModelProperty(value = "GPS定位")
+    private String gpsAddr;
+
+    @ApiModelProperty(value = "邮政编码")
+    private String postalCode;
+
+    @ApiModelProperty(value = "销售单位号")
+    private String saleDeptNo;
+
+    @ApiModelProperty(value = "销售单位")
+    private String saleDeptName;
+
+    @ApiModelProperty(value = "发票编号")
+    private String invoiceCode;
+
+    @ApiModelProperty(value = "购买日期")
+    private Date buyDate;
+
+    @ApiModelProperty(value = "安装日期")
+    private Date installDate;
+
+    @ApiModelProperty(value = "报修日期")
+    private Date reportDate;
+
+    @ApiModelProperty(value = "修复日期")
+    private Date repairDate;
+
+    @ApiModelProperty(value = "维修工id")
+    private String repairWorkerId;
+
+    @ApiModelProperty(value = "维修工名字")
+    private String repairWorkerName;
+
+    @ApiModelProperty(value = "维修工电话")
+    private String repairWorkerMobile;
+
+    @ApiModelProperty(value = "维修费用")
+    private BigDecimal repairFee;
+
+    @ApiModelProperty(value = "交通费")
+    private BigDecimal trafficFee;
+
+    @ApiModelProperty(value = "住宿费用")
+    private BigDecimal accommodationFee;
+
+    @ApiModelProperty(value = "吊装费用")
+    private BigDecimal liftingFee;
+
+    @ApiModelProperty(value = "其他费用")
+    private BigDecimal otherFee;
+
+    @ApiModelProperty(value = "总费用")
+    private BigDecimal totalFee;
+
+    @ApiModelProperty(value = "结算单批号")
+    private String settlementBatchNo;
+
+    @ApiModelProperty(value = "安装网点号")
+    private String installWebsitNo;
+
+    @ApiModelProperty(value = "安装网点名称")
+    private String installWebsitName;
+
+    @ApiModelProperty(value = "新维修单位号")
+    private String repairUnit;
+
+    @ApiModelProperty(value = "旧维修单位号")
+    private String oldRepairUnit;
+
+    @ApiModelProperty(value = "维修单位名")
+    private String repairName;
+
+    @ApiModelProperty(value = "故障现象")
+    private String faultPhenomenon;
+
+    @ApiModelProperty(value = "故障分析")
+    private String faultAnalysis;
+
+    @ApiModelProperty(value = "维修内容")
+    private String repairDetail;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "转结算时间")
+    private Date settlementTime;
+
+}

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

@@ -700,4 +700,15 @@ public interface CommonMapper {
      * @return
      */
     IPage<SettleDailyBankTransferRecordVO> transferList(Page page, @Param("ex") ZfireParamBean zfireParamBean);
+
+    /**
+     * 维修工单结算清单列表
+     * @param page
+     * @param zfireParamBean
+     * @param companyWechatIds
+     * @return
+     */
+    IPage<AllDailyImportSummaryItemVO> repairAllList(Page page,
+                                                  @Param("ex") ZfireParamBean zfireParamBean,
+                                                  @Param("companyWechatIds") List<String> companyWechatIds);
 }

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

@@ -116,6 +116,7 @@ public class BankAccountController {
         return ResponseHelper.success();
     }
 
+    @ZfireList
     @PostMapping("/transfer/list")
     @ApiOperation(value = "转帐记录列表")
     public ResponseHelper<IPage<SettleDailyBankTransferRecordVO>> transferList(

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

@@ -450,4 +450,27 @@ public class DailyImportSummaryController {
         return ResponseHelper.success(page);
     }
 
+    @ZfireList
+    @PostMapping("/repiar/all/list")
+    @ApiOperation(value = "维修工单结算清单-列表")
+    public ResponseHelper<IPage<AllDailyImportSummaryItemVO>> repairAllList(
+            @RequestBody ZfireParamBean zfireParamBean
+    ) {
+        IPage<AllDailyImportSummaryItemVO> page = dailyImportSummaryLogic.repairAllList(zfireParamBean);
+        return ResponseHelper.success(page, new TypeReference<AllDailyImportSummaryItemVO>() {
+        });
+    }
+
+    @PostMapping("/repiar/all/list/export")
+    @ApiOperation("维修工单结算清单-导出")
+    public void repairAllListExport(
+            @RequestBody ZfireParamBean zfireParamBean,
+            HttpServletRequest request,
+            HttpServletResponse response
+    ) throws Exception {
+        //2.查询要导出的内容
+        IPage<AllDailyImportSummaryItemVO> page = dailyImportSummaryLogic.repairAllList(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

@@ -1440,4 +1440,11 @@ public class DailyImportSummaryLogic {
         excelData.setTitles(Arrays.asList(titles));
         return excelData;
     }
+
+    public IPage<AllDailyImportSummaryItemVO> repairAllList(ZfireParamBean zfireParamBean) {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        FieldUtils.supplyParam(zfireParamBean, DailyImportSummaryItemVO.class, adminUser);
+
+        return commonMapper.repairAllList(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminUser.getCompanyWechatIds());
+    }
 }

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

@@ -1224,5 +1224,46 @@
 
     </select>
 
+    <select id="repairAllList" resultType="com.gree.mall.manager.bean.settle.repair.AllDailyImportSummaryItemVO">
+        SELECT
+            ${ex.selected}
+        FROM
+            settle_daily_import_summary_item  a
+            LEFT JOIN settle_daily_reduce_cost sdrc  on a.dispatch_order_no = sdrc.dispatch_order_no
+            LEFT 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'
+            ) aa on a.worker_number = aa.worker_number
+            LEFT JOIN settle_daily_bank_account b ON aa.id_card = b.idcard
+            LEFT JOIN settle_daily_issue_summary_record c ON c.id  = a.issue_salary_id
+        ${ex.query}
+        <if test="companyWechatIds != null and companyWechatIds.size > 0">
+            AND a.company_wechat_id IN
+            <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND a.websit_number IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY a.id
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time, a.id DESC
+        </if>
+        ${ex.orderBy}
+    </select>
+
 
 </mapper>