xiangshan
/
lcoa-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
lijiaqi 2023-10-25 14:12:34 +08:00
parent d09ad1f29a 4b353bc327
commit 9b3884c634
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/spire.doc.free-5.2.0.jar Normal file
View File

Binary file not shown.

2
pom.xml
View File

@ -265,6 +265,8 @@
<groupId>e-iceblue</groupId> <groupId>e-iceblue</groupId>
<artifactId>spire.doc.free</artifactId> <artifactId>spire.doc.free</artifactId>
<version>5.2.0</version> <version>5.2.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/spire.doc.free-5.2.0.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>

3
src/main/java/com/ydool/staff/entity/Places.java
View File

@ -11,6 +11,9 @@ import lombok.EqualsAndHashCode;
@TableName("t_lc_places") @TableName("t_lc_places")
public class Places extends BaseEntity { public class Places extends BaseEntity {
@ApiModelProperty(value = "企业id")
private String companyId;
@ApiModelProperty(value = "登记id") @ApiModelProperty(value = "登记id")
private String organizationId; private String organizationId;

19
src/main/java/com/ydool/staff/service/impl/AuditServiceImpl.java
View File

@ -311,17 +311,24 @@ public class AuditServiceImpl extends BaseService<AuditMapper, Audit> implements
organization.setLastInstance(auditRequest.getAuditOpinion()); organization.setLastInstance(auditRequest.getAuditOpinion());
organizationMapper.updateById(organization); organizationMapper.updateById(organization);
} }
List<Recruitment> recruitments = recruitmentMapper.selectList(Wrappers.lambdaQuery(Recruitment.class).eq(Recruitment::getCompanyId, organization.getId())); // 生成单号
List<Long> 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 places = new Places();
places.setStatus(Boolean.FALSE); places.setStatus(Boolean.FALSE);
places.setCompanyId(organization.getCompanyId());
places.setOrganizationId(organization.getId()); places.setOrganizationId(organization.getId());
places.setOdd(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss" + getNextId())); places.setOdd(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmss" + getNextId()));
placesMapper.insert(places); placesMapper.insert(places);
} // List<Recruitment> recruitments = recruitmentMapper.selectList(Wrappers.lambdaQuery(Recruitment.class).eq(Recruitment::getCompanyId, organization.getId()));
} // List<Long> 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 workFlowNotice = new WorkFlowNotice();
workFlowNotice.setStatus(Boolean.FALSE); workFlowNotice.setStatus(Boolean.FALSE);
workFlowNotice.setFlowType(ArgsConst.ORGANIZATION); workFlowNotice.setFlowType(ArgsConst.ORGANIZATION);

2
src/main/resources/application.yml
View File

@ -16,7 +16,7 @@ spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource 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 username: root
password: Wang09211108 password: Wang09211108
druid: druid: