Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.自定义报表,模板选择修改

Browse Source 
2.自定义报告调度,更具部门绑定来选择监测点
3.技术监督附件代码更新
This commit is contained in:
wr
2023-09-14 19:14:08 +08:00
parent b701132711
commit 3aa0dc8eeb
24 changed files with 235 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvFileParam.java
View File

@@ -1,9 +1,9 @@
package com.njcn.process.pojo.param;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Getter;
import lombok.Setter;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* <p>
@@ -13,31 +13,17 @@ import lombok.Setter;
* @author hongawen
* @since 2023-06-21
*/
@Getter
@Setter
@TableName("supv_file")
@Data
public class SupvFileParam {
private String id;
/**
* 附件路径
*/
private String file;
/**
* 附件名称
*/
private String attachmentName;
@ApiModelProperty(value = "业务id集合")
private List<String> ids;
@ApiModelProperty(value = "0.计划 1.问题")
private Integer type;
@ApiModelProperty(value = "区分类型")
private String attachmentType;
/**
* 计划问题id
*/
private String busiId;
}

29
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvFile.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
@@ -31,38 +32,38 @@ public class SupvFile {
@TableField(exist = false)
private String provinceId;
/**
* 附件路径
*/
@ApiModelProperty("附件路径")
private String fileUrl;
@TableField(exist = false)
private MultipartFile file;
@ApiModelProperty("业务名称")
private String busiName;
/**
* 附件名称
*/
@ApiModelProperty("附件名称")
private String attachmentName;
/**
* 0.计划 1.问题
*/
@ApiModelProperty("0.计划 1.问题")
private Integer type;
@ApiModelProperty("附件分类")
private String attachmentType;
/**
* 计划问题id
*/
@ApiModelProperty("业务id")
private String busiId;
@ApiModelProperty("上传人")
private String uploaderName;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime uploadTime;
@ApiModelProperty("上传人id")
private String uploaderId;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("0.未上送 1.已上送 2.取消上送")
@TableField("is_upload_head")
private Integer isUploadHead;
}