修改任务一览右下角bug及人员赋码更新时间问题

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

@@ -290,7 +290,8 @@
             IFNULL(b.project_name, '') as stationName,
             '' as unitName,
             IFNULL(a.qrcode_color, 'green') as qrCodeColor,
-            IFNULL(a.rec_date, a.qrcode_date) AS recDate,
+            IFNULL(a.rec_date, '') AS recDate,
+            IFNULL(a.qrcode_date, '') AS qrcodeDate,
             IFNULL(head_photo, '') AS headPhoto
         FROM
             person_basic a

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

@@ -212,6 +212,7 @@
         ) warnNum LEFT  join   amos_mcb.mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
         LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
         <where>
+            question.COMPLETION_STATUS != 1
             <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
                 AND question.SOURCE_ATTRIBUTION IN
                 <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">

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

@@ -329,6 +329,10 @@ public class PersonQrCodeController extends BaseController {
         Map<String, Object> resultMap = new HashMap<>();
         if ("V1".equals(column)) {
             resultMap = personBasicServiceImpl.getPersonDetailInfoByObjectId(objectId);
+
+            if (resultMap.get("recDate").equals("")){
+                resultMap.put("recDate",resultMap.get("qrcodeDate"));
+            }
         } else if ("S1".equals(column)) {
             resultMap = sjglZsjZsbtzMapper.getEquipDetailInfoByObjectId(objectId);
         } else if ("P1".equals(column)) {