机构流程bug
This commit is contained in:
parent
3b32775cae
commit
35c62b69b8
|
|
@ -361,4 +361,17 @@ public class OrgAllInfoApiEntity implements Serializable {
|
|||
*/
|
||||
private String izSkipRepetVali;
|
||||
|
||||
/**
|
||||
* 访问地址
|
||||
*/
|
||||
private java.lang.String netUrl;
|
||||
/**
|
||||
*账号
|
||||
*/
|
||||
private java.lang.String accountNo;
|
||||
/**
|
||||
*密码
|
||||
*/
|
||||
private java.lang.String passwordText;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -167,9 +167,11 @@
|
|||
CASE WHEN sd.id IS NOT NULL THEN sd.end_time ELSE info.end_time END AS end_time,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.card_zm_path ELSE info.card_zm_path END AS card_zm_path,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.card_fm_path ELSE info.card_fm_path END AS card_fm_path,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_business_license ELSE info.com_business_license END AS com_business_license,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_business_license ELSE info.com_business_license END AS
|
||||
com_business_license,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_name ELSE info.com_name END AS com_name,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_register_address ELSE info.com_register_address END AS com_register_address,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_register_address ELSE info.com_register_address END AS
|
||||
com_register_address,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_credit_code ELSE info.com_credit_code END AS com_credit_code,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_legal_person ELSE info.com_legal_person END AS com_legal_person,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_address ELSE info.org_address END AS org_address,
|
||||
|
|
@ -177,7 +179,8 @@
|
|||
CASE WHEN sd.id IS NOT NULL THEN sd.org_coordinate_la ELSE info.org_coordinate_la END AS org_coordinate_la,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_leader ELSE info.org_leader END AS org_leader,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_leader_phone ELSE info.org_leader_phone END AS org_leader_phone,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_building_number ELSE info.org_building_number END AS org_building_number,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_building_number ELSE info.org_building_number END AS
|
||||
org_building_number,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_property_type ELSE info.org_property_type END AS org_property_type,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_building_area ELSE info.org_building_area END AS org_building_area,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_province ELSE info.org_province END AS org_province,
|
||||
|
|
@ -235,7 +238,10 @@
|
|||
sd.province,
|
||||
sd.city,
|
||||
sd.district,
|
||||
sd.address
|
||||
sd.address,
|
||||
sd.net_url,
|
||||
sd.account_no,
|
||||
sd.password_text
|
||||
FROM nu_org_apply_info_new AS info
|
||||
left join sys_depart sd on info.pk_id = sd.id
|
||||
<where>
|
||||
|
|
@ -281,9 +287,11 @@
|
|||
CASE WHEN sd.id IS NOT NULL THEN sd.end_time ELSE info.end_time END AS end_time,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.card_zm_path ELSE info.card_zm_path END AS card_zm_path,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.card_fm_path ELSE info.card_fm_path END AS card_fm_path,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_business_license ELSE info.com_business_license END AS com_business_license,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_business_license ELSE info.com_business_license END AS
|
||||
com_business_license,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_name ELSE info.com_name END AS com_name,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_register_address ELSE info.com_register_address END AS com_register_address,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_register_address ELSE info.com_register_address END AS
|
||||
com_register_address,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_credit_code ELSE info.com_credit_code END AS com_credit_code,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.com_legal_person ELSE info.com_legal_person END AS com_legal_person,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_address ELSE info.org_address END AS org_address,
|
||||
|
|
@ -291,7 +299,8 @@
|
|||
CASE WHEN sd.id IS NOT NULL THEN sd.org_coordinate_la ELSE info.org_coordinate_la END AS org_coordinate_la,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_leader ELSE info.org_leader END AS org_leader,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_leader_phone ELSE info.org_leader_phone END AS org_leader_phone,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_building_number ELSE info.org_building_number END AS org_building_number,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_building_number ELSE info.org_building_number END AS
|
||||
org_building_number,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_property_type ELSE info.org_property_type END AS org_property_type,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_building_area ELSE info.org_building_area END AS org_building_area,
|
||||
CASE WHEN sd.id IS NOT NULL THEN sd.org_province ELSE info.org_province END AS org_province,
|
||||
|
|
|
|||
|
|
@ -297,7 +297,16 @@ public class SysDepartEntity implements Serializable {
|
|||
private String oldDirectorUserIds;
|
||||
//update-end---author:wangshuai ---date:20200308 for:[JTC-119]新增字段负责人ids和旧的负责人ids
|
||||
|
||||
/**
|
||||
* 访问地址
|
||||
*/
|
||||
private java.lang.String netUrl;
|
||||
/**
|
||||
*账号
|
||||
*/
|
||||
private java.lang.String accountNo;
|
||||
/**
|
||||
*密码
|
||||
*/
|
||||
private java.lang.String passwordText;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -493,8 +493,17 @@ public class SysDepart implements Serializable {
|
|||
//update-begin---author:wangshuai ---date:20200308 for:[JTC-119]在部门管理菜单下设置部门负责人,新增字段负责人ids和旧的负责人ids
|
||||
|
||||
|
||||
/**
|
||||
* 访问地址
|
||||
*/
|
||||
private java.lang.String netUrl;
|
||||
/**
|
||||
*账号
|
||||
*/
|
||||
private java.lang.String accountNo;
|
||||
/**
|
||||
*密码
|
||||
*/
|
||||
private java.lang.String passwordText;
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue