feat: 企标复审计划-数据字典值切换为注解
This commit is contained in:
+2
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
|
import com.jero.common.aspect.annotation.Dict;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -99,6 +100,7 @@ public class EnterpriseStandardInspectRectifyPlan implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 整改状态
|
* 整改状态
|
||||||
*/
|
*/
|
||||||
|
@Dict(dicCode = "inspect_rectify_status")
|
||||||
@ApiModelProperty(value = "整改状态")
|
@ApiModelProperty(value = "整改状态")
|
||||||
private String rectifyStatus;
|
private String rectifyStatus;
|
||||||
|
|
||||||
|
|||||||
-15
@@ -39,23 +39,8 @@ public class EnterpriseStandardInspectRectifyPlanServiceImpl extends ServiceImpl
|
|||||||
public IPage<EnterpriseStandardInspectRectifyPlan> getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) {
|
public IPage<EnterpriseStandardInspectRectifyPlan> getRectifyPlan(String inspectId, Integer pageNo, Integer pageSize) {
|
||||||
IPage<EnterpriseStandardInspectRectifyPlan> page = new Page<>(pageNo, pageSize);
|
IPage<EnterpriseStandardInspectRectifyPlan> page = new Page<>(pageNo, pageSize);
|
||||||
esInspectRectifyPlanMapper.page(page, inspectId);
|
esInspectRectifyPlanMapper.page(page, inspectId);
|
||||||
this.transInspectVo(page.getRecords());
|
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 转换列表中的状态值为中文
|
|
||||||
private void transInspectVo(List<EnterpriseStandardInspectRectifyPlan> list) {
|
|
||||||
if (list.isEmpty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
List<DictModel> ynDictModelList = sysBaseAPI.getDictItems("inspect_rectify_status");
|
|
||||||
list.forEach(e -> {
|
|
||||||
List<DictModel> collect = ynDictModelList.stream().filter(e1 -> e1.getValue().equals(e.getRectifyStatus())).collect(Collectors.toList());
|
|
||||||
if (!collect.isEmpty()) {
|
|
||||||
e.setRectifyStatus(collect.get(0).getText());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user