Skip to content

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

jackwang 部署微服务接口

上级 96648c7b
隐藏空白字符变更
内嵌 并排
正在显示 包含 75 行增加 和 42 行删除
config.xml
浏览文件 @ a137abec
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizhumanresources/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizhumanresources/
mvn clean package -Ppim
cd humanresource-app/humanresource-app-pim
mvn -Ppim docker:build
mvn -Ppim docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-app-pim.yaml iBizEE --with-registry-auth
mvn clean package -Phrapi
cd humanresource-provider/humanresource-provider-hrapi
mvn -Phrapi docker:build
mvn -Phrapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/humanresource-provider-hrapi.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
humanresource-app/humanresource-app-pim/src/main/docker/Dockerfile
浏览文件 @ a137abec
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-app-pim.jar
EXPOSE 10327
EXPOSE 8080
ADD humanresource-app-pim.jar /humanresource-app-pim.jar
humanresource-app/humanresource-app-pim/src/main/docker/humanresource-app-pim.yaml
浏览文件 @ a137abec
......@@ -3,25 +3,9 @@ services:
humanresource-app-pim:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-app-pim:latest
ports:
- "10327:10327"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10327
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRContract.java
浏览文件 @ a137abec
......@@ -204,6 +204,13 @@ public class HRContract extends EntityMP implements Serializable {
@JSONField(name = "contractsignnum")
@JsonProperty("contractsignnum")
private BigInteger contractsignnum;
/**
* 附件
*/
@TableField(value = "attachment")
@JSONField(name = "attachment")
@JsonProperty("attachment")
private String attachment;
/**
* 员工
......@@ -373,6 +380,14 @@ public class HRContract extends EntityMP implements Serializable {
this.modify("contractsignnum",contractsignnum);
}
/**
* 设置 [附件]
*/
public void setAttachment(String attachment){
this.attachment = attachment ;
this.modify("attachment",attachment);
}
}
......
humanresource-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ a137abec
......@@ -86,7 +86,7 @@
<!--输出实体[HRCONTRACT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-67-4">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrcontract-103-4">
<createTable tableName="T_HRCONTRACT">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -127,6 +127,8 @@
</column>
<column name="CONTRACTSIGNNUM" remarks="" type="BIGINT">
</column>
<column name="ATTACHMENT" remarks="" type="VARCHAR(100)">
</column>
</createTable>
</changeSet>
......@@ -338,7 +340,7 @@
<!--输出实体[HREMPLOYEE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-284-12">
<changeSet author="a_LAB01_e85d8801c" id="tab-hremployee-286-12">
<createTable tableName="EMPLOYEE">
<column name="EMPLOYEENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -994,7 +996,7 @@
<!--输出实体[HRTRANSFERAPPLY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-149-33">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrtransferapply-154-33">
<createTable tableName="T_HRTRANSFERAPPLY">
<column name="HRTRANSFERAPPLYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRTRANSFERAPPLY_HRTRANSFERA"/>
......@@ -1087,10 +1089,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"/>
</changeSet>
<!--输出实体[HRCONTRACT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-67-38">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-103-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"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-67-39">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrcontract-103-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"/>
</changeSet>
<!--输出实体[HRDISTRIBUTION]外键关系 -->
......@@ -1119,13 +1121,13 @@
</changeSet>
<!--输出实体[HREMPSTATE]外键关系 -->
<!--输出实体[HREMPLOYEE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-284-47">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-286-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"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-284-48">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-286-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"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-284-49">
<changeSet author="a_LAB01_e85d8801c" id="fk-hremployee-286-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"/>
</changeSet>
<!--输出实体[HRFAMILY]外键关系 -->
......@@ -1203,13 +1205,13 @@
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRAININGRECORD" constraintName="DER1N_HRTRAININGRECORD_HREMPLO" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet>
<!--输出实体[HRTRANSFERAPPLY]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-149-69">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-154-69">
<addForeignKeyConstraint baseColumnNames="HREMPLOYEEID" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HREMPLOY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EMPLOYEEID" referencedTableName="EMPLOYEE" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-149-70">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-154-70">
<addForeignKeyConstraint baseColumnNames="HRORGANIZATIONID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRORGANI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGANIZATIONID" referencedTableName="ORGANIZATION" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-149-71">
<changeSet author="a_LAB01_e85d8801c" id="fk-hrtransferapply-154-71">
<addForeignKeyConstraint baseColumnNames="HRPOSTID2" baseTableName="T_HRTRANSFERAPPLY" constraintName="DER1N_HRTRANSFERAPPLY_HRPOST_H" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="HRPOSTID" referencedTableName="T_HRPOST" validate="true"/>
</changeSet>
<!--输出实体[HRWORKRECORD]外键关系 -->
......
humanresource-core/src/main/resources/mapper/humanresource/hrcontract/HRContractMapper.xml
浏览文件 @ a137abec
......@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
<select id="selectById" resultMap="HRContractResultMap" databaseId="mysql">
<![CDATA[select t1.* from (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 ) t1 where hrcontractid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`ATTACHMENT`, 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 ) t1 where hrcontractid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
......@@ -84,29 +84,29 @@
<!--数据查询[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
<![CDATA[ SELECT t1.`ATTACHMENT`, 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]-->
<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.`ATTACHMENT`, 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>
<!--数据查询[View]-->
<sql id="View" 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.`ATTACHMENT`, 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>
<!--数据查询[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
<![CDATA[ SELECT t1.`ATTACHMENT`, 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
<![CDATA[ SELECT t1.`ATTACHMENT`, 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>
......
humanresource-provider/humanresource-provider-hrapi/src/main/docker/Dockerfile
浏览文件 @ a137abec
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /humanresource-provider-hrapi.jar
EXPOSE 8081
EXPOSE 10317
ADD humanresource-provider-hrapi.jar /humanresource-provider-hrapi.jar
humanresource-provider/humanresource-provider-hrapi/src/main/docker/humanresource-provider-hrapi.yaml
浏览文件 @ a137abec
......@@ -3,9 +3,25 @@ services:
humanresource-provider-hrapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/humanresource-provider-hrapi:latest
ports:
- "8081:8081"
- "10317:10317"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10317
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
humanresource-provider/humanresource-provider-hrapi/src/main/java/cn/ibizlab/humanresource/hrapi/dto/HRContractDTO.java
浏览文件 @ a137abec
......@@ -205,6 +205,14 @@ public class HRContractDTO extends DTOBase implements Serializable {
@JsonProperty("contractsignnum")
private BigInteger contractsignnum;
/**
* 属性 [ATTACHMENT]
*
*/
@JSONField(name = "attachment")
@JsonProperty("attachment")
private String attachment;
/**
* 设置 [HRCONTRACTNAME]
......@@ -318,6 +326,14 @@ public class HRContractDTO extends DTOBase implements Serializable {
this.modify("contractsignnum",contractsignnum);
}
/**
* 设置 [ATTACHMENT]
*/
public void setAttachment(String attachment){
this.attachment = attachment ;
this.modify("attachment",attachment);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或