API

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -281,7 +281,8 @@
             IFNULL(a.post_name, '') as postName,
             IFNULL(b.project_name, '') as stationName,
             '' as unitName,
-            IFNULL(a.qrcode_color, 'green') as qrCodeColor
+            IFNULL(a.qrcode_color, 'green') as qrCodeColor,
+            IFNULL(a.rec_date, '') AS date
         FROM
             person_basic a
                 LEFT JOIN person_account b ON a.sequence_nbr = b.person_id

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

@@ -317,15 +317,15 @@ public class PersonQrCodeController extends BaseController {
     @GetMapping(value = "/getDetailInfoByObjectId")
     @ApiOperation(httpMethod = "GET", value = "评估大屏 - 三级弹窗左侧信息API", notes = "评估大屏 - 三级弹窗左侧信息API")
     public ResponseModel<Map<String, Object>> getDetailInfoByObjectId(@RequestParam(value = "objectId") String objectId,
-                                                                      @RequestParam(value = "column") String column) {
+                                                                      @RequestParam(value = "column") String column,
+                                                                      @RequestParam(value = "jobId") String jobId) {
         Map<String, Object> resultMap = new HashMap<>();
         if ("V1".equals(column)) {
             resultMap = personBasicServiceImpl.getPersonDetailInfoByObjectId(objectId);
         } else if ("S1".equals(column)) {
             resultMap = sjglZsjZsbtzMapper.getEquipDetailInfoByObjectId(objectId);
         } else if ("P1".equals(column)) {
-            // TODO: 2023/9/1  任务sql未处理
-            resultMap = sjglZsjZsbtzMapper.getJobDetailInfoByObjectId(objectId);
+            resultMap = sjglZsjZsbtzMapper.getJobDetailInfoByObjectId(jobId);
         }
         return ResponseHelper.buildResponse(resultMap);
     }

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

@@ -153,10 +153,12 @@
         ifnull(a.qrcode_color, '') AS qrCodeColor,
         ifnull(b.COMPANY_NAME, '') AS stationName,
         ifnull(a.CREATE_TIME, '') as recDate,
-        GLDJBH AS objectId
+        a.DBID AS jobId,
+        c.SBBM as objectId
         FROM
         fdgl_job_main a
         LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
+        left join sjgl_zsj_zsbtz c on a.EQUIP_DBID = c.DBID
         <where>
             <if test="parentCode != null and parentCode != ''">
                 AND b.ORG_CODE like concat(#{parentCode},'%')
@@ -204,7 +206,8 @@
             IFNULL(GGXH, '') as typeCode,
             IFNULL(SCCJ, '') as source,
             '' as stationName,
-            IFNULL(QRCODE_COLOR, 'green') as qrCodeColor
+            IFNULL(QRCODE_COLOR, 'green') as qrCodeColor,
+            IFNULL(UPDATE_TIME, '') AS recDate
         FROM
             sjgl_zsj_zsbtz
         where SBBM = #{objectId}
@@ -212,6 +215,18 @@
     </select>
 
     <select id="getJobDetailInfoByObjectId" resultType="java.util.Map">
-
+        SELECT
+            IFNULL(`JOB_DESCRIPTION`, '') as `name`,
+            case
+                when QRCODE_COLOR = 'red' then '重大'
+                when QRCODE_COLOR = 'yellow' then '超时'
+                else '正常' end as `status`,
+            IFNULL(QRCODE_COLOR, 'green') as qrCodeColor,
+            ZFZR as person,
+            '' as phone,
+            IFNULL(CREATE_TIME, '') as `recDate`
+        FROM
+            fdgl_job_main
+        where DBID = #{objectId}
     </select>
 </mapper>