更改项目成本表id为雪花

jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -134,10 +134,18 @@ spring:
           username: itdm-boot
           password: itdm-boot@2023
           driver-class-name: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://localhost:3306/kezhikeshi?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: root
+#          driver-class-name: com.mysql.cj.jdbc.Driver
         slave:  # 第二个数据源
-          url: jdbc:mysql://119.3.168.55:3306/look?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          url: jdbc:mysql://119.3.168.55:3306/look?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: 302201
+#          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://localhost:3306/look?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: 302201
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
 #          username: root
 #          password: 302201
@@ -149,7 +157,7 @@ spring:
           #driver-class-name: com.mysql.cj.jdbc.Driver
   redis:
     database: 0
-    host: 152.136.206.27
+    host: localhost
     port: 6379
     password: ''
 #mybatis plus 设置

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/entity/CostModelClPrice.java

@@ -1,18 +1,13 @@
 package org.jeecg.modules.costModelClPrice.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
@@ -118,7 +113,7 @@ public class CostModelClPrice implements Serializable {
     /**入库单号*/
     @Excel(name = "入库单号", width = 15)
     @ApiModelProperty(value = "入库单号")
-    private java.lang.Integer billno;
+    private java.lang.String billno;
     /**合同号*/
     @Excel(name = "合同号", width = 15)
     @ApiModelProperty(value = "合同号")

module_kzks/src/main/java/org/jeecg/modules/costModelWxPrice/entity/CostModelWxPrice.java

@@ -1,18 +1,13 @@
 package org.jeecg.modules.costModelWxPrice.entity;
 
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;

module_kzks/src/main/java/org/jeecg/modules/projectCost/entity/ProjectCost.java

@@ -35,7 +35,7 @@ public class ProjectCost implements Serializable {
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.Integer id;
+    private java.lang.Long id;
 	/**任务号/来自科研任务*/
 	@Excel(name = "任务号/来自科研任务", width = 15)
     @ApiModelProperty(value = "任务号/来自科研任务")

module_kzks/src/main/java/org/jeecg/modules/projectCost/vo/ProjectCostVO.java

@@ -19,7 +19,7 @@ public class ProjectCostVO implements Serializable {
     /**主键*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.Integer id;
+    private java.lang.Long id;
     /**任务号/来自科研任务*/
     @Excel(name = "任务号/来自科研任务", width = 15)
     @ApiModelProperty(value = "任务号/来自科研任务")
@@ -222,11 +222,11 @@ public class ProjectCostVO implements Serializable {
         return serialVersionUID;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectCostHuiji.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -129,8 +130,12 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 
         QueryWrapper<ProjectCostHuiji> queryWrapper = QueryGenerator.initQueryWrapper(projectCostHuiji, req.getParameterMap());
 
+        //高级查询参数不等于"null"并且有查询条件（"[%5B%5D]" 高级查询无查询条件） 则返回true，获取满足查询条件的任务号
+        //普通查询有查询条件则returnFlag()返回true，判断条件是ProjectCostHuiji对象有任意属性不为null
+        boolean flag = !superQueryParams.equals("null") && !"[%5B%5D]".equals(superQueryParams) || returnFlag(projectCostHuiji);
+
         List<String> taskNos;
-        if (!superQueryParams.isEmpty() && !"[%5B%5D]".equals(superQueryParams) || ObjectUtils.anyNotNull(projectCostHuiji)) {
+        if (flag) {
             List<ProjectCostHuiji> resultList = projectCostHuijiService.selectList(queryWrapper);
             taskNos = resultList.stream().map(ProjectCostHuiji::getTaskno).collect(Collectors.toList());
         } else {
@@ -138,21 +143,24 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
         }
 
         CompletableFuture<ProjectCostHuiji> huijiFuture = CompletableFuture.supplyAsync(() -> {
-            if (taskNos.isEmpty() && !(!superQueryParams.isEmpty() && !"[%5B%5D]".equals(superQueryParams) || ObjectUtils.anyNotNull(projectCostHuiji)))
+            if (!flag)
                 return projectCostHuijiService.costHJSum(projectCostHuiji);//汇集总和
             if (taskNos.isEmpty())
                 return initProjectCostHuiji();
             return projectCostHuijiService.costHJSumByTaskNoList(taskNos);
         });
 
+        //当前任务号集合是查询的汇集表，一定是主任务的任务号集合，所以根据主任务号，查询子级任务号
         if (!taskNos.isEmpty()) {
             List<String> taskNoListByRefTaskNo = costService.getTaskNoListByRefTaskNo(taskNos);
             taskNos.addAll(taskNoListByRefTaskNo);
         }
 
         CompletableFuture<KzksProjectCostYs> ysFuture = CompletableFuture.supplyAsync(() -> {
-            if (taskNos.isEmpty())
+            if (!flag)
                 return costYsService.selectSumClys();
+            if (taskNos.isEmpty())
+                return new KzksProjectCostYs();
             return costYsService.selectSumClysByTaskNos(taskNos);
         });
 
@@ -380,6 +388,14 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
         return huiji;
     }
 
+    private boolean returnFlag(ProjectCostHuiji projectCostHuiji){
+        JSONObject json = (JSONObject) JSONObject.toJSON(projectCostHuiji);
+        for (Map.Entry<String, Object> entry : json.entrySet()) {
+            if (entry.getValue() != null) return true;
+        }
+        return false;
+    }
+
     /**
      * 添加
      *

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/entity/ProjectCostHuiji.java

@@ -38,7 +38,7 @@ public class ProjectCostHuiji implements Serializable {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.Integer id;
+    private java.lang.Long id;
     /**
      * 任务号/来自科研任务
      */

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/vo/ProjectCostHuijiListVO.java

@@ -31,7 +31,7 @@ public class ProjectCostHuijiListVO implements Serializable {
     /**主键*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    private java.lang.Integer id;
+    private java.lang.Long id;
     /**任务号/来自科研任务*/
     @Excel(name = "任务号/来自科研任务", width = 15)
     @ApiModelProperty(value = "任务号/来自科研任务")
@@ -230,11 +230,11 @@ public class ProjectCostHuijiListVO implements Serializable {
         return serialVersionUID;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }