fix xzqh

zjugis-business/src/main/java/com/zjugis/business/flow/contract/service/FlowContractService.java

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

zjugis-business/src/main/java/com/zjugis/business/framework/rpc/config/RpcSystemConfiguration.java

@@ -8,6 +8,7 @@ import com.zjugis.module.system.api.dept.DeptApi;
 import com.zjugis.module.system.api.dept.DeptLeaderApi;
 import com.zjugis.module.system.api.dept.PostApi;
 import com.zjugis.module.system.api.dict.DictDataApi;
+import com.zjugis.module.system.api.district.DistrictApi;
 import com.zjugis.module.system.api.permission.RoleApi;
 import com.zjugis.module.system.api.user.AdminUserApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -19,6 +20,6 @@ import org.springframework.context.annotation.Configuration;
  * @Version 1.0
  */
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, DictDataApi.class, AttendanceSheetApi.class, CompanyApi.class, RoleApi.class, WorkdayApi.class, ConfigApi.class, PostApi.class, DeptLeaderApi.class})
+@EnableFeignClients(clients = {AdminUserApi.class, DeptApi.class, DictDataApi.class, AttendanceSheetApi.class, CompanyApi.class, RoleApi.class, WorkdayApi.class, ConfigApi.class, PostApi.class, DeptLeaderApi.class, DistrictApi.class})
 public class RpcSystemConfiguration {
 }

zjugis-business/src/main/resources/templates/FlowContract/js/apply.js

@@ -33,8 +33,7 @@
                 })
             }
             var projectTypeCode = $("[name=projectTypeCode]").val();
-            // var xzqh = $("[name=xzqh]").val();
-            var xzqh = 'test';
+            var xzqh = $("[name=xzqh]").val();
             var params = {"projectType": projectTypeCode,"xzqh": xzqh};
             var postdata = {"name": '合同编号',"params": params}
             if(genFlag){