修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -98,7 +98,7 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
 
     List<Map<String, Object>> getOnDutyPersonList(
             @Param("dutyDate") String dutyDay,
-            @Param("shiftId") String shiftIds,
+            @Param("idList") List<String> idList,
             @Param("fieldCodes") Map<String, Object> fieldCodes,
             @Param("groupCode") String groupCode);
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -298,8 +298,12 @@
         ))
         and ps.shift_id = ds.sequence_nbr
         and ps.duty_date = #{dutyDate}
-        <if test="shiftId != null and shiftId != ''">
-            and ps.shift_id in (#{shiftId})
+        <if test="idList != null">
+            and ps.shift_id in
+            <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
+                #{item, jdbcType=NUMERIC}
+            </foreach>
+
         </if>
         order by instanceId desc
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -737,12 +737,14 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 		DateTime now = new DateTime();
 		List<Long> shiftIdList = getOnDuty(now);
 		String shiftIds = StringUtils.join(shiftIdList.toArray(), ",");
+		String[] ids = shiftIds.split(",");
+		List<String> idList = Arrays.asList(ids);
 		String dutyDay = now.toString(YYYY_MM_DD);
 		// 获取当前值班人员
 		List<DynamicFormColumn> columns = dynamicFormColumnService
 				.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
 		Map<String, Object> fieldCodes = Bean.listToMap(columns, FIELDCODE, QUERYSTRATEGY, DynamicFormColumn.class);
-		List<Map<String, Object>> maps = dynamicFormInstanceService.getBaseMapper().getOnDutyPersonList(dutyDay, shiftIds,
+		List<Map<String, Object>> maps = dynamicFormInstanceService.getBaseMapper().getOnDutyPersonList(dutyDay, idList,
 				fieldCodes, groupCode);
 		return maps;
 	}

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

@@ -5041,7 +5041,11 @@
             ed.`name`,
             IFNULL(concat_ws( '-', ws.full_name, ed.area ), '') AS area,
             es.id,
-            IFNULL( max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ), '--' ) AS nowInfluentFlow,
+            IF
+                (
+                        CONCAT(IFNULL( max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ), '--' ), '')  = '--',
+                        '--',
+                        TRUNCATE (max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ), 2)) AS nowInfluentFlow,
             IF
                 ((
                      max( CASE WHEN ei.equipment_index_key = 'FHS_FirePoolDevice_InfluentFlow' THEN ei.`value` END ) IS NOT NULL