增加企业查询
This commit is contained in:
parent
76d048ce64
commit
b557b48299
|
|
@ -214,6 +214,7 @@ public class BigScreenControllerP2 {
|
||||||
;
|
;
|
||||||
|
|
||||||
List<SurvEnterpriseInfo> list = survEnterpriseInfoService.list(wraps);
|
List<SurvEnterpriseInfo> list = survEnterpriseInfoService.list(wraps);
|
||||||
|
list.forEach(item->item.setEntLonglat(item.getEntLong()+","+item.getEntLat()));
|
||||||
result.setResult(list);
|
result.setResult(list);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,13 @@ public class SurvEnterpriseInfoController extends JeecgController<SurvEnterprise
|
||||||
ZhUtils zhUtils = new ZhUtils();
|
ZhUtils zhUtils = new ZhUtils();
|
||||||
survEnterpriseInfo.setEntCode(zhUtils.genEntCode());
|
survEnterpriseInfo.setEntCode(zhUtils.genEntCode());
|
||||||
survEnterpriseInfo.setCreateTime(new Date());
|
survEnterpriseInfo.setCreateTime(new Date());
|
||||||
|
|
||||||
|
if(StringUtils.isNotBlank(survEnterpriseInfo.getEntLonglat())){
|
||||||
|
String[] longlat = survEnterpriseInfo.getEntLonglat().split(",");
|
||||||
|
survEnterpriseInfo.setEntLong(longlat[0]);
|
||||||
|
survEnterpriseInfo.setEntLat(longlat[1]);
|
||||||
|
}
|
||||||
|
|
||||||
survEnterpriseInfoService.save(survEnterpriseInfo);
|
survEnterpriseInfoService.save(survEnterpriseInfo);
|
||||||
return Result.OK("添加成功!");
|
return Result.OK("添加成功!");
|
||||||
}
|
}
|
||||||
|
|
@ -97,6 +104,13 @@ public class SurvEnterpriseInfoController extends JeecgController<SurvEnterprise
|
||||||
survEnterpriseInfo.setUpdatedTime(null);
|
survEnterpriseInfo.setUpdatedTime(null);
|
||||||
String username = JwtUtil.getUserNameByToken(request);
|
String username = JwtUtil.getUserNameByToken(request);
|
||||||
survEnterpriseInfo.setUpdatedBy(username);
|
survEnterpriseInfo.setUpdatedBy(username);
|
||||||
|
|
||||||
|
if(StringUtils.isNotBlank(survEnterpriseInfo.getEntLonglat())){
|
||||||
|
String[] longlat = survEnterpriseInfo.getEntLonglat().split(",");
|
||||||
|
survEnterpriseInfo.setEntLong(longlat[0]);
|
||||||
|
survEnterpriseInfo.setEntLat(longlat[1]);
|
||||||
|
}
|
||||||
|
|
||||||
survEnterpriseInfoService.updateById(survEnterpriseInfo);
|
survEnterpriseInfoService.updateById(survEnterpriseInfo);
|
||||||
return Result.OK("编辑成功!");
|
return Result.OK("编辑成功!");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -795,6 +795,7 @@ public class WxAppletController {
|
||||||
|
|
||||||
|
|
||||||
List<SurvEnterpriseInfo> list = enterpriseInfoService.list(wraps);
|
List<SurvEnterpriseInfo> list = enterpriseInfoService.list(wraps);
|
||||||
|
list.forEach(item->item.setEntLonglat(item.getEntLong()+","+item.getEntLat()));
|
||||||
result.setResult(list);
|
result.setResult(list);
|
||||||
result.setSuccess(true);
|
result.setSuccess(true);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,6 @@
|
||||||
package org.jeecg.common.entity;
|
package org.jeecg.common.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
|
@ -109,4 +106,7 @@ public class SurvEnterpriseInfo implements Serializable {
|
||||||
/** 是否启用 */
|
/** 是否启用 */
|
||||||
@ApiModelProperty(name = "是否启用",notes = "")
|
@ApiModelProperty(name = "是否启用",notes = "")
|
||||||
private Integer isEnable ;
|
private Integer isEnable ;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String entLonglat ;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue