fix:工程巡查概况统计

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhHiddenDangerQueDto.java

@@ -27,6 +27,6 @@ public class DfYhHiddenDangerQueDto   implements IAdcd {
     @ApiModelProperty("地区code")
     private String adcd;
     @ApiModelProperty("处置状态")
-    private Integer handleStatus;
+    private String handleStatus;
 
 }

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java

@@ -40,10 +40,10 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
         "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
         "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
         "</if> " +
-        "<if test='dto.problem != null  \"\"'> " +
+        "<if test='dto.problem != null and dto.problem != \"\"'> " +
         "AND problem=#{dto.problem} "+
         "</if> " +
-        "<if test='dto.handleStatus != null  \"\"'> " +
+        "<if test='dto.handleStatus != null and dto.handleStatus != \"\"'>  " +
         "AND handle_status=#{dto.handleStatus} "+
         "</if> " +
         "</script>")
@@ -61,7 +61,7 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
             "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
-            "<if test='dto.problem != null  \"\"'> " +
+            "<if test='dto.problem != null and dto.problem != \"\"'> " +
             "AND lz.problem=#{dto.problem} "+
             "</if> " +
             "group by adb.adcd ,lz.problem "+
@@ -74,7 +74,7 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
             "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
             "left join att_dike_base base on base.dike_code=hj.dike_code and base.adcd like concat(#{dto.adcdQx}, '%')  "+
             "</if>"+
-            "<if test='dto.handleStatus != null  \"\"'> " +
+            "<if test='dto.handleStatus != null  and dto.handleStatus != \"\"'> " +
             "AND hj.handle_status=#{dto.handleStatus} "+
             "</if> " +
             "where 1=1  "+
@@ -82,7 +82,7 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
             "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
-            "<if test='dto.problem != null  \"\"'> " +
+            "<if test='dto.problem != null  and dto.problem != \"\"'> "+
             "AND lz.problem=#{dto.problem} "+
             "</if> " +
             "group by adb.adcd ,lz.handle_status "+

shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@@ -74,7 +74,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         dto.setProblem("2");
         int zdNumber = this.baseMapper.dfNumber(dto);
         // 处置数量
-        dto.setHandleStatus(2);
+        dto.setHandleStatus("2");
         int czNumber = this.baseMapper.dfNumber(dto);
 
         dfYhCharHiddenDangerDto.setDfNumber(dfNumber);
@@ -101,7 +101,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         }
 
         // 处理数量数据
-        dto.setHandleStatus(2);
+        dto.setHandleStatus("2");
         List<DfYhHiddenDangerModel>  clModel = baseMapper.clfNumberData(dto);
         if (!CollectionUtil.isEmpty(clModel)) {
             list.addAll(clModel);

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java

@@ -68,7 +68,8 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
         for (Map.Entry<String, List<DfYhStatisticsModelDto>> entry : groupingByList.entrySet()) {
             // 设置 x轴
             // 转换名称
-            SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().likeRight("XZQHDM", entry.getKey()));
+            SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper<SysXzqh>()
+                    .likeRight("XZQHDM", entry.getKey()).last(" limit 1"));
             if (null != xzqhdm) {
                 xList.add(xzqhdm.getName());
             }