更改sql

src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/AlarmPhoneMapper.xml

@@ -105,7 +105,7 @@
         insert into monitor_alarm_phone (id, org_id, alarm_man,
         alarm_role, alarm_phone, detection_type,
         updatetime)
-        values (SEQ_MONITOR_ALARM_PHONE.nextVal, #{orgId,jdbcType=INTEGER}, #{alarmMan,jdbcType=VARCHAR},
+        values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{alarmMan,jdbcType=VARCHAR},
         #{alarmRole,jdbcType=VARCHAR}, #{alarmPhone,jdbcType=VARCHAR}, #{detectionType,jdbcType=VARCHAR},
         #{updatetime,jdbcType=TIMESTAMP})
       </insert>
@@ -135,7 +135,9 @@
           </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
-          SEQ_MONITOR_ALARM_PHONE.nextVal,
+          <if test="id != null" >
+            #{id,jdbcType=INTEGER},
+          </if>
           <if test="orgId != null" >
             #{orgId,jdbcType=INTEGER},
           </if>

src/main/java/com/chinaitop/depot/intelligent/basicdata/mapper/WareHouseBasicInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.chinaitop.depot.intelligent.basicdata.mapper.WareHouseBasicInfoMapper" >
     <select id="getStorehouseInfo" parameterType="java.util.Map" resultType="java.util.Map">
-        select * from (
+        <!-- select * from (
         SELECT
         row_number() over(partition by t2.storehouse_code ) rn,
         case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_type else t2.storehouse_type end as storehouse_type,
@@ -70,7 +70,75 @@
             </if>
         </where>
         ) a
-        where a.rn = 1
+        where a.rn = 1 -->
+        
+        SELECT
+        case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_type else t2.storehouse_type end as storehouse_type,
+        t2.storehouse_code,
+        t2.storehouse_name,
+        case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_capacity else t2.design_capacity end as design_capacity,
+        t2.house_doot_position,
+        case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_status else t2.storehouse_state end as storehouse_state,
+        t2.dutyStoreman,
+        t1.lkmc,
+        t1.pz,
+        t1.hwxz,
+        t1.dj,
+        t1.kcsl,
+        char(t1.rq,'yyyy-MM-dd HH24:mi:ss') AS rq,
+        char(t1.rq,'yyyy-MM-dd HH24:mi:ss') AS rcrq,
+        char(t1.cjsj,'yyyy-MM-dd HH24:mi:ss') AS cjsj,
+        t1.UnitID
+	    FROM crk_qh.data_kcgl_kcsw_default AS t1
+	    LEFT JOIN depot_qh.basic_storehouse t2 ON t1.UnitID = t2.org_id AND t1.ch = t2.storehouse_id AND del_flag = 1
+	    LEFT JOIN depot_qh.basic_tank t4 on t4.id=t2.storehouse_id
+	    <where>
+            <if test="org_id != null">
+                t2.org_id = #{org_id}
+            </if>
+            <if test="library_type != null">
+                AND t2.library_type = #{library_type}
+            </if>
+            <if test="cfCdoe != null">
+                AND t2.storehouse_code = #{cfCdoe}
+            </if>
+        </where>
+	    group by t2.storehouse_code
+        
+      union all
+    	SELECT
+        case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_type else t2.storehouse_type end as storehouse_type,
+        t2.storehouse_code,
+        t2.storehouse_name,
+        case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_capacity else t2.design_capacity end as design_capacity,
+        t2.house_doot_position,
+        case substr(t2.storehouse_code,1,2) when 'YG' then t4.tank_status else t2.storehouse_state end as storehouse_state,
+        t2.dutyStoreman,
+        t3.org_name,
+        t1.lypz,
+        t1.lyxz,
+        t1.lydj,
+        t1.kcsl,
+        char(t1.rksj,'yyyy-MM-dd HH24:mi:ss') AS rq,
+        char(t1.rksj,'yyyy-MM-dd HH24:mi:ss') AS rcrq,
+        char(t1.input_time,'yyyy-MM-dd HH24:mi:ss') AS cjsj,
+        t1.org_id
+	    FROM depot_qh.storage_product_kcsl AS t1
+	    LEFT JOIN depot_qh.basic_storehouse t2 ON t1.org_id = t2.org_id AND t1.house_id = t2.storehouse_id AND t2.del_flag = 1
+	    LEFT JOIN depot_qh.org_info t3 ON t3.org_id = t2.org_id
+	    LEFT JOIN depot_qh.basic_tank t4 on t4.id=t2.storehouse_id
+	     <where>
+            <if test="org_id != null">
+                t2.org_id = #{org_id}
+            </if>
+            <if test="library_type != null">
+                AND t2.library_type = #{library_type}
+            </if>
+            <if test="cfCdoe != null">
+                AND t2.storehouse_code = #{cfCdoe}
+            </if>
+        </where>
+	    group by t2.storehouse_code
     </select>
 
     <select id="getColumn1Max" parameterType="java.util.Map" resultType="java.util.Map">

src/main/java/com/chinaitop/depot/intelligent/supervise/mapper/TDepotStyleMapper.xml

@@ -465,7 +465,7 @@ GROUP BY
 
 
     <select id="selectByWarning" parameterType="java.util.Map" resultType="java.util.HashMap">
-select
+<!-- select
  *
 from
  (
@@ -532,6 +532,67 @@ from
    and st.t_type = 2
  ) a
 where
- a.rn = 1
+ a.rn = 1 -->
+ 
+ 
+ select
+   st.styles,
+   st.imgdata,
+   hw.input_year TestDate,
+   house.storehouse_name barnName,
+   house.storehouse_code vCf,
+   t3.wThreshold wThreshold,
+   t3.threshold threshold,
+   t3.wRemark wRemark,
+   t3.w_time time,
+   t3.vCfCode vCfCode,
+   house.storehouse_id house_id,
+   house.storehouse_name,
+   house.storehouse_type,
+   hw.sub_type
+  from
+   basic_storehouse house left join t_depot_style st on
+   st.indexid = house.storehouse_id left join storage_foodbasicinfo hw on
+   house.storehouse_id = hw.house_id left join(
+    select
+     th.v_cf_code vCfCode,
+     th.w_time,
+     th.w_threshold wThreshold,
+     th.threshold threshold,
+     th.w_remark wRemark
+    from
+     t_warning_threshold_history th
+    where
+     th.org_id =#{orgId}
+     and(
+      th.v_cf_code in(
+       select
+        v_cf_code
+       from
+        t_warning_threshold_history
+       where
+        org_id =#{orgId}
+       group by
+        v_cf_code
+      )
+     )
+     and th.w_time in(
+      select
+       max( w_time ) w_time
+      from
+       t_warning_threshold_history
+      where
+       org_id =#{orgId}
+      group by
+       w_time
+     )
+    order by
+     th.w_time desc
+   ) t3 on
+   house.storehouse_code = t3.vCfCode
+  where
+   1 = 1
+   and st.t_type = 2
+   group by house.storehouse_code
     </select>
 </mapper>

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/BusinessApprovalMapper.xml

@@ -182,7 +182,7 @@
       title, version, task_type_name, 
       is_hide, is_countersign, apply_name, 
       apply_name_id, apply_time)
-    values (business_approval_seq.nextVal, #{createTime,jdbcType=TIMESTAMP}, #{isDeleted,jdbcType=INTEGER},
+    values (#{id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{isDeleted,jdbcType=INTEGER},
       #{remark,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{content,jdbcType=VARCHAR}, 
       #{fromDepartment,jdbcType=VARCHAR}, #{fromPeople,jdbcType=VARCHAR}, #{fromUserName,jdbcType=VARCHAR}, 
       #{lastPeople,jdbcType=VARCHAR}, #{operateTime,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR},