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

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -150,7 +150,7 @@
 <select id="getHealthInfoByArea" resultType="java.util.Map">
     SELECT
         ARAE as area,
-        avg( a.avgHealthIndex ) AS healthIndex
+        CEILING(avg( a.avgHealthIndex )) AS healthIndex
     FROM
         (
             SELECT

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonQrCodeController.java

@@ -325,7 +325,7 @@ public class PersonQrCodeController extends BaseController {
         } else if ("S1".equals(column)) {
             resultMap = sjglZsjZsbtzMapper.getEquipDetailInfoByObjectId(objectId);
         } else if ("P1".equals(column)) {
-            resultMap = sjglZsjZsbtzMapper.getJobDetailInfoByObjectId(jobId);
+            resultMap = sjglZsjZsbtzMapper.getJobDetailInfoByObjectId(objectId);
         }
         return ResponseHelper.buildResponse(resultMap);
     }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -152,8 +152,8 @@
         ifnull(a.qrcode_color, '') AS qrCodeColor,
         ifnull(b.COMPANY_NAME, '') AS stationName,
         ifnull(a.CREATE_TIME, '') as recDate,
-        a.DBID AS jobId,
-        c.SBBM as objectId
+        a.DBID AS objectId,
+        c.SBBM as jobId
         FROM
         fdgl_job_main a
         INNER JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'