Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-equip/src/main/resources/mapper/FormInstanceMapper.xml

@@ -65,8 +65,8 @@
         (
         select
         i.INSTANCE_ID instanceId,
-        i.GROUP_CODE groupCode,
-        <foreach collection="fieldNames" item="value" index="key" separator=",">
+        i.GROUP_CODE groupCode
+        <foreach collection="fieldNames" item="value" open="," index="key" separator=",">
             MAX( CASE WHEN i.FIELD_NAME = #{key} THEN i.FIELD_VALUE END) ${key}
         </foreach>
         from

amos-boot-system-fas/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -149,10 +149,10 @@
 	            AND d.update_date  BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
             <if test="buildId!=null">
-               AND d.buildId in
-                <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
+               AND d.buildId in #{buildId}
+              <!--  <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
                     #{item}
-                </foreach>
+                </foreach>-->
             </if>
         </where>
     </select>
@@ -203,10 +203,11 @@
 	            AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
 	        </if>
             <if test="buildId!=null">
+                AND d.buildId in #{buildId}
              AND d.buildId in
-           <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
+        <!--   <foreach item="item" index="index"  collection="buildId" open="(" separator="," close=")">
                #{item}
-          </foreach>
+          </foreach>-->
       </if>
       </where>
         ORDER BY d.create_date desc

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -2908,7 +2908,7 @@
 
             INSERT INTO  `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000327, 'storage_plan', '储罐区平面图图纸', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
 
-            INSERT INTO  `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000328, 'company_code', '消防设施情况', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
+            INSERT INTO  `wl_form_group_column`(`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`) VALUES (133000000328, 'fire_situation', '消防设施情况', 'String', 132828674824, 'eq', b'0', 'r_tank', 2581805);
         </sql>
     </changeSet>