公务用车 数据同步 修改,

        json上传接口 修改

工程现场  问题相关接口修改

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

@@ -11,6 +11,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
+
 @RestController
 @RequestMapping("/large/check")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
@@ -50,8 +52,8 @@ public class PlatProjectCheckController extends BaseController {
      * 近一周问题列表
      */
     @GetMapping("/getIssueListLastWeek/{appOrg}")
-    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg) {
-        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg));
+    public AjaxResult getIssueListLastWeek(@PathVariable String appOrg, @RequestParam(required = false) Date date) {
+        return AjaxResult.success("查询成功", largeIssueService.getIssueListLastWeek(appOrg, date));
     }
 
     /**
@@ -71,6 +73,14 @@ public class PlatProjectCheckController extends BaseController {
     }
 
     /**
+     * 新增问题
+     * */
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody LargeIssue entity) {
+        return toAjax(largeIssueService.save(entity));
+    }
+
+    /**
      * 本周检查计划
      * */
     @GetMapping("/planCheckList")

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

@@ -3,6 +3,7 @@ package com.project.zcustom.domain.addional;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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;
@@ -11,6 +12,8 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * 上报问题对象 large_plat_issue
  *
@@ -47,10 +50,10 @@ public class LargeIssue extends CustomBaseEntity {
     private String description;
 
     /**
-     * 整改要求
+     * 发起人
      */
 
-    private String need;
+    private String person;
 
     /**
      * 所属项目id
@@ -68,4 +71,7 @@ public class LargeIssue extends CustomBaseEntity {
     @Excel(name = "问题状态", readConverterExp = "0=代表未解决,1=代表已解决")
     private String status;
 
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createDate;
 }

project-zcustom/src/main/java/com/project/zcustom/mapper/unit/LargeIssueMapper.java

@@ -1,5 +1,6 @@
 package com.project.zcustom.mapper.unit;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.project.zcustom.domain.addional.LargeIssue;
@@ -74,4 +75,6 @@ public interface LargeIssueMapper extends BaseMapper<LargeIssue>
     public int getOverIssueNum(String appOrg);
 
     public List<LargeIssue> getIssueListLastWeek(String appOrg);
+
+    public List<LargeIssue> getIssueList(String appOrg, Date date);
 }

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

@@ -5,6 +5,8 @@ import com.project.zcustom.domain.addional.LargeIssue;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.project.common.core.domain.search.PageParamVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -91,7 +93,7 @@ public interface ILargeIssueService extends IService<LargeIssue> {
 
     public int getOverIssueNum(String appOrg);
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg);
+    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date);
 
     public List<LargeIssue> selectList(LargeIssue largeIssue);
     public LargeIssue selectLargeIssueById(Long id);

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

@@ -13,6 +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.Date;
 import java.util.List;
 
 /**
@@ -177,8 +178,11 @@ public class LargeIssueServiceImpl extends ServiceImpl<LargeIssueMapper, LargeIs
         return largeIssueMapper.getOverIssueNum(appOrg);
     }
 
-    public List<LargeIssue> getIssueListLastWeek(String appOrg){
-        return largeIssueMapper.getIssueListLastWeek(appOrg);
+    public List<LargeIssue> getIssueListLastWeek(String appOrg, Date date){
+        if (date == null){
+            return largeIssueMapper.getIssueListLastWeek(appOrg);
+        }
+        else return largeIssueMapper.getIssueList(appOrg, date);
     }
 
 

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

@@ -11,18 +11,25 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.project.common.core.domain.search.PageParamVo;
 import com.project.common.utils.StringUtils;
 import com.project.zcustom.domain.addional.LargeCar;
+import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.mapper.unit.LargePublicCarMapper;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.unit.ILargePublicCarService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper, LargeCar> implements ILargePublicCarService {
 
+    @Autowired
+    private IPlatAppOrgService platAppOrgService;
+
     /**
      * 组装查询条件
      */
@@ -226,8 +233,13 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
 
     public int upload(String type, Map<String, Object> json){
         try {
+            List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
+            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
             List<LargeCar> list = JSON.parseArray(JSON.toJSONString(json.get("data")), LargeCar.class);
             for (LargeCar largeCar : list){
+                if (!orgMap.containsKey(largeCar.getAppEncode())){
+                    continue;
+                }
                 LargeCar car = this.getOne(new QueryWrapper<LargeCar>().eq("app_encode", largeCar.getAppEncode()));
                 if (car != null) {
                     largeCar.setId(car.getId());

project-zcustom/src/main/java/com/project/zcustom/tools/CarService.java

@@ -26,6 +26,7 @@ import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -57,24 +58,24 @@ public class CarService {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
         String formattedDate = currentDate.format(formatter);
         List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
-        List<String> xList = orgList.stream().map(PlatAppOrg::getAppEncode).collect(Collectors.toList());
+        Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
 //        TODO
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarChange(), "year=" + year), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarType(), "year=" + year), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEnterpriseCar(), "year=" + year), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarPowerType(), "year=" + year), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarOrderAndMileage(), "yearMonth=" + formattedDate), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarTerminal(), "yearMonth=" + formattedDate), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarNotArchived(), "yearMonth=" + formattedDate), LargeCar.class), xList);
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarning(), "yearMonth=" + formattedDate), LargeCar.class), xList);
-//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarIncrease(), "year=" + year), LargeCarDetail.class), xList);
-//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarReduce(), "year=" + year), LargeCarDetail.class), xList);
-//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningTickets(), "yearMonth=" + formattedDate), LargeWarnDetail.class), xList);
-//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningHoliday(), "yearMonth=" + formattedDate), LargeWarnDetail.class), xList);
-//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningOverSpeed(), "yearMonth=" + formattedDate), LargeWarnDetail.class), xList);
-//        entryD(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarRank(), "yearMonth=" + formattedDate), LargeCarRank.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarChange(), "year=" + year), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarType(), "year=" + year), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEnterpriseCar(), "year=" + year), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarPowerType(), "year=" + year), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarOrderAndMileage(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarTerminal(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarNotArchived(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarning(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
+//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarIncrease(), "year=" + year), LargeCarDetail.class), orgMap);
+//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarReduce(), "year=" + year), LargeCarDetail.class), orgMap);
+//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningTickets(), "yearMonth=" + formattedDate), LargeWarnDetail.class), orgMap);
+//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningHoliday(), "yearMonth=" + formattedDate), LargeWarnDetail.class), orgMap);
+//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningOverSpeed(), "yearMonth=" + formattedDate), LargeWarnDetail.class), orgMap);
+//        entryD(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarRank(), "yearMonth=" + formattedDate), LargeCarRank.class), orgMap);
         String a = "[\n" +
                 "        {\n" +
                 "            \"lockTag\": \"已审核\",\n" +
@@ -986,19 +987,19 @@ public class CarService {
                 "            \"COUNTNUM\": 1\n" +
                 "        }\n" +
                 "    ]\n";
-        entryB(JSON.parseArray(a, LargeCarDetail.class), xList);
-        entryB(JSON.parseArray(b, LargeCarDetail.class), xList);
-        entryC(JSON.parseArray(c, LargeWarnDetail.class), xList);
-        entryC(JSON.parseArray(d, LargeWarnDetail.class), xList);
-        entryC(JSON.parseArray(e, LargeWarnDetail.class), xList);
-        entryD(JSON.parseArray(f, LargeCarRank.class), xList);
+        entryB(JSON.parseArray(a, LargeCarDetail.class), orgMap);
+        entryB(JSON.parseArray(b, LargeCarDetail.class), orgMap);
+        entryC(JSON.parseArray(c, LargeWarnDetail.class), orgMap);
+        entryC(JSON.parseArray(d, LargeWarnDetail.class), orgMap);
+        entryC(JSON.parseArray(e, LargeWarnDetail.class), orgMap);
+        entryD(JSON.parseArray(f, LargeCarRank.class), orgMap);
     }
 
-    public void entryA(List<LargeCar> x, List<String> list){
+    public void entryA(List<LargeCar> x, Map<String, String> map){
         try {
             for (LargeCar it : x){
-                if (list.contains(it.getAppEncode())){
-                    return;
+                if (!map.containsKey(it.getAppEncode())){
+                    continue;
                 }
                 QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
                 lqw.eq("app_encode", it.getAppEncode());
@@ -1013,11 +1014,11 @@ public class CarService {
         }
     }
 
-    public void entryB(List<LargeCarDetail> x, List<String> list){
+    public void entryB(List<LargeCarDetail> x, Map<String, String> map){
         try {
             for (LargeCarDetail it : x){
-                if (list.contains(it.getAppEncode())){
-                    return;
+                if (!map.containsKey(it.getAppEncode())){
+                    continue;
                 }
                 QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
                 lqw.eq("app_encode", it.getAppEncode());
@@ -1032,11 +1033,11 @@ public class CarService {
         }
     }
 
-    public void entryC(List<LargeWarnDetail> x, List<String> list){
+    public void entryC(List<LargeWarnDetail> x, Map<String, String> map){
         try {
             for (LargeWarnDetail it : x){
-                if (list.contains(it.getAppEncode())){
-                    return;
+                if (!map.containsKey(it.getAppEncode())){
+                    continue;
                 }
                 QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
                 lqw.eq("app_encode", it.getAppEncode());
@@ -1051,11 +1052,11 @@ public class CarService {
         }
     }
 
-    public void entryD(List<LargeCarRank> x, List<String> list){
+    public void entryD(List<LargeCarRank> x, Map<String, String> map){
         try {
             for (LargeCarRank it : x){
-                if (list.contains(it.getAppEncode())){
-                    return;
+                if (!map.containsKey(it.getAppEncode())){
+                    continue;
                 }
                 QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
                 lqw.eq("app_encode", it.getAppEncode());

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -7,12 +7,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.project.zcustom.domain.addional.LargeIssue" id="LargeIssueResult">
         <result property="id"    column="id"    />
         <result property="description"    column="description"    />
+        <result property="person"    column="person"    />
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
+        <result property="createDate"    column="create_date"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
@@ -128,9 +130,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getIssueListLastWeek" parameterType="String" resultMap="LargeIssueResult">
         SELECT
-            title,description,
+            a.id,
+            title,description,person,
             `status`,
-            a.create_time
+            a.create_time,
+            DATE(a.create_time) AS create_date
         FROM
             large_plat_issue a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id
@@ -146,4 +150,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
         order by a.create_time desc
     </select>
+
+    <select id="getIssueList" resultMap="LargeIssueResult">
+        SELECT
+        a.id,
+        title,description,person,
+        `status`,
+        a.create_time
+        FROM
+        large_plat_issue a
+        LEFT JOIN large_plat_project b ON a.project_id = b.id
+        LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
+        WHERE
+        a.del_flag = 0
+        AND b.del_flag = 0
+        AND c.del_flag = '0'
+        AND (
+        DATE( a.create_time ) BETWEEN DATE( #{arg1} )
+        AND CURDATE()
+        )
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{arg0} OR c.app_org = #{arg0} )</if>
+        order by a.create_time desc
+    </select>
 </mapper>