我的待办-槽液

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/entity/OemStatementEntity.java

@@ -225,4 +225,11 @@ public class OemStatementEntity extends BaseEntity {
     private Long approvalId;
     @Schema(description = "流程卡号")
     private String cardNo;
+
+    public static String getRosStatusName(String rosStatus){
+        if(rosStatus != null){
+            return rosStatusMap.get(Integer.parseInt(rosStatus));
+        }
+        return null;
+    }
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemSettlementApprovalExcel.java

@@ -0,0 +1,73 @@
+package org.springblade.desk.oem.pojo.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class OemSettlementApprovalExcel implements Serializable {
+
+    @ColumnWidth(20)
+    @ExcelProperty("审核编号")
+    private String approvalNo;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算总批数")
+    private Integer totalCount;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算总面积(dm²)")
+    private BigDecimal totalArea;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算总金额(元)")
+    private BigDecimal totalAmount;
+
+    @ColumnWidth(20)
+    @ExcelProperty("结算说明")
+    private String settlementMemo;
+
+    @ColumnWidth(20)
+    @ExcelProperty("审批状态")
+    private String approvalStatusName;
+
+    @ColumnWidth(20)
+    @ExcelProperty("提交人")
+    private String createUserName;
+
+    @ColumnWidth(20)
+    @ExcelProperty("提交时间")
+    private String submitDate;
+
+    @ColumnWidth(20)
+    @ExcelProperty("校对人1")
+    private String proofreader1Name;
+
+    @ColumnWidth(20)
+    @ExcelProperty("校对时间1")
+    private String proofreadTime1Str;
+
+    @ColumnWidth(20)
+    @ExcelProperty("校对人2")
+    private String proofreader2Name;
+
+    @ColumnWidth(20)
+    @ExcelProperty("校对时间2")
+    private String proofreadTime2Str;
+
+    @ColumnWidth(20)
+    @ExcelProperty("审核人")
+    private String approvalUserName;
+
+    @ColumnWidth(20)
+    @ExcelProperty("审核时间")
+    private String approvalDate;
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStandardProcessExcel.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 外协标准工序代码模板导入
@@ -44,4 +45,12 @@ public class OemStandardProcessExcel implements Serializable {
     @ColumnWidth(20)
     @ExcelProperty("标准工序代码")
     private String standardProcessCode;
+
+    @ColumnWidth(20)
+    @ExcelProperty("维护人")
+    private String updateUserName;
+
+    @ColumnWidth(20)
+    @ExcelProperty("维护时间")
+    private Date updateTime;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementCategoryExcel.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 外协结算大类模板导入
@@ -27,4 +28,12 @@ public class OemStatementCategoryExcel implements Serializable {
     @ColumnWidth(20)
     @ExcelProperty("结算大类")
     private String statementCategory;
+
+    @ColumnWidth(20)
+    @ExcelProperty("维护人")
+    private String updateUserName;
+
+    @ColumnWidth(20)
+    @ExcelProperty("维护时间")
+    private Date updateTime;
 }

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/OemStatementExcel.java

@@ -9,6 +9,8 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -44,16 +46,20 @@ public class OemStatementExcel implements Serializable {
     private String batchNo;
 
     @ColumnWidth(20)
-    @ExcelProperty("生产标识")
+    @ExcelProperty("质量等级")
     private String productIdent;
 
+    @ColumnWidth(20)
+    @ExcelProperty("流程卡号")
+    private String cardNo;
+
     @ColumnWidth(20)
     @ExcelProperty("工序")
     private String psName;
 
     @ColumnWidth(20)
-    @ExcelProperty("工艺能力")
+    @ExcelProperty("结算大类")
-    private String caName;
+    private String statementCategory;
 
     @ColumnWidth(20)
     @ExcelProperty("厂商代码")
@@ -96,7 +102,7 @@ public class OemStatementExcel implements Serializable {
     private String tsdNum;
 
     @ColumnWidth(20)
-    @ExcelProperty("涂箭个数")
+    @ExcelProperty("涂箭头个数")
     private String tjtNum;
 
     @ColumnWidth(20)
@@ -111,30 +117,6 @@ public class OemStatementExcel implements Serializable {
     @ExcelProperty("镀后入库时间")
     private String putStoreDate;
 
-    @ColumnWidth(20)
-    @ExcelProperty("报价单号")
-    private String quotation;
-
-    @ColumnWidth(20)
-    @ExcelProperty("计量单位")
-    private String unit;
-
-    @ColumnWidth(20)
-    @ExcelProperty("结算单价")
-    private BigDecimal unitPrice;
-
-    @ColumnWidth(20)
-    @ExcelProperty("结算金额")
-    private BigDecimal totalPrice;
-
-    @ColumnWidth(20)
-    @ExcelProperty("异常原因")
-    private String memo;
-
-    @ColumnWidth(20)
-    @ExcelProperty("结算时间")
-    private String settleDate;
-
     @ColumnWidth(20)
     @ExcelProperty("结算状态")
     private String rosStatusName;

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/excel/PlatingTypeRulesExcel.java

@@ -29,17 +29,33 @@ public class PlatingTypeRulesExcel implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 镀种-描述规则
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("镀种-描述规则")
+    private String quotationPlat;
+
     /**
-     * 订单镀种
+     * 镀种-订单
      */
     @ColumnWidth(20)
-    @ExcelProperty("订单镀种")
+    @ExcelProperty("镀种-订单")
     private String orderPlat;
+
     /**
-     * 报价单镀种
+     * 维护人
      */
     @ColumnWidth(20)
-    @ExcelProperty("报价单镀种")
+    @ExcelProperty("维护人")
-    private String quotationPlat;
+    private String updateUserName;
+
+    /**
+     * 维护时间
+     */
+    @ColumnWidth(20)
+    @ExcelProperty("维护时间")
+    private Date updateTime;
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemSettlementApprovalController.java

@@ -4,12 +4,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.desk.oem.pojo.entity.OemStatementEntity;
+import org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel;
+import org.springblade.desk.oem.pojo.excel.OemStatementExcel;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalQuery;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalRequest;
 import org.springblade.desk.oem.pojo.request.StatementQuery;
@@ -45,6 +51,17 @@ public class OemSettlementApprovalController extends BladeController {
         return R.data(oemSettlementApprovalService.selectApprovalPage(page, queryEntity));
     }
 
+    /**
+     * 导出数据
+     */
+    @GetMapping("/export-excel")
+    @ApiOperationSupport(order = 13)
+    @Operation(summary = "导出数据", description = "传入settlementApprovalQuery")
+    public void exportApproval(SettlementApprovalQuery settlementApprovalQuery, Query query, HttpServletResponse response) {
+        List<OemSettlementApprovalExcel> oemSettlementApprovalExcels = oemSettlementApprovalService.exportApproval(settlementApprovalQuery);
+        ExcelUtil.export(response, "外协结算单数据" + DateUtil.time(), "外协结算单数据表", oemSettlementApprovalExcels, OemSettlementApprovalExcel.class);
+    }
+
     /**
      * 审批详情
      */
@@ -61,8 +78,7 @@ public class OemSettlementApprovalController extends BladeController {
     @GetMapping("/detailList")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "审批明细列表", description = "查询审批明细，支持按厂家或厂家+结算大类分组")
-    public R<List<OemSettlementApprovalDetailVO>> detailList(@RequestParam Long approvalId,
+    public R<List<OemSettlementApprovalDetailVO>> detailList(@RequestParam Long approvalId, @RequestParam(required = false, defaultValue = "false") Boolean groupByOc) {
-                                                              @RequestParam(required = false, defaultValue = "false") Boolean groupByOc) {
         // groupByOc: true-按厂家，false-按厂家+结算大类（默认）
         return R.data(oemSettlementApprovalService.getApprovalDetailList(approvalId, groupByOc));
     }
@@ -76,6 +92,6 @@ public class OemSettlementApprovalController extends BladeController {
     public R submit(@Valid @RequestBody SettlementApprovalRequest request) {
         return oemSettlementApprovalService.submitApproval(request);
     }
-    
+
-    
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStandardProcessController.java

@@ -3,9 +3,11 @@ package org.springblade.desk.oem.controller;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -13,12 +15,15 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.dashboard.service.IBsProcessSetService;
 import org.springblade.desk.oem.pojo.entity.OemStandardProcessEntity;
+import org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel;
 import org.springblade.desk.oem.pojo.excel.OemStandardProcessExcel;
+import org.springblade.desk.oem.pojo.request.SettlementApprovalQuery;
 import org.springblade.desk.oem.pojo.vo.OemStandardProcessVO;
 import org.springblade.desk.oem.service.IOemStandardProcessService;
 import org.springframework.beans.BeanUtils;
@@ -58,6 +63,18 @@ public class OemStandardProcessController {
         return R.data(pages);
     }
 
+    /**
+     * 导出数据
+     */
+    @GetMapping("/export-excel")
+    @ApiOperationSupport(order = 13)
+    @Operation(summary = "导出数据", description = "传入oemStandardProcess")
+    public void exportApproval(OemStandardProcessVO oemStandardProcess, Query query, HttpServletResponse response) {
+        List<OemStandardProcessExcel> oemStandardProcessExcels = oemStandardProcessService.exportOemStandardProcess(oemStandardProcess);
+        ExcelUtil.export(response, "标准工序代码" + DateUtil.time(), "标准工序代码", oemStandardProcessExcels, OemStandardProcessExcel.class);
+    }
+
+
     /**
      * 外协标准工序代码 新增或修改
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementCategoryController.java

@@ -3,9 +3,11 @@ package org.springblade.desk.oem.controller;
 import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
@@ -13,10 +15,13 @@ import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.oem.pojo.entity.OemStatementCategoryEntity;
+import org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel;
 import org.springblade.desk.oem.pojo.excel.OemStatementCategoryExcel;
+import org.springblade.desk.oem.pojo.request.SettlementApprovalQuery;
 import org.springblade.desk.oem.pojo.vo.OemStatementCategoryVO;
 import org.springblade.desk.oem.service.IOemStatementCategoryService;
 import org.springframework.beans.BeanUtils;
@@ -56,6 +61,18 @@ public class OemStatementCategoryController {
         return R.data(pages);
     }
 
+
+    /**
+     * 导出数据
+     */
+    @GetMapping("/export-excel")
+    @ApiOperationSupport(order = 13)
+    @Operation(summary = "导出数据", description = "传入settlementApprovalQuery")
+    public void exportApproval(OemStatementCategoryVO oemStatementCategory, Query query, HttpServletResponse response) {
+        List<OemStatementCategoryExcel> oemStatementCategoryExcels = oemStatementCategoryService.exportOemStatementCategory(oemStatementCategory);
+        ExcelUtil.export(response, "结算大类" + DateUtil.time(), "结算大类", oemStatementCategoryExcels, OemStatementCategoryExcel.class);
+    }
+
     /**
      * 外协结算大类 新增或修改
      *
@@ -141,7 +158,7 @@ public class OemStatementCategoryController {
                 int rowNum = i + 2;
                 String name = importList.get(i).getStatementCategory();
                 if (dbExistSet.contains(name)) {
-                    return R.fail(rowNum + "行错误，"+ name + "已存在不可重复导入");
+                    return R.fail(rowNum + "行错误，" + name + "已存在不可重复导入");
                 }
             }
         }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/OemStatementController.java

@@ -174,39 +174,17 @@ public class OemStatementController extends BladeController {
     /**
      * 导出数据
      */
-    @GetMapping("/export-mesOemStatement")
+    @GetMapping("/export-excel")
     @ApiOperationSupport(order = 13)
     @Operation(summary = "导出数据", description = "传入mesOemStatement")
-    public void exportOemStatement(StatementQuery mesOemStatement, Query query, BladeUser bladeUser, HttpServletResponse response) {
+    public void exportOemStatement(StatementQuery mesOemStatement, Query query, HttpServletResponse response) {
-        query.setSize(9999);
+        List<OemStatementExcel> oemStatementExcels = mesOemStatementService.exportOemStatement(mesOemStatement);
-        IPage<StatementVO> pages = mesOemStatementService.selectOemStatementPage(Condition.getPage(query), mesOemStatement);
+        for (OemStatementExcel excel : oemStatementExcels) {
-        List<StatementVO> list = pages.getRecords();
+            excel.setRosStatusName(OemStatementEntity.getRosStatusName(excel.getRosStatusName()));
-        List<OemStatementExcel> excels = new ArrayList<>();
-        for (StatementVO statementVO : list) {
-            OemStatementExcel excel = new OemStatementExcel();
-            BeanUtils.copyProperties(statementVO, excel);
-            excels.add(excel);
         }
-        ExcelUtil.export(response, "外协结算单数据" + DateUtil.time(), "外协结算单数据表", excels, OemStatementExcel.class);
+        ExcelUtil.export(response, "外协结算单数据" + DateUtil.time(), "外协结算单数据表", oemStatementExcels, OemStatementExcel.class);
     }
 
-//    /**
-//     * 外协预结算导出数据
-//     */
-//    @PostMapping("/export-preSettlement")
-//    @ApiOperationSupport(order = 14)
-//    @Operation(summary = "外协预结算-导出", description = "传入mesOemStatement")
-//    public void exportPreSettlement(@Valid @RequestBody OemSettleAccountsSave oemSettleAccountsSave, BladeUser bladeUser, HttpServletResponse response) {
-//        List<StatementVO> list = mesOemStatementService.preSettlement(oemSettleAccountsSave.getStatementList(), oemSettleAccountsSave.getPrice());
-//        List<OemStatementExcel> excels = new ArrayList<>();
-//        for (StatementVO statementVO : list) {
-//            OemStatementExcel excel = new OemStatementExcel();
-//            BeanUtils.copyProperties(statementVO, excel);
-//            excels.add(excel);
-//        }
-//        ExcelUtil.export(response, "外协预结算单数据" + DateUtil.time(), "外协预结算单数据表", excels, OemStatementExcel.class);
-//    }
-
     /**
      * 外协手动结算
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/controller/PlatingTypeRulesController.java

@@ -17,8 +17,10 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.util.ExcelExtUtil;
 import org.springblade.desk.oem.pojo.excel.OemProcessImport;
+import org.springblade.desk.oem.pojo.excel.OemStandardProcessExcel;
 import org.springblade.desk.oem.pojo.excel.PlatingTypeRulesExcel;
 import org.springblade.desk.oem.pojo.excel.PlatingTypeRulesImport;
+import org.springblade.desk.oem.pojo.vo.OemStandardProcessVO;
 import org.springframework.core.io.Resource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -76,6 +78,14 @@ public class PlatingTypeRulesController extends BladeController {
         return R.data(pages);
     }
 
+    @GetMapping("/export-excel")
+    @ApiOperationSupport(order = 13)
+    @Operation(summary = "导出数据", description = "传入oemStandardProcess")
+    public void exportApproval(PlatingTypeRulesVO mesPlatingTypeRules, Query query, HttpServletResponse response) {
+        List<PlatingTypeRulesExcel> platingTypeRulesExcels = mesPlatingTypeRulesService.exportPlatingTypeRules(mesPlatingTypeRules);
+        ExcelUtil.export(response, "结算规则" + DateUtil.time(), "结算规则", platingTypeRulesExcels, PlatingTypeRulesExcel.class);
+    }
+
     /**
      * 外协镀种规则 新增
      */
@@ -125,24 +135,6 @@ public class PlatingTypeRulesController extends BladeController {
         return R.status(mesPlatingTypeRulesService.deleteLogic(Func.toLongList(ids)));
     }
 
-
-    /**
-     * 导出数据
-     */
-    @IsAdmin
-    @GetMapping("/export-mesPlatingTypeRules")
-    @ApiOperationSupport(order = 9)
-    @Operation(summary = "导出数据", description = "传入mesPlatingTypeRules")
-    public void exportPlatingTypeRules(@Parameter(hidden = true) @RequestParam Map<String, Object> mesPlatingTypeRules, BladeUser bladeUser, HttpServletResponse response) {
-        QueryWrapper<PlatingTypeRulesEntity> queryWrapper = Condition.getQueryWrapper(mesPlatingTypeRules, PlatingTypeRulesEntity.class);
-        //if (!AuthUtil.isAdministrator()) {
-        //	queryWrapper.lambda().eq(PlatingTypeRules::getTenantId, bladeUser.getTenantId());
-        //}
-        //queryWrapper.lambda().eq(PlatingTypeRulesEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-        List<PlatingTypeRulesExcel> list = mesPlatingTypeRulesService.exportPlatingTypeRules(queryWrapper);
-        ExcelUtil.export(response, "外协镀种规则数据" + DateUtil.time(), "外协镀种规则数据表", list, PlatingTypeRulesExcel.class);
-    }
-
     /**
      * 下载Excel模板
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.desk.oem.pojo.entity.OemSettlementApprovalEntity;
+import org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalQuery;
 import org.springblade.desk.oem.pojo.vo.OemSettlementApprovalVO;
 
@@ -25,4 +26,12 @@ public interface OemSettlementApprovalMapper extends BaseMapper<OemSettlementApp
      * @return List<OemSettlementApprovalVO>
      */
     List<OemSettlementApprovalVO> selectApprovalPage(IPage page, @Param("query") SettlementApprovalQuery query);
+
+    /**
+     * 自定义导出查询
+     *
+     * @param query
+     * @return
+     */
+    List<OemSettlementApprovalExcel> exportApproval(SettlementApprovalQuery query);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemSettlementApprovalMapper.xml

@@ -76,4 +76,77 @@
         ORDER BY a.SUBMIT_TIME DESC
     </select>
 
+    <select id="exportApproval" resultType="org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel">
+        SELECT
+        a.ID,
+        a.TENANT_ID,
+        a.CREATE_USER,
+        a.CREATE_TIME,
+        a.CREATE_DEPT,
+        a.UPDATE_USER,
+        a.UPDATE_TIME,
+        a.STATUS,
+        a.IS_DELETED,
+        a.APPROVAL_NO,
+        a.TOTAL_COUNT,
+        a.TOTAL_AREA,
+        a.TOTAL_AMOUNT,
+        a.SETTLEMENT_MEMO,
+        a.APPROVAL_STATUS,
+        CASE a.APPROVAL_STATUS
+        WHEN 1 THEN '待审批'
+        WHEN 2 THEN '审批中'
+        WHEN 3 THEN '审批通过'
+        WHEN 4 THEN '审批不通过'
+        ELSE '未知'
+        END AS APPROVAL_STATUS_NAME,
+        a.SUBMIT_TIME,
+        to_char(a.SUBMIT_TIME, 'yyyy-MM-dd') as SUBMIT_DATE,
+        a.APPROVAL_TIME,
+        to_char(a.APPROVAL_TIME, 'yyyy-MM-dd') as APPROVAL_DATE,
+        a.APPROVAL_USER_ID,
+        a.APPROVAL_MEMO,
+        a.PROOFREADER1_ID,
+        a.PROOFREADER1_NAME,
+        a.PROOFREAD_TIME1,
+        to_char(a.PROOFREAD_TIME1, 'yyyy-MM-dd HH24:mi:ss') as PROOFREAD_TIME1_STR,
+        a.PROOFREADER2_ID,
+        a.PROOFREADER2_NAME,
+        a.PROOFREAD_TIME2,
+        to_char(a.PROOFREAD_TIME2, 'yyyy-MM-dd HH24:mi:ss') as PROOFREAD_TIME2_STR,
+        u.NAME AS CREATE_USER_NAME,
+        a.APPROVAL_USER_NAME
+        FROM MES_OEM_SETTLEMENT_APPROVAL a
+        LEFT JOIN BLADE_USER u ON a.CREATE_USER = u.ID
+        <where>
+            a.IS_DELETED = 0
+            <if test="approvalNo != null and approvalNo != ''">
+                AND a.APPROVAL_NO LIKE CONCAT('%', CONCAT(#{approvalNo}, '%'))
+            </if>
+            <if test="approvalStatus != null">
+                AND a.APPROVAL_STATUS = #{approvalStatus}
+            </if>
+            <if test="approvalStatusList != null and approvalStatusList != ''">
+                AND a.APPROVAL_STATUS IN
+                <foreach collection="approvalStatusList.split(',')" item="approval"
+                         open="(" separator="," close=")" index="index">
+                    #{approval}
+                </foreach>
+            </if>
+            <if test="submitTimeStart != null">
+                AND a.SUBMIT_TIME &gt;= #{submitTimeStart}
+            </if>
+            <if test="submitTimeEnd != null">
+                AND a.SUBMIT_TIME &lt; #{submitTimeEnd} + 1
+            </if>
+            <if test="proofreader1Id != null">
+                AND a.PROOFREADER1_ID = #{proofreader1Id}
+            </if>
+            <if test="proofreader2Id != null">
+                AND a.PROOFREADER2_ID = #{proofreader2Id}
+            </if>
+        </where>
+        ORDER BY a.SUBMIT_TIME DESC
+    </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStandardProcessMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.desk.efficiency.pojo.vo.BsEfficiencyTaskVO;
 import org.springblade.desk.oem.pojo.entity.OemStandardProcessEntity;
+import org.springblade.desk.oem.pojo.excel.OemStandardProcessExcel;
 import org.springblade.desk.oem.pojo.vo.OemStandardProcessVO;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface OemStandardProcessMapper extends BaseMapper<OemStandardProcessE
      * @return List<BsEfficiencyTaskVO>
      */
     List<OemStandardProcessVO> selectOemStandardProcessPage(IPage page, OemStandardProcessVO oemStandardProcess);
+
+    List<OemStandardProcessExcel> exportOemStandardProcess(OemStandardProcessVO oemStandardProcess);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStandardProcessMapper.xml

@@ -17,8 +17,17 @@
         <result column="UPDATE_TIME" property="updateTime"/>
         <result column="STATUS" property="status"/>
         <result column="IS_DELETED" property="isDeleted"/>
+        <result column="UPDATE_USER_NAME" property="updateUserName"/>
+    </resultMap>
+
+    <resultMap id="mesOemStandardProcessExcelResultMap" type="org.springblade.desk.oem.pojo.excel.OemStandardProcessExcel">
         <result column="PROCESS_NAME" property="processName"/>
+        <result column="PLATE" property="plate"/>
+        <result column="PLATE_THICKNESS" property="plateThickness"/>
+        <result column="PART_NAME" property="partName"/>
+        <result column="STANDARD_PROCESS_CODE" property="standardProcessCode"/>
         <result column="UPDATE_USER_NAME" property="updateUserName"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
     </resultMap>
 
     <select id="selectOemStandardProcessPage" resultMap="mesOemStandardProcessVOResultMap">
@@ -58,4 +67,41 @@
         </choose>
     </select>
 
+    <select id="exportOemStandardProcess" resultMap="mesOemStandardProcessExcelResultMap">
+        SELECT * FROM (
+        SELECT t.*,
+        bu.REAL_NAME as UPDATE_USER_NAME
+        FROM MES_OEM_STANDARD_PROCESS t
+        LEFT JOIN BLADE_USER bu ON t.update_user = bu.id
+        <where>
+            t.IS_DELETED = 0
+            <if test="processName != null">
+                AND t.PROCESS_NAME like concat(concat('%', #{processName}),'%')
+            </if>
+            <if test="plate != null">
+                AND t.PLATE like concat(concat('%', #{plate}),'%')
+            </if>
+            <if test="plateThickness != null">
+                AND t.PLATE_THICKNESS like concat(concat('%', #{plateThickness}),'%')
+            </if>
+            <if test="partName != null">
+                AND t.PART_NAME like concat(concat('%', #{partName}),'%')
+            </if>
+            <if test="standardProcessCode != null">
+                AND t.STANDARD_PROCESS_CODE like concat(concat('%', #{standardProcessCode}),'%')
+            </if>
+        </where>
+        )
+        <choose>
+            <when test="orderByField != null and orderByField != ''">
+                ORDER BY ${orderByField}
+                <if test="isAsc">ASC</if>
+                <if test="!isAsc">DESC</if>
+            </when>
+            <otherwise>
+                ORDER BY CREATE_TIME DESC
+            </otherwise>
+        </choose>
+    </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementCategoryMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.desk.efficiency.pojo.vo.BsEfficiencyTaskVO;
 import org.springblade.desk.oem.pojo.entity.OemStatementCategoryEntity;
+import org.springblade.desk.oem.pojo.excel.OemStatementCategoryExcel;
 import org.springblade.desk.oem.pojo.vo.OemStatementCategoryVO;
 
 import java.util.List;
@@ -24,4 +25,6 @@ public interface OemStatementCategoryMapper extends BaseMapper<OemStatementCateg
      * @return
      */
     List<OemStatementCategoryVO> selectOemStatementCategoryPage(IPage page, OemStatementCategoryVO oemStatementCategory);
+
+    List<OemStatementCategoryExcel> exportOemStatementCategory(OemStatementCategoryVO oemStatementCategory);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementCategoryMapper.xml

@@ -16,6 +16,11 @@
         <result column="UPDATE_USER_NAME" property="updateUserName"/>
     </resultMap>
 
+    <resultMap id="oemStatementCategoryExcelResultMap" type="org.springblade.desk.oem.pojo.excel.OemStatementCategoryExcel">
+
+
+    </resultMap>
+
     <select id="selectOemStatementCategoryPage" resultMap="mesOemStatementCategoryVOResultMap">
         SELECT t.*,bu.REAL_NAME as UPDATE_USER_NAME FROM MES_OEM_STATEMENT_CATEGORY t
         LEFT JOIN BLADE_USER bu ON t.update_user = bu.id
@@ -25,4 +30,13 @@
         ORDER BY t.UPDATE_TIME DESC
     </select>
 
+    <select id="exportOemStatementCategory" resultMap="oemStatementCategoryExcelResultMap">
+        SELECT t.*,bu.REAL_NAME as UPDATE_USER_NAME FROM MES_OEM_STATEMENT_CATEGORY t
+        LEFT JOIN BLADE_USER bu ON t.update_user = bu.id
+        <where>
+            t.IS_DELETED = 0
+        </where>
+        ORDER BY t.UPDATE_TIME DESC
+    </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.java

@@ -32,10 +32,10 @@ public interface OemStatementMapper extends BaseMapper<OemStatementEntity> {
     /**
      * 获取导出数据
      *
-     * @param queryWrapper 查询条件
+     * @param statementQuery
-     * @return List<OemStatementExcel>
+     * @return
      */
-    List<OemStatementExcel> exportOemStatement(@Param("ew") Wrapper<OemStatementEntity> queryWrapper);
+    List<OemStatementExcel> exportOemStatement(StatementQuery statementQuery);
 
     /**
      * 获取未结算订单

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml

@@ -23,7 +23,7 @@
         <result column="MEMO" property="memo"/>
     </resultMap>
 
-    <resultMap id="StatementVOResultMap" type="org.springblade.desk.oem.pojo.vo.StatementVO">
+    <resultMap id="statementVOResultMap" type="org.springblade.desk.oem.pojo.vo.StatementVO">
         <!-- 基础字段映射 -->
         <result column="ID" property="id"/>
         <result column="TENANT_ID" property="tenantId"/>
@@ -102,14 +102,37 @@
         <result column="STATEMENT_CATEGORY_ID" property="statementCategoryId"/>
         <result column="STATEMENT_CATEGORY" property="statementCategory"/>
         <result column="CARD_NO" property="cardNo"/>
+        <result column="YP_CODE" property="ypCode"/>
     </resultMap>
 
-    <select id="exportOemStatement" resultType="org.springblade.desk.oem.pojo.excel.OemStatementExcel">
+    <resultMap id="statementExcelResultMap" type="org.springblade.desk.oem.pojo.excel.OemStatementExcel">
-        SELECT *
+        <result column="YP_CODE" property="ypCode"/>
-        FROM MES_OEM_STATEMENT ${ew.customSqlSegment}
+        <result column="WO_CODE" property="woCode"/>
-    </select>
+        <result column="PART_CODE" property="partCode"/>
+        <result column="PART_NAME" property="partName"/>
+        <result column="BATCH_NO" property="batchNo"/>
+        <result column="PRODUCT_IDENT" property="productIdent"/>
+        <result column="CARD_NO" property="cardNo"/>
+        <result column="PS_NAME" property="psName"/>
+        <result column="STATEMENT_CATEGORY" property="statementCategory"/>
+        <result column="OC_CODE" property="ocCode"/>
+        <result column="OC_NAME" property="ocName"/>
+        <result column="MAKE_QTY" property="makeQty"/>
+        <result column="YP_AREA" property="ypArea"/>
+        <result column="TOTAL_AREA" property="totalArea"/>
+        <result column="PLATE" property="plate"/>
+        <result column="ROS_THICKNESS" property="rosThickness"/>
+        <result column="STANDARD_PROCESS_CODE" property="standardProcessCode"/>
+        <result column="TSB_NUM" property="tsbNum"/>
+        <result column="TSD_NUM" property="tsdNum"/>
+        <result column="TJT_NUM" property="tjtNum"/>
+        <result column="PLAN_DEPTCODE" property="planDeptcode"/>
+        <result column="USE_DEPT_CODE" property="useDeptCode"/>
+        <result column="PUT_STORE_DATE" property="putStoreDate"/>
+        <result column="ROS_STATUS_NAME" property="rosStatusName"/>
+    </resultMap>
 
-    <select id="selectUnsettled" resultMap="StatementVOResultMap">
+    <select id="selectUnsettled" resultMap="statementVOResultMap">
         SELECT
             a.id AS WP_ID,
             a.wo_id,
@@ -195,7 +218,7 @@
         AND os.ROS_STATUS = 4
     </select>
 
-    <select id="selectOemStatementPage" resultMap="StatementVOResultMap">
+    <select id="selectOemStatementPage" resultMap="statementVOResultMap">
         SELECT ID,
             YP_CODE,
             WO_CODE,
@@ -327,8 +350,142 @@
 
     </select>
 
+
+    <select id="exportOemStatement" resultMap="statementExcelResultMap">
+        SELECT ID,
+        YP_CODE,
+        WO_CODE,
+        PART_ID,
+        PART_CODE,
+        PART_NAME,
+        BATCH_NO,
+        PRODUCT_IDENT,
+        PPS_ID,
+        PS_CODE,
+        PS_NAME,
+        CA_ID,
+        CA_NAME,
+        OC_ID,
+        OC_CODE,
+        OC_NAME,
+        MAKE_QTY,
+        YP_AREA,
+        MAKE_QTY * YP_AREA as TOTAL_AREA,
+        PLATE,
+        ROS_THICKNESS,
+        STANDARD_PROCESS_CODE,
+        TSB_NUM,
+        TSD_NUM,
+        TJT_NUM,
+        PLAN_DEPTCODE,
+        USE_DEPT_CODE,
+        PUT_STORE_TIME,
+        to_char(PUT_STORE_TIME, 'yyyy-MM-dd') as PUT_STORE_DATE,
+        QUOTATION,
+        UNIT,
+        UNIT_PRICE,
+        TOTAL_PRICE,
+        CASE WHEN ROS_STATUS = 3 THEN MEMO ELSE NULL END as MEMO,
+        to_char(SETTLE_TIME, 'yyyy-MM-dd') as SETTLE_DATE,
+        ROS_STATUS,
+        to_char(APPROVAL_TIME, 'yyyy-MM-dd') as APPROVAL_DATE,
+        to_char(PUSH_TIME, 'yyyy-MM-dd') as PUSH_DATE,
+        STATEMENT_NO,
+        STATEMENT_CATEGORY_ID,
+        STATEMENT_CATEGORY,
+        CARD_NO,
+        ROS_STATUS as ROS_STATUS_NAME
+        FROM MES_OEM_STATEMENT
+        <where>
+            IS_DELETED = 0
+            <if test="rosStatusList != null and rosStatusList != ''">
+                AND ROS_STATUS IN
+                <foreach collection="rosStatusList.split(',')" item="status"
+                         open="(" separator="," close=")" index="index">
+                    #{status}
+                </foreach>
+            </if>
+            <if test="memo != null and memo != ''">
+                AND MEMO IN
+                <foreach collection="memo.split(';')" item="memo" open="(" separator="," close=")" index="index">
+                    #{memo}
+                </foreach>
+            </if>
+            <if test="postPlatingStorageTimeStart != null">
+                AND PUT_STORE_TIME &gt;= #{postPlatingStorageTimeStart}
+            </if>
+            <if test="postPlatingStorageTimeEnd != null">
+                AND PUT_STORE_TIME &lt; #{postPlatingStorageTimeEnd} + 1
+            </if>
+            <if test="productIdent != null and productIdent != ''">
+                AND PRODUCT_IDENT LIKE CONCAT('%', CONCAT(#{productIdent}, '%'))
+            </if>
+            <if test="manual != null and manual != ''">
+                AND manual = #{manual}
+            </if>
+            <if test="caId != null and caId != ''">
+                AND CA_ID = #{caId}
+            </if>
+            <if test="ppsId != null and ppsId != ''">
+                AND PPS_ID = #{ppsId}
+            </if>
+            <if test="woCode != null and woCode != ''">
+                AND WO_CODE LIKE CONCAT('%', CONCAT(#{woCode}, '%'))
+            </if>
+            <if test="partCode != null and partCode != ''">
+                AND PART_CODE LIKE CONCAT('%', CONCAT(#{partCode}, '%'))
+            </if>
+            <if test="ypCode != null and ypCode != ''">
+                AND YP_CODE LIKE CONCAT('%', CONCAT(#{ypCode}, '%'))
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND BATCH_NO LIKE CONCAT('%', CONCAT(#{batchNo}, '%'))
+            </if>
+            <if test="plate != null and plate != ''">
+                AND PLATE LIKE CONCAT('%', CONCAT(#{plate}, '%'))
+            </if>
+            <if test="productIdent != null and productIdent != ''">
+                AND PRODUCT_IDENT LIKE CONCAT('%', CONCAT(#{productIdent}, '%'))
+            </if>
+            <if test="cardNo != null and cardNo != ''">
+                AND CARD_NO LIKE CONCAT('%', CONCAT(#{cardNo}, '%'))
+            </if>
+            <if test="statementCategoryId != null and statementCategoryId != ''">
+                AND STATEMENT_CATEGORY_ID = #{statementCategoryId}
+            </if>
+            <if test="statementCategory != null and statementCategory != ''">
+                AND STATEMENT_CATEGORY LIKE CONCAT('%', CONCAT(#{statementCategory}, '%'))
+            </if>
+            <if test="ocIds != null and ocIds != ''">
+                AND OC_ID IN
+                <foreach collection="ocIds.split(',')" item="id"
+                         open="(" separator="," close=")" index="index">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="psCode != null and psCode != ''">
+                AND ps_code IN
+                <foreach collection="psCode.split(',')" item="id"
+                         open="(" separator="," close=")" index="index">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+        <choose>
+            <when test="orderByField != null and orderByField != ''">
+                ORDER BY ${orderByField}
+                <if test="isAsc">ASC</if>
+                <if test="!isAsc">DESC</if>
+            </when>
+            <otherwise>
+                order by PUT_STORE_TIME asc
+            </otherwise>
+        </choose>
+
+    </select>
+
     <!-- 查询结算异常数据（带关联字段） -->
-    <select id="selectErrorStatements" resultMap="StatementVOResultMap">
+    <select id="selectErrorStatements" resultMap="statementVOResultMap">
         SELECT
             h.ID,
             h.pps_id AS ps_id,
@@ -347,7 +504,7 @@
     </select>
 
     <!-- 查询订单数据错误的结算异常数据 -->
-    <select id="selectOrderDataErrorStatements" resultMap="StatementVOResultMap">
+    <select id="selectOrderDataErrorStatements" resultMap="statementVOResultMap">
         SELECT
             h.ID,
             h.WP_ID,
@@ -380,7 +537,7 @@
           AND h.MEMO LIKE '%订单数据错误%'
     </select>
 
-    <select id="selectUnsettledByMjMes" resultMap="StatementVOResultMap">
+    <select id="selectUnsettledByMjMes" resultMap="statementVOResultMap">
         SELECT
         a.wp_id,
         a.wo_id,

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/PlatingTypeRulesMapper.java

@@ -31,9 +31,9 @@ public interface PlatingTypeRulesMapper extends BaseMapper<PlatingTypeRulesEntit
     /**
      * 获取导出数据
      *
-     * @param queryWrapper 查询条件
+     * @param mesPlatingTypeRules 查询条件
      * @return List<PlatingTypeRulesExcel>
      */
-    List<PlatingTypeRulesExcel> exportPlatingTypeRules(@Param("ew") Wrapper<PlatingTypeRulesEntity> queryWrapper);
+    List<PlatingTypeRulesExcel> exportPlatingTypeRules(PlatingTypeRulesVO mesPlatingTypeRules);
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/PlatingTypeRulesMapper.xml

@@ -26,8 +26,10 @@
 
 
     <select id="exportPlatingTypeRules" resultType="org.springblade.desk.oem.pojo.excel.PlatingTypeRulesExcel">
-        SELECT *
+        SELECT a.*, bu.REAL_NAME as updateUserName
-        FROM MES_PLATING_TYPE_RULES ${ew.customSqlSegment}
+        FROM MES_PLATING_TYPE_RULES a
+        LEFT JOIN BLADE_USER bu ON a.UPDATE_USER = bu.id
+        where a.is_deleted = 0
     </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IOemSettlementApprovalService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.oem.pojo.entity.OemSettlementApprovalEntity;
+import org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalQuery;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalRequest;
 import org.springblade.desk.oem.pojo.vo.OemSettlementApprovalDetailVO;
@@ -28,6 +29,14 @@ public interface IOemSettlementApprovalService extends BaseService<OemSettlement
      */
     IPage<OemSettlementApprovalVO> selectApprovalPage(IPage<OemSettlementApprovalVO> page, SettlementApprovalQuery query);
 
+    /**
+     * 自定义导出查询
+     *
+     * @param query
+     * @return
+     */
+    List<OemSettlementApprovalExcel> exportApproval(SettlementApprovalQuery query);
+
     /**
      * 根据ID查询审批详情
      *

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IOemStandardProcessService.java

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.efficiency.pojo.vo.BsEfficiencyTaskParamVO;
 import org.springblade.desk.oem.pojo.entity.OemStandardProcessEntity;
+import org.springblade.desk.oem.pojo.excel.OemStandardProcessExcel;
 import org.springblade.desk.oem.pojo.vo.OemStandardProcessVO;
 
+import java.util.List;
+
 /**
  * 外协标准工序代码 服务类
  *
@@ -17,9 +20,17 @@ public interface IOemStandardProcessService extends BaseService<OemStandardProce
     /**
      * 自定义分页
      *
-     * @param page 分页参数
+     * @param page               分页参数
      * @param oemStandardProcess 查询参数
      * @return IPage<OemStandardProcessVO>
      */
     IPage<OemStandardProcessVO> selectOemStandardProcessPage(IPage<OemStandardProcessVO> page, OemStandardProcessVO oemStandardProcess);
+
+    /**
+     * 自定义导出查询
+     *
+     * @param oemStandardProcess
+     * @return
+     */
+    List<OemStandardProcessExcel> exportOemStandardProcess(OemStandardProcessVO oemStandardProcess);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IOemStatementCategoryService.java

@@ -3,8 +3,11 @@ package org.springblade.desk.oem.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.desk.oem.pojo.entity.OemStatementCategoryEntity;
+import org.springblade.desk.oem.pojo.excel.OemStatementCategoryExcel;
 import org.springblade.desk.oem.pojo.vo.OemStatementCategoryVO;
 
+import java.util.List;
+
 /**
  * 外协结算大类 服务类
  *
@@ -22,4 +25,5 @@ public interface IOemStatementCategoryService extends BaseService<OemStatementCa
      */
     IPage<OemStatementCategoryVO> selectOemStatementCategoryPage(IPage<OemStatementCategoryVO> page, OemStatementCategoryVO oemStatementCategory);
 
+    List<OemStatementCategoryExcel> exportOemStatementCategory(OemStatementCategoryVO oemStatementCategory);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IOemStatementService.java

@@ -32,14 +32,8 @@ public interface IOemStatementService extends BaseService<OemStatementEntity> {
      */
     IPage<StatementVO> selectOemStatementPage(IPage<StatementVO> page, StatementQuery mesOemStatement);
 
+    List<OemStatementExcel> exportOemStatement(StatementQuery mesOemStatement);
 
-    /**
-     * 导出数据
-     *
-     * @param queryWrapper 查询条件
-     * @return List<OemStatementExcel>
-     */
-    List<OemStatementExcel> exportOemStatement(Wrapper<OemStatementEntity> queryWrapper);
 
     /**
      * 外协结算

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/IPlatingTypeRulesService.java

@@ -31,10 +31,10 @@ public interface IPlatingTypeRulesService extends BaseService<PlatingTypeRulesEn
     /**
      * 导出数据
      *
-     * @param queryWrapper 查询条件
+     * @param mesPlatingTypeRules 查询条件
      * @return List<PlatingTypeRulesExcel>
      */
-    List<PlatingTypeRulesExcel> exportPlatingTypeRules(Wrapper<PlatingTypeRulesEntity> queryWrapper);
+    List<PlatingTypeRulesExcel> exportPlatingTypeRules(PlatingTypeRulesVO mesPlatingTypeRules);
 
     /**
      * 导入

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemSettlementApprovalServiceImpl.java

@@ -15,6 +15,7 @@ import org.springblade.desk.oem.mapper.OemSettlementApprovalMapper;
 import org.springblade.desk.oem.pojo.entity.OemSettlementApprovalDetailEntity;
 import org.springblade.desk.oem.pojo.entity.OemSettlementApprovalEntity;
 import org.springblade.desk.oem.pojo.entity.OemStatementEntity;
+import org.springblade.desk.oem.pojo.excel.OemSettlementApprovalExcel;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalQuery;
 import org.springblade.desk.oem.pojo.request.SettlementApprovalRequest;
 import org.springblade.desk.oem.pojo.vo.OemSettlementApprovalDetailVO;
@@ -57,6 +58,11 @@ public class OemSettlementApprovalServiceImpl extends BaseServiceImpl<OemSettlem
         return page.setRecords(baseMapper.selectApprovalPage(page, query));
     }
 
+    @Override
+    public List<OemSettlementApprovalExcel> exportApproval(SettlementApprovalQuery query) {
+        return baseMapper.exportApproval(query);
+    }
+
     @Override
     public OemSettlementApprovalVO getApprovalDetail(Long id) {
         OemSettlementApprovalEntity entity = this.getById(id);

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStandardProcessServiceImpl.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.oem.mapper.OemStandardProcessMapper;
 import org.springblade.desk.oem.pojo.entity.OemStandardProcessEntity;
+import org.springblade.desk.oem.pojo.excel.OemStandardProcessExcel;
 import org.springblade.desk.oem.pojo.vo.OemStandardProcessVO;
 import org.springblade.desk.oem.service.IOemStandardProcessService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 外协标准工序代码 服务实现类
  *
@@ -22,4 +25,10 @@ public class OemStandardProcessServiceImpl extends BaseServiceImpl<OemStandardPr
         return page.setRecords(baseMapper.selectOemStandardProcessPage(page, oemStandardProcess));
     }
 
+    @Override
+    public List<OemStandardProcessExcel> exportOemStandardProcess(OemStandardProcessVO oemStandardProcess) {
+        return baseMapper.exportOemStandardProcess(oemStandardProcess);
+    }
+
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementCategoryServiceImpl.java

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.oem.mapper.OemStatementCategoryMapper;
 import org.springblade.desk.oem.pojo.entity.OemStatementCategoryEntity;
+import org.springblade.desk.oem.pojo.excel.OemStatementCategoryExcel;
 import org.springblade.desk.oem.pojo.vo.OemStatementCategoryVO;
 import org.springblade.desk.oem.service.IOemStatementCategoryService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 外协结算大类 服务实现类
  *
@@ -22,4 +25,9 @@ public class OemStatementCategoryServiceImpl extends BaseServiceImpl<OemStatemen
     public IPage<OemStatementCategoryVO> selectOemStatementCategoryPage(IPage<OemStatementCategoryVO> page, OemStatementCategoryVO oemStatementCategory) {
         return page.setRecords(baseMapper.selectOemStatementCategoryPage(page, oemStatementCategory));
     }
+
+    @Override
+    public List<OemStatementCategoryExcel> exportOemStatementCategory(OemStatementCategoryVO oemStatementCategory) {
+        return baseMapper.exportOemStatementCategory(oemStatementCategory);
+    }
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -119,14 +119,9 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         return page.setRecords(baseMapper.selectOemStatementPage(page, mesOemStatement));
     }
 
-
     @Override
-    public List<OemStatementExcel> exportOemStatement(Wrapper<OemStatementEntity> queryWrapper) {
+    public List<OemStatementExcel> exportOemStatement(StatementQuery mesOemStatement) {
-        List<OemStatementExcel> mesOemStatementList = baseMapper.exportOemStatement(queryWrapper);
+        return baseMapper.exportOemStatement(mesOemStatement);
-        //mesOemStatementList.forEach(mesOemStatement -> {
-        //	mesOemStatement.setTypeName(DictCache.getValue(DictEnum.YES_NO, OemStatement.getType()));
-        //});
-        return mesOemStatementList;
     }
 
     @Override
@@ -730,7 +725,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             BigDecimal qty = statementVO.getMakeQty();
             statementVO.setRosStatus(StatementVO.IN_SETTLEMENT);
             statementVO.setUnitPrice(unitPrice);
-            statementVO.setUnit(priceSheet.getPrtum());
+            statementVO.setUnit(priceSheet.getStairunit());
             statementVO.setTotalPrice(unitPrice.multiply(qty));
             statementVO.setMemo("结算中");
             statementVO.setQuotation(priceSheet.getSeqid());
@@ -1058,7 +1053,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             statementVO.setRosStatus(StatementVO.IN_SETTLEMENT);
             statementVO.setMemo("结算中");
             statementVO.setUnitPrice(unitPrice);
-            statementVO.setUnit(priceSheet.getPrtum());
+            statementVO.setUnit(priceSheet.getStairunit());
             statementVO.setTotalPrice(unitPrice.multiply(qty));
             statementVO.setQuotation(priceSheet.getSeqid());
             //使用此报价
@@ -1098,7 +1093,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             statementVO.setRosStatus(StatementVO.IN_SETTLEMENT);
             statementVO.setMemo("结算中");
             statementVO.setUnitPrice(unitPrice);
-            statementVO.setUnit(priceSheet.getPrtum());
+            statementVO.setUnit(priceSheet.getStairunit());
             statementVO.setTotalPrice(unitPrice.multiply(qty));
             statementVO.setQuotation(priceSheet.getSeqid());
             return true;
@@ -1126,7 +1121,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
                     statementVO.setRosStatus(StatementVO.IN_SETTLEMENT);
                     statementVO.setMemo("结算中");
                     statementVO.setUnitPrice(unitPrice);
-                    statementVO.setUnit(priceSheet.getPrtum());
+                    statementVO.setUnit(priceSheet.getStairunit());
                     statementVO.setTotalPrice(unitPrice.multiply(qty));
                     statementVO.setQuotation(priceSheet.getSeqid());
                     return true;
@@ -1160,7 +1155,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
                     statementVO.setRosStatus(StatementVO.IN_SETTLEMENT);
                     statementVO.setMemo("结算中");
                     statementVO.setUnitPrice(unitPrice);
-                    statementVO.setUnit(priceSheet.getPrtum());
+                    statementVO.setUnit(priceSheet.getStairunit());
                     statementVO.setTotalPrice(unitPrice.multiply(qty));
                     statementVO.setQuotation(priceSheet.getSeqid());
                     return true;
@@ -1904,7 +1899,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             statementVO.setMemo("结算中");
             statementVO.setSettleTime(new Date());
             statementVO.setUnitPrice(unitPrice);
-            statementVO.setUnit(sheet.getPrtum());
+            statementVO.setUnit(sheet.getStairunit());
             statementVO.setTotalPrice(totalPrice);
             statementVO.setQuotation(sheet.getSeqid());
             return true;
@@ -1949,14 +1944,14 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         }
         //报价单号
         StringBuilder quotationSb = new StringBuilder();
-        String prtum = "";
+        String stairunit = "";
         if (tsbNum > 0) {
             List<PriceSheetVO> tsbPriceSheetList = coatingDescPriceSheetMap.get("涂色标");
             BigDecimal unitPrice = new BigDecimal(tsbPriceSheetList.get(0).getPrice());
             BigDecimal itemTotalPrice = unitPrice.multiply(BigDecimal.valueOf(tsbNum));
             totalPrice = totalPrice.add(itemTotalPrice);
             quotationSb.append(tsbPriceSheetList.get(0).getSeqid()).append("、");
-            prtum = tsbPriceSheetList.get(0).getPrtum();
+            stairunit = tsbPriceSheetList.get(0).getStairunit();
         }
         if (tsdNum > 0) {
             List<PriceSheetVO> tsdPriceSheetList = coatingDescPriceSheetMap.get("涂色带");
@@ -1964,7 +1959,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             BigDecimal itemTotalPrice = unitPrice.multiply(BigDecimal.valueOf(tsdNum));
             totalPrice = totalPrice.add(itemTotalPrice);
             quotationSb.append(tsdPriceSheetList.get(0).getSeqid()).append("、");
-            prtum = tsdPriceSheetList.get(0).getPrtum();
+            stairunit = tsdPriceSheetList.get(0).getStairunit();
         }
         if (tjtNum > 0) {
             List<PriceSheetVO> tjtPriceSheetList = coatingDescPriceSheetMap.get("涂箭头");
@@ -1972,14 +1967,14 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
             BigDecimal itemTotalPrice = unitPrice.multiply(BigDecimal.valueOf(tjtNum));
             totalPrice = totalPrice.add(itemTotalPrice);
             quotationSb.append(tjtPriceSheetList.get(0).getSeqid()).append("、");
-            prtum = tjtPriceSheetList.get(0).getPrtum();
+            stairunit = tjtPriceSheetList.get(0).getStairunit();
         }
         String quotation = quotationSb.length() > 0 ? quotationSb.substring(0, quotationSb.length() - 1) : "";
         statementVO.setRosStatus(StatementVO.IN_SETTLEMENT);
         statementVO.setMemo("结算中");
         statementVO.setSettleTime(new Date());
         statementVO.setUnitPrice(totalPrice);
-        statementVO.setUnit(prtum);
+        statementVO.setUnit(stairunit);
         statementVO.setTotalPrice(totalPrice);
         statementVO.setQuotation(quotation);
         return true;

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/PlatingTypeRulesServiceImpl.java

@@ -54,12 +54,8 @@ public class PlatingTypeRulesServiceImpl extends BaseServiceImpl<PlatingTypeRule
 
 
     @Override
-    public List<PlatingTypeRulesExcel> exportPlatingTypeRules(Wrapper<PlatingTypeRulesEntity> queryWrapper) {
+    public List<PlatingTypeRulesExcel> exportPlatingTypeRules(PlatingTypeRulesVO mesPlatingTypeRules) {
-        List<PlatingTypeRulesExcel> mesPlatingTypeRulesList = baseMapper.exportPlatingTypeRules(queryWrapper);
+        return baseMapper.exportPlatingTypeRules(mesPlatingTypeRules);
-        //mesPlatingTypeRulesList.forEach(mesPlatingTypeRules -> {
-        //	mesPlatingTypeRules.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingTypeRules.getType()));
-        //});
-        return mesPlatingTypeRulesList;
     }
 
     @Override