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

普测计划模块联调修改

Browse Source
This commit is contained in:
huangzj
2022-12-06 15:36:15 +08:00
parent 428703b7cb
commit f9733d0fe1
12 changed files with 146 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java
View File

@@ -16,7 +16,6 @@ import java.util.List;
* @author clam
* @version V1.0.0
*/
@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
@Data
public class RGeneralSurveyPlanAddParm {

6
process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanQueryParm.java
View File

@@ -1,7 +1,6 @@
package com.njcn.process.pojo.param;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +16,6 @@ import java.util.Date;
* @author clam
* @version V1.0.0
*/
@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
@Data
public class RGeneralSurveyPlanQueryParm {
@@ -37,6 +35,10 @@ public class RGeneralSurveyPlanQueryParm {
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date planStartTime;
@ApiModelProperty(value="计划结束时间")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date planEndTime;
@ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)")
private String status;

2
process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlandetailQueryParm.java
View File

@@ -1,6 +1,5 @@
package com.njcn.process.pojo.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +14,6 @@ import javax.validation.constraints.NotNull;
* @author clam
* @version V1.0.0
*/
@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
@Data
public class RGeneralSurveyPlandetailQueryParm {

1
process-api/src/main/java/com/njcn/process/pojo/param/SurveyPlanQuestionQueryParm.java
View File

@@ -26,6 +26,7 @@ public class SurveyPlanQuestionQueryParm {
@ApiModelProperty(value="计划开始时间")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@NotNull(message="计划开始时间不能为空！")
private Date planStartTime;
@ApiModelProperty(value="计划名称")

4
process-api/src/main/java/com/njcn/process/pojo/param/SurveyResultUploadParam.java
View File

@@ -22,9 +22,9 @@ public class SurveyResultUploadParam {
@NotBlank(message = ValidMessage.ID_NOT_BLANK)
private String planId;
@ApiModelProperty(name = "files",value = "普测结果报告",required = true)
@ApiModelProperty(name = "file",value = "普测结果报告",required = true)
@NotNull(message = "普测结果报告")
private MultipartFile[] files;
private MultipartFile[] file;

9
process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java
View File

@@ -104,10 +104,17 @@ public class RGeneralSurveyPlanDetail {
@ApiModelProperty(value="离线监测点id")
private String measurementPointId;
/**
* 是否实现监测(0:否 1:是)
*/
@TableField(value = "is_survey")
@ApiModelProperty(value="是否生成问题(0:否 1:是)")
private Integer isSurvey;
/**
* 是否生成问题(0:否 1:是)
*/
@TableField(value = "is_problem")
@ApiModelProperty(value="是否生成问题(0:否 1:是)")
private Byte isProblem;
private Integer isProblem;
}

15
process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java
View File

@@ -17,12 +17,14 @@ import java.util.List;
* @author clam
* @version V1.0.0
*/
@ApiModel(value="com-njcn-process-pojo-param-RGeneralSurveyPlanAddParm")
@Data
public class RGeneralSurveyPlanVO {
@ApiModelProperty(value="单位ID")
private String orgNo;
@ApiModelProperty(value="单位名称")
private String orgName;
@ApiModelProperty(value="普测计划编号")
private String planNo;
@@ -45,11 +47,11 @@ public class RGeneralSurveyPlanVO {
private Long busCount;
@ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)")
private int status;
private Integer status;
@TableField(value = "is_file_upload")
@ApiModelProperty(value="文件是否上传(0:否 1:是)")
private Byte isFileUpload;
private Integer isFileUpload;
/**
* 上传文件数量
@@ -116,6 +118,13 @@ public class RGeneralSurveyPlanVO {
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date generalSurveyTime;
/**
* 是否实现监测(0:否 1:是)
*/
@TableField(value = "is_survey")
@ApiModelProperty(value="是否生成问题(0:否 1:是)")
private Integer isSurvey;
/**
* 测试负责人
*/

2
process-api/src/main/java/com/njcn/process/pojo/po/SurveyPlanExcel.java → process-api/src/main/java/com/njcn/process/pojo/vo/SurveyPlanExcel.java
View File

@@ -1,4 +1,4 @@
package com.njcn.process.pojo.po;
package com.njcn.process.pojo.vo;
import cn.afterturn.easypoi.excel.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat;