Merge remote-tracking branch 'origin/master' into pim_yys

maven

2 天以前 0ce689b428cf9ceb58972db2bdd42a1a176f8f20

Merge remote-tracking branch 'origin/master' into pim_yys

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

@@ -36,6 +36,15 @@
    }

    /**
     * 在职员工下拉(新增离职用)
     * @return
     */
    @GetMapping("/list")
    public AjaxResult staffOnJobList() {
        return AjaxResult.success(staffOnJobService.staffOnJobList());
    }

    /**
     * 在职员工详情
     * @param staffNo
     * @return

 src/main/java/com/ruoyi/staff/service/IStaffOnJobService.java

@@ -17,4 +17,6 @@
    List<StaffJoinLeaveRecord> staffOnJobDetail(String staffNo);

    void staffOnJobExport(HttpServletResponse response, StaffOnJob staffOnJob);

    List<StaffOnJob> staffOnJobList();
}

 src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java

@@ -50,6 +50,10 @@
        util.exportExcel(response, staffOnJobs, "在职员工台账导出");
    }

    @Override
    public List<StaffOnJob> staffOnJobList() {
        return staffOnJobMapper.selectList(Wrappers.<StaffOnJob>lambdaQuery().eq(StaffOnJob::getStaffState,1));
    }


}

 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml

@@ -7,10 +7,10 @@
        FROM quality_unqualified
        where
        1=1
        <if test="qualityUnqualified.inspectType != null and qualityUnqualified.inspectType != '' ">
        <if test="qualityUnqualified.inspectType != null ">
            AND inspect_type = #{qualityUnqualified.inspectType}
        </if>
        <if test="qualityUnqualified.inspectState != null and qualityUnqualified.inspectState != '' ">
        <if test="qualityUnqualified.inspectState != null ">
            AND inspect_state = #{qualityUnqualified.inspectState}
        </if>
        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
@@ -23,10 +23,10 @@
        FROM quality_unqualified
        where
        1=1
        <if test="qualityUnqualified.inspectType != null and qualityUnqualified.inspectType != '' ">
        <if test="qualityUnqualified.inspectType != null">
            AND inspect_type = #{qualityUnqualified.inspectType}
        </if>
        <if test="qualityUnqualified.inspectState != null and qualityUnqualified.inspectState != '' ">
        <if test="qualityUnqualified.inspectState != null">
            AND inspect_state = #{qualityUnqualified.inspectState}
        </if>
        <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">