相关bug修改
parent
f8b4d4972a
commit
3edcb6d035
|
|
@ -150,4 +150,9 @@ public class StStbprpB implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<String> elems;
|
private List<String> elems;
|
||||||
|
|
||||||
|
@TableField(value = "create_time")
|
||||||
|
@Schema(description = "创建时间")
|
||||||
|
@JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
@ -48,6 +49,7 @@ public class AttDamProfileController extends AbstractCommonFileController{
|
||||||
if (service.lambdaQuery().eq(AttDamProfile::getProfileCode, dto.getProfileCode()).list().size() > 0) {
|
if (service.lambdaQuery().eq(AttDamProfile::getProfileCode, dto.getProfileCode()).list().size() > 0) {
|
||||||
throw new IllegalArgumentException("当前编号已存在");
|
throw new IllegalArgumentException("当前编号已存在");
|
||||||
}
|
}
|
||||||
|
dto.setCreateTime(new Date());
|
||||||
boolean result = service.save(dto);
|
boolean result = service.save(dto);
|
||||||
if (result){
|
if (result){
|
||||||
fileService.saveFile(dto.getFiles(), getGroupId(), dto.getProfileCode());
|
fileService.saveFile(dto.getFiles(), getGroupId(), dto.getProfileCode());
|
||||||
|
|
@ -101,7 +103,7 @@ public class AttDamProfileController extends AbstractCommonFileController{
|
||||||
if (ObjectUtils.isNotNull(page.getProfileName())) {
|
if (ObjectUtils.isNotNull(page.getProfileName())) {
|
||||||
query.like(AttDamProfile::getProfileName, page.getProfileName());
|
query.like(AttDamProfile::getProfileName, page.getProfileName());
|
||||||
}
|
}
|
||||||
|
query.orderByDesc(AttDamProfile::getCreateTime);
|
||||||
Page<AttDamProfile> data = service.page(page.getPageSo().toPage(), query);
|
Page<AttDamProfile> data = service.page(page.getPageSo().toPage(), query);
|
||||||
data.getRecords().forEach(o -> o.setFiles(
|
data.getRecords().forEach(o -> o.setFiles(
|
||||||
fileService.getFiles(getGroupId(),o.getProfileCode())
|
fileService.getFiles(getGroupId(),o.getProfileCode())
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ public class BusinessRuleController extends AbstractCommonFileController {
|
||||||
for (BusinessRule record : page.getRecords()) {
|
for (BusinessRule record : page.getRecords()) {
|
||||||
List<FileAssociations> files = fileService.getFiles(getGroupId(), record.getId().toString());
|
List<FileAssociations> files = fileService.getFiles(getGroupId(), record.getId().toString());
|
||||||
record.setFiles(files);
|
record.setFiles(files);
|
||||||
|
record.setFileCount(files.size());
|
||||||
}
|
}
|
||||||
return R.ok(page);
|
return R.ok(page);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
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 io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
|
|
@ -12,6 +14,7 @@ import lombok.Data;
|
||||||
import org.apache.http.auth.AUTH;
|
import org.apache.http.auth.AUTH;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -63,6 +66,11 @@ public class AttDamProfile implements Serializable {
|
||||||
@Size(max = 250,message = "备注/描述最大长度要小于 250")
|
@Size(max = 250,message = "备注/描述最大长度要小于 250")
|
||||||
private String remark;
|
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)
|
@TableField(exist = false)
|
||||||
@Schema(description = "文件集合")
|
@Schema(description = "文件集合")
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ public class FundBudget {
|
||||||
|
|
||||||
@TableField("budget_year")
|
@TableField("budget_year")
|
||||||
@Schema(description = "年度")
|
@Schema(description = "年度")
|
||||||
private Integer budgetYear;
|
private String budgetYear;
|
||||||
|
|
||||||
@TableField("annual_income_budget")
|
@TableField("annual_income_budget")
|
||||||
@Schema(description = "年度支出预算")
|
@Schema(description = "年度支出预算")
|
||||||
|
|
|
||||||
|
|
@ -595,6 +595,7 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean saveData(StStbprpB dto) {
|
public boolean saveData(StStbprpB dto) {
|
||||||
|
dto.setCreateTime(new Date());
|
||||||
boolean save = save(dto);
|
boolean save = save(dto);
|
||||||
List<StStbprpBElem> elemList = new ArrayList<>();
|
List<StStbprpBElem> elemList = new ArrayList<>();
|
||||||
for (String el : dto.getElems()) {
|
for (String el : dto.getElems()) {
|
||||||
|
|
@ -620,6 +621,7 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
|
||||||
if (ObjectUtils.isNotNull(pageSo.getStatus())) {
|
if (ObjectUtils.isNotNull(pageSo.getStatus())) {
|
||||||
query.eq(StStbprpB::getStatus,pageSo.getStatus());
|
query.eq(StStbprpB::getStatus,pageSo.getStatus());
|
||||||
}
|
}
|
||||||
|
query.orderByDesc(StStbprpB::getCreateTime);
|
||||||
Page<StStbprpB> stStbprpBPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), query);
|
Page<StStbprpB> stStbprpBPage = this.baseMapper.selectPage(pageSo.getPageSo().toPage(), query);
|
||||||
for (StStbprpB record : stStbprpBPage.getRecords()) {
|
for (StStbprpB record : stStbprpBPage.getRecords()) {
|
||||||
List<StStbprpBElem> elemList = stStbprpBElemService.lambdaQuery()
|
List<StStbprpBElem> elemList = stStbprpBElemService.lambdaQuery()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue