Skip to content

I
iBiz人力资源
提交 ef0829be 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

jackwang 部署微服务接口

上级 34b6e993
隐藏空白字符变更
内嵌 并排
正在显示 包含 271 行增加 和 14 行删除
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/mapper/HRContractMapper.java
浏览文件 @ ef0829be
...@@ -19,7 +19,10 @@ import com.alibaba.fastjson.JSONObject; ...@@ -19,7 +19,10 @@ import com.alibaba.fastjson.JSONObject;
public interface HRContractMapper extends BaseMapper<HRContract>{ public interface HRContractMapper extends BaseMapper<HRContract>{
Page<HRContract> searchActive(IPage page, @Param("srf") HRContractSearchContext context, @Param("ew") Wrapper<HRContract> wrapper) ;
Page<HRContract> searchDefault(IPage page, @Param("srf") HRContractSearchContext context, @Param("ew") Wrapper<HRContract> wrapper) ; Page<HRContract> searchDefault(IPage page, @Param("srf") HRContractSearchContext context, @Param("ew") Wrapper<HRContract> wrapper) ;
Page<HRContract> searchWaitSign(IPage page, @Param("srf") HRContractSearchContext context, @Param("ew") Wrapper<HRContract> wrapper) ;
Page<HRContract> searchWaitStop(IPage page, @Param("srf") HRContractSearchContext context, @Param("ew") Wrapper<HRContract> wrapper) ;
@Override @Override
HRContract selectById(Serializable id); HRContract selectById(Serializable id);
@Override @Override
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/mapper/HREmployeeMapper.java
浏览文件 @ ef0829be
...@@ -22,6 +22,7 @@ public interface HREmployeeMapper extends BaseMapper<HREmployee>{ ...@@ -22,6 +22,7 @@ public interface HREmployeeMapper extends BaseMapper<HREmployee>{
Page<HREmployee> searchAfterProbation(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ; Page<HREmployee> searchAfterProbation(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchDefault(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ; Page<HREmployee> searchDefault(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchLeaveDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ; Page<HREmployee> searchLeaveDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchNoContract(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchOnDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ; Page<HREmployee> searchOnDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
Page<HREmployee> searchWaitDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ; Page<HREmployee> searchWaitDuty(IPage page, @Param("srf") HREmployeeSearchContext context, @Param("ew") Wrapper<HREmployee> wrapper) ;
@Override @Override
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHRContractService.java
浏览文件 @ ef0829be
...@@ -36,7 +36,10 @@ public interface IHRContractService extends IService<HRContract>{ ...@@ -36,7 +36,10 @@ public interface IHRContractService extends IService<HRContract>{
boolean checkKey(HRContract et) ; boolean checkKey(HRContract et) ;
boolean save(HRContract et) ; boolean save(HRContract et) ;
void saveBatch(List<HRContract> list) ; void saveBatch(List<HRContract> list) ;
Page<HRContract> searchActive(HRContractSearchContext context) ;
Page<HRContract> searchDefault(HRContractSearchContext context) ; Page<HRContract> searchDefault(HRContractSearchContext context) ;
Page<HRContract> searchWaitSign(HRContractSearchContext context) ;
Page<HRContract> searchWaitStop(HRContractSearchContext context) ;
List<HRContract> selectByHremployeeid(String employeeid) ; List<HRContract> selectByHremployeeid(String employeeid) ;
void removeByHremployeeid(String employeeid) ; void removeByHremployeeid(String employeeid) ;
List<HRContract> selectByMgrorganizationid(String organizationid) ; List<HRContract> selectByMgrorganizationid(String organizationid) ;
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/IHREmployeeService.java
浏览文件 @ ef0829be
...@@ -39,6 +39,7 @@ public interface IHREmployeeService extends IService<HREmployee>{ ...@@ -39,6 +39,7 @@ public interface IHREmployeeService extends IService<HREmployee>{
Page<HREmployee> searchAfterProbation(HREmployeeSearchContext context) ; Page<HREmployee> searchAfterProbation(HREmployeeSearchContext context) ;
Page<HREmployee> searchDefault(HREmployeeSearchContext context) ; Page<HREmployee> searchDefault(HREmployeeSearchContext context) ;
Page<HREmployee> searchLeaveDuty(HREmployeeSearchContext context) ; Page<HREmployee> searchLeaveDuty(HREmployeeSearchContext context) ;
Page<HREmployee> searchNoContract(HREmployeeSearchContext context) ;
Page<HREmployee> searchOnDuty(HREmployeeSearchContext context) ; Page<HREmployee> searchOnDuty(HREmployeeSearchContext context) ;
Page<HREmployee> searchWaitDuty(HREmployeeSearchContext context) ; Page<HREmployee> searchWaitDuty(HREmployeeSearchContext context) ;
List<HREmployee> selectByOrganizationid(String organizationid) ; List<HREmployee> selectByOrganizationid(String organizationid) ;
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HRContractServiceImpl.java
浏览文件 @ ef0829be
...@@ -184,6 +184,15 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr ...@@ -184,6 +184,15 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr
} }
/**
* 查询集合 执行中
*/
@Override
public Page<HRContract> searchActive(HRContractSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HRContract> pages=baseMapper.searchActive(context.getPages(),context,context.getSelectCond());
return new PageImpl<HRContract>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/** /**
* 查询集合 DEFAULT * 查询集合 DEFAULT
*/ */
...@@ -193,6 +202,24 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr ...@@ -193,6 +202,24 @@ public class HRContractServiceImpl extends ServiceImpl<HRContractMapper, HRContr
return new PageImpl<HRContract>(pages.getRecords(), context.getPageable(), pages.getTotal()); return new PageImpl<HRContract>(pages.getRecords(), context.getPageable(), pages.getTotal());
} }
/**
* 查询集合 待续签
*/
@Override
public Page<HRContract> searchWaitSign(HRContractSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HRContract> pages=baseMapper.searchWaitSign(context.getPages(),context,context.getSelectCond());
return new PageImpl<HRContract>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/**
* 查询集合 待终止
*/
@Override
public Page<HRContract> searchWaitStop(HRContractSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HRContract> pages=baseMapper.searchWaitStop(context.getPages(),context,context.getSelectCond());
return new PageImpl<HRContract>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/** /**
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/service/impl/HREmployeeServiceImpl.java
浏览文件 @ ef0829be
...@@ -259,6 +259,15 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo ...@@ -259,6 +259,15 @@ public class HREmployeeServiceImpl extends ServiceImpl<HREmployeeMapper, HREmplo
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal()); return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
} }
/**
* 查询集合 待新签合同人员
*/
@Override
public Page<HREmployee> searchNoContract(HREmployeeSearchContext context) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page<HREmployee> pages=baseMapper.searchNoContract(context.getPages(),context,context.getSelectCond());
return new PageImpl<HREmployee>(pages.getRecords(), context.getPageable(), pages.getTotal());
}
/** /**
* 查询集合 在岗员工 * 查询集合 在岗员工
*/ */
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ ef0829be
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<!--输出实体[HRCONTRACT]数据结构 --> <!--输出实体[HRCONTRACT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-32-4"> <changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-60-4">
<createTable tableName="T_HRCONTRACT"> <createTable tableName="T_HRCONTRACT">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<!--输出实体[HREMPLOYEE]数据结构 --> <!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-266-12"> <changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-274-12">
<createTable tableName="EMPLOYEE"> <createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)"> <column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column> </column>
...@@ -1087,10 +1087,10 @@ ...@@ -1087,10 +1087,10 @@
<addForeignKeyConstraint baseColumnNames="REGISTERORGANIZATIONID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HRORGANIZA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/> <addForeignKeyConstraint baseColumnNames="REGISTERORGANIZATIONID" baseTableName="T_HRCERTIFICATE" constraintName="DER1N_HRCERTIFICATE_HRORGANIZA" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRCONTRACT]外键关系 --> <!--输出实体[HRCONTRACT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-32-38"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-60-38">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/> <addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HREMPLOYEE_HR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-32-39"> <changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-60-39">
<addForeignKeyConstraint baseColumnNames="MGRORGANIZATIONID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HRORGANIZATIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/> <addForeignKeyConstraint baseColumnNames="MGRORGANIZATIONID" baseTableName="T_HRCONTRACT" constraintName="DER1N_HRCONTRACT_HRORGANIZATIO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRDISTRIBUTION]外键关系 --> <!--输出实体[HRDISTRIBUTION]外键关系 -->
...@@ -1119,13 +1119,13 @@ ...@@ -1119,13 +1119,13 @@
</changeSet> </changeSet>
<!--输出实体[HREMPSTATE]外键关系 --> <!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 --> <!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-266-47"> <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-274-47">
<addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/> <addForeignKeyConstraint baseColumnNames="ORGANIZATIONID" baseTableName="EMPLOYEE" constraintName="DER1N_EMPLOYEE_ORGANIZATION_OR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-266-48"> <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-274-48">
<addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/> <addForeignKeyConstraint baseColumnNames="EMPSTATE" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HREMPSTATE_EM" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HREMPSTATEID" referencedTableName="T_HREMPSTATE" validate="true"/>
</changeSet> </changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-266-49"> <changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-274-49">
<addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HRPOST_HRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/> <addForeignKeyConstraint baseColumnNames="HRPOSTID" baseTableName="EMPLOYEE" constraintName="DER1N_HREMPLOYEE_HRPOST_HRPOST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[HRFAMILY]外键关系 --> <!--输出实体[HRFAMILY]外键关系 -->
......
humanresource-core/src/main/resources/mapper/humanresource/hrcontract/HRContractMapper.xml
浏览文件 @ ef0829be
...@@ -46,6 +46,15 @@ ...@@ -46,6 +46,15 @@
where signorganizationid=#{organizationid} where signorganizationid=#{organizationid}
</select> </select>
<!--数据集合[Active]-->
<select id="searchActive" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HRContractSearchContext" resultMap="HRContractResultMap">
select t1.* from (
<include refid="Active" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[Default]--> <!--数据集合[Default]-->
<select id="searchDefault" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HRContractSearchContext" resultMap="HRContractResultMap"> <select id="searchDefault" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HRContractSearchContext" resultMap="HRContractResultMap">
select t1.* from ( select t1.* from (
...@@ -55,6 +64,30 @@ ...@@ -55,6 +64,30 @@
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if> <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select> </select>
<!--数据集合[WaitSign]-->
<select id="searchWaitSign" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HRContractSearchContext" resultMap="HRContractResultMap">
select t1.* from (
<include refid="WaitSign" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[WaitStop]-->
<select id="searchWaitStop" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HRContractSearchContext" resultMap="HRContractResultMap">
select t1.* from (
<include refid="WaitStop" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据查询[Active]-->
<sql id="Active" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
WHERE ( t1.`CONTRACTSTATE` = 'ACTIVE' )
]]>
</sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID <![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
...@@ -65,5 +98,17 @@ ...@@ -65,5 +98,17 @@
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID <![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[WaitSign]-->
<sql id="WaitSign" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
WHERE ( t1.`CONTRACTSTATE` = 'WAITSIGN' )
]]>
</sql>
<!--数据查询[WaitStop]-->
<sql id="WaitStop" databaseId="mysql">
<![CDATA[ SELECT t1.`BEGINTIME`, t1.`CONTRACTCODE`, t1.`CONTRACTMODE`, t1.`CONTRACTSIGNNUM`, t1.`CONTRACTSIGNTYPE`, t1.`CONTRACTSTATE`, t1.`CONTRACTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENDTIME`, t1.`HRCONTRACTID`, t1.`HRCONTRACTNAME`, t1.`HREMPLOYEEID`, t11.`EMPLOYEENAME` AS `HREMPLOYEENAME`, t1.`MEMO`, t1.`MGRORGANIZATIONID`, t21.`ORGANIZATIONNAME` AS `MGRORGANIZATIONNAME`, t1.`PROBATIONTIME`, t1.`SIGNORGANIZATIONID`, t31.`ORGANIZATIONNAME` AS `SIGNORGANIZATIONNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_HRCONTRACT` t1 LEFT JOIN EMPLOYEE t11 ON t1.HREMPLOYEEID = t11.EMPLOYEEID LEFT JOIN ORGANIZATION t21 ON t1.MGRORGANIZATIONID = t21.ORGANIZATIONID LEFT JOIN ORGANIZATION t31 ON t1.SIGNORGANIZATIONID = t31.ORGANIZATIONID
WHERE ( t1.`CONTRACTSTATE` = 'WAITSTOP' )
]]>
</sql>
</mapper> </mapper>
humanresource-core/src/main/resources/mapper/humanresource/hremployee/HREmployeeMapper.xml
浏览文件 @ ef0829be
...@@ -73,6 +73,15 @@ ...@@ -73,6 +73,15 @@
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if> <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select> </select>
<!--数据集合[NoContract]-->
<select id="searchNoContract" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from (
<include refid="NoContract" />
)t1
<where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
</select>
<!--数据集合[OnDuty]--> <!--数据集合[OnDuty]-->
<select id="searchOnDuty" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap"> <select id="searchOnDuty" parameterType="cn.ibizlab.humanresource.core.humanresource.filter.HREmployeeSearchContext" resultMap="HREmployeeResultMap">
select t1.* from ( select t1.* from (
...@@ -108,6 +117,12 @@ ...@@ -108,6 +117,12 @@
WHERE ( t21.`JOBSTATE` = 'LEAVEDUTY' ) WHERE ( t21.`JOBSTATE` = 'LEAVEDUTY' )
]]> ]]>
</sql> </sql>
<!--数据查询[NoContract]-->
<sql id="NoContract" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
WHERE NOT(EXISTS(SELECT * FROM T_HRCONTRACT t51 WHERE t1.EMPLOYEEID = t51.HREMPLOYEEID ))
]]>
</sql>
<!--数据查询[OnDuty]--> <!--数据查询[OnDuty]-->
<sql id="OnDuty" databaseId="mysql"> <sql id="OnDuty" databaseId="mysql">
<![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID <![CDATA[ SELECT (TIMESTAMPDIFF(YEAR, t1.`BIRTHDAY`, CURDATE())) AS `AGE`, t1.`BIRTHADDRESS`, t1.`BIRTHDAY`, t1.`BLOODTYPE`, t1.`CERTIFICATES`, t1.`CERTNUM`, t1.`CERTTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EMAIL`, t1.`EMPLOYEECODE`, t1.`EMPLOYEEID`, t1.`EMPLOYEENAME`, t1.`EMPSTATE`, t1.`ENTRYTYPE`, t1.`FIRSTDEGREE`, t1.`HEALTH`, t1.`HIGHESTDEGREE`, t1.`HOBBY`, t41.`HRDUTYNAME`, t1.`HRPOSTID`, t31.`HRPOSTNAME`, t21.`JOBSTATE`, t1.`MARRIAGE`, t1.`MOBILE`, t1.`NATION`, t1.`NATIVEADDRESS`, t1.`NATIVEPLACE`, t1.`NATIVETYPE`, t1.`ORGANIZATIONID`, t11.`ORGANIZATIONNAME`, t1.`PHOTO`, t1.`POLITICAL`, t1.`POLITICALTIME`, t1.`POSTALADDRESS`, t1.`PROBATIONTIME`, t1.`SEX`, t1.`STARTORGTIME`, t1.`STARTWORKTIME`, t1.`TECHNICALTITLE`, t1.`TELEPHONE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `EMPLOYEE` t1 LEFT JOIN ORGANIZATION t11 ON t1.ORGANIZATIONID = t11.ORGANIZATIONID LEFT JOIN T_HREMPSTATE t21 ON t1.EMPSTATE = t21.HREMPSTATEID LEFT JOIN T_HRPOST t31 ON t1.HRPOSTID = t31.HRPOSTID LEFT JOIN T_HRDUTY t41 ON t31.HRDUTYID = t41.HRDUTYID
......
humanresource-core/src/main/resources/permission/systemResource.json
浏览文件 @ ef0829be
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
"dename":"HREmployee", "dename":"HREmployee",
"delogicname":"员工", "delogicname":"员工",
"sysmoudle":{"id":"HUMANRESOURCE","name":"人力"}, "sysmoudle":{"id":"HUMANRESOURCE","name":"人力"},
"dedataset":[{"id":"AfterProbation" , "name":"待定工作人员"},{"id":"Default" , "name":"DEFAULT"},{"id":"LeaveDuty" , "name":"前员工"},{"id":"OnDuty" , "name":"在岗员工"},{"id":"WaitDuty" , "name":"待定工作人员"}], "dedataset":[{"id":"AfterProbation" , "name":"待定工作人员"},{"id":"Default" , "name":"DEFAULT"},{"id":"LeaveDuty" , "name":"前员工"},{"id":"NoContract" , "name":"待新签合同人员"},{"id":"OnDuty" , "name":"在岗员工"},{"id":"WaitDuty" , "name":"待定工作人员"}],
"deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }], "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}] "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
} }
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
"dename":"HRContract", "dename":"HRContract",
"delogicname":"合同信息", "delogicname":"合同信息",
"sysmoudle":{"id":"HUMANRESOURCE","name":"人力"}, "sysmoudle":{"id":"HUMANRESOURCE","name":"人力"},
"dedataset":[{"id":"Default" , "name":"DEFAULT"}], "dedataset":[{"id":"Active" , "name":"执行中"},{"id":"Default" , "name":"DEFAULT"},{"id":"WaitSign" , "name":"待续签"},{"id":"WaitStop" , "name":"待终止"}],
"deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }], "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
"datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}] "datascope":[{"id":"all","name":"全部数据"}, {"id":"createman","name":"创建人"}]
} }
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
{ {
"appid":"PIM", "appid":"PIM",
"appname":"基础管理", "appname":"基础管理",
"appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }] "appmenu":[{"menuid":"PIM", "menuname":"PIM", "menuitem":[{ "id":"user_menus" , "name":"用户菜单" , "items":[{ "id":"menuitem3" , "name":"设置" }]},{ "id":"top_menus" , "name":"顶部菜单" , "items":[{ "id":"menuitem1" , "name":"-" }]},{ "id":"left_exp" , "name":"左侧菜单" , "items":[{ "id":"menuitem5" , "name":"人员" , "items":[{ "id":"menuitem15" , "name":"员工信息" },{ "id":"menuitem8" , "name":"合同信息" }]},{ "id":"menuitem2" , "name":"组织" , "items":[{ "id":"menuitem4" , "name":"法人" },{ "id":"menuitem6" , "name":"运营单位" },{ "id":"menuitem7" , "name":"组织层次结构" },{ "id":"menuitem9" , "name":"所有组织" }]},{ "id":"menuitem10" , "name":"职位" , "items":[{ "id":"menuitem11" , "name":"职位" },{ "id":"menuitem12" , "name":"职务" }]}]},{ "id":"bottom_exp" , "name":"底部内容" },{ "id":"footer_left" , "name":"底部左侧" },{ "id":"footer_center" , "name":"底部中间" },{ "id":"footer_right" , "name":"底部右侧" }] }]
} }
] ]
} }
humanresource-core/src/main/resources/workflow/TransferApplicationApprovalv1.bpmn
浏览文件 @ ef0829be
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</flowable:field> </flowable:field>
</extensionElements> </extensionElements>
<serviceTask id="sid-03b4ae8ee2fa25738b7579cbb122e922" name="11" flowable:expression="${wfCoreService.execute(execution, activedata)}" > <serviceTask id="sid-03b4ae8ee2fa25738b7579cbb122e922" name="更新处理状态为已取消" flowable:expression="${wfCoreService.execute(execution, activedata)}" >
<extensionElements> <extensionElements>
<flowable:field name="service-entity"><flowable:string>hrtransferapplies</flowable:string></flowable:field> <flowable:field name="service-entity"><flowable:string>hrtransferapplies</flowable:string></flowable:field>
<flowable:field name="service-deaction"><flowable:string>update</flowable:string></flowable:field> <flowable:field name="service-deaction"><flowable:string>update</flowable:string></flowable:field>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" id="tid-50-2460008b701052acd8ecac24c4d32104" name="调入单位董事长审批" > <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" id="tid-50-2460008b701052acd8ecac24c4d32104" name="调入单位董事长审批" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
</userTask> </userTask>
<startEvent id="sid-0c0b39a1bdc3bc642bd55e20074e3366" name="提交"/> <startEvent id="sid-0c0b39a1bdc3bc642bd55e20074e3366" name="开始"/>
<userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" id="tid-10-61fa76aef8b148d06d26738ab8df9c5c" name="申请人" > <userTask flowable:category="${businessKey}" flowable:candidateUsers="${activedata.createman}" flowable:exclusive="true" id="tid-10-61fa76aef8b148d06d26738ab8df9c5c" name="申请人" >
<documentation>${majortext}</documentation> <documentation>${majortext}</documentation>
</userTask> </userTask>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<sequenceFlow id="lid-C9013-b7dc81b095aac12e1e98287b432fca6f" sourceRef="tid-10-61fa76aef8b148d06d26738ab8df9c5c" targetRef="tid-20-bc2714d25b1d4d05e613ffa390c73722" name="提交"> <sequenceFlow id="lid-C9013-b7dc81b095aac12e1e98287b432fca6f" sourceRef="tid-10-61fa76aef8b148d06d26738ab8df9c5c" targetRef="tid-20-bc2714d25b1d4d05e613ffa390c73722" name="提交">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C9013-b7dc81b095aac12e1e98287b432fca6f"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C9013-b7dc81b095aac12e1e98287b432fca6f"}]]></conditionExpression>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C32-b8169ba01165a618f4859c098bb70803" sourceRef="tid-10-61fa76aef8b148d06d26738ab8df9c5c" targetRef="sid-03b4ae8ee2fa25738b7579cbb122e922" name="操作32"> <sequenceFlow id="lid-C32-b8169ba01165a618f4859c098bb70803" sourceRef="tid-10-61fa76aef8b148d06d26738ab8df9c5c" targetRef="sid-03b4ae8ee2fa25738b7579cbb122e922" name="取消">
<conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C32-b8169ba01165a618f4859c098bb70803"}]]></conditionExpression> <conditionExpression xsi:type="tFormalExpression" ><![CDATA[${sequenceFlowId=="lid-C32-b8169ba01165a618f4859c098bb70803"}]]></conditionExpression>
</sequenceFlow> </sequenceFlow>
<sequenceFlow id="lid-C6-42cf03141ff296c8ea8edeaaf0c80078" sourceRef="tid-40-a89d2487b1f410af51ab756faf165cec" targetRef="tid-50-2460008b701052acd8ecac24c4d32104" name="提交至董事长审批"> <sequenceFlow id="lid-C6-42cf03141ff296c8ea8edeaaf0c80078" sourceRef="tid-40-a89d2487b1f410af51ab756faf165cec" targetRef="tid-50-2460008b701052acd8ecac24c4d32104" name="提交至董事长审批">
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<omgdi:Bounds x="191" y="6" width="100" height="80" /> <omgdi:Bounds x="191" y="6" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-aa50f0cdc470fc7eda80586253f9e119" bpmnElement="sid-aa50f0cdc470fc7eda80586253f9e119"> <bpmndi:BPMNShape id="BPMNShape-aa50f0cdc470fc7eda80586253f9e119" bpmnElement="sid-aa50f0cdc470fc7eda80586253f9e119">
<omgdi:Bounds x="765" y="371" width="30" height="30" /> <omgdi:Bounds x="786" y="371" width="30" height="30" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape-4f4cbd1b1c56a1afdf6b732acbdbb3d2" bpmnElement="sid-4f4cbd1b1c56a1afdf6b732acbdbb3d2"> <bpmndi:BPMNShape id="BPMNShape-4f4cbd1b1c56a1afdf6b732acbdbb3d2" bpmnElement="sid-4f4cbd1b1c56a1afdf6b732acbdbb3d2">
<omgdi:Bounds x="1005" y="345" width="100" height="80" /> <omgdi:Bounds x="1005" y="345" width="100" height="80" />
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/rest/HRContractResource.java
浏览文件 @ ef0829be
...@@ -139,6 +139,27 @@ public class HRContractResource { ...@@ -139,6 +139,27 @@ public class HRContractResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchActive-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "获取执行中", tags = {"合同信息" } ,notes = "获取执行中")
@RequestMapping(method= RequestMethod.GET , value="/hrcontracts/fetchactive")
public ResponseEntity<List<HRContractDTO>> fetchActive(HRContractSearchContext context) {
Page<HRContract> domains = hrcontractService.searchActive(context) ;
List<HRContractDTO> list = hrcontractMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchActive-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "查询执行中", tags = {"合同信息" } ,notes = "查询执行中")
@RequestMapping(method= RequestMethod.POST , value="/hrcontracts/searchactive")
public ResponseEntity<Page<HRContractDTO>> searchActive(@RequestBody HRContractSearchContext context) {
Page<HRContract> domains = hrcontractService.searchActive(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchDefault-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchDefault-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "获取DEFAULT", tags = {"合同信息" } ,notes = "获取DEFAULT") @ApiOperation(value = "获取DEFAULT", tags = {"合同信息" } ,notes = "获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/hrcontracts/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/hrcontracts/fetchdefault")
...@@ -160,6 +181,48 @@ public class HRContractResource { ...@@ -160,6 +181,48 @@ public class HRContractResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitSign-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "获取待续签", tags = {"合同信息" } ,notes = "获取待续签")
@RequestMapping(method= RequestMethod.GET , value="/hrcontracts/fetchwaitsign")
public ResponseEntity<List<HRContractDTO>> fetchWaitSign(HRContractSearchContext context) {
Page<HRContract> domains = hrcontractService.searchWaitSign(context) ;
List<HRContractDTO> list = hrcontractMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitSign-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "查询待续签", tags = {"合同信息" } ,notes = "查询待续签")
@RequestMapping(method= RequestMethod.POST , value="/hrcontracts/searchwaitsign")
public ResponseEntity<Page<HRContractDTO>> searchWaitSign(@RequestBody HRContractSearchContext context) {
Page<HRContract> domains = hrcontractService.searchWaitSign(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitStop-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "获取待终止", tags = {"合同信息" } ,notes = "获取待终止")
@RequestMapping(method= RequestMethod.GET , value="/hrcontracts/fetchwaitstop")
public ResponseEntity<List<HRContractDTO>> fetchWaitStop(HRContractSearchContext context) {
Page<HRContract> domains = hrcontractService.searchWaitStop(context) ;
List<HRContractDTO> list = hrcontractMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitStop-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "查询待终止", tags = {"合同信息" } ,notes = "查询待终止")
@RequestMapping(method= RequestMethod.POST , value="/hrcontracts/searchwaitstop")
public ResponseEntity<Page<HRContractDTO>> searchWaitStop(@RequestBody HRContractSearchContext context) {
Page<HRContract> domains = hrcontractService.searchWaitStop(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasPermission(this.hrcontractMapping.toDomain(#hrcontractdto),'iBizHumanResources-HRContract-Create')") @PreAuthorize("hasPermission(this.hrcontractMapping.toDomain(#hrcontractdto),'iBizHumanResources-HRContract-Create')")
@ApiOperation(value = "根据员工建立合同信息", tags = {"合同信息" }, notes = "根据员工建立合同信息") @ApiOperation(value = "根据员工建立合同信息", tags = {"合同信息" }, notes = "根据员工建立合同信息")
@RequestMapping(method = RequestMethod.POST, value = "/hremployees/{hremployee_id}/hrcontracts") @RequestMapping(method = RequestMethod.POST, value = "/hremployees/{hremployee_id}/hrcontracts")
...@@ -270,6 +333,29 @@ public class HRContractResource { ...@@ -270,6 +333,29 @@ public class HRContractResource {
return ResponseEntity.status(HttpStatus.OK).body(true); return ResponseEntity.status(HttpStatus.OK).body(true);
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchActive-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工获取执行中", tags = {"合同信息" } ,notes = "根据员工获取执行中")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/{hremployee_id}/hrcontracts/fetchactive")
public ResponseEntity<List<HRContractDTO>> fetchHRContractActiveByHREmployee(@PathVariable("hremployee_id") String hremployee_id,HRContractSearchContext context) {
context.setN_hremployeeid_eq(hremployee_id);
Page<HRContract> domains = hrcontractService.searchActive(context) ;
List<HRContractDTO> list = hrcontractMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchActive-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工查询执行中", tags = {"合同信息" } ,notes = "根据员工查询执行中")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/{hremployee_id}/hrcontracts/searchactive")
public ResponseEntity<Page<HRContractDTO>> searchHRContractActiveByHREmployee(@PathVariable("hremployee_id") String hremployee_id, @RequestBody HRContractSearchContext context) {
context.setN_hremployeeid_eq(hremployee_id);
Page<HRContract> domains = hrcontractService.searchActive(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchDefault-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchDefault-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工获取DEFAULT", tags = {"合同信息" } ,notes = "根据员工获取DEFAULT") @ApiOperation(value = "根据员工获取DEFAULT", tags = {"合同信息" } ,notes = "根据员工获取DEFAULT")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/{hremployee_id}/hrcontracts/fetchdefault") @RequestMapping(method= RequestMethod.GET , value="/hremployees/{hremployee_id}/hrcontracts/fetchdefault")
...@@ -293,5 +379,51 @@ public class HRContractResource { ...@@ -293,5 +379,51 @@ public class HRContractResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitSign-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工获取待续签", tags = {"合同信息" } ,notes = "根据员工获取待续签")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/{hremployee_id}/hrcontracts/fetchwaitsign")
public ResponseEntity<List<HRContractDTO>> fetchHRContractWaitSignByHREmployee(@PathVariable("hremployee_id") String hremployee_id,HRContractSearchContext context) {
context.setN_hremployeeid_eq(hremployee_id);
Page<HRContract> domains = hrcontractService.searchWaitSign(context) ;
List<HRContractDTO> list = hrcontractMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitSign-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工查询待续签", tags = {"合同信息" } ,notes = "根据员工查询待续签")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/{hremployee_id}/hrcontracts/searchwaitsign")
public ResponseEntity<Page<HRContractDTO>> searchHRContractWaitSignByHREmployee(@PathVariable("hremployee_id") String hremployee_id, @RequestBody HRContractSearchContext context) {
context.setN_hremployeeid_eq(hremployee_id);
Page<HRContract> domains = hrcontractService.searchWaitSign(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitStop-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工获取待终止", tags = {"合同信息" } ,notes = "根据员工获取待终止")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/{hremployee_id}/hrcontracts/fetchwaitstop")
public ResponseEntity<List<HRContractDTO>> fetchHRContractWaitStopByHREmployee(@PathVariable("hremployee_id") String hremployee_id,HRContractSearchContext context) {
context.setN_hremployeeid_eq(hremployee_id);
Page<HRContract> domains = hrcontractService.searchWaitStop(context) ;
List<HRContractDTO> list = hrcontractMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HRContract-searchWaitStop-all') and hasPermission(#context,'iBizHumanResources-HRContract-Get')")
@ApiOperation(value = "根据员工查询待终止", tags = {"合同信息" } ,notes = "根据员工查询待终止")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/{hremployee_id}/hrcontracts/searchwaitstop")
public ResponseEntity<Page<HRContractDTO>> searchHRContractWaitStopByHREmployee(@PathVariable("hremployee_id") String hremployee_id, @RequestBody HRContractSearchContext context) {
context.setN_hremployeeid_eq(hremployee_id);
Page<HRContract> domains = hrcontractService.searchWaitStop(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hrcontractMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
} }
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/rest/HREmployeeResource.java
浏览文件 @ ef0829be
...@@ -202,6 +202,27 @@ public class HREmployeeResource { ...@@ -202,6 +202,27 @@ public class HREmployeeResource {
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements())); .body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
} }
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchNoContract-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取待新签合同人员", tags = {"员工" } ,notes = "获取待新签合同人员")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchnocontract")
public ResponseEntity<List<HREmployeeDTO>> fetchNoContract(HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchNoContract(context) ;
List<HREmployeeDTO> list = hremployeeMapping.toDto(domains.getContent());
return ResponseEntity.status(HttpStatus.OK)
.header("x-page", String.valueOf(context.getPageable().getPageNumber()))
.header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
.header("x-total", String.valueOf(domains.getTotalElements()))
.body(list);
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchNoContract-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "查询待新签合同人员", tags = {"员工" } ,notes = "查询待新签合同人员")
@RequestMapping(method= RequestMethod.POST , value="/hremployees/searchnocontract")
public ResponseEntity<Page<HREmployeeDTO>> searchNoContract(@RequestBody HREmployeeSearchContext context) {
Page<HREmployee> domains = hremployeeService.searchNoContract(context) ;
return ResponseEntity.status(HttpStatus.OK)
.body(new PageImpl(hremployeeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchOnDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')") @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizHumanResources-HREmployee-searchOnDuty-all') and hasPermission(#context,'iBizHumanResources-HREmployee-Get')")
@ApiOperation(value = "获取在岗员工", tags = {"员工" } ,notes = "获取在岗员工") @ApiOperation(value = "获取在岗员工", tags = {"员工" } ,notes = "获取在岗员工")
@RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchonduty") @RequestMapping(method= RequestMethod.GET , value="/hremployees/fetchonduty")
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或