Commit 04ffe681 authored by zhangyingbin's avatar zhangyingbin

修改获取设备列表接口,修改通过设备id获取设备详情接口

parent 63e65f8a
...@@ -59,4 +59,6 @@ public class EquipmentDto extends BaseDto { ...@@ -59,4 +59,6 @@ public class EquipmentDto extends BaseDto {
@ApiModelProperty(value = "单位机构代码") @ApiModelProperty(value = "单位机构代码")
private String orgCode; private String orgCode;
private String companyName;
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper"> <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper">
<select id="queryEquipmentPage" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Equipment"> <select id="queryEquipmentPage" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto">
select * from tz_ugp_equipment select * from tz_ugp_equipment
<where> <where>
<if test="equipment.name != '' and equipment.name != null"> <if test="equipment.name != '' and equipment.name != null">
......
...@@ -142,8 +142,14 @@ public class EquipmentController extends BaseController { ...@@ -142,8 +142,14 @@ public class EquipmentController extends BaseController {
IPage<EquipmentDto> page = new Page<>(); IPage<EquipmentDto> page = new Page<>();
page.setSize(size); page.setSize(size);
page.setCurrent(current); page.setCurrent(current);
// equipment.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr()); page = equipmentServiceImpl.queryEquipmentPage(page,equipment);
return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(page,equipment)); List<EquipmentDto> equipments = page.getRecords();
if(!ValidationUtil.isEmpty(equipments)) {
for (EquipmentDto equipmentDto : equipments) {
equipmentDto.setCompanyName((String) orgService.getdetialInfo(String.valueOf(equipmentDto.getCompanyId())).get("name"));
}
}
return ResponseHelper.buildResponse(page);
} }
/** /**
......
...@@ -78,11 +78,6 @@ public class ProjectController extends BaseController { ...@@ -78,11 +78,6 @@ public class ProjectController extends BaseController {
public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) { public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
String regionName = "",regionCode = ""; String regionName = "",regionCode = "";
Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode())); Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
try {
model.setStartDate(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").parse(model.getStartDateString()));
} catch (ParseException e) {
e.printStackTrace();
}
model.setSubmitDate(new Date()); model.setSubmitDate(new Date());
model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName()); model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName());
model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName()); model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName());
...@@ -139,11 +134,6 @@ public class ProjectController extends BaseController { ...@@ -139,11 +134,6 @@ public class ProjectController extends BaseController {
@PutMapping(value = "/{sequenceNbr}") @PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目信息表", notes = "根据sequenceNbr更新项目信息表") @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新项目信息表", notes = "根据sequenceNbr更新项目信息表")
public ResponseModel<ProjectDto> updateBySequenceNbrProject(@RequestBody ProjectDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<ProjectDto> updateBySequenceNbrProject(@RequestBody ProjectDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
try {
model.setStartDate(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").parse(model.getStartDateString()));
} catch (ParseException e) {
e.printStackTrace();
}
model.setRecDate(new Date()); model.setRecDate(new Date());
model.setSequenceNbr(sequenceNbr); model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(projectServiceImpl.updateWithModel(model)); return ResponseHelper.buildResponse(projectServiceImpl.updateWithModel(model));
......
package com.yeejoin.amos.boot.module.ugp.biz.service.impl; package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -77,7 +78,11 @@ public class OrgServiceImpl { ...@@ -77,7 +78,11 @@ public class OrgServiceImpl {
BeanUtils.copyProperties(dynamicFormColumn, dynamicFormInstance); BeanUtils.copyProperties(dynamicFormColumn, dynamicFormInstance);
dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr()); dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr());
//通过字段名去拿到表单传来的值 //通过字段名去拿到表单传来的值
dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode())); if("image".equals(dynamicFormColumn.getFieldCode())){
dynamicFormInstance.setFieldValue(JSON.toJSONString(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode())));
}else{
dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
}
dynamicFormInstance.setInstanceId(orgUsr.getSequenceNbr()); dynamicFormInstance.setInstanceId(orgUsr.getSequenceNbr());
dynamicFormInstance.setSequenceNbr(null); dynamicFormInstance.setSequenceNbr(null);
dynamicFormInstanceList.add(dynamicFormInstance); dynamicFormInstanceList.add(dynamicFormInstance);
...@@ -235,7 +240,13 @@ public class OrgServiceImpl { ...@@ -235,7 +240,13 @@ public class OrgServiceImpl {
map.put("type",type); map.put("type",type);
map.put("sequenceNbr",sequenceNbr); map.put("sequenceNbr",sequenceNbr);
for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) { for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue()); if("image".equals(dynamicFormInstance.getFieldCode())){
if(!ValidationUtil.isEmpty(dynamicFormInstance.getFieldValue())){
map.put(dynamicFormInstance.getFieldCode(),JSON.parseArray(dynamicFormInstance.getFieldValue()));
}
} else {
map.put(dynamicFormInstance.getFieldCode(), dynamicFormInstance.getFieldValue());
}
} }
return map; return map;
} }
......
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