|
@@ -23,6 +23,7 @@ import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
|
|
import com.zjugis.framework.workflow.utils.Select;
|
|
import com.zjugis.framework.workflow.utils.Select;
|
|
import com.zjugis.module.system.api.dict.DictDataApi;
|
|
import com.zjugis.module.system.api.dict.DictDataApi;
|
|
import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
|
|
import com.zjugis.module.system.api.dict.dto.DictDataRespDTO;
|
|
|
|
+import com.zjugis.module.system.api.district.DistrictApi;
|
|
import com.zjugis.module.system.api.user.AdminUserApi;
|
|
import com.zjugis.module.system.api.user.AdminUserApi;
|
|
import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
|
|
import com.zjugis.module.system.api.user.dto.AdminUserRespDTO;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -60,6 +61,9 @@ public class FlowContractService {
|
|
@Autowired
|
|
@Autowired
|
|
AdminUserApi adminUserApi;
|
|
AdminUserApi adminUserApi;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ DistrictApi districtApi;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
AreaClient areaCLient;
|
|
AreaClient areaCLient;
|
|
|
|
|
|
@@ -99,7 +103,7 @@ public class FlowContractService {
|
|
if(StringUtils.isNotBlank(entity.getProjectId())){
|
|
if(StringUtils.isNotBlank(entity.getProjectId())){
|
|
Project project = projectService.selectById(entity.getProjectId());
|
|
Project project = projectService.selectById(entity.getProjectId());
|
|
map.put("projectTypeCode",projectTypeService.topCode(project.getProjectTypeId()));
|
|
map.put("projectTypeCode",projectTypeService.topCode(project.getProjectTypeId()));
|
|
-// map.put("xzqh",areaCLient.);
|
|
|
|
|
|
+ map.put("xzqh",districtApi.getQhByJoincode(project.getXzqdm()));
|
|
map.put("project",project);
|
|
map.put("project",project);
|
|
}
|
|
}
|
|
if(StringUtils.isNotBlank(entity.getParentId())){
|
|
if(StringUtils.isNotBlank(entity.getParentId())){
|