diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java index c666229e4..2fb6f40cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java @@ -627,6 +627,9 @@ public class WorkerAdmissionController { setUploadFileName(finalUnzip, nameIdCardMap, "体检报告", con -> { con.getLeft().setExaminationImage(con.getRight()); }); + setUploadFileName(finalUnzip, nameIdCardMap, "二级、三级培训证明", con -> { + con.getLeft().setTwoTrainProof(con.getRight()); + }); return Result.success(vos); } catch (Exception e) { log.error("", e); diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/vo/UploadZipWorkAdmissionVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/vo/UploadZipWorkAdmissionVo.java index c3804bdfc..ac1f574d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/vo/UploadZipWorkAdmissionVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/vo/UploadZipWorkAdmissionVo.java @@ -244,4 +244,6 @@ public class UploadZipWorkAdmissionVo { @ApiModelProperty(value = "支部名称Id") private Long branchId; private String branchIdStr; + @ApiModelProperty(value = "二级、三级培训证明") + private java.lang.String twoTrainProof; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PartyConstructionMemberServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PartyConstructionMemberServiceImpl.java index bd5cd287d..ab380f7d4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PartyConstructionMemberServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PartyConstructionMemberServiceImpl.java @@ -149,14 +149,14 @@ public class PartyConstructionMemberServiceImpl extends ServiceImpl mans = members.stream().filter(m -> Objects.equals(m.getSex(), 1)).collect(Collectors.toList()); stats.setMenNum(mans.size()); stats.setWomenNum(members.size() - mans.size()); - stats.setMenPercent(NumberUtil.div(stats.getMenNum(), stats.getTotal(), 2)); - stats.setWomenPercent(NumberUtil.div(stats.getWomenNum(), stats.getTotal(), 2)); + stats.setMenPercent(NumberUtil.mul(NumberUtil.div(stats.getMenNum(), stats.getTotal(), 2), new BigDecimal("100"))); + stats.setWomenPercent(NumberUtil.mul(NumberUtil.div(stats.getWomenNum(), stats.getTotal(), 2), new BigDecimal("100"))); List dzs = members.stream().filter(m -> Optional.ofNullable(Convert.toInt(m.getEducationalBackground())).map(x -> x >= 5).orElse(false)).collect(Collectors.toList()); List sss = members.stream().filter(m -> !Objects.equals(m.getNation(), "汉族")).collect(Collectors.toList()); stats.setDzNum(dzs.size()); stats.setSsNum(sss.size()); - stats.setDzPercent(NumberUtil.div(stats.getDzNum(), stats.getTotal(), 2)); - stats.setSsPercent(NumberUtil.div(stats.getSsNum(), stats.getTotal(), 2)); + stats.setDzPercent(NumberUtil.mul(NumberUtil.div(stats.getDzNum(), stats.getTotal(), 2), new BigDecimal("100"))); + stats.setSsPercent(NumberUtil.mul(NumberUtil.div(stats.getSsNum(), stats.getTotal(), 2), new BigDecimal("100"))); } return stats; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java index fad320f6e..f2bb0f642 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java @@ -454,7 +454,8 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl { + "身份证人像面文件夹", + "二级、三级培训证明").forEach(o -> { FileUtil.mkdir(new File(dir, o)); }); ExcelUtils.exportExcelWorkAdmissionTemplate(response, epcInfos, enterpriseInfos, deviceUnits, postWorkTypes, certTypeList, groupList, new File(dir, "人员入场导入模板.xlsx"), organizations); diff --git a/src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java b/src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java index 57264dfa4..5fa716d63 100644 --- a/src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java @@ -453,11 +453,11 @@ public class FlowSeviceUtil { instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr(); } else if (Objects.equals(customStatus, 2)) { instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr(); + instanceQuery.finished(); } Executor.builder() //customStatus 1待催办2已办结3审批进行中4审批被撤销5审批被驳回 .ifTrueNext(Objects.equals(customStatus, 1), instanceQuery::unfinished) - .ifNotBlankNext(Objects.equals(customStatus, 2) ? "PRE%" : null, instanceQuery::processInstanceBusinessStatusLike) .ifNotBlankNext(Objects.equals(customStatus, 5) ? ProcessStatus.REFUSE.toString() : null, instanceQuery::processInstanceBusinessStatus); instanceQuery.count(); return instanceQuery;