xuxiaofei пре 2 година
родитељ
комит
99e170c992

+ 19 - 6
zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/AlgorithmMapper.xml

@@ -6,9 +6,9 @@
 
     <select id="queryList" resultType="com.zd.model.entity.AlgorithmVO" parameterType="com.zd.model.entity.AlgorithmVO">
         select la.id,la.algorithm_type,la.algorithm_result,la.parse_result,
-               la.parse_result_msg,la.original_img,la.resp_code,
-               la.sign_id,la.sub_id,la.create_time,la.status,la.algorithm_name,
-               la.is_alarm,
+        la.parse_result_msg,la.original_img,la.resp_code,
+        la.sign_id,la.sub_id,la.create_time,la.status,la.algorithm_name,
+        la.is_alarm,
         su.nick_name as userName,ls.`name` as subName from lab_algorithm la
         left join lab_subject_access_record lsar
         ON lsar.id = la.sign_id
@@ -26,12 +26,25 @@
     </select>
 
     <select id="getId" resultType="com.zd.model.entity.Algorithm">
-        select *
-        from lab_algorithm
+        select la.id,
+               la.algorithm_type,
+               la.algorithm_result,
+               la.parse_result,
+               la.parse_result_msg,
+               la.original_img,
+               la.resp_code,
+               la.sign_id,
+               la.sub_id,
+               la.create_time,
+               la.status,
+               la.algorithm_name,
+               la.is_alarm
+        from lab_algorithm la
         where id = #{id}
     </select>
 
-    <insert id="insertBatchAlgorithm" parameterType="com.zd.model.entity.Algorithm" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertBatchAlgorithm" parameterType="com.zd.model.entity.Algorithm" useGeneratedKeys="true"
+            keyProperty="id">
         insert into lab_algorithm
         <trim prefix="(" suffix=")" suffixOverrides=",">
             algorithm_type,

+ 29 - 12
zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/ApkFileUploadMapper.xml

@@ -1,7 +1,7 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.ApkFileUpLoadMapper">
 
     <resultMap type="com.zd.laboratory.onemachine.domain.ApkUpload" id="ApkUploadResult">
@@ -19,15 +19,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
     </resultMap>
 
-    <select id="selectApkFileUpLoadList" parameterType="com.zd.laboratory.onemachine.domain.ApkUploadVo" resultType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
+    <select id="selectApkFileUpLoadList" parameterType="com.zd.laboratory.onemachine.domain.ApkUploadVo"
+            resultType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
         select ul.*,ul.id apkId from apk_upload ul
         <where>
-            <if test="onepcType != null "> and ul.onepc_type = #{onepcType} </if>
-            <if test="versionName != null "> and ul.version_name  like concat("%", #{versionName}, "%")  </if>
+            <if test="onepcType != null ">and ul.onepc_type = #{onepcType}</if>
+            <if test="versionName != null ">and ul.version_name like concat("%", #{versionName}, "%")</if>
         </where>
     </select>
 
-    <insert id="insertApkFileUpLoad" parameterType="com.zd.laboratory.onemachine.domain.ApkUpload" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertApkFileUpLoad" parameterType="com.zd.laboratory.onemachine.domain.ApkUpload"
+            useGeneratedKeys="true" keyProperty="id">
         insert into apk_upload
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="apkName != null">apk_name,</if>
@@ -41,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="remark != null">remark,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="apkName != null">#{apkName},</if>
             <if test="apkFileUpload != null">#{apkFileUpload},</if>
@@ -54,15 +56,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
-    <delete id="deleteApkUploadByIds" >
-        delete from apk_upload where id = #{id}
+    <delete id="deleteApkUploadByIds">
+        delete
+        from apk_upload
+        where id = #{id}
     </delete>
 
-    <select id="getById"  resultType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
-        select * from apk_upload where id=#{id}
+    <select id="getById" resultType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
+        select id,
+               apk_name,
+               apk_file_upload,
+               version,
+               version_name,
+               onepc_type,
+               apk_info,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from apk_upload
+        where id = #{id}
     </select>
 
 </mapper>