diff --git a/module-common/src/main/java/com/gunshi/project/ss/common/model/StStbprpB.java b/module-common/src/main/java/com/gunshi/project/ss/common/model/StStbprpB.java index 61c7288..8a86f77 100644 --- a/module-common/src/main/java/com/gunshi/project/ss/common/model/StStbprpB.java +++ b/module-common/src/main/java/com/gunshi/project/ss/common/model/StStbprpB.java @@ -150,4 +150,9 @@ public class StStbprpB implements Serializable { @TableField(exist = false) private List elems; + @TableField(value = "create_time") + @Schema(description = "创建时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date createTime; + } diff --git a/src/main/java/com/gunshi/project/ss/controller/AttDamProfileController.java b/src/main/java/com/gunshi/project/ss/controller/AttDamProfileController.java index 5271038..72ea856 100644 --- a/src/main/java/com/gunshi/project/ss/controller/AttDamProfileController.java +++ b/src/main/java/com/gunshi/project/ss/controller/AttDamProfileController.java @@ -23,6 +23,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -48,6 +49,7 @@ public class AttDamProfileController extends AbstractCommonFileController{ if (service.lambdaQuery().eq(AttDamProfile::getProfileCode, dto.getProfileCode()).list().size() > 0) { throw new IllegalArgumentException("当前编号已存在"); } + dto.setCreateTime(new Date()); boolean result = service.save(dto); if (result){ fileService.saveFile(dto.getFiles(), getGroupId(), dto.getProfileCode()); @@ -101,7 +103,7 @@ public class AttDamProfileController extends AbstractCommonFileController{ if (ObjectUtils.isNotNull(page.getProfileName())) { query.like(AttDamProfile::getProfileName, page.getProfileName()); } - + query.orderByDesc(AttDamProfile::getCreateTime); Page data = service.page(page.getPageSo().toPage(), query); data.getRecords().forEach(o -> o.setFiles( fileService.getFiles(getGroupId(),o.getProfileCode()) diff --git a/src/main/java/com/gunshi/project/ss/controller/BusinessRuleController.java b/src/main/java/com/gunshi/project/ss/controller/BusinessRuleController.java index eae0cab..42f336f 100644 --- a/src/main/java/com/gunshi/project/ss/controller/BusinessRuleController.java +++ b/src/main/java/com/gunshi/project/ss/controller/BusinessRuleController.java @@ -78,6 +78,7 @@ public class BusinessRuleController extends AbstractCommonFileController { for (BusinessRule record : page.getRecords()) { List files = fileService.getFiles(getGroupId(), record.getId().toString()); record.setFiles(files); + record.setFileCount(files.size()); } return R.ok(page); } diff --git a/src/main/java/com/gunshi/project/ss/model/AttDamProfile.java b/src/main/java/com/gunshi/project/ss/model/AttDamProfile.java index 049aa37..034853f 100644 --- a/src/main/java/com/gunshi/project/ss/model/AttDamProfile.java +++ b/src/main/java/com/gunshi/project/ss/model/AttDamProfile.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; 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.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -12,6 +14,7 @@ import lombok.Data; import org.apache.http.auth.AUTH; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -63,6 +66,11 @@ public class AttDamProfile implements Serializable { @Size(max = 250,message = "备注/描述最大长度要小于 250") private String remark; + @TableField(value = "create_time") + @Schema(description = "创建时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date createTime; + @TableField(exist = false) @Schema(description = "文件集合") diff --git a/src/main/java/com/gunshi/project/ss/model/FundBudget.java b/src/main/java/com/gunshi/project/ss/model/FundBudget.java index 6085f7a..a7ab0b7 100644 --- a/src/main/java/com/gunshi/project/ss/model/FundBudget.java +++ b/src/main/java/com/gunshi/project/ss/model/FundBudget.java @@ -24,7 +24,7 @@ public class FundBudget { @TableField("budget_year") @Schema(description = "年度") - private Integer budgetYear; + private String budgetYear; @TableField("annual_income_budget") @Schema(description = "年度支出预算") diff --git a/src/main/java/com/gunshi/project/ss/service/StStbprpBService.java b/src/main/java/com/gunshi/project/ss/service/StStbprpBService.java index 055c975..7ecc33a 100644 --- a/src/main/java/com/gunshi/project/ss/service/StStbprpBService.java +++ b/src/main/java/com/gunshi/project/ss/service/StStbprpBService.java @@ -595,6 +595,7 @@ public class StStbprpBService extends ServiceImpl { } public boolean saveData(StStbprpB dto) { + dto.setCreateTime(new Date()); boolean save = save(dto); List elemList = new ArrayList<>(); for (String el : dto.getElems()) { @@ -620,6 +621,7 @@ public class StStbprpBService extends ServiceImpl { if (ObjectUtils.isNotNull(pageSo.getStatus())) { query.eq(StStbprpB::getStatus,pageSo.getStatus()); } + query.orderByDesc(StStbprpB::getCreateTime); Page stStbprpBPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), query); for (StStbprpB record : stStbprpBPage.getRecords()) { List elemList = stStbprpBElemService.lambdaQuery()