diff --git a/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml b/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml
index 99d9e81..13c177c 100644
--- a/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml
+++ b/src/main/resources/mybatis/datasource/corp/CorpInfoMapper.xml
@@ -93,7 +93,13 @@
f.TRAINTYPE,
f.VIPLEVEL,
f.USERS_NUM,
- f.REGULARTYPE
+ f.REGULARTYPE,
+ f.BUSINESS_LICENSE,
+ f.OFFICIAL_SEAL_PATH,
+ f.VIDEO_PATH,
+ f.VIDEO_NAME,
+ f.PEOPLECOUNT,
+ f.BALANCE_WARN_AMOUNT
@@ -148,7 +154,13 @@
SMALL_TYPE,
SMALL_TYPE2,
USERS_NUM,
- REGULARTYPE
+ REGULARTYPE,
+ BUSINESS_LICENSE,
+ OFFICIAL_SEAL_PATH,
+ VIDEO_PATH,
+ VIDEO_NAME,
+ PEOPLECOUNT,
+ BALANCE_WARN_AMOUNT
@@ -203,7 +215,13 @@
#{SMALL_TYPE},
#{SMALL_TYPE2},
#{USERS_NUM},
- #{REGULARTYPE}
+ #{REGULARTYPE},
+ #{BUSINESS_LICENSE},
+ #{OFFICIAL_SEAL_PATH},
+ #{VIDEO_PATH},
+ #{VIDEO_NAME},
+ #{PEOPLECOUNT},
+ #{BALANCE_WARN_AMOUNT}
@@ -260,14 +278,14 @@
SALESREVENUE = #{SALESREVENUE},
ANNUALPROFIT = #{ANNUALPROFIT},
ECO_TYPE = #{ECO_TYPE},
- ECO_TYPE2 = #{ECO_TYPE2},
- ECO_TYPE_NAME=#{ECO_TYPE_NAME},
+ ECO_TYPE2 = #{ECO_TYPE2},
+ ECO_TYPE_NAME=#{ECO_TYPE_NAME},
INDUSTRY = #{INDUSTRY},
CORP_TYPE = #{CORP_TYPE},
- CORP_TYPE2 = #{CORP_TYPE2},
- CORP_TYPE3 = #{CORP_TYPE3},
- CORP_TYPE4 = #{CORP_TYPE4},
- CORP_TYPE_NAME = #{CORP_TYPE_NAME},
+ CORP_TYPE2 = #{CORP_TYPE2},
+ CORP_TYPE3 = #{CORP_TYPE3},
+ CORP_TYPE4 = #{CORP_TYPE4},
+ CORP_TYPE_NAME = #{CORP_TYPE_NAME},
CORP_TYPE_SMALL = #{CORP_TYPE_SMALL},
LR_NAME = #{LR_NAME},
LR_POSITION = #{LR_POSITION},
@@ -285,27 +303,27 @@
PROVINCE=#{PROVINCE},
CITY=#{CITY},
- VILLAGE = #{VILLAGE},
- LOGIN_USER_ID = #{LOGIN_USER_ID},
- ADDRESS_BUSINESS = #{ADDRESS_BUSINESS},
- ADDRESS_OFFICE = #{ADDRESS_OFFICE},
- CORP_STATE = #{CORP_STATE},
- FIXED_ASSETS = #{FIXED_ASSETS},
- YEAR_OUTPUT_VALUE = #{YEAR_OUTPUT_VALUE},
- REG_TYPE = #{REG_TYPE},
- SUBORDINATION = #{SUBORDINATION},
- CORP_OF_TYPE = #{CORP_OF_TYPE},
- CORP_OF_TYPE2 = #{CORP_OF_TYPE2},
- INDUSTRY_DEPARTMENT = #{INDUSTRY_DEPARTMENT},
- SCALE_TYPE = #{SCALE_TYPE},
- SAFETY_NAME = #{SAFETY_NAME},
- SAFETY_POST = #{SAFETY_POST},
- SAFETY_NUMBER = #{SAFETY_NUMBER},
- SAFETY_PHONE = #{SAFETY_PHONE},
- CORP_CONFIRM = #{CORP_CONFIRM},
- CORP_EXAMINE = #{CORP_EXAMINE},
- REPORT_CYCLE=#{REPORT_CYCLE},
- REPORT_STATUS=#{REPORT_STATUS},
+ VILLAGE = #{VILLAGE},
+ LOGIN_USER_ID = #{LOGIN_USER_ID},
+ ADDRESS_BUSINESS = #{ADDRESS_BUSINESS},
+ ADDRESS_OFFICE = #{ADDRESS_OFFICE},
+ CORP_STATE = #{CORP_STATE},
+ FIXED_ASSETS = #{FIXED_ASSETS},
+ YEAR_OUTPUT_VALUE = #{YEAR_OUTPUT_VALUE},
+ REG_TYPE = #{REG_TYPE},
+ SUBORDINATION = #{SUBORDINATION},
+ CORP_OF_TYPE = #{CORP_OF_TYPE},
+ CORP_OF_TYPE2 = #{CORP_OF_TYPE2},
+ INDUSTRY_DEPARTMENT = #{INDUSTRY_DEPARTMENT},
+ SCALE_TYPE = #{SCALE_TYPE},
+ SAFETY_NAME = #{SAFETY_NAME},
+ SAFETY_POST = #{SAFETY_POST},
+ SAFETY_NUMBER = #{SAFETY_NUMBER},
+ SAFETY_PHONE = #{SAFETY_PHONE},
+ CORP_CONFIRM = #{CORP_CONFIRM},
+ CORP_EXAMINE = #{CORP_EXAMINE},
+ REPORT_CYCLE=#{REPORT_CYCLE},
+ REPORT_STATUS=#{REPORT_STATUS},
STREET=#{STREET},
COUNTY=#{COUNTY},
ISSMALL=#{ISSMALL},
@@ -313,7 +331,11 @@
LR_PERSONID=#{LR_PERSONID},
CORPINFO_ID = CORPINFO_ID,
USERS_NUM = #{USERS_NUM},
- REGULARTYPE = #{REGULARTYPE}
+ BUSINESS_LICENSE = #{BUSINESS_LICENSE},
+ OFFICIAL_SEAL_PATH = #{OFFICIAL_SEAL_PATH},
+ VIDEO_PATH = #{VIDEO_PATH},
+ VIDEO_NAME = #{VIDEO_NAME},
+ PEOPLECOUNT = #{PEOPLECOUNT}
where
CORPINFO_ID = #{CORPINFO_ID}
diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
index e946943..341703e 100644
--- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml
+++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml
@@ -67,8 +67,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
DEPARTMENT_ID,
POST_ID,
ISMAIN,
-
-
FUN_IDS,
SORT,
LEARNERCATEGORY,
@@ -87,7 +85,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ISHEAD,
CARDNO,
PLS_ID,
- ISLEADER
+ ISLEADER,
+ USER_ID_CARD,
+ CERTIFICATETYPE,
+ AUTHENTICATION,
+ CULTURAL_LEVEL,
+ PORTRAIT,
+ ID_PHOTO,
+ SIGNATUR_FILE_PATH
@@ -130,7 +135,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{ISHEAD},
#{CARDNO},
#{PLS_ID},
- #{ISLEADER}
+ #{ISLEADER},
+ #{USER_ID_CARD},
+ #{CERTIFICATETYPE},
+ #{AUTHENTICATION},
+ #{CULTURAL_LEVEL},
+ #{PORTRAIT},
+ #{ID_PHOTO},
+ #{SIGNATUR_FILE_PATH}
@@ -169,7 +181,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f.ISHEAD,
f.CARDNO,
f.PLS_ID,
- f.ISLEADER
+ f.ISLEADER,
+ f.USER_ID_CARD,
+ f.CERTIFICATETYPE,
+ f.AUTHENTICATION,
+ f.CULTURAL_LEVEL,
+ f.PORTRAIT,
+ f.ID_PHOTO,
+ f.SIGNATUR_FILE_PATH
@@ -1465,14 +1484,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.PORTRAIT,
a.ID_PHOTO,
a.USER_ID_CARD,
- a.CREATTIME,
- d.ENTERPRISE_ID,
- d.NAME as ENTERPRISE_NAME
+ a.CREATTIME
from a
LEFT JOIN bus_student s on s.USER_ID = a.USER_ID
left join SYS_DICTIONARIES b on b.DICTIONARIES_ID = a.CERTIFICATETYPE
left join SYS_DICTIONARIES c on c.DICTIONARIES_ID = a.CULTURAL_LEVEL
- left join BUS_ENTERPRISE d on s.ENTERPRISE_ID = d.ENTERPRISE_ID
where a.USERNAME != 'admin'
and a.ISDELETE = '0'
@@ -1481,12 +1497,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.NAME LIKE CONCAT(CONCAT('%', #{pd.NAME}),'%')
-
- and a.PERSONNELTYPE = #{pd.PERSONNELTYPE}
-
-
- and s.ENTERPRISE_ID = #{pd.ENTERPRISE_ID}
-
and s.CORPINFO_ID = #{pd.CORPINFO_ID}
@@ -1529,7 +1539,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.NAME as CERTIFICATETYPE_NAME,
b.USER_ID_CARD,
b.PHONE,
- en.NAME as ENTERPRISE,
case if(length(a.USER_ID_CARD) = 18, cast(substring(a.USER_ID_CARD, 17, 1) as UNSIGNED)%2,
if(length(a.USER_ID_CARD) = 15, cast(substring(a.USER_ID_CARD, 15, 1) as UNSIGNED)%2, 3))
when 1 then '男'
@@ -1543,7 +1552,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.CREATTIME
from sys_user a
left join bus_student b on a.USER_ID = b.USER_ID and b.ISDELETE = '0'
--- left join bus_enterprise en on en.enterprise_id = b.enterprise_id and en.isdelete = '0'
left join sys_dictionaries c on a.CERTIFICATETYPE = c.DICTIONARIES_ID
left join sys_dictionaries e on b.DEGREE_OF_EDUCATION = e.DICTIONARIES_ID and a.USER_ID = b.USER_ID
left join sys_dictionaries h on b.PERSONNEL_TYPE = h.DICTIONARIES_ID and a.USER_ID = b.USER_ID
@@ -1561,4 +1569,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
f.ISDELETE = '0'
and f.USER_ID_CARD = #{USER_ID_CARD}
+