From 7e06bc88b20577fbd3ae26cfe76f2838beb8a3b6 Mon Sep 17 00:00:00 2001
From: syruan <1555146157@163.com>
Date: Sun, 24 Dec 2023 01:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/base/api/domain/LeaseApplyDetails.java    | 9 +++++++++
 .../com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java   | 3 +++
 .../com/bonus/sgzb/base/api/domain/LeaseOutDetails.java  | 3 +++
 .../main/java/com/bonus/sgzb/base/api/domain/TmTask.java | 4 +++-
 .../src/main/resources/mapper/app/TmTaskMapper.xml       | 2 +-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
index bda93fd4..61caf1e1 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.api.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -63,6 +64,12 @@ public class LeaseApplyDetails implements Serializable {
     @ApiModelProperty(value = "已领数量")
     private Double alNum;
 
+    /**
+     * 此数量是剩余需要出库的数量（preNum - alNum）
+     */
+    @ApiModelProperty(value = "剩余最大出库数量")
+    private Double outNum;
+
     /** 审批数量 */
     @ApiModelProperty(value = "审批数量")
     private Double auditNum;
@@ -84,6 +91,7 @@ public class LeaseApplyDetails implements Serializable {
      */
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -97,6 +105,7 @@ public class LeaseApplyDetails implements Serializable {
      */
     @ApiModelProperty(value = "更新时间 ")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java
index 54b0c615..a5238612 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.api.domain;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -121,6 +122,7 @@ public class LeaseApplyInfo implements Serializable {
      */
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -134,6 +136,7 @@ public class LeaseApplyInfo implements Serializable {
      */
     @ApiModelProperty(value = "更新时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
index 3b7d6b19..80c088da 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseOutDetails.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.api.domain;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -62,6 +63,7 @@ public class LeaseOutDetails implements Serializable {
 
     /** 创建时间 */
     @ApiModelProperty(value = "创建时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 更新者 */
@@ -70,6 +72,7 @@ public class LeaseOutDetails implements Serializable {
 
     /** 更新时间 */
     @ApiModelProperty(value = "更新时间")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /** 备注 */
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
index 0f8df389..f99861d4 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.api.domain;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -83,6 +84,7 @@ public class TmTask implements Serializable {
     */
     @ApiModelProperty(value="创建时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -96,6 +98,7 @@ public class TmTask implements Serializable {
     */
     @ApiModelProperty(value="更新时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**
@@ -197,7 +200,6 @@ public class TmTask implements Serializable {
     @ApiModelProperty(value="公司审批备注")
     private String companyAuditRemark;
 
-
     @ApiModelProperty(value="分管审批人")
     private String deptAuditBy;
 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 6662bc61..104d6509 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -512,7 +512,7 @@
     SELECT
         lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
         case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
-        mt.num
+        mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum
     FROM
         lease_apply_details lad
         LEFT JOIN ma_type mt ON lad.type_id = mt.type_id