人员bug修改

zss

2024-12-24 8216fd30e7eb970fd175f658c502ec2563174c37

 cnas-personnel/src/main/resources/mapper/PersonSupervisionRecordMapper.xml

@@ -1,30 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.PersonSupervisionRecordMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.PersonSupervisionRecord">
        <id column="id" property="id" />
        <result column="tester_id" property="testerId" />
        <result column="supervisor_id" property="supervisorId" />
        <result column="test_item" property="testItem" />
        <result column="sample_number" property="sampleNumber" />
        <result column="detection_date" property="detectionDate" />
        <result column="personnel" property="personnel" />
        <result column="instrument_equipment" property="instrumentEquipment" />
        <result column="working_environment" property="workingEnvironment" />
        <result column="sample_collection" property="sampleCollection" />
        <result column="sample_preparation" property="samplePreparation" />
        <result column="test_method" property="testMethod" />
        <result column="test_report" property="testReport" />
        <result column="evaluation_supervision_situation" property="evaluationSupervisionSituation" />
        <result column="do_not_meet_the_handling_opinions" property="doNotMeetTheHandlingOpinions" />
        <result column="technical_director" property="technicalDirector" />
        <result column="technical_director_date" property="technicalDirectorDate" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_user" property="createUser" />
        <result column="update_user" property="updateUser" />
        <id column="id" property="id"/>
        <result column="tester_id" property="testerId"/>
        <result column="supervisor_id" property="supervisorId"/>
        <result column="test_item" property="testItem"/>
        <result column="sample_number" property="sampleNumber"/>
        <result column="detection_date" property="detectionDate"/>
        <result column="personnel" property="personnel"/>
        <result column="instrument_equipment" property="instrumentEquipment"/>
        <result column="working_environment" property="workingEnvironment"/>
        <result column="sample_collection" property="sampleCollection"/>
        <result column="sample_preparation" property="samplePreparation"/>
        <result column="test_method" property="testMethod"/>
        <result column="test_report" property="testReport"/>
        <result column="evaluation_supervision_situation" property="evaluationSupervisionSituation"/>
        <result column="do_not_meet_the_handling_opinions" property="doNotMeetTheHandlingOpinions"/>
        <result column="technical_director" property="technicalDirector"/>
        <result column="technical_director_date" property="technicalDirectorDate"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="create_user" property="createUser"/>
        <result column="update_user" property="updateUser"/>
    </resultMap>

    <select id="personSupervisionRecordPage" resultType="com.yuanchu.mom.dto.PersonSupervisionRecordDto">
@@ -58,8 +57,14 @@

    <!-- 查询监督记录详情 -->
    <select id="selectPersonSupervisionRecord" resultType="com.yuanchu.mom.dto.PersonSupervisionRecordDto">
        select cpsr.*, u1.name tester_name, u2.name supervisor_name, u3.name technical_director_name,
               cp.personnel_name, cpscs.current_state current_state_control, cpsps.current_state current_state_processing
        select cpsr.*,
               date_format(detection_date, '%Y年%m月%d日') detectionDateString,
               u1.name                                  tester_name,
               u2.name                                  supervisor_name,
               u3.name                                  technical_director_name,
               cp.personnel_name,
               cpscs.current_state                      current_state_control,
               cpsps.current_state                      current_state_processing
        from cnas_person_supervision_record cpsr
                 left join user u1 on cpsr.tester_id = u1.id
                 left join user u2 on cpsr.supervisor_id = u2.id