Commit e4d60f82 authored by suhuiguang's avatar suhuiguang

fix(大编辑):bug修复

1.前端根据dateSource无法判断设备来源,后端处理后返回,前端业务块显示隐藏使用
parent 20725ceb
...@@ -761,9 +761,21 @@ public class CommonEquipDataProcessService { ...@@ -761,9 +761,21 @@ public class CommonEquipDataProcessService {
result.put("maintenanceSeq", idxBizJgMaintenanceRecordInfo != null ? idxBizJgMaintenanceRecordInfo.getSequenceNbr() : null); result.put("maintenanceSeq", idxBizJgMaintenanceRecordInfo != null ? idxBizJgMaintenanceRecordInfo.getSequenceNbr() : null);
result.put("constructionInfoSeq", constructionInfo != null ? constructionInfo.getSequenceNbr() : null); result.put("constructionInfoSeq", constructionInfo != null ? constructionInfo.getSequenceNbr() : null);
result.put("record", useInfo.getRecord()); result.put("record", useInfo.getRecord());
// 设备来源,前端无法判断,故后端进行判断,分为新设备(new)、历史有证设备(his)、历史无证设备(black)
result.put("dataSourceClassify", this.genDataSource(useInfo.getDataSource()));
return result; return result;
} }
private String genDataSource(String dataSource) {
if(dataSource.contains("jg_his_black")) {
return "black";
} else if (dataSource.contains("jg_his")) {
return "his";
} else {
return "new";
}
}
public IPage<?> getEquListByRecords(Set<String> eqs, JSONObject map) { public IPage<?> getEquListByRecords(Set<String> eqs, JSONObject map) {
if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) { if (map.containsKey("flag") && !map.containsKey("USE_UNIT_CREDIT_CODE")) {
return new Page<>(); return new Page<>();
...@@ -886,6 +898,7 @@ public class CommonEquipDataProcessService { ...@@ -886,6 +898,7 @@ public class CommonEquipDataProcessService {
equList.stream().filter(e -> e.get("inspectReport") != null).forEach(item -> item.put("inspectReport", JSON.parse(item.get("inspectReport").toString()))); equList.stream().filter(e -> e.get("inspectReport") != null).forEach(item -> item.put("inspectReport", JSON.parse(item.get("inspectReport").toString())));
re.put("projectContraptionId", projectContraption.getSequenceNbr()); re.put("projectContraptionId", projectContraption.getSequenceNbr());
re.put("tableData", equList); re.put("tableData", equList);
re.put("dataSourceClassify", this.genDataSource(projectContraption.getDataSource()));
return re; return re;
} }
......
...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; ...@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine; import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
import com.yeejoin.amos.boot.biz.common.annotation.Group;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity; import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData; import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
import lombok.Data; import lombok.Data;
...@@ -20,6 +21,7 @@ import lombok.experimental.Accessors; ...@@ -20,6 +21,7 @@ import lombok.experimental.Accessors;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Accessors(chain = true) @Accessors(chain = true)
@TableName("idx_biz_jg_other_info") @TableName("idx_biz_jg_other_info")
@Group("idx_biz_jg_other_info")
public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData { public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData {
/** /**
......
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