Commit 8783a8c3 authored by zhangsen's avatar zhangsen

城燃管道 问题表字段和枚举添加

parent cb46d886
package com.yeejoin.amos.boot.module.ugp.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum QuestionComeFromEnum {
/**
* 问题来源
*/
AUTO("1", "自动生成"),
HAND_MOVE("2", "手动录入"),
OVER_DUE("3", "超期转入");
private final String code;
private final String name;
public String getCode() {
return code;
}
public String getName() {
return name;
}
public static String getTypeByCode(String code){
for (QuestionComeFromEnum constants : values()) {
if (constants.getCode().equals(code)) {
return constants.getName();
}
}
return null;
}
}
package com.yeejoin.amos.boot.module.ugp.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
......@@ -173,4 +174,13 @@ public class QualityProblemDto extends BaseDto {
private String rectifyWithingName;
private String reviewStatusName;
@ApiModelProperty("问题来源")
private String comeFrom;
@ApiModelProperty("系统联络单")
private String systemContactSheet;
@ApiModelProperty("意见书")
private String submission;
}
......@@ -145,5 +145,21 @@ public class QualityProblem extends BaseEntity {
*/
private String status;
/**
* 问题来源
*/
@TableField("come_from")
private String comeFrom;
/**
* 系统联络单
*/
@TableField("system_contact_sheet")
private String systemContactSheet;
/**
* 意见书
*/
@TableField("submission")
private String submission;
}
......@@ -49,9 +49,9 @@ public class ProblemCodeLibServiceImpl extends BaseService<ProblemCodeLibDto, Pr
/**
* 处理监管指标类型列表展示问题
* @param idxThresholds
* @param idxType
* @return
* @param idxThresholds 子表单提交的数据
* @param idxType 监管指标类型
* @return 组装好字符串【列表展示】
*/
private String doDataToString (String idxThresholds, String idxType) {
StringBuilder resultString = new StringBuilder();
......@@ -72,7 +72,7 @@ public class ProblemCodeLibServiceImpl extends BaseService<ProblemCodeLibDto, Pr
/**
* 列表查询全量数据
* @return
* @return 数据查询
*/
public List<ProblemCodeLib> queryProblemCodeInfoList() {
LambdaQueryWrapper<ProblemCodeLib> lambdaQueryWrapper = new LambdaQueryWrapper<>();
......@@ -91,7 +91,7 @@ public class ProblemCodeLibServiceImpl extends BaseService<ProblemCodeLibDto, Pr
/**
* 获取不重复的code
* @return
* @return 返回不重复的code
*/
public String getProblemCode() {
LambdaQueryWrapper<ProblemCodeLib> lambdaQueryWrapper = new LambdaQueryWrapper<>();
......@@ -99,7 +99,7 @@ public class ProblemCodeLibServiceImpl extends BaseService<ProblemCodeLibDto, Pr
lambdaQueryWrapper.orderByDesc(ProblemCodeLib::getCreateDate);
lambdaQueryWrapper.last("limit 1");
ProblemCodeLib problemCodeLib = problemCodeLibMapper.selectOne(lambdaQueryWrapper);
String resultCode = "";
String resultCode;
if (!ObjectUtils.isEmpty(problemCodeLib)) {
if (problemCodeLib.getCode() != null) {
String[] codeNum = problemCodeLib.getCode().split("QD");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment