Commit 7042444863d81ce9e349bac6376e715a04abb9bd

Authored by liquanyu

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ 7042444
... ... @@ -30,6 +30,17 @@
30 30  
31 31 //整体风险
32 32 private String ztfx;
  33 + //整体风险
  34 + private String ztfxText;
  35 +
  36 + public String getZtfxText() {
  37 + return ztfxText;
  38 + }
  39 +
  40 + public void setZtfxText(String ztfxText) {
  41 + this.ztfxText = ztfxText;
  42 + }
  43 +
33 44 //联系方式
34 45 private String phone;
35 46  
... ... @@ -153,7 +164,8 @@
153 164 }
154 165 setDueWeek(destModel.getDueWeek());
155 166 if(null!=destModel.getZtfx()) {
156   - setZtfx(SieveEnums.getTitle(destModel.getZtfx()));
  167 + setZtfx(destModel.getZtfx()+"");
  168 + setZtfxText(SieveEnums.getTitle(destModel.getZtfx()));
157 169 }
158 170 setPhone(destModel.getPhone());
159 171 if(null!=destModel.getCqStatus()) {