4.25

src/main/resources/bootstrap.yml

@@ -20,6 +20,15 @@ spring:
         file-extension: yml
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  mvc:
+    date-format: yyyy-MM-dd HH:mm:ss
+    throw-exception-if-no-handler-found: true
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: true
+
   profiles:
     active: @profiles.active@
   datasource:
@@ -28,3 +37,29 @@ spring:
     username: root
     password: 7990016
     url: jdbc:mysql://dlp-mysql:3306/reagent_managment?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+
+
+  servlet:
+    multipart:
+      # 根据实际需求作调整
+      # 默认最大上传文件大小为1M, 单个文件大小
+      max-file-size: 20MB
+      # 默认最大请求大小为10M, 总上传的数据大小
+      max-request-size: 55MB
+
+  # minio 文件存储配置信息
+  # 文件上传相关 支持阿里云、华为云、腾讯、minio
+#  oss:
+#    endpoint: http://127.0.0.1:9000
+#    accessKey: dlp-yhh
+#    secretKey: 87990016
+#    bucket-name: bucket1
+
+#   文件上传相关 支持阿里云、华为云、腾讯、minio
+#  oss:
+#    endpoint: http://192.168.9.73:9000
+#    accessKey: dlp
+#    secretKey: 87990016
+#    bucket-name: dlpfiles
+
+

src/main/resources/mapper/AcceptanceContentMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.AcceptanceContentMapper">
 
     <resultMap id="acceptanceContentMap" type="digital.laboratory.platform.reagent.entity.AcceptanceContent">
-      <id property="acceptanceContentId" column="acceptance_content_id"/>
+      <id property="id" column="id"/>
         <result property="acceptanceRecordFormId" column="acceptance_record_form_id"/>
         <result property="consistentQuantity" column="consistent_quantity"/>
         <result property="cRemark" column="c_remark"/>

src/main/resources/mapper/AcceptanceRecordFormMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.AcceptanceRecordFormMapper">
 
     <resultMap id="acceptanceRecordFormMap" type="digital.laboratory.platform.reagent.entity.AcceptanceRecordForm">
-        <id property="acceptanceRecordFormId" column="acceptance_record_form_id"/>
+        <id property="id" column="id"/>
         <result property="acceptanceConclusion" column="acceptance_conclusion"/>
         <result property="auditTimeOfThreeLevel" column="audit_time_of_three_level"/>
         <result property="dateOfAcceptance" column="date_of_acceptance"/>
@@ -20,7 +20,6 @@
         <result property="reagentConsumableId" column="reagent_consumable_id"/>
         <result property="auditOpinionOfPrimary" column="audit_opinion_of_primary"/>
         <result property="auditTimeOfPrimary" column="audit_time_of_primary"/>
-        <result property="signedBatchListId" column="signed_batch_list_id"/>
         <result property="auditResultOfPrimary" column="audit_result_of_primary"/>
         <result property="auditResultOfThreeLevel" column="audit_result_of_three_level"/>
         <result property="auditResultOfSecondary" column="audit_result_of_secondary"/>
@@ -41,6 +40,7 @@
         <result property="supplierId" column="supplier_id"/>
         <result property="status" column="status"/>
         <result property="warehousingContentId" column="warehousing_content_id"/>
+        <result property="userName" column="user_name"/>
     </resultMap>
 
     <resultMap id="acceptanceRecordFormVO" type="digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO"
@@ -50,6 +50,8 @@
         <result property="primaryAuditorName" column="primary_auditor_name"></result>
         <result property="secondaryAuditorName" column="secondary_auditor_name"></result>
         <result property="threeLevelAuditorName" column="three_level_auditor_name"></result>
+
+
     </resultMap>
 
     <sql id="getAcceptanceRecordFormVOSQL">
@@ -59,7 +61,7 @@
                 where rc.reagent_consumable_id = arf.reagent_consumable_id) as reagent_consumable_name,
                (select si.supplier_name
                 from supplier_information si
-                where si.supplier_information_id = arf.supplier_id)  as supplier_name,
+                where si.id = arf.supplier_id)  as supplier_name,
                (SELECT user.name
                 FROM dlp_base.sys_user user
         WHERE user.user_id=arf.primary_auditor_id
@@ -89,8 +91,8 @@
                 where rc.reagent_consumable_id = arf.reagent_consumable_id) as reagent_consumable_name,
                (select si.supplier_name
                 from supplier_information si
-                where si.supplier_id = arf.supplier_id)as supplier_name
+                where si.id  = arf.supplier_id)as supplier_name
         FROM acceptance_record_form arf
-        WHERE arf.acceptance_record_form_id = #{acceptanceRecordFormId}
+        WHERE arf.id = #{acceptanceRecordFormId}
     </select>
 </mapper>

src/main/resources/mapper/ApplicationForUseMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.ApplicationForUseMapper">
 
     <resultMap id="applicationForUseMap" type="digital.laboratory.platform.reagent.entity.ApplicationForUse">
-        <id property="applicationForUseId" column="application_for_use_id"/>
+        <id property="id" column="id"/>
         <result property="dateOfCollection" column="date_of_collection"/>
         <result property="recipientId" column="recipient_id"/>
         <result property="status" column="status"/>
@@ -40,7 +40,7 @@
     <select id="getApplicationForUseVOPage" resultMap="applicationForUseVO"
             resultType="digital.laboratory.platform.reagent.vo.ApplicationForUseVO">
         <include refid="getApplicationForUseVOSQL"></include>
-
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getApplicationForUseVO" resultMap="applicationForUseVO"
@@ -50,7 +50,7 @@
                 from dlp_base.sys_user user
         where user.user_id =afu.recipient_id) AS recipient_name
         FROM application_for_use afu
-        WHERE afu.application_for_use_id = #{applicationForUseId}
+        WHERE afu.id = #{applicationForUseId}
     </select>
 
 </mapper>

src/main/resources/mapper/BatchDetailsMapper.xml

@@ -7,6 +7,7 @@
   <resultMap id="batchDetailsMap" type="digital.laboratory.platform.reagent.entity.BatchDetails">
     <id property="batchDetailsId" column="batch_details_id"/>
     <result property="batch" column="batch"/>
+    <result property="warningInformation" column="warning_information"/>
     <result property="batchNumber" column="batch_number"/>
     <result property="complianceTestSituation" column="compliance_test_situation"/>
     <result property="dateOfLastCheck" column="date_of_last_check"/>
@@ -25,6 +26,7 @@
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
+    <result property="batchDetailsId" column="batch_details_id"/>
 
   </resultMap>
 </mapper>

src/main/resources/mapper/CabinetFormMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.CabinetFormMapper">
 
   <resultMap id="cabinetFormMap" type="digital.laboratory.platform.reagent.entity.CabinetForm">
-    <id property="cabinetFormId" column="cabinet_form_id"/>
+    <id property="id" column="id"/>
     <result property="storageRoomFormId" column="storage_room_form_id"/>
     <result property="name" column="name"/>
     <result property="number" column="number"/>
@@ -16,5 +16,6 @@
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
+    <result property="type" column="type"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/CatalogueDetailsMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.CatalogueDetailsMapper">
 
     <resultMap id="catalogueDetailsMap" type="digital.laboratory.platform.reagent.entity.CatalogueDetails">
-        <id property="catalogueDetailsId" column="catalogue_details_id"/>
+        <id property="id" column="id"/>
         <result property="brand" column="brand"/>
         <result property="category" column="category"/>
         <result property="deviationOrUncertainty" column="deviation_or_uncertainty"/>
@@ -27,5 +27,7 @@
     </resultMap>
 
 
+
+
 </mapper>
 

src/main/resources/mapper/CentralizedRequestMapper.xml

@@ -5,32 +5,28 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.CentralizedRequestMapper">
 
     <resultMap id="centralizedRequestMap" type="digital.laboratory.platform.reagent.entity.CentralizedRequest">
-        <id property="centralizedRequestId" column="centralized_request_id"/>
+        <id property="id" column="id"/>
         <result property="status" column="status"/>
         <result property="purchasingPlanId" column="purchasing_plan_id"/>
         <result property="dateOfApplication" column="date_of_application"/>
         <result property="auditOpinion" column="audit_opinion"/>
         <result property="applicantId" column="applicant_id"/>
-        <result property="orgName" column="org_name"/>
         <result property="applicantName" column="applicant_name"/>
         <result property="auditorId" column="auditor_id"/>
         <result property="number" column="number"/>
-        <result property="orgName" column="org_name"/>
         <result property="applicantName" column="applicant_name"/>
 
     </resultMap>
 
     <resultMap id="CentralizedRequestVO" type="digital.laboratory.platform.reagent.vo.CentralizedRequestVO"
                extends="centralizedRequestMap">
-        <result property="orgName" column="org_name"/>
+        <result property="department" column="department"/>
         <result property="applicantName" column="applicant_name"/>
     </resultMap>
 
     <sql id="getCentralizedRequestVOSQL">
         SELECT cr.*,
-               (SELECT org.name
-                FROM dlp_base.sys_org org
-                WHERE org.org_id in (select org_id from dlp_base.sys_user where user_id = cr.applicant_id)) AS org_name,
+               (select department from dlp_base.sys_user where user_id = cr.applicant_id) AS department,
                (SELECT user.name
                 FROM dlp_base.sys_user user
         WHERE user.user_id=cr.applicant_id
@@ -41,15 +37,10 @@
     <sql id="getCentralizedRequestSQL">
 
         select cr.*,
-               (SELECT org.name
-                FROM dlp_base.sys_org org
-                WHERE org.org_id in (select org_id from dlp_base.sys_user where user_id = cr.applicant_id)) AS org_name,
-               (SELECT user.name
-                FROM dlp_base.sys_user user
-        WHERE user.user_id=cr.applicant_id
-            ) AS applicant_name
+               (select department from dlp_base.sys_user where user_id = cr.applicant_id) as department,
+               (select user.name from dlp_base.sys_user user where user.user_id=cr.applicant_id ) as applicant_name
         from centralized_request cr
-        where cr.centralized_request_id =#{centralizedRequestId}
+        where cr.id =#{id}
     </sql>
 
     <!-- 根据条件取 CentralizedRequestVO 列表分页 -->

src/main/resources/mapper/CheckContentMapper.xml

@@ -1,32 +0,0 @@
-<?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="digital.laboratory.platform.reagent.mapper.CheckContentMapper">
-
-  <resultMap id="checkContentMap" type="digital.laboratory.platform.reagent.entity.CheckContent">
-    <id property="checkContentId" column="check_content_id"/>
-    <result property="brand" column="brand"/>
-    <result property="complianceCheckId" column="compliance_check_id"/>
-    <result property="reagentConsumableId" column="reagent_consumable_id"/>
-    <result property="specificationAndModel" column="specification_and_model"/>
-
-    <result property="createTime" column="create_time"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateBy" column="update_by"/>
-  </resultMap>
-  
-  <resultMap id="checkContentVO" type="digital.laboratory.platform.reagent.vo.CheckContentVO" extends="checkContentMap">
-    <result property="reagentConsumableName" column="reagent_consumable_name"></result>
-  </resultMap>
-  
-  <select id="getCheckContentVOList" resultMap="checkContentVO" resultType="digital.laboratory.platform.reagent.vo.CheckContentVO">
-    SELECT cc.*,
-           (select rc.name
-            from reagent_consumables rc
-            where rc.reagent_consumable_id = cc.reagent_consumable_id)
-    FROM check_content cc
-    WHERE cc.compliance_check_id = #{complianceCheckId}
-  </select>
-</mapper>

src/main/resources/mapper/CheckScheduleMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.CheckScheduleMapper">
 
     <resultMap id="checkScheduleMap" type="digital.laboratory.platform.reagent.entity.CheckSchedule">
-        <id property="checkScheduleId" column="check_schedule_id"/>
+        <id property="id" column="id"/>
         <result property="auditTimeOfTechnical" column="audit_time_of_technical"/>
         <result property="auditResultOfTechnical" column="audit_result_of_technical"/>
         <result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
@@ -27,19 +27,14 @@
 
     <sql id="getCheckScheduleVOSQL">
         SELECT cs.*,
-               (SELECT user.name
-                FROM dlp_base.sys_user user
-        WHERE user.user_id=cs.technical_director_id ) as technical_director_name
-            , (
-        SELECT user.name
-        FROM dlp_base.sys_user user
-        WHERE user.user_id=cs.manager_id ) as manager_mame
+               (SELECT user.name FROM dlp_base.sys_user user  WHERE user.user_id=cs.technical_director_id ) as technical_director_name,
+               (SELECT user.name FROM dlp_base.sys_user user WHERE user.user_id=cs.manager_id ) as manager_mame
         FROM check_schedule cs
-
     </sql>
 
     <select id="getCheckScheduleVOPage" resultMap="checkScheduleVO" resultType="digital.laboratory.platform.reagent.vo.CheckScheduleVO">
         <include refid="getCheckScheduleVOSQL"></include>
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getCheckScheduleVO"  resultMap="checkScheduleVO" resultType="digital.laboratory.platform.reagent.vo.CheckScheduleVO" >
@@ -52,6 +47,6 @@
         FROM dlp_base.sys_user user
         WHERE user.user_id=cs.manager_id ) as manager_mame
         FROM check_schedule cs
-        WHERE cs.check_schedule_id = #{checkScheduleId}
+        WHERE cs.id = #{checkScheduleId}
     </select>
 </mapper>

src/main/resources/mapper/ComplianceCheckMapper.xml

@@ -4,73 +4,90 @@
 
 <mapper namespace="digital.laboratory.platform.reagent.mapper.ComplianceCheckMapper">
 
-  <resultMap id="complianceCheckMap" type="digital.laboratory.platform.reagent.entity.ComplianceCheck">
-    <id property="complianceCheckId" column="compliance_check_id"/>
-    <result property="auditOpinionOfPrimary" column="audit_opinion_of_primary"/>
-    <result property="auditOpinionOfSecondary" column="audit_opinion_of_secondary"/>
-    <result property="auditResultOfPrimary" column="audit_result_of_primary"/>
-    <result property="auditResultOfSecondary" column="audit_result_of_secondary"/>
-    <result property="auditTimeOfPrimary" column="audit_time_of_primary"/>
-    <result property="auditTimeOfSecondary" column="audit_time_of_secondary"/>
-    <result property="dateOfInspection" column="date_of_inspection"/>
-    <result property="examinationConclusion" column="examination_conclusion"/>
-    <result property="primaryAuditorId" column="primary_auditor_id"/>
-    <result property="inspectionScheme" column="inspection_scheme"/>
-    <result property="status" column="status"/>
-    <result property="secondaryAuditorId" column="secondary_auditor_id"/>
-    <result property="createTime" column="create_time"/>
-    <result property="updateTime" column="update_time"/>
-    <result property="createBy" column="create_by"/>
-    <result property="updateBy" column="update_by"/>
-    <result property="number" column="number"/>
-    <result property="brand" column="brand"/>
-    <result property="reagentConsumableId" column="reagent_consumable_id"/>
-    <result property="specificationAndModel" column="specification_and_model"/>
-    <result property="nonconformingItem" column="nonconforming_item"/>
-    <result property="reagentConsumableNumber" column="reagent_consumable_number"/>
-  </resultMap>
+    <resultMap id="complianceCheckMap" type="digital.laboratory.platform.reagent.entity.ComplianceCheck">
+        <id property="id" column="id"/>
+        <result property="auditOpinionOfPrimary" column="audit_opinion_of_primary"/>
+        <result property="auditOpinionOfSecondary" column="audit_opinion_of_secondary"/>
+        <result property="auditResultOfPrimary" column="audit_result_of_primary"/>
+        <result property="auditResultOfSecondary" column="audit_result_of_secondary"/>
+        <result property="auditTimeOfPrimary" column="audit_time_of_primary"/>
+        <result property="auditTimeOfSecondary" column="audit_time_of_secondary"/>
+        <result property="dateOfInspection" column="date_of_inspection"/>
+        <result property="examinationConclusion" column="examination_conclusion"/>
+        <result property="primaryAuditorId" column="primary_auditor_id"/>
+        <result property="inspectionScheme" column="inspection_scheme"/>
+        <result property="status" column="status"/>
+        <result property="secondaryAuditorId" column="secondary_auditor_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="number" column="number"/>
+        <result property="brand" column="brand"/>
+        <result property="reagentConsumableId" column="reagent_consumable_id"/>
+        <result property="specificationAndModel" column="specification_and_model"/>
+        <result property="nonconformingItem" column="nonconforming_item"/>
+        <result property="reagentConsumableNumber" column="reagent_consumable_number"/>
+        <result property="executorId" column="executor_id"/>
+        <result property="batchDetailsId" column="batch_details_id"/>
+    </resultMap>
 
-  <resultMap id="complianceCheckVO" type="digital.laboratory.platform.reagent.vo.ComplianceCheckVO" extends="complianceCheckMap">
-    <result property="executorName" column="executor_name"></result>
-    <result property="primaryAuditorName" column="primary_auditor_name"></result>
-    <result property="secondaryAuditorId" column="secondary_auditor_name"></result>
-  </resultMap>
-  <sql id="getComplianceCheckVOSQL">
-    SELECT cc.*,
-           (SELECT user.name
-            FROM dlp_base.sys_user user
-    WHERE user.user_id =cc.executor_id) AS executor_name,
-        (SELECT user.name
-    FROM dlp_base.sys_user user
-    WHERE user.user_id =cc.primary_auditor_id) AS primary_auditor_name ,
-        (SELECT user.name
-    FROM dlp_base.sys_user user
-    WHERE user.user_id =cc.secondary_auditor_id) AS secondary_auditor_name
-    FROM compliance_check cc
-  </sql>
+    <resultMap id="complianceCheckVO" type="digital.laboratory.platform.reagent.vo.ComplianceCheckVO"
+               extends="complianceCheckMap">
+        <result property="executorName" column="executor_name"></result>
+        <result property="primaryAuditorName" column="primary_auditor_name"></result>
+        <result property="secondaryAuditorId" column="secondary_auditor_name"></result>
+        <result property="makerName" column="maker_name"></result>
+    </resultMap>
+    <sql id="getComplianceCheckVOSQL">
+        SELECT cc.*,
+               (SELECT user.name
+                FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.executor_id) AS executor_name
+            , (
+        SELECT user.name
+        FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.create_by) AS maker_name
+            , (
+        SELECT user.name
+        FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.primary_auditor_id) AS primary_auditor_name
+            , (
+        SELECT user.name
+        FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.secondary_auditor_id) AS secondary_auditor_name
+        FROM compliance_check cc
+    </sql>
 
-  <select id="getComplianceCheckVOPage" resultMap="complianceCheckVO" resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
-    <include refid="getComplianceCheckVOSQL"></include>
-    ${ew.customSqlSegment}
-  </select>
+    <select id="getComplianceCheckVOPage" resultMap="complianceCheckVO"
+            resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
+        <include refid="getComplianceCheckVOSQL"></include>
+    </select>
 
-  <select id="getComplianceCheckVOList" resultMap="complianceCheckVO" resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
-    <include refid="getComplianceCheckVOSQL"></include>
-    ${ew.customSqlSegment}
-  </select>
+    <select id="getComplianceCheckVOList" resultMap="complianceCheckVO"
+            resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
+        <include refid="getComplianceCheckVOSQL"></include>
+    </select>
 
-  <select id="getComplianceCheckVO" resultMap="complianceCheckVO" resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
-    SELECT cc.*,
-           (SELECT user.name
-            FROM dlp_base.sys_user user
-    WHERE user.user_id =cc.executor_id) AS executor_name ,
-        (SELECT user.name
-    FROM dlp_base.sys_user user
-    WHERE user.user_id =cc.primary_auditor_id) AS primary_auditor_name ,
-        (SELECT user.name
-    FROM dlp_base.sys_user user
-    WHERE user.user_id =cc.secondary_auditor_id) AS secondary_auditor_name
-    FROM compliance_check cc
-    WHERE cc.compliance_check_id = #{complianceCheckId}
-  </select>
+    <select id="getComplianceCheckVO" resultMap="complianceCheckVO"
+            resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
+        SELECT cc.*,
+               (SELECT user.name
+                FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.executor_id) AS executor_name
+            , (
+        SELECT user.name
+        FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.create_by) AS maker_name
+            , (
+        SELECT user.name
+        FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.primary_auditor_id) AS primary_auditor_name
+            , (
+        SELECT user.name
+        FROM dlp_base.sys_user user
+        WHERE user.user_id =cc.secondary_auditor_id) AS secondary_auditor_name
+        FROM compliance_check cc
+        WHERE cc.id = #{complianceCheckId}
+    </select>
 </mapper>

src/main/resources/mapper/DecentralizeDetailsMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.DecentralizeDetailsMapper">
 
     <resultMap id="decentralizeDetailsMap" type="digital.laboratory.platform.reagent.entity.DecentralizeDetails">
-        <id property="decentralizeDetailsId" column="decentralize_details_id"/>
+        <id property="id" column="id"/>
         <result property="brand" column="brand"/>
         <result property="category" column="category"/>
         <result property="decentralizedRequestId" column="decentralized_request_id"/>
@@ -23,7 +23,7 @@
         <result property="reagentConsumableName" column="reagent_consumable_name"/>
         <result property="alias" column="alias"/>
         <result property="storageCondition" column="storage_condition"/>
-        <result property="remark" column="remark"/>
+        <result property="remarks" column="remarks"/>
         <result property="minimumUnit" column="minimum_unit"/>
     </resultMap>
 </mapper>

src/main/resources/mapper/DecentralizedRequestMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.DecentralizedRequestMapper">
 
     <resultMap id="decentralizedRequestMap" type="digital.laboratory.platform.reagent.entity.DecentralizedRequest">
-        <id property="decentralizedRequestId" column="decentralized_request_id"/>
+        <id property="id" column="id"/>
         <result property="applicantId" column="applicant_id"/>
         <result property="opinionOfApproval" column="opinion_of_approval"/>
         <result property="resultOfApproval" column="result_of_approval"/>
@@ -37,14 +37,12 @@
         <result property="primaryAuditorName" column="primary_auditor_name"/>
         <result property="applicantName" column="applicant_name"/>
         <result property="approverName" column="approver_name"/>
-        <result property="ogrName" column="ogr_name"/>
+        <result property="department" column="department"/>
     </resultMap>
 
     <sql id="getDecentralizedRequestVOSQL">
         SELECT dr.*,
-               (SELECT org.name
-                FROM dlp_base.sys_org org
-                WHERE org.org_id in (select org_id from dlp_base.sys_user where user_id = dr.applicant_id)) AS org_name,
+            (select department from dlp_base.sys_user where user_id = dr.applicant_id) AS department,
                (SELECT user.name
                 FROM dlp_base.sys_user user
         WHERE user.user_id =dr.three_level_audit_id) AS three_level_audit_name
@@ -101,7 +99,7 @@
         FROM dlp_base.sys_user user
         WHERE user.user_id =dr.approver_id) As approver_name
         FROM decentralized_request dr
-        WHERE dr.decentralized_request_id = #{decentralizedRequestId}
+        WHERE dr.id = #{id}
     </select>
 </mapper>
 

src/main/resources/mapper/DeliveryRegistrationFormMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.DeliveryRegistrationFormMapper">
 
   <resultMap id="deliveryRegistrationFormMap" type="digital.laboratory.platform.reagent.entity.DeliveryRegistrationForm">
-    <id property="deliveryRegistrationFormId" column="delivery_registration_form_id"/>
+    <id property="id" column="id"/>
     <result property="dateOfDelivery" column="date_of_delivery"/>
     <result property="depositorId" column="depositor_id"/>
     <result property="outgoingApplicantId" column="outgoing_applicant_id"/>
@@ -13,6 +13,29 @@
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
-
+    <result property="status" column="status"/>
   </resultMap>
+
+  <resultMap id="deliveryRegistrationFormVO" type="digital.laboratory.platform.reagent.vo.DeliveryRegistrationFormVO" extends="deliveryRegistrationFormMap">
+    <result property="depositorName" column="depositor_name"></result>
+    <result property="outgoingApplicantName" column="outgoing_applicant_name"></result>
+  </resultMap>
+
+  <select id="getDeliveryRegistrationFormVOPage" resultMap="deliveryRegistrationFormVO" resultType="digital.laboratory.platform.reagent.vo.DeliveryRegistrationFormVO">
+    SELECT drf.*,
+           (select user.name from dlp_base.sys_user user where user.user_id=drf.depositor_id ) as depositor_name,
+           (select user.name from dlp_base.sys_user user where user.user_id=drf.outgoing_applicant_id ) as outgoing_applicant_name
+    FROM delivery_registration_form drf
+    WHERE drf.status = 0
+  </select>
+
+  <select id="getDeliveryRegistrationFormVOById" resultMap="deliveryRegistrationFormVO" resultType="digital.laboratory.platform.reagent.vo.DeliveryRegistrationFormVO">
+    SELECT drf.*,
+           (select user.name from dlp_base.sys_user user where user.user_id=drf.depositor_id ) as depositor_name,
+           (select user.name from dlp_base.sys_user user where user.user_id=drf.outgoing_applicant_id ) as outgoing_applicant_name
+    FROM delivery_registration_form drf
+    WHERE drf.id = #{deliveryRegistrationFormId}
+  </select>
+
+
 </mapper>

src/main/resources/mapper/DetailsOfCentralizedMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.DetailsOfCentralizedMapper">
 
     <resultMap id="detailsOfCentralizedMap" type="digital.laboratory.platform.reagent.entity.DetailsOfCentralized">
-        <id property="detailsOfCentralizedId" column="details_of_centralized_id"/>
+        <id property="id" column="id"/>
         <result property="quantityPurchased" column="quantity_purchased"/>
         <result property="reagentConsumableId" column="reagent_consumable_id"/>
         <result property="centralizedRequestId" column="centralized_request_id"/>
@@ -14,6 +14,7 @@
         <result property="numberOfApplications" column="number_of_applications"/>
         <result property="replacementReagentConsumableId" column="replacement_reagent_consumable_id"/>
         <result property="replacementQuantity" column="replacement_quantity"/>
+        <result property="detailsRemark" column="details_remark"/>
     </resultMap>
 
     <resultMap id="DetailsOfCentralizedVO" type="digital.laboratory.platform.reagent.vo.DetailsOfCentralizedVO"

src/main/resources/mapper/EvaluationFormMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.EvaluationFormMapper">
 
     <resultMap id="evaluationFormMap" type="digital.laboratory.platform.reagent.entity.EvaluationForm">
-        <id property="evaluationFormId" column="evaluation_form_id"/>
+        <id property="id" column="id"/>
         <result property="commentsFromPrimary" column="comments_from_primary"/>
         <result property="commentsFromThreeLevel" column="comments_from_three_level"/>
         <result property="contactNumber" column="contact_number"/>
@@ -60,6 +60,25 @@
         where user.user_id = ef.three_level_user_id)
             AS three_level_user_name
         FROM evaluation_form ef
-        WHERE ef.evaluation_form_id = #{evaluationFormId}
+        WHERE ef.id = #{id}
+    </select>
+
+    <select id="getEvaluationFormVOList" resultMap="evaluationFormVO"
+            resultType="digital.laboratory.platform.reagent.vo.EvaluationFormVO">
+        SELECT ef.*,
+               (select user.name
+                from dlp_base.sys_user user
+        where user.user_id = ef.primary_user_id)
+            AS primary_user_name,
+            (select user.name
+        from dlp_base.sys_user user
+        where user.user_id = ef.secondary_user_id)
+            AS secondary_user_name,
+            (select user.name
+        from dlp_base.sys_user user
+        where user.user_id = ef.three_level_user_id)
+            AS three_level_user_name
+        FROM evaluation_form ef
+        WHERE ef.supplier_information_id = #{supplierInformationId}
     </select>
 </mapper>

src/main/resources/mapper/InstructionBookMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.InstructionBookMapper">
 
   <resultMap id="instructionBookMap" type="digital.laboratory.platform.reagent.entity.InstructionBook">
-    <id property="instructionBookId" column="instruction_book_id"/>
+    <id property="id" column="id"/>
     <result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
     <result property="auditResultOfTechnical" column="audit_result_of_technical"/>
     <result property="auditTimeOfTechnical" column="audit_time_of_technical"/>

src/main/resources/mapper/OutgoingContentsMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.OutgoingContentsMapper">
 
   <resultMap id="outgoingContentsMap" type="digital.laboratory.platform.reagent.entity.OutgoingContents">
-    <id property="outgoingContentsId" column="outgoing_contents_id"/>
+    <id property="id" column="id"/>
     <result property="deliveryRegistrationFormId" column="delivery_registration_form_id"/>
     <result property="outboundUse" column="outbound_use"/>
     <result property="quantity" column="quantity"/>
@@ -16,6 +16,9 @@
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
+    <result property="returnOrNot" column="return_or_not"/>
+    <result property="referenceMaterialNumber" column="reference_material_number"/>
+    <result property="referenceMaterialId" column="reference_material_id"/>
 
   </resultMap>
 </mapper>

src/main/resources/mapper/PeriodVerificationImplementationMapper.xml

@@ -29,20 +29,17 @@
         <result property="updateBy" column="update_by"/>
         <result property="referenceMaterialNumber" column="reference_material_number"/>
         <result property="periodVerificationPlanId" column="period_verification_plan_id"/>
+        <result property="referenceMaterialName" column="reference_material_name"/>
     </resultMap>
 
     <resultMap id="periodVerificationImplementationVO" type="digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO"
                extends="periodVerificationImplementationMap">
         <result property="inspectorName" column="inspector_name"></result>
-        <result property="referenceMaterialName" column="reference_material_name"></result>
         <result property="technicalDirectorName" column="technical_director_name"></result>
     </resultMap>
 
     <sql id="getPeriodVerificationImplementationVOSQL">
         select pvi.*,
-               (select rc.reagent_consumable_name
-                from reagent_consumables rc
-                where rc.reagent_consumable_id = pvi.reference_material_id) as reference_material_name,
                (SELECT user.name
                 FROM dlp_base.sys_user user
         WHERE user.user_id=pvi.inspector_id ) as inspector_nam
@@ -56,6 +53,7 @@
 
     <select id="getPeriodVerificationImplementationVOPage" resultMap="periodVerificationImplementationVO" resultType="digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO">
         <include refid="getPeriodVerificationImplementationVOSQL"></include>
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getPeriodVerificationImplementationVO" resultMap="periodVerificationImplementationVO" resultType="digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO">

src/main/resources/mapper/PeriodVerificationPlanMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.PeriodVerificationPlanMapper">
 
     <resultMap id="periodVerificationPlanMap" type="digital.laboratory.platform.reagent.entity.PeriodVerificationPlan">
-        <id property="periodVerificationPlanId" column="period_verification_plan_id"/>
+        <id property="id" column="id"/>
         <result property="dateOfNextCheck" column="date_of_next_check"/>
         <result property="deviationAndUncertainty" column="deviation_and_uncertainty"/>
         <result property="inspectorId" column="inspector_id"/>

src/main/resources/mapper/ProcurementContentMapper.xml

@@ -20,6 +20,7 @@
         <result property="replacementQuantity" column="replacement_quantity"/>
         <result property="replacementPrice" column="replacement_price"/>
         <result property="numberOfApplications" column="number_of_applications"/>
+        <result property="planRemark" column="plan_remark"/>
 
     </resultMap>
 

src/main/resources/mapper/ProvideServicesOrSuppliesMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.ProvideServicesOrSuppliesMapper">
 
   <resultMap id="provideServicesOrSuppliesMap" type="digital.laboratory.platform.reagent.entity.ProvideServicesOrSupplies">
-    <id property="provideServicesOrSuppliesId" column="provide_services_or_supplies_id"/>
+    <id property="id" column="id"/>
     <result property="reagentConsumableId" column="reagent_consumable_id"/>
     <result property="evaluationFormId" column="evaluation_form_id"/>
     <result property="createTime" column="create_time"/>
@@ -19,12 +19,4 @@
     <result property="reagentConsumableName" column="reagent_consumable_name"></result>
   </resultMap>
 
-  <select id="getProvideServicesOrSuppliesVOList" resultMap="provideServicesOrSuppliesVO" resultType="digital.laboratory.platform.reagent.vo.ProvideServicesOrSuppliesVO">
-    SELECT ps.*,
-           (select rc.name
-            from reagent_consumables rc
-            where rc.reagent_consumable_id = ps.reagent_consumable_id) AS reagent_consumable_name
-    FROM provide_services_or_supplies ps
-    WHERE ps.provide_services_or_supplies_id = #{provideServicesOrSuppliesId}
-  </select>
 </mapper>

src/main/resources/mapper/PurchaseListMapper.xml

@@ -5,13 +5,15 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.PurchaseListMapper">
 
   <resultMap id="purchaseListMap" type="digital.laboratory.platform.reagent.entity.PurchaseList">
-    <id property="purchaseListId" column="purchase_list_id"/>
+    <id property="id" column="id"/>
     <result property="name" column="name"/>
     <result property="createTime" column="create_time"/>
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
     <result property="number" column="number"/>
+    <result property="status" column="status"/>
+    <result property="type" column="type"/>
 
   </resultMap>
 </mapper>

src/main/resources/mapper/PurchaselistDetailsMapper.xml

@@ -5,12 +5,11 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.PurchaseListDetailsMapper">
 
     <resultMap id="purchaseListDetailsMap" type="digital.laboratory.platform.reagent.entity.PurchaseListDetails">
-        <id property="purchaseListDetailsId" column="purchase_list_details_id"/>
+        <id property="id" column="id"/>
         <result property="purchaseCatalogueNumber" column="purchase_catalogue_number"/>
         <result property="purchaseListId" column="purchase_list_id"/>
         <result property="purchaseQuantity" column="purchase_quantity"/>
         <result property="reagentConsumableId" column="reagent_consumable_id"/>
-        <result property="remarks" column="remarks"/>
         <result property="supplierId" column="supplier_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
@@ -27,8 +26,19 @@
 
     <select id="getPurchaseListDetailsVOList" resultMap="purchaseListDetailsVO" resultType="digital.laboratory.platform.reagent.vo.PurchaseListDetailsVO">
         SELECT pd.*,
-               (select rc.reagent_consumable_name from reagent_consumables rc where rc.reagent_consumable_id = pd.reagent_consumable_id) AS reagent_consumable_name
+               (select rc.reagent_consumable_name from reagent_consumables rc where rc.reagent_consumable_id = pd.reagent_consumable_id) as reagent_consumable_name,
+               (select si.supplier_name from supplier_information si where si.id = pd.supplier_id) as supplier_name
+
         FROM purchase_list_details pd
-        WHERE pd.purchase_list_id = #{purchaseListId}
+        WHERE pd.purchase_list_id = #{id}
+    </select>
+
+    <select id="getPurchaseListDetails" resultMap="purchaseListDetailsVO" resultType="digital.laboratory.platform.reagent.vo.PurchaseListDetailsVO">
+        SELECT pd.*,
+               (select rc.reagent_consumable_name from reagent_consumables rc where rc.reagent_consumable_id = pd.reagent_consumable_id) as reagent_consumable_name,
+               (select si.supplier_name from supplier_information si where si.id = pd.supplier_id) as supplier_name
+
+        FROM purchase_list_details pd
+        WHERE pd.id = #{id}
     </select>
 </mapper>

src/main/resources/mapper/ReagentConsumableInventoryMapper.xml

@@ -21,6 +21,17 @@
     <result property="totalQuantity" column="total_quantity"/>
     <result property="species" column="species"/>
     <result property="packagedCopies" column="packaged_copies"/>
-
+    <result property="configurationConcentration" column="configuration_concentration"/>
+    <result property="minimumUnit" column="minimum_unit"/>
+    <result property="remark" column="remark"/>
+    <result property="storageCondition" column="storage_condition"/>
+    <result property="alias" column="alias"/>
+    <result property="englishName" column="english_name"/>
+    <result property="unitPrice" column="unit_price"/>
+    <result property="reagentConsumableName" column="reagent_consumable_name"/>
+    <result property="storageLife" column="storage_life"/>
+    <result property="status" column="status"/>
   </resultMap>
+
+
 </mapper>

src/main/resources/mapper/ReagentConsumablesMapper.xml

@@ -26,6 +26,7 @@
     <result property="remark" column="remark"/>
     <result property="minimumUnit" column="minimum_unit"/>
     <result property="number" column="number"/>
+    <result property="configurationConcentration" column="configuration_concentration"/>
 
 
 

src/main/resources/mapper/ReagentConsumablesSetMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.ReagentConsumablesSetMapper">
 
   <resultMap id="reagentConsumablesSetMap" type="digital.laboratory.platform.reagent.entity.ReagentConsumablesSet">
-    <id property="reagentConsumablesSetId" column="reagent_consumables_set_id"/>
+    <id property="id" column="id"/>
     <result property="applicationForUseId" column="application_for_use_id"/>
     <result property="quantity" column="quantity"/>
     <result property="reagentConsumableId" column="reagent_consumable_id"/>
@@ -16,5 +16,7 @@
     <result property="remarks" column="remarks"/>
     <result property="purpose" column="purpose"/>
     <result property="batchDetailsId" column="batch_details_id"/>
+    <result property="returnOrNot" column="return_or_not"/>
+    <result property="referenceMaterialNumber" column="reference_material_number"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/ReferenceMaterialMapper.xml

@@ -14,5 +14,6 @@
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
     <result property="status" column="status"/>
+    <result property="reagentConsumableInventoryId" column="reagent_consumable_inventory_id"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/RequisitionRecordMapper.xml

@@ -35,7 +35,6 @@
                 FROM dlp_base.sys_user user
         WHERE user.user_id=rr.recipient_id
             ) AS recipient_name
-
         FROM requisition_record rr
     </sql>
 

src/main/resources/mapper/StandardMaterialApplicationMapper.xml

@@ -29,6 +29,7 @@
         <result property="number" column="number"/>
         <result property="status" column="status"/>
         <result property="applicationForUseId" column="application_for_use_id"/>
+        <result property="referenceMaterialId" column="reference_material_id"/>
     </resultMap>
 
     <resultMap id="standardMaterialApplicationVO"

src/main/resources/mapper/StandardMaterialApprovalFormMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.StandardMaterialApprovalFormMapper">
 
   <resultMap id="standardMaterialApprovalFormMap" type="digital.laboratory.platform.reagent.entity.StandardMaterialApprovalForm">
-    <id property="standardMaterialApprovalFormId" column="standard_material_approval_form_id"/>
+    <id property="id" column="id"/>
     <result property="agentId" column="agent_id"/>
     <result property="applicantId" column="applicant_id"/>
     <result property="applicationTime" column="application_time"/>
@@ -16,15 +16,14 @@
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
-    <result property="auditOpinionOfManager" column="audit_opinion_of_manager"/>
-    <result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
-    <result property="auditResultOfManager" column="audit_result_of_manager"/>
-    <result property="auditResultOfTechnical" column="audit_result_of_technical"/>
-    <result property="auditTimeOfManager" column="audit_time_of_manager"/>
-    <result property="auditTimeOfTechnical" column="audit_time_of_technical"/>
+    <result property="auditOpinionOfPrimary" column="audit_opinion_of_primary"/>
+    <result property="auditOpinionOfSecondary" column="audit_opinion_of_secondary"/>
+    <result property="auditResultOfPrimary" column="audit_result_of_primary"/>
+    <result property="auditResultOfSecondary" column="audit_result_of_secondary"/>
+    <result property="auditTimeOfPrimary" column="audit_time_of_primary"/>
+    <result property="auditTimeOfSecondary" column="audit_time_of_secondary"/>
     <result property="batchNumber" column="batch_number"/>
     <result property="commitStatus" column="commit_status"/>
-    <result property="directorId" column="director_id"/>
     <result property="fixedResult" column="fixed_result"/>
     <result property="manufacturerId" column="manufacturer_id"/>
     <result property="number" column="number"/>
@@ -33,24 +32,28 @@
     <result property="quantity" column="quantity"/>
     <result property="reasonForApplication" column="reason_for_application"/>
     <result property="referenceMaterialId" column="reference_material_id"/>
-    <result property="managerId" column="manager_id"/>
+    <result property="primaryAuditorId" column="primary_auditorId"/>
     <result property="remarks" column="remarks"/>
     <result property="specification" column="specification"/>
-    <result property="technicalDirectorId" column="technical_director_id"/>
+    <result property="secondaryAuditorId" column="secondary_auditor_id"/>
+    <result property="approverId" column="approver_id"/>
 
   </resultMap>
 
   <resultMap id="standardMaterialApprovalFormVO" type="digital.laboratory.platform.reagent.vo.StandardMaterialApprovalFormVO" extends="standardMaterialApprovalFormMap">
     <result property="manufacturerName" column="manufacturer_name"></result>
-
+    <result property="primaryAuditorName" column="primary_auditor_name"></result>
+    <result property="secondaryAuditorName" column="secondary_auditor_name"></result>
+    <result property="approverName" column="approver_name"></result>
 
   </resultMap>
 
   <select id="getVOPage" resultMap="standardMaterialApprovalFormVO" resultType="digital.laboratory.platform.reagent.vo.StandardMaterialApprovalFormVO">
     SELECT smaf.*,
-           (select si.supplier_name
-            from supplier_information si
-            where si.supplier_information_id = smaf.manufacturer_id) as manufacturer_name
+           (select si.supplier_name from supplier_information si where si.supplier_information_id = smaf.manufacturer_id) as manufacturer_name
+           (select user.name from dlp_base.sys_user user where user.user_id=smaf.primary_auditorId ) as primary_auditor_name
+           (select user.name from dlp_base.sys_user user where user.user_id=smaf.secondary_auditor_id ) as secondary_auditor_name
+           (select user.name from dlp_base.sys_user user where user.user_id=smaf.approver_id ) as approver_name
     FROM standard_material_approval_form smaf
   </select>
 

src/main/resources/mapper/StandardReserveSolutionMapper.xml

@@ -5,13 +5,13 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.StandardReserveSolutionMapper">
 
   <resultMap id="standardReserveSolutionMap" type="digital.laboratory.platform.reagent.entity.StandardReserveSolution">
-    <id property="standardReserveSolutionId" column="standard_reserve_solution_id"/>
+    <id property="id" column="id"/>
     <result property="configurationConcentration" column="configuration_concentration"/>
     <result property="configurationDate" column="configuration_date"/>
     <result property="constantVolume" column="constant_volume"/>
     <result property="dateOfUse" column="date_of_use"/>
     <result property="dispenserId" column="dispenser_id"/>
-    <result property="orderofuse" column="orderofuse"/>
+    <result property="orderOfUse" column="order_of_use"/>
     <result property="quantityUsed" column="quantity_used"/>
     <result property="referenceMaterialId" column="reference_material_id"/>
     <result property="referenceMaterialNumber" column="reference_material_number"/>
@@ -26,6 +26,25 @@
     <result property="useOfSolvent" column="use_of_solvent"/>
     <result property="userId" column="user_id"/>
     <result property="validityPeriod" column="validity_period"/>
+    <result property="status" column="status"/>
 
   </resultMap>
+
+  <resultMap id="standardReserveSolutionVO" type="digital.laboratory.platform.reagent.vo.StandardReserveSolutionVO" extends="standardReserveSolutionMap">
+    <result property="dispenserName" column="dispenser_name"></result>
+  </resultMap>
+
+  <select id="getStandardReserveSolutionVOById" resultMap="standardReserveSolutionVO" resultType="digital.laboratory.platform.reagent.vo.StandardReserveSolutionVO">
+    select srs.*,
+           (select user.name from dlp_base.sys_user user where user.user_id = srs.dispenser_id) as dispenser_name
+    from standard_reserve_solution srs
+    where srs.id = #{id}
+  </select>
+
+  <select id="getStandardReserveSolutionVOPage" resultMap="standardReserveSolutionVO" resultType="digital.laboratory.platform.reagent.vo.StandardReserveSolutionVO">
+    select srs.*,
+           (select user.name from dlp_base.sys_user user where user.user_id = srs.dispenser_id) as dispenser_name
+    from standard_reserve_solution srs
+    where srs.status = 0
+  </select>
 </mapper>

src/main/resources/mapper/StandardSolutionCurveMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.StandardSolutionCurveMapper">
 
   <resultMap id="standardSolutionCurveMap" type="digital.laboratory.platform.reagent.entity.StandardSolutionCurve">
-    <id property="standardSolutionCurveId" column="standard_solution_curve_id"/>
+    <id property="id" column="id"/>
     <result property="dispenserId" column="dispenser_id"/>
     <result property="serialnNumber" column="serialn_number"/>
     <result property="solutionName" column="solution_name_"/>
@@ -17,7 +17,16 @@
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
     <result property="configurationDate" column="configuration_date"/>
-
-    <result property="storageRegistrationFormId" column="storage_registration_form_id"/>
+    <result property="referenceMaterialId" column="reference_material_id"/>
   </resultMap>
+
+  <resultMap id="standardSolutionCurveVO" type="digital.laboratory.platform.reagent.vo.StandardSolutionCurveVO" extends="standardSolutionCurveMap">
+    <result property="dispenserName" column="dispenser_name"></result>
+  </resultMap>
+
+  <select id="getStandardSolutionCurveVOPage" resultMap="standardSolutionCurveVO" resultType="digital.laboratory.platform.reagent.vo.StandardSolutionCurveVO">
+    SELECT ssc.*,
+           (select user.name from dlp_base.sys_user user where user.user_id=ssc.dispenser_id ) as dispenser_name
+    FROM standard_solution_curve ssc
+  </select>
 </mapper>

src/main/resources/mapper/StorageRoomFormMapper.xml

@@ -5,10 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.StorageRoomFormMapper">
 
   <resultMap id="storageRoomFormMap" type="digital.laboratory.platform.reagent.entity.StorageRoomForm">
-    <id property="storageRoomFormId" column="storage_room_form_id"/>
-    <result property="type" column="type"/>
-    <result property="temperature" column="temperature"/>
-    <result property="humidity" column="humidity"/>
+    <id property="id" column="id"/>
     <result property="picture" column="picture"/>
     <result property="name" column="name"/>
     <result property="floor" column="floor"/>
@@ -16,5 +13,6 @@
     <result property="updateTime" column="update_time"/>
     <result property="createBy" column="create_by"/>
     <result property="updateBy" column="update_by"/>
+    <result property="roomLocation" column="room_location"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/SupplierInformationMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.SupplierInformationMapper">
 
   <resultMap id="supplierInformationMap" type="digital.laboratory.platform.reagent.entity.SupplierInformation">
-    <id property="supplierInformationId" column="supplier_information_id"/>
+    <id property="id" column="id"/>
     <result property="acceptableCondition" column="acceptable_condition"/>
     <result property="contactNumber" column="contact_number"/>
     <result property="contactPersonName" column="contact_person_name"/>

src/main/resources/mapper/WarehousingBatchListMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.WarehousingBatchListMapper">
 
     <resultMap id="warehousingBatchListMap" type="digital.laboratory.platform.reagent.entity.WarehousingBatchList">
-        <id property="warehousingBatchListId" column="warehousing_batch_list_id"/>
+        <id property="id" column="id"/>
         <result property="batch" column="batch"/>
         <result property="batchNumber" column="batch_number"/>
         <result property="dateOfProduction" column="date_of_production"/>
@@ -19,31 +19,23 @@
         <result property="updateBy" column="update_by"/>
         <result property="reagentConsumableId" column="reagent_consumable_id"/>
         <result property="warehousingContentId" column="warehousing_content_id"/>
-        <result property="supplierId" column="supplier_id"/>
         <result property="warningValue" column="warning_value"/>
         <result property="depositorId" column="depositor_id"/>
         <result property="latticeId" column="lattice_id"/>
+        <result property="limitDate" column="limit_date"/>
+        <result property="remark" column="remark"/>
 
     </resultMap>
 
     <resultMap id="warehousingBatchListVO" type="digital.laboratory.platform.reagent.vo.WarehousingBatchListVO"
                extends="warehousingBatchListMap">
-        <result property="supplierName" column="supplier_name"></result>
         <result property="depositorName" column="depositor_name"></result>
     </resultMap>
 
     <select id="getWarehousingBatchListVOList" resultMap="warehousingBatchListVO"
             resultType="digital.laboratory.platform.reagent.vo.WarehousingBatchListVO">
         SELECT wbl.*,
-               (select user.name
-                from dlp_base.sys_user user
-        where user.user_id = wbl.depositor_id)
-            as signatory_name,
-            (
-        select si.supplier_name
-        from supplier_information si
-        where si.supplier_information_id =wbl.supplier_id)
-            as supplier_name
+               (select user.name from dlp_base.sys_user user where user.user_id=wbl.create_by ) as depositor_name
         FROM warehousing_batch_list wbl
         WHERE wbl.warehousing_content_id = #{warehousingContentId}
     </select>

src/main/resources/mapper/WarehousingContentMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.WarehousingContentMapper">
 
     <resultMap id="warehousingContentMap" type="digital.laboratory.platform.reagent.entity.WarehousingContent">
-        <id property="warehousingContentId" column="warehousing_content_id"></id>
+        <id property="id" column="id"></id>
         <result property="reagentConsumableId" column="reagent_consumable_id"></result>
         <result property="totalQuantity" column="total_quantity"></result>
         <result property="warehousingRecordFormId" column="warehousing_record_form_id"></result>
@@ -16,17 +16,22 @@
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="acceptanceRecordFormId" column="acceptance_record_form_id"/>
+        <result property="supplierId" column="supplier_id"/>
+
     </resultMap>
 
     <resultMap id="warehousingContentVO" type="digital.laboratory.platform.reagent.vo.WarehousingContentVO" extends="warehousingContentMap">
         <result property="reagentConsumableName" column="reagent_consumable_name"></result>
+        <result property="supplierName" column="supplier_name"/>
+        <result property="applicantName" column="applicant_name"/>
+
     </resultMap>
 
     <select id="getWarehousingContentVOList" resultMap="warehousingContentVO" resultType="digital.laboratory.platform.reagent.vo.WarehousingContentVO">
         SELECT wc.*,
-               (select rc.reagent_consumable_name
-                from reagent_consumables rc
-                where rc.reagent_consumable_id = wc.reagent_consumable_id) as reagent_consumable_name
+               (select rc.reagent_consumable_name from reagent_consumables rc where rc.reagent_consumable_id = wc.reagent_consumable_id) as reagent_consumable_name ,
+               (select si.supplier_name from supplier_information si where si.id = #{supplierId}) as supplier_name ,
+               (select user.name from dlp_base.sys_user user where user.user_id=wc.create_by ) as applicant_name
         FROM warehousing_content wc
         WHERE wc.warehousing_record_form_id = #{warehousingRecordFormId}
     </select>

src/main/resources/mapper/WarehousingRecordFormMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.WarehousingRecordFormMapper">
 
   <resultMap id="warehousingRecordFormMap" type="digital.laboratory.platform.reagent.entity.WarehousingRecordForm">
-    <id property="warehousingRecordFormId" column="warehousing_record_form_id"/>
+    <id property="id" column="id"/>
     <result property="purchaseListId" column="purchase_list_id"/>
     <result property="status" column="status"/>
     <result property="createTime" column="create_time"/>
@@ -16,40 +16,15 @@
 
   </resultMap>
 
-<!--  <resultMap id="warehousingRecordFormVO" type="digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO" extends="signingRecordFormMap">-->
-<!--    <result property="reagentConsumableName" column="reagent_consumable_name"></result>-->
-<!--  </resultMap>-->
+  <resultMap id="warehousingRecordFormVO" type="digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO" extends="warehousingRecordFormMap">
+    <result property="userName" column="user_name"></result>
+  </resultMap>
+  <select id="getWarehousingRecordFormVOList" resultMap="warehousingRecordFormVO" resultType="digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO">
+    SELECT wrf.*,
+             (select user.name from dlp_base.sys_user user where user.user_id=wrf.create_by ) as user_name
+    FROM  warehousing_record_form wrf
 
-<!--  <sql id="getSigningRecordFormVOSQL">-->
-<!--    SELECT srf.*,-->
-<!--           (select rc.name-->
-<!--            from reagent_consumables rc-->
-<!--    where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
-<!--        , AS reagent_consumable_name-->
-<!--    FROM signing_record_form srf-->
-<!--  </sql>-->
+  </select>
 
-<!--  <select id=" getSigningRecordFormVO" resultMap="warehousingRecordFormVO" resultType="digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO">-->
-<!--      SELECT srf.*,-->
-<!--             (select rc.name-->
-<!--              from reagent_consumables rc-->
-<!--              where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
-<!--              , AS reagent_consumable_name-->
-<!--      FROM signing_record_form srf-->
-<!--    WHERE signing_record_form_id = #{signingRecordFormId}-->
-<!--  </select>-->
 
-<!--    &lt;!&ndash; 根据条件取 warehousingRecordFormVO 列表分页 &ndash;&gt;-->
-<!--    <select id="getSigningRecordFormVOPage" resultMap="warehousingRecordFormVO"-->
-<!--            resultType="digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO">-->
-<!--        <include refid="getSigningRecordFormVOSQL"/>-->
-<!--        ${ew.customSqlSegment}-->
-<!--    </select>-->
-
-<!--    &lt;!&ndash; 根据条件取 warehousingRecordFormVO 列表 &ndash;&gt;-->
-<!--    <select id="getSigningRecordFormVOPList" resultMap="warehousingRecordFormVO"-->
-<!--            resultType="digital.laboratory.platform.reagent.vo.WarehousingRecordFormVO">-->
-<!--        <include refid="getSigningRecordFormVOSQL"/>-->
-<!--        ${ew.customSqlSegment}-->
-<!--    </select>-->
 </mapper>