修改了 获取各个市的在建和施工项目数量 接口；

修改了 公务用车 部分接口

project-zcustom/src/main/java/com/project/zcustom/controller/car/PlatCarController.java

@@ -2,10 +2,16 @@ package com.project.zcustom.controller.car;
 
 import com.project.common.core.domain.AjaxResult;
 import com.project.zcustom.service.car.ILargePlatCarService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
+@RestController
+@RequestMapping("/large/car")
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class PlatCarController {
 
     @Autowired

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectProductionController.java

@@ -54,8 +54,8 @@ public class PlatProjectProductionController extends BaseController {
     /**
      * 获取各个市的在建和施工项目数量
      */
-    @GetMapping("/getProjectNumZ/{appOrg}")
-    public AjaxResult getProjectNumZ(@PathVariable List<String> appOrg) {
-        return AjaxResult.success("查询成功", largeProjectService.getProjectNumZ(appOrg));
+    @GetMapping("/getProjectNumZ")
+    public AjaxResult getProjectNumZ() {
+        return AjaxResult.success("查询成功", largeProjectService.getProjectNumZ());
     }
 }

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCar.java

@@ -2,6 +2,7 @@ package com.project.zcustom.domain.addional;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
@@ -10,7 +11,9 @@ import java.math.BigDecimal;
 
 @Data
 @TableName("large_plat_public_car")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeCar extends CustomBaseEntity {
+    private Long id;
 
     /**
      * 所属单位

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCarDetail.java

@@ -1,6 +1,9 @@
 package com.project.zcustom.domain.addional;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
@@ -8,10 +11,16 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
+@TableName("large_plat_public_car_change_detail")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeCarDetail extends CustomBaseEntity {
+
+    private Long id;
+
     /**
      * 单位名称
      */
+    @TableField(exist = false)
     private String appName;
 
     /**
@@ -26,7 +35,7 @@ public class LargeCarDetail extends CustomBaseEntity {
      */
     @Excel(name = "车牌号")
 
-    private Integer vehicleNum;
+    private String vehicleNum;
 
     /**
      * 车辆用途

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCarRank.java

@@ -1,15 +1,22 @@
 package com.project.zcustom.domain.addional;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 
 @Data
+@TableName("large_plat_public_car_rank_person")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeCarRank extends CustomBaseEntity {
+    private Long id;
 
     /**
      * 单位名称
      */
+    @TableField(exist = false)
     private String appName;
 
     /**

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeUnitRank.java

@@ -1,15 +1,22 @@
 package com.project.zcustom.domain.addional;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 
 @Data
+@TableName("large_plat_public_car_rank_unit")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeUnitRank extends CustomBaseEntity {
+    private Long id;
 
     /**
      * 单位名称
      */
+    @TableField(exist = false)
     private String appName;
 
 

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeWarnDetail.java

@@ -1,14 +1,25 @@
 package com.project.zcustom.domain.addional;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
 import com.project.common.core.domain.CustomBaseEntity;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
+@TableName("large_plat_public_car_warn_detail")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class LargeWarnDetail extends CustomBaseEntity {
+    private Long id;
+
     /**
      * 单位名称
      */
+    @TableField(exist = false)
     private String appName;
 
     /**
@@ -36,14 +47,14 @@ public class LargeWarnDetail extends CustomBaseEntity {
      * 预警开始时间
      */
     @Excel(name = "预警开始时间")
-
-    private Long startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
 
     /**
      * 预警结束时间
      */
     @Excel(name = "预警结束时间")
-
-    private Integer endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 
 }

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatAppOrgServiceImpl.java

@@ -36,7 +36,8 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
                 PlatAppOrg::getId,
                 PlatAppOrg::getAppOrg,
                 PlatAppOrg::getAppParentOrg,
-                PlatAppOrg::getAppName
+                PlatAppOrg::getAppName,
+                PlatAppOrg::getConnectFlag
         );
         if (StringUtils.isNotBlank(platAppOrg.getAppOrg())) {
             lqw.eq(PlatAppOrg::getAppOrg, platAppOrg.getAppOrg());

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeProjectService.java

@@ -100,5 +100,5 @@ public interface ILargeProjectService extends IService<LargeProject> {
 
     public int getProjectNumThisWeek(String appOrg);
 
-    public Map<String, Object> getProjectNumZ(List<String> appOrg);
+    public Map<String, Object> getProjectNumZ();
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargeProjectServiceImpl.java

@@ -13,10 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.utils.StringUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 工程项目Service业务层处理
@@ -195,7 +192,8 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
         return largeProjectMapper.getProjectNumThisWeek(appOrg);
     }
 
-    public Map<String, Object> getProjectNumZ(List<String> appOrg){
+    public Map<String, Object> getProjectNumZ(){
+        List<String> appOrg = new ArrayList<>(Arrays.asList("1A003", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001"));
         List<LargeProject> list = largeProjectMapper.getProjectNumZ(appOrg);
         Map<String, Object> map = new HashMap<>();
         List<Integer> list1 = new ArrayList<>();