Commit 082e882f authored by tangwei's avatar tangwei

修改bug

parent 968e0ec8
package com.yeejoin.amos.patrol.dao.entity; package com.yeejoin.amos.patrol.dao.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.data.jpa.domain.support.AuditingEntityListener;
...@@ -30,6 +31,7 @@ public class BasicEntity implements Serializable{ ...@@ -30,6 +31,7 @@ public class BasicEntity implements Serializable{
@CreatedDate @CreatedDate
@Column(name="create_date") @Column(name="create_date")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate; private Date createDate;
@Id @Id
......
...@@ -133,15 +133,15 @@ public class RouteController extends AbstractBaseController { ...@@ -133,15 +133,15 @@ public class RouteController extends AbstractBaseController {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
route.setOrgCode(loginOrgCode); route.setOrgCode(loginOrgCode);
route.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
route.setBizOrgName(reginParams.getPersonIdentity().getCompanyName());
if(route.getDeptId()!=null){ if(route.getDeptId()!=null){
//查询jcs //查询jcs
ResponseModel<Object> companyInfo = jcsFeignClient.getCompanyInfo(route.getDeptId()); ResponseModel<Object> companyInfo = jcsFeignClient.getCompanyInfo(route.getDeptId());
Object obj = companyInfo.getResult(); Object obj = companyInfo.getResult();
String bizOrgName = ((Map<String, Object>) obj).get("bizOrgName").toString(); String bizOrgName = ((Map<String, Object>) obj).get("bizOrgName").toString();
route.setDeptName(bizOrgName); route.setDeptName(bizOrgName);
route.setBizOrgCode(((Map<String, Object>) obj).get("bizOrgCode").toString());
route.setBizOrgName(bizOrgName);
} }
if(route.getBoss()!=null){ if(route.getBoss()!=null){
//查询jcs //查询jcs
......
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