修改分析大屏排序bug 勘察制单日期 大屏评估人员赋码列表时间

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInformationDto.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -48,9 +49,9 @@ public class SurveyInformationDto  extends BaseDto {
     @ApiModelProperty(value = "制单人")
     private String creator;
 
-    @JsonFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd HH:ss:mm")
     @ApiModelProperty(value = "制单时间")
-    private Date creatorTime;
+    private LocalDateTime creatorTime;
 
     @ApiModelProperty(value = "业主类型")
     private String ownerType;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/SurveyInformation.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.joda.time.LocalDateTime;
 
 import java.util.Date;
 
@@ -69,7 +70,7 @@ public class SurveyInformation extends BaseEntity {
      * 制单时间
      */
 	@TableField("creator_time")
-    private Date creatorTime;
+    private LocalDateTime creatorTime;
 
     /**
      * 业主类型

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanWarningRecord.xml

@@ -380,7 +380,7 @@
                 and concat(#{endDate}, ' 23:59:59') >= a.recdate
             </if>
         </where>
-        order by sort desc, recDate desc
+        order by recDate desc
         limit #{current}, #{size}
     </select>
 

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

@@ -216,6 +216,7 @@
             ifnull(a.qrcode_color, '') AS qrCodeColor,
             ifnull(c.station_name, '') AS stationName,
             ifnull(a.rec_date, '') as recDate,
+            ifnull(a.qrcode_date, '') as qrcodeDate,
             a.sequence_nbr as objectId,
             b.project_name as unitName,
             case when a.qrcode_color = 'red' then 1

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -133,6 +133,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             item.put("name", name);
             item.put("faultInfo", "证书不全或临期");
             item.put("faultLevel", "严重");
+            if (item.get("recDate").equals("")){
+                item.put("recDate", item.get("qrcodeDate"));
+            }
             if (!Objects.isNull(score) && count != 0) {
                 BigDecimal divide = new BigDecimal(100).subtract(score).divide(BigDecimal.valueOf(count), 10, 2);
                 BigDecimal bigDecimal = divide.setScale(getNonZeroDecimalPlaces(divide), RoundingMode.HALF_UP);