增加日志

huminmin

10 天以前 d2038a623e02c2d7bb6b95a908832c0432adf2f0

增加日志

 src/main/java/com/ruoyi/home/controller/HomeController.java

@@ -44,6 +44,7 @@

    @GetMapping("/approveAndDeviceTodos")
    @ApiOperation("审批协同，设备报修待办事项")
    @Log(title = "审批协同，设备报修待办事项", businessType = BusinessType.OTHER)
    public AjaxResult approveAndDeviceTodos(){
        Map<String, Object> map = homeService.approveAndDeviceTodos();
        return AjaxResult.success(map);
@@ -51,6 +52,7 @@

    @GetMapping("/noticesCount")
    @ApiOperation("未过期的公告数量")
    @Log(title = "未过期的公告数量", businessType = BusinessType.OTHER)
    public AjaxResult noticesCount(){
        Long count = homeService.noticesCount();
        return AjaxResult.success(count);
@@ -58,6 +60,7 @@

    @GetMapping("/deptStaffDistribution")
    @ApiOperation("各部门人员分布")
    @Log(title = "各部门人员分布", businessType = BusinessType.OTHER)
    public AjaxResult deptStaffDistribution() {
        DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
        return AjaxResult.success(dto);
@@ -65,6 +68,7 @@

    @GetMapping("/summaryStatistics")
    @ApiOperation("员工-客户-供应商总数")
    @Log(title = "员工-客户-供应商总数", businessType = BusinessType.OTHER)
    public AjaxResult summaryStatistics() {
        HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
        return AjaxResult.success(homeSummaryDto);
@@ -73,6 +77,7 @@
    /********************************************************营销采购类**************************************************/
    @GetMapping("/supplierPurchaseRanking")
    @ApiOperation("供应商采购排名")
    @Log(title = "供应商采购排名", businessType = BusinessType.OTHER)
    public AjaxResult supplierPurchaseRanking(@DefaultType Integer type) {
        List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
        return AjaxResult.success(list);
@@ -80,6 +85,7 @@

    @GetMapping("/customerRevenueAnalysis")
    @ApiOperation("客户营收贡献数值分析")
    @Log(title = "客户营收贡献数值分析", businessType = BusinessType.OTHER)
    public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
        CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
        return AjaxResult.success(dto);
@@ -87,6 +93,7 @@

    @GetMapping("/customerContributionRanking")
    @ApiOperation("客户金额贡献排名")
    @Log(title = "客户金额贡献排名", businessType = BusinessType.OTHER)
    public AjaxResult customerContributionRanking(@DefaultType Integer type) {
        List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
        return AjaxResult.success(list);
@@ -94,6 +101,7 @@

    @GetMapping("/productSalesAnalysis")
    @ApiOperation("各产品销售金额分析")
    @Log(title = "各产品销售金额分析", businessType = BusinessType.OTHER)
    public AjaxResult productSalesAnalysis() {
        List<MapDto> list = homeService.productSalesAnalysis();
        return AjaxResult.success(list);
@@ -101,6 +109,7 @@

    @GetMapping("/rawMaterialPurchaseAmountRatio")
    @ApiOperation("原材料采购金额占比")
    @Log(title = "原材料采购金额占比", businessType = BusinessType.OTHER)
    public AjaxResult rawMaterialPurchaseAmountRatio(){
        List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
        return AjaxResult.success(list);
@@ -125,6 +134,7 @@
    /********************************************************生产类*****************************************************/
    @GetMapping("/inputOutputAnalysis")
    @ApiOperation("投入产出分析")
    @Log(title = "投入产出分析", businessType = BusinessType.OTHER)
    public AjaxResult inputOutputAnalysis(@DefaultType Integer type){
      List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
        return AjaxResult.success(list);
@@ -132,6 +142,7 @@

    @GetMapping("/processOutputAnalysis")
    @ApiOperation("工序产出分析")
    @Log(title = "工序产出分析", businessType = BusinessType.OTHER)
    public AjaxResult processOutputAnalysis(@DefaultType Integer type){
        List<MapDto> list = homeService.processOutputAnalysis(type);
        return AjaxResult.success(list);
@@ -139,6 +150,7 @@

    @GetMapping("/workOrderEfficiencyAnalysis")
    @ApiOperation("工单执行效率分析")
    @Log(title = "工单执行效率分析", businessType = BusinessType.OTHER)
    public AjaxResult workOrderEfficiencyAnalysis(@DefaultType Integer type){
        List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
        return AjaxResult.success(list);
@@ -146,6 +158,7 @@

    @GetMapping("/productionAccountingAnalysis")
    @ApiOperation("生产核算分析")
    @Log(title = "生产核算分析", businessType = BusinessType.OTHER)
    public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
        List<ProductionAccountingDto> list   = homeService.productionAccountingAnalysis(type);
        return AjaxResult.success(list);
@@ -153,12 +166,14 @@

    @GetMapping("/orderCount")
    @ApiOperation("订单数")
    @Log(title = "订单数", businessType = BusinessType.OTHER)
    public AjaxResult orderCount(){
        return AjaxResult.success(homeService.orderCount());
    }

    @GetMapping("/progressStatistics")
    @ApiOperation("各生产订单的完成进度统计")
    @Log(title = "各生产订单的完成进度统计", businessType = BusinessType.OTHER)
    public AjaxResult progressStatistics(){
        ProductionProgressDto productionProgressDto = homeService.productionProgress();
        return AjaxResult.success(productionProgressDto);
@@ -166,6 +181,7 @@

    @GetMapping("/workInProcessTurnover")
    @ApiOperation("在制品周转情况")
    @Log(title = "在制品周转情况", businessType = BusinessType.OTHER)
    public AjaxResult workInProcessTurnover(){
        ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
        return AjaxResult.success(productionTurnoverDto);
@@ -173,6 +189,7 @@

    @GetMapping("/processDataProductionStatistics")
    @ApiOperation("工序数据生产统计数据")
    @Log(title = "工序数据生产统计数据", businessType = BusinessType.OTHER)
    public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
        List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
        return AjaxResult.success(list);
@@ -181,24 +198,28 @@
    /********************************************************质量类*****************************************************/
    @GetMapping("/rawMaterialDetection")
    @ApiOperation("原材料检测")
    @Log(title = "原材料检测", businessType = BusinessType.OTHER)
    public AjaxResult rawMaterialDetection(@DefaultType Integer type){
        return AjaxResult.success(homeService.rawMaterialDetection(type));
    }

    @GetMapping("/processDetection")
    @ApiOperation("过程检测")
    @Log(title = "过程检测", businessType = BusinessType.OTHER)
    public AjaxResult processDetection(@DefaultType Integer type){
        return AjaxResult.success(homeService.processDetection(type));
    }

    @GetMapping("/factoryDetection")
    @ApiOperation("成品出厂检测")
    @Log(title = "成品出厂检测", businessType = BusinessType.OTHER)
    public AjaxResult factoryDetection(@DefaultType Integer type){
        return AjaxResult.success(homeService.factoryDetection(type));
    }

    @GetMapping("/qualityInspectionCount")
    @ApiOperation("质量检验数量")
    @Log(title = "质量检验数量", businessType = BusinessType.OTHER)
    public AjaxResult qualityInspectionCount(){
        QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
        return AjaxResult.success(qualityInspectionCountDto);
@@ -206,6 +227,7 @@

    @GetMapping("/nonComplianceWarning")
    @ApiOperation("不合格预警")
    @Log(title = "不合格预警", businessType = BusinessType.OTHER)
    public AjaxResult nonComplianceWarning(){
        NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
        return AjaxResult.success(nonComplianceWarningDto);
@@ -213,6 +235,7 @@

    @GetMapping("/completedInspectionCount")
    @ApiOperation("完成检验数")
    @Log(title = "完成检验数", businessType = BusinessType.OTHER)
    public AjaxResult completedInspectionCount(){
        List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
        return AjaxResult.success(list);
@@ -220,6 +243,7 @@

    @GetMapping("/unqualifiedProductRanking")
    @ApiOperation("不合格产品排名")
    @Log(title = "不合格产品排名", businessType = BusinessType.OTHER)
    public AjaxResult unqualifiedProductRanking(){
        List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
        return AjaxResult.success(list);
@@ -227,6 +251,7 @@

    @GetMapping("/unqualifiedProductProcessingAnalysis")
    @ApiOperation("不合格检品处理分析")
    @Log(title = "不合格检品处理分析", businessType = BusinessType.OTHER)
    public AjaxResult unqualifiedProductProcessingAnalysis(){
        List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
        return AjaxResult.success(list);
@@ -242,6 +267,7 @@

    @GetMapping("/qualityInspectionStatistics")
    @ApiOperation("质量统计")
    @Log(title = "质量统计", businessType = BusinessType.OTHER)
    public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
       QualityStatisticsDto  dto = homeService.qualityInspectionStatistics(type);
        return AjaxResult.success(dto);
@@ -250,6 +276,7 @@
    /********************************************************财务类*****************************************************/
    @GetMapping("/incomeExpenseAnalysis")
    @ApiOperation("支收对比分析")
    @Log(title = "支收对比分析", businessType = BusinessType.OTHER)
    public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
        List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
        return AjaxResult.success(result);
@@ -257,6 +284,7 @@

    @GetMapping("/profitTrendAnalysis")
    @ApiOperation("利润趋势分析")
    @Log(title = "利润趋势分析", businessType = BusinessType.OTHER)
    public AjaxResult profitTrendAnalysis(){
        List<MapDto> list = homeService.profitTrendAnalysis();
        return AjaxResult.success(list);
@@ -264,6 +292,7 @@

    @GetMapping("/expenseCompositionAnalysis")
    @ApiOperation("构成分析")
    @Log(title = "构成分析", businessType = BusinessType.OTHER)
    public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
        List<MapDto> list = homeService.expenseCompositionAnalysis(type);
        return AjaxResult.success(list);
@@ -271,6 +300,7 @@

    @GetMapping("/monthlyIncome")
    @ApiOperation("月度收入")
    @Log(title = "月度收入", businessType = BusinessType.OTHER)
    public AjaxResult monthlyIncome(){
        MonthlyIncomeDto dto = homeService.monthlyIncome();
        return AjaxResult.success(dto);
@@ -278,6 +308,7 @@

    @GetMapping("/monthlyExpenditure")
    @ApiOperation("月度支出")
    @Log(title = "月度支出", businessType = BusinessType.OTHER)
    public AjaxResult monthlyExpenditure(){
        MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
        return AjaxResult.success(dto);
@@ -295,6 +326,7 @@

    @GetMapping("/productCategoryDistribution")
    @ApiOperation("产品大类分布")
    @Log(title = "产品大类分布", businessType = BusinessType.OTHER)
    public AjaxResult productCategoryDistribution() {
        ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
        return AjaxResult.success(dto);
@@ -302,6 +334,7 @@

    @GetMapping("/salesPurchaseStorageProductCount")
    @ApiOperation("销售-采购-储存产品数")
    @Log(title = "销售-采购-储存产品数", businessType = BusinessType.OTHER)
    public AjaxResult salesPurchaseStorageProductCount(){
        List<MapDto> list = homeService.salesPurchaseStorageProductCount();
        return AjaxResult.success(list);
@@ -309,6 +342,7 @@

    @GetMapping("/productInOutAnalysis")
    @ApiOperation("产品出入库分析")
    @Log(title = "产品出入库分析", businessType = BusinessType.OTHER)
    public AjaxResult productInOutAnalysis(@DefaultType Integer type){
        List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
        return AjaxResult.success(result);
@@ -316,6 +350,7 @@

    @GetMapping("/productTurnoverDays")
    @ApiOperation("产品周转天数")
    @Log(title = "产品周转天数", businessType = BusinessType.OTHER)
    public AjaxResult productTurnoverDays(){
        List<MapDto> list = homeService.productTurnoverDays();
        return AjaxResult.success(list);

 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -55,6 +57,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增检验")
    @Log(title = "新增检验", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
    }
@@ -66,6 +69,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检验")
    @Log(title = "删除检验", businessType = BusinessType.DELETE)
    public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -94,6 +98,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation("检验单详情")
    @Log(title = "检验单详情", businessType = BusinessType.OTHER)
    public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityInspectService.getDetailById(id));
    }
@@ -105,6 +110,7 @@
     */
    @PostMapping("/update")
    @ApiOperation("修改检验单")
    @Log(title = "修改检验单", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
        return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
    }
@@ -117,6 +123,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("检验单分页查询")
    @Log(title = "检验单分页查询", businessType = BusinessType.OTHER)
    public AjaxResult qualityInspectListPage(Page page, QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
    }
@@ -128,6 +135,7 @@
     */
    @PostMapping("/export")
    @ApiOperation("导出检验单")
    @Log(title = "导出检验单", businessType = BusinessType.EXPORT)
    public void qualityInspectExport(HttpServletResponse response,QualityInspect qualityInspect) {
        qualityInspectService.qualityInspectExport(response, qualityInspect);
    }
@@ -139,6 +147,7 @@
     */
    @PostMapping("/submit")
    @ApiOperation("提交检验单")
    @Log(title = "提交检验单", businessType = BusinessType.UPDATE)
    public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
        return AjaxResult.success(qualityInspectService.submit(qualityInspect));
    }
@@ -150,6 +159,7 @@
     */
    @PostMapping("/down")
    @ApiOperation("下载检验单附件")
    @Log(title = "下载检验单附件", businessType = BusinessType.OTHER)
    public void down(HttpServletResponse response,@RequestBody QualityInspect qualityInspect) {
        qualityInspectService.down(response, qualityInspect);
    }
@@ -161,6 +171,7 @@
     */
    @PostMapping("/downOutReport")
    @ApiOperation("下载出库检验报告")
    @Log(title = "下载出库检验报告", businessType = BusinessType.OTHER)
    public void downOutReport(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
        qualityInspectService.downOutReport(response, qualityInspect);
    }

 src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -40,6 +42,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增检验附件")
    @Log(title = "新增检验附件", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
        return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
    }
@@ -51,6 +54,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检验附件")
    @Log(title = "删除检验附件", businessType = BusinessType.DELETE)
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -67,6 +71,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("检验附件分页查询")
    @Log(title = "检验附件分页查询", businessType = BusinessType.OTHER)
    public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
        return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
    }

 src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -36,6 +38,7 @@
     */
    @GetMapping("/{inspectId}")
    @ApiOperation("检验参数项详情")
    @Log(title = "检验参数项详情", businessType = BusinessType.OTHER)
    public AjaxResult QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
        return AjaxResult.success(qualityInspectParamService.qualityInspectParamDetail(inspectId));
    }
@@ -48,6 +51,7 @@
     */
    @PostMapping("/update")
    @ApiOperation("修改检验参数项")
    @Log(title = "修改检验参数项", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
        return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
    }
@@ -59,6 +63,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检验参数项")
    @Log(title = "删除检验参数项", businessType = BusinessType.DELETE)
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");

 src/main/java/com/ruoyi/quality/controller/QualityReportController.java

@@ -1,5 +1,7 @@
package com.ruoyi.quality.controller;

import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.service.QualityReportService;
import io.swagger.annotations.Api;
@@ -31,6 +33,7 @@
     */
    @ApiOperation("获取检验统计数据")
    @GetMapping("/getInspectStatistics")
    @Log(title = "获取检验统计数据", businessType = BusinessType.OTHER)
    public AjaxResult getInspectStatistics() {
        return AjaxResult.success(qualityReportService.getInspectStatistics());
    }
@@ -40,6 +43,7 @@
     */
    @ApiOperation("获取合格率统计数据")
    @GetMapping("/getPassRateStatistics")
    @Log(title = "获取合格率统计数据", businessType = BusinessType.OTHER)
    public AjaxResult getPassRateStatistics() {
        return AjaxResult.success(qualityReportService.getPassRateStatistics());
    }
@@ -49,6 +53,7 @@
     */
    @ApiOperation("获取月度合格率统计数据")
    @GetMapping("/getMonthlyPassRateStatistics")
    @Log(title = "获取月度合格率统计数据", businessType = BusinessType.OTHER)
    public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
        return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
    }
@@ -58,6 +63,7 @@
     */
    @ApiOperation("获取年度总合格率统计数据")
    @GetMapping("/getYearlyPassRateStatistics")
    @Log(title = "获取年度总合格率统计数据", businessType = BusinessType.OTHER)
    public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
        return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
    }
@@ -67,6 +73,7 @@
     */
    @ApiOperation("获取月度完成明细数据")
    @GetMapping("/getMonthlyCompletionDetails")
    @Log(title = "获取月度完成明细数据", businessType = BusinessType.OTHER)
    public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
        return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
    }
@@ -76,6 +83,7 @@
     */
    @ApiOperation("获取热点检测指标统计")
    @GetMapping("/getTopParameters")
    @Log(title = "获取热点检测指标统计", businessType = BusinessType.OTHER)
    public AjaxResult getTopParameters(@RequestParam("modelType") Integer modelType) {
        return AjaxResult.success(qualityReportService.getTopParameters(modelType));
    }

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java

@@ -1,6 +1,8 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
@@ -37,6 +39,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增检测标准主表与产品关联表")
    @Log(title = "新增检测标准主表与产品关联表", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
        return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
    }
@@ -48,6 +51,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检测标准主表与产品关联表")
    @Log(title = "删除检测标准主表与产品关联表", businessType = BusinessType.DELETE)
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -61,6 +65,7 @@
     */
    @GetMapping("/list")
    @ApiOperation("检测指标维护查询")
    @Log(title = "检测指标维护查询", businessType = BusinessType.OTHER)
    public AjaxResult listBinding(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardBindingService.listBinding(testStandardId));
    }

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
@@ -43,6 +45,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增检测标准")
    @Log(title = "新增检测标准", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
    }
@@ -54,6 +57,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检测标准")
    @Log(title = "删除检测标准", businessType = BusinessType.DELETE)
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -68,6 +72,7 @@
     */
    @PostMapping("/update")
    @ApiOperation("修改检测标准")
    @Log(title = "修改检测标准", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
    }
@@ -80,6 +85,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("检测标准分页查询")
    @Log(title = "检测标准分页查询", businessType = BusinessType.OTHER)
    public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
    }
@@ -91,6 +97,7 @@
     */
    @PostMapping("/copyParam")
    @ApiOperation("复制检测标准参数")
    @Log(title = "复制检测标准参数", businessType = BusinessType.OTHER)
    public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
        return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
    }
@@ -102,6 +109,7 @@
     */
    @PostMapping("/qualityTestStandardAudit")
    @ApiOperation("批量审核检测标准")
    @Log(title = "批量审核检测标准", businessType = BusinessType.OTHER)
    public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
        return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
    }
@@ -112,6 +120,7 @@
     */
    @GetMapping("/getQualityTestStandardByProductId")
    @ApiOperation("根据产品id查询相关的检验标准")
    @Log(title = "根据产品id查询相关的检验标准", businessType = BusinessType.OTHER)
    public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
        return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
    }
@@ -122,6 +131,7 @@
     */
    @GetMapping("/getQualityTestStandardParamByTestStandardId")
    @ApiOperation("根据检测标准id查询相关的检验标准参数")
    @Log(title = "根据检测标准id查询相关的检验标准参数", businessType = BusinessType.OTHER)
    public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
    }

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
@@ -37,6 +39,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增检测标准参数")
    @Log(title = "新增检测标准参数", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
        return AjaxResult.success(qualityTestStandardParamService.save(qualityTestStandardParam));
    }
@@ -48,6 +51,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除检测标准参数")
    @Log(title = "删除检测标准参数", businessType = BusinessType.DELETE)
    public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -62,6 +66,7 @@
     */
    @PostMapping("/update")
    @ApiOperation("修改检测标准参数")
    @Log(title = "修改检测标准参数", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
        return AjaxResult.success(qualityTestStandardParamService.updateById(qualityTestStandardParam));
    }
@@ -72,6 +77,7 @@
     */
    @GetMapping("/list")
    @ApiOperation("查询检测标准参数")
    @Log(title = "查询检测标准参数", businessType = BusinessType.OTHER)
    public AjaxResult list(Long testStandardId) {
        return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
    }

 src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java

@@ -1,6 +1,8 @@
package com.ruoyi.quality.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
@@ -33,6 +35,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增不合格管理")
    @Log(title = "新增不合格管理", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
        qualityUnqualified.setInspectState(0);
        return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
@@ -46,6 +49,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除不合格管理")
    @Log(title = "删除不合格管理", businessType = BusinessType.DELETE)
    public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
        qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
            if (qualityUnqualified.getInspectState() == 1) {
@@ -63,6 +67,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation("不合格管理详情")
    @Log(title = "不合格管理详情", businessType = BusinessType.OTHER)
    public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
        return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
    }
@@ -75,6 +80,7 @@
     */
    @PostMapping("/update")
    @ApiOperation("不合格管理修改")
    @Log(title = "不合格管理详情", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
    }
@@ -88,6 +94,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("不合格管理分页查询")
    @Log(title = "不合格管理分页查询", businessType = BusinessType.OTHER)
    public AjaxResult qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
    }
@@ -100,6 +107,7 @@
     */
    @PostMapping("/export")
    @ApiOperation("不合格管理导出")
    @Log(title = "不合格管理导出", businessType = BusinessType.EXPORT)
    public void qualityUnqualifiedExport(HttpServletResponse response, QualityUnqualified qualityUnqualified) {
        qualityUnqualifiedService.qualityUnqualifiedExport(response, qualityUnqualified);
    }
@@ -112,12 +120,14 @@
     */
    @PostMapping("/deal")
    @ApiOperation("不合格管理处理")
    @Log(title = "不合格管理处理", businessType = BusinessType.OTHER)
    public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
        return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
    }

    @GetMapping("/downloadReturnRecord")
    @ApiOperation("下载不合格管理处理记录")
    @Log(title = "下载不合格管理处理记录", businessType = BusinessType.OTHER)
    public void downloadReturnRecord(@RequestParam("id") Long id,HttpServletResponse response) throws IOException {
        qualityUnqualifiedService.downloadReturnRecord(id,response);
    }

 src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java

@@ -43,6 +43,7 @@
     */
    @PostMapping("/saveOrUpdate")
    @ApiOperation("开票台账新增")
    @Log(title = "开票台账新增", businessType = BusinessType.UPDATE)
    public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
        invoiceLedgerService.invoiceLedgerSaveOrUpdate(productDto);
        return AjaxResult.success();
@@ -55,6 +56,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("开票台账删除")
    @Log(title = "开票台账删除", businessType = BusinessType.DELETE)
    public AjaxResult invoiceLedgerDel(@RequestBody List<Integer> ids) {
        invoiceLedgerService.invoiceLedgerDel(ids);
        return AjaxResult.success();
@@ -68,6 +70,7 @@
     */
    @GetMapping("/page")
    @ApiOperation("开票台账分页查询")
    @Log(title = "开票台账分页查询", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
    }
@@ -79,6 +82,7 @@
     */
    @GetMapping("/fileList")
    @ApiOperation("开票台账文件查询")
    @Log(title = "开票台账文件查询", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerFileList(Integer invoiceLedgerId) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
    }
@@ -104,6 +108,7 @@
     */
    @PostMapping("/uploadFile")
    @ApiOperation("开票台账文件上传")
    @Log(title = "开票台账文件上传", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerUploadFile(MultipartFile file) {
        try {
            return AjaxResult.success(invoiceLedgerService.invoiceLedgerUploadFile(file));
@@ -120,6 +125,7 @@
     */
    @PostMapping("/export")
    @ApiOperation("开票台账导出")
    @Log(title = "开票台账导出", businessType = BusinessType.EXPORT)
    public void invoiceLedgerExport(HttpServletResponse response, InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
        invoiceLedgerService.invoiceLedgerExport(response, invoiceRegistrationProductDto);
    }
@@ -131,6 +137,7 @@
     */
    @GetMapping("/info")
    @ApiOperation("开票台账详情")
    @Log(title = "开票台账详情", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerInfo(Integer id) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerDetail(id));
    }
@@ -142,6 +149,7 @@
     */
    @PostMapping("/commitFile")
    @ApiOperation("文件提交")
    @Log(title = "文件提交", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
        try {
            invoiceLedgerService.invoiceLedgerCommitFile(invoiceLedgerDto);
@@ -158,6 +166,7 @@
     */
    @GetMapping("/list")
    @ApiOperation("开票台账查询")
    @Log(title = "开票台账查询", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
    }
@@ -170,6 +179,7 @@
     */
    @GetMapping("/salesAccount")
    @ApiOperation("客户销售记录")
    @Log(title = "客户销售记录", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
    }
@@ -179,6 +189,7 @@
     */
    @GetMapping("/getInvoiceAmount")
    @ApiOperation("本月开票金额")
    @Log(title = "本月开票金额", businessType = BusinessType.OTHER)
    public AjaxResult getInvoiceAmount() {
        try {
            BigDecimal amount = invoiceLedgerService.getInvoiceAmount();
@@ -196,6 +207,7 @@
     */
    @GetMapping("/registrationProductPage")
    @ApiOperation("产品开票记录查询")
    @Log(title = "产品开票记录查询", businessType = BusinessType.OTHER)
    public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {

        return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
@@ -208,6 +220,7 @@
     */
    @GetMapping("/invoiceLedgerProductInfo")
    @ApiOperation("产品开票详情")
    @Log(title = "产品开票详情", businessType = BusinessType.OTHER)
    public AjaxResult invoiceLedgerProductDetail(Integer id) {
        return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id));
    }
@@ -219,6 +232,7 @@
     */
    @DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}")
    @ApiOperation("开票台账删除")
    @Log(title = "开票台账删除", businessType = BusinessType.DELETE)
    public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
        try {
            invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId);

 src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java

@@ -42,6 +42,7 @@
     * @return
     */
    @PostMapping("/saveOrUpdate")
    @Log(title = "新增回款登记", businessType = BusinessType.INSERT)
    public AjaxResult receiptPaymentSaveOrUpdate (@RequestBody List<ReceiptPayment> receiptPayment) {
        receiptPaymentService.receiptPaymentSaveOrUpdate(receiptPayment);
        return AjaxResult.success();
@@ -53,6 +54,7 @@
     * @return
     */
    @PostMapping("/update")
    @Log(title = "修改回款登记", businessType = BusinessType.UPDATE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
        return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
@@ -64,6 +66,7 @@
     * @return
     */
    @DeleteMapping("/del")
    @Log(title = "删除回款登记", businessType = BusinessType.DELETE)
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
        return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
@@ -75,6 +78,7 @@
     * @return
     */
    @GetMapping("/customerInteractions")
    @Log(title = "查询客户往来记录", businessType = BusinessType.OTHER)
    public AjaxResult customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
        return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
    }
@@ -85,6 +89,7 @@
     * @return
     */
    @GetMapping("/info")
    @Log(title = "查询回款登记详情", businessType = BusinessType.OTHER)
    public AjaxResult receiptPaymentInfo (Integer id) {
        return AjaxResult.success(receiptPaymentService.receiptPaymentInfo(id));
    }
@@ -93,6 +98,7 @@
     * 本月回款金额
     */
    @GetMapping("/getReceiptAmount")
    @Log(title = "查询本月回款金额", businessType = BusinessType.OTHER)
    public AjaxResult getReceiptAmount() {
        try {
            BigDecimal receiptAmount = receiptPaymentService.getReceiptAmount();
@@ -109,12 +115,14 @@
     * @return
     */
    @GetMapping("/bindInvoiceNoRegPage")
    @Log(title = "查询已经绑定发票的开票台账", businessType = BusinessType.OTHER)
    public AjaxResult bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
    }

    @ApiModelProperty("导出回款登记")
    @PostMapping("/export")
    @Log(title = "导出回款登记", businessType = BusinessType.EXPORT)
    public void export(HttpServletResponse response, String ids) {
        if (ids == null || ids.isEmpty()) {
            receiptPaymentService.exportPaymentList(response, null);
@@ -134,6 +142,7 @@
     * @return
     */
    @GetMapping("/invoiceInfo")
    @Log(title = "查询开票台账详情", businessType = BusinessType.OTHER)
    public AjaxResult invoiceInfo (Integer id) {
        return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
    }
@@ -142,6 +151,7 @@
     * 本月应收,回款金额
     */
    @GetMapping("/getAmountMouth")
    @Log(title = "查询本月应收,回款金额", businessType = BusinessType.OTHER)
    public AjaxResult getAmountMouth() {
        return  AjaxResult.success(receiptPaymentService.getAmountMouth());
    }
@@ -149,6 +159,7 @@
    /**
     * 查询回款记录
     */
    @Log(title = "查询回款记录", businessType = BusinessType.OTHER)
    @GetMapping("/receiptPaymentHistoryList")
    public TableDataInfo receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto) {
        startPage();
@@ -160,6 +171,7 @@
     * 查询回款记录
     */
    @GetMapping("/receiptPaymentHistoryListPage")
    @Log(title = "查询回款记录", businessType = BusinessType.OTHER)
    public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
        return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
    }

 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java

@@ -76,6 +76,7 @@

    @ApiOperation("导出销售台账模板")
    @PostMapping("/exportTemplate")
    @Log(title = "导出销售台账模板", businessType = BusinessType.EXPORT)
    public void exportTemplate(HttpServletResponse response) {
        // 1. 模板文件在resources/static下的路径
        String templatePath = "static/销售台账导入模板.xlsx";
@@ -117,6 +118,7 @@
     */
    @GetMapping("/list")
    @ApiOperation("查询销售台账列表")
    @Log(title = "查询销售台账列表", businessType = BusinessType.OTHER)
    public TableDataInfo list(Page page, SalesLedgerDto salesLedgerDto) {
        startPage();
        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
@@ -146,6 +148,7 @@
     */
    @GetMapping("/getSalesLedgerWithProducts")
    @ApiOperation("查询销售台账和产品父子列表")
    @Log(title = "查询销售台账和产品父子列表", businessType = BusinessType.OTHER)
    public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
        return salesLedgerService.getSalesLedgerWithProducts(salesLedgerDto);
    }
@@ -214,6 +217,7 @@
     */
    @GetMapping("/listNoPage")
    @ApiOperation("查询销售台账不分页")
    @Log(title = "查询销售台账不分页", businessType = BusinessType.OTHER)
    public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
        List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
        return AjaxResult.success(list);

 src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java

@@ -47,6 +47,7 @@
     * 回款登记分页查询
     */
    @GetMapping("/listPageSalesLedger")
    @Log(title = "回款登记分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
        return AjaxResult.success(list);
@@ -57,6 +58,7 @@
     * 付款登记分页查询
     */
    @GetMapping("/listPagePurchaseLedger")
    @Log(title = "付款登记分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
        IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
        return AjaxResult.success(list);
@@ -67,6 +69,7 @@
     * 查询产品信息列表
     */
    @GetMapping("/list")
    @Log(title = "查询产品信息列表", businessType = BusinessType.OTHER)
    public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
        List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
        list.forEach(item -> {
@@ -124,6 +127,7 @@
     * 获取产品信息详细信息
     */
    @GetMapping(value = "/{id}")
    @Log(title = "查询产品信息详细信息", businessType = BusinessType.OTHER)
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(salesLedgerProductService.selectSalesLedgerProductById(id));
@@ -154,6 +158,7 @@

    //根据产品id获取bom判断库存是否充足
    @GetMapping("/judgmentInventory")
    @Log(title = "判断库存是否充足", businessType = BusinessType.OTHER)
    public R judgmentInventory(SalesLedgerProduct salesLedgerProduct) {
        return  salesLedgerProductService.judgmentInventory(salesLedgerProduct);
    }

 src/main/java/com/ruoyi/staff/controller/AnalyticsController.java

@@ -1,5 +1,7 @@
package com.ruoyi.staff.controller;

import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.service.AnalyticsService;
import io.swagger.annotations.Api;
@@ -20,18 +22,21 @@

    @GetMapping("/reason")
    @ApiOperation("员工离职原因分析")
    @Log(title = "员工离职原因分析", businessType = BusinessType.OTHER)
    public AjaxResult staffLeaveReasonAnalytics() {
        return AjaxResult.success(analyticsService.staffLeaveReasonAnalytics());
    }

    @GetMapping("/monthly_turnover_rate")
    @ApiOperation("12个月员工离职率分析")
    @Log(title = "12个月员工离职率分析", businessType = BusinessType.OTHER)
    public AjaxResult getMonthlyTurnoverRateFor12Months() {
        return AjaxResult.success(analyticsService.getMonthlyTurnoverRateFor12Months());
    }

    @GetMapping("/total_statistic")
    @ApiOperation("员工总统计分析")
    @Log(title = "员工总统计分析", businessType = BusinessType.OTHER)
    public AjaxResult getTotalStatistic() {
        return AjaxResult.success(analyticsService.getTotalStatistic());
    }

 src/main/java/com/ruoyi/staff/controller/BankController.java

@@ -31,6 +31,7 @@

    @GetMapping("/list")
    @ApiOperation("查询银行管理表列表")
    @Log(title = "银行管理表", businessType = BusinessType.OTHER)
    public AjaxResult list() {
        return AjaxResult.success(bankService.list());
    }

 src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java

@@ -1,6 +1,8 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
@@ -20,6 +22,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("请假申请分页查询")
    @Log(title = "请假申请分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
    }
@@ -28,6 +31,7 @@
     */
    @PostMapping("/add")
    @ApiOperation("新增请假申请")
    @Log(title = "新增请假申请", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.save(holidayApplication));
    }
@@ -36,6 +40,7 @@
     */
    @PostMapping("/update")
    @ApiOperation("修改请假申请")
    @Log(title = "修改请假申请", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
        return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
    }
@@ -44,6 +49,7 @@
     */
    @DeleteMapping("/delete/{id}")
    @ApiOperation("删除请假申请")
    @Log(title = "删除请假申请", businessType = BusinessType.DELETE)
    public AjaxResult delete(@PathVariable("id") Long id){
        return AjaxResult.success(holidayApplicationService.removeById(id));
    }

 src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java

@@ -1,6 +1,8 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
@@ -33,12 +35,14 @@

    @ApiOperation("新增/修改人员打卡规则配置")
    @PostMapping("/add")
    @Log(title = "新增/修改人员打卡规则配置", businessType = BusinessType.INSERT)
    public R add(@RequestBody PersonalAttendanceLocationConfig personalAttendanceLocationConfig){
        return R.ok(personalAttendanceLocationConfigService.saveOrUpdate(personalAttendanceLocationConfig));
    }

    @ApiOperation("分页查询人员打卡规则配置")
    @GetMapping("/listPage")
    @Log(title = "分页查询人员打卡规则配置", businessType = BusinessType.OTHER)
    public R listPage(Page page){
        return R.ok(personalAttendanceLocationConfigService.page(page));
    }
@@ -46,6 +50,7 @@

    @ApiOperation("删除人员打卡规则配置")
    @DeleteMapping("/del")
    @Log(title = "删除人员打卡规则配置", businessType = BusinessType.DELETE)
    public R del(@RequestBody List<Integer> ids) {
        return R.ok(personalAttendanceLocationConfigService.removeBatchByIds(ids));
    }

 src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java

@@ -1,6 +1,8 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
@@ -29,24 +31,28 @@

    @ApiOperation("新增打卡签到")
    @PostMapping("")
    @Log(title = "新增打卡签到", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
    }

    @ApiOperation("分页查询打卡签到")
    @GetMapping("/listPage")
    @Log(title = "分页查询打卡签到", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
    }

    @ApiOperation("获取当前人的考勤相关数据")
    @GetMapping("/today")
    @Log(title = "获取当前人的考勤相关数据", businessType = BusinessType.OTHER)
    public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
        return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
    }

    @ApiOperation("导出打卡签到")
    @PostMapping("/export")
    @Log(title = "导出打卡签到", businessType = BusinessType.EXPORT)
    public void export(HttpServletResponse response, PersonalAttendanceRecordsDto personalAttendanceRecordsDto) {
        personalAttendanceRecordsService.export(response, personalAttendanceRecordsDto);
    }

 src/main/java/com/ruoyi/staff/controller/PersonalShiftController.java

@@ -4,6 +4,8 @@
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.PerformanceShiftAddDto;
import com.ruoyi.staff.pojo.PersonalAttendanceLocationConfig;
@@ -41,24 +43,28 @@

    @ApiOperation("人员排班")
    @PostMapping("/add")
    @Log(title = "人员排班", businessType = BusinessType.INSERT)
    public R add(@RequestBody PerformanceShiftAddDto performanceShiftAddDto){
        return R.ok(personalShiftService.performanceShiftAdd(performanceShiftAddDto));
    }

    @ApiOperation(value = "月份分页查询")
    @GetMapping("page")
    @Log(title = "月份分页查询", businessType = BusinessType.OTHER)
    public R performanceShiftPage(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
        return R.ok(personalShiftService.performanceShiftPage(new Page<>(current, size), time, userName, sysDeptId));
    }

    @ApiOperation(value = "年份分页查询")
    @GetMapping("pageYear")
    @Log(title = "年份分页查询", businessType = BusinessType.OTHER)
    public R performanceShiftPageYear(Integer size, Integer current, String time, String userName, Integer sysDeptId) {
        return R.ok(personalShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, sysDeptId));
    }

    @ApiOperation(value = "班次状态修改")
    @PostMapping("update")
    @Log(title = "班次状态修改", businessType = BusinessType.UPDATE)
    public R performanceShiftUpdate(@RequestBody PersonalShift personalShift) {
        personalShiftService.performanceShiftUpdate(personalShift);
        return R.ok();
@@ -66,6 +72,7 @@

    @ApiOperation(value = "导出")
    @GetMapping("export")
    @Log(title = "导出", businessType = BusinessType.EXPORT)
    public void exportToExcel(@NotNull(message = "时间不能为空！") String time, String userName, Integer sysDeptId, Boolean isMonth, HttpServletResponse response) throws Exception {
        Map<Object, Object> data;
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

 src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java

@@ -36,6 +36,7 @@

    @GetMapping("/listPage")
    @ApiOperation(value = "分页查询")
    @Log(title = "分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
    }

 src/main/java/com/ruoyi/staff/controller/StaffContractController.java

@@ -1,6 +1,8 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.service.StaffContractService;
@@ -30,6 +32,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("员工合同分页查询")
    @Log(title = "员工合同分页查询", businessType = BusinessType.OTHER)
    public AjaxResult staffContractListPage(Page page, StaffContract staffContract) {
        return AjaxResult.success(staffContractService.staffContractListPage(page, staffContract));
    }

 src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java

@@ -1,6 +1,8 @@
package com.ruoyi.staff.controller;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
@@ -30,6 +32,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("新增离职分页查询")
    @Log(title = "新增离职分页查询", businessType = BusinessType.OTHER)
    public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
        return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
    }
@@ -41,6 +44,7 @@
     */
    @PostMapping("")
    @ApiOperation("新增离职")
    @Log(title = "新增离职", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
        return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
    }
@@ -53,6 +57,7 @@
     */
    @PutMapping("/{id}")
    @ApiOperation("更新离职信息")
    @Log(title = "更新离职信息", businessType = BusinessType.UPDATE)
    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
        return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
    }
@@ -64,6 +69,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除入职")
    @Log(title = "删除入职", businessType = BusinessType.DELETE)
    public AjaxResult del(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -77,6 +83,7 @@
     */
    @PostMapping("/export")
    @ApiOperation("离职导出")
    @Log(title = "离职导出", businessType = BusinessType.EXPORT)
    public void export(HttpServletResponse response, StaffLeaveDto staffLeaveDto) {
        staffLeaveService.export(response, staffLeaveDto);
    }

 src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java

@@ -39,6 +39,7 @@
     */
    @GetMapping("/listPage")
    @ApiOperation("在职员工台账分页查询")
    @Log(title = "在职员工台账分页查询", businessType = BusinessType.OTHER)
    public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
        return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
    }
@@ -49,6 +50,7 @@
     */
    @GetMapping("/list")
    @ApiOperation("在职员工下拉(新增离职用)")
    @Log(title = "在职员工下拉(新增离职用)", businessType = BusinessType.OTHER)
    public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
        return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
    }
@@ -60,6 +62,7 @@
     */
    @PostMapping("")
    @ApiOperation("新增入职")
    @Log(title = "新增入职", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
        return AjaxResult.success(staffOnJobService.add(staffOnJob));
    }
@@ -71,6 +74,7 @@
     */
    @PutMapping("/{id}")
    @ApiOperation("更新入职信息")
    @Log(title = "更新入职信息", businessType = BusinessType.UPDATE)
    public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
        return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
    }
@@ -82,6 +86,7 @@
     */
    @DeleteMapping("/del")
    @ApiOperation("删除入职")
    @Log(title = "删除入职", businessType = BusinessType.DELETE)
    public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
        if(CollectionUtils.isEmpty(ids)){
            return AjaxResult.error("请选择至少一条数据");
@@ -96,6 +101,7 @@
     */
    @GetMapping("/{id}")
    @ApiOperation("在职员工详情")
    @Log(title = "在职员工详情", businessType = BusinessType.OTHER)
    public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
        return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
    }
@@ -108,6 +114,7 @@
     */
    @PostMapping("/renewContract/{id}")
    @ApiOperation("续签合同")
    @Log(title = "续签合同", businessType = BusinessType.UPDATE)
    public AjaxResult renewContract(@PathVariable("id") Long id, @RequestBody StaffContract staffContract) {
        return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
    }
@@ -133,6 +140,7 @@
     */
    @PostMapping("/export")
    @ApiOperation("在职员工导出")
    @Log(title = "在职员工导出", businessType = BusinessType.EXPORT)
    public void staffOnJobExport(HttpServletResponse response,StaffOnJob staffOnJob) {
        staffOnJobService.staffOnJobExport(response, staffOnJob);
    }
@@ -144,6 +152,7 @@
     */
    @PostMapping("/exportCopy")
    @ApiOperation("word模板合同在职员工导出")
    @Log(title = "word模板合同在职员工导出", businessType = BusinessType.EXPORT)
    public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
       return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
    }

 src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java

@@ -34,12 +34,14 @@

    @GetMapping("/listPage")
    @ApiOperation("员工工资主表分页查询")
    @Log(title = "员工工资主表分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
        return staffSalaryMainService.listPage(page, staffSalaryMain);
    }

    @ApiOperation("通过部门ids获取用户信息计算每个员工的工资")
    @PostMapping("/calculateSalary")
    @Log(title = "通过部门ids获取用户信息计算每个员工的工资", businessType = BusinessType.OTHER)
    public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
        return staffSalaryMainService.calculateSalary(calculateSalaryDto);
    }

 src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java

@@ -35,12 +35,14 @@

    @PostMapping("/listPage")
    @ApiOperation("排班分页查询")
    @Log(title = "排班分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(@RequestBody SearchSchedulingVo vo){
       return AjaxResult.success(staffSchedulingService.listPage(vo));
    }

    @PostMapping("/save")
    @ApiOperation("保存排班")
    @Log(title = "保存排班", businessType = BusinessType.UPDATE)
    public AjaxResult save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
        staffSchedulingService.saveStaffScheduling(saveStaffSchedulingDto);
        return AjaxResult.success();
@@ -48,6 +50,7 @@

    @DeleteMapping("/delByIds")
    @ApiOperation("批量删除排班")
    @Log(title = "批量删除排班", businessType = BusinessType.DELETE)
    public AjaxResult delByIds(@RequestBody List<Integer> ids){
        staffSchedulingService.removeByIds(ids);
        return AjaxResult.success();
@@ -55,6 +58,7 @@

    @DeleteMapping("/del/{id}")
    @ApiOperation("删除排班")
    @Log(title = "删除排班", businessType = BusinessType.DELETE)
    public AjaxResult del(@PathVariable("id") Integer id){
        staffSchedulingService.removeById(id);
        return AjaxResult.success();
@@ -65,6 +69,7 @@
     */
    @GetMapping("/getCurrentUserLatestScheduling")
    @ApiOperation("获取当前用户最新排班记录")
    @Log(title = "获取当前用户最新排班记录", businessType = BusinessType.OTHER)
    public AjaxResult getCurrentUserLatestScheduling(){
        return AjaxResult.success(staffSchedulingService.getCurrentUserLatestScheduling());
    }