diff --git a/lib/spire.doc.free-5.2.0.jar b/lib/spire.doc.free-5.2.0.jar new file mode 100644 index 0000000..a0c4d89 Binary files /dev/null and b/lib/spire.doc.free-5.2.0.jar differ diff --git a/pom.xml b/pom.xml index 521d597..fd0a57a 100644 --- a/pom.xml +++ b/pom.xml @@ -265,6 +265,8 @@ e-iceblue spire.doc.free 5.2.0 + system + ${project.basedir}/lib/spire.doc.free-5.2.0.jar diff --git a/src/main/java/com/ydool/staff/entity/Places.java b/src/main/java/com/ydool/staff/entity/Places.java index 27b32ff..9927905 100644 --- a/src/main/java/com/ydool/staff/entity/Places.java +++ b/src/main/java/com/ydool/staff/entity/Places.java @@ -11,6 +11,9 @@ import lombok.EqualsAndHashCode; @TableName("t_lc_places") public class Places extends BaseEntity { + @ApiModelProperty(value = "企业id") + private String companyId; + @ApiModelProperty(value = "登记id") private String organizationId; diff --git a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java index b257c91..ac9ccde 100644 --- a/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java @@ -311,17 +311,24 @@ public class AuditServiceImpl extends BaseService implements organization.setLastInstance(auditRequest.getAuditOpinion()); organizationMapper.updateById(organization); } - List recruitments = recruitmentMapper.selectList(Wrappers.lambdaQuery(Recruitment.class).eq(Recruitment::getCompanyId, organization.getId())); - List list = recruitments.stream().map(Recruitment::getPlaces).collect(Collectors.toList()); - for (Long aLong : list) { - for (int i = 0; i < aLong.intValue(); i++) { - Places places = new Places(); - places.setStatus(Boolean.FALSE); - places.setOrganizationId(organization.getId()); - places.setOdd(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss" + getNextId())); - placesMapper.insert(places); - } - } + // 生成单号 + Places places = new Places(); + places.setStatus(Boolean.FALSE); + places.setCompanyId(organization.getCompanyId()); + places.setOrganizationId(organization.getId()); + places.setOdd(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss" + getNextId())); + placesMapper.insert(places); + // List recruitments = recruitmentMapper.selectList(Wrappers.lambdaQuery(Recruitment.class).eq(Recruitment::getCompanyId, organization.getId())); + // List list = recruitments.stream().map(Recruitment::getPlaces).collect(Collectors.toList()); + // for (Long aLong : list) { + // for (int i = 0; i < aLong.intValue(); i++) { + // Places places = new Places(); + // places.setStatus(Boolean.FALSE); + // places.setOrganizationId(organization.getId()); + // places.setOdd(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss" + getNextId())); + // placesMapper.insert(places); + // } + // } WorkFlowNotice workFlowNotice = new WorkFlowNotice(); workFlowNotice.setStatus(Boolean.FALSE); workFlowNotice.setFlowType(ArgsConst.ORGANIZATION); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8b9bb38..880b11a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,7 +16,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://127.0.0.1:3306/lc_oa?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + url: jdbc:mysql://192.168.2.24:3306/lc_oa?useSSL=false&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF8&autoReconnect=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root password: Wang09211108 druid: