admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修改

Browse Source
This commit is contained in:
guoshengxiong 2025-03-26 18:48:45 +08:00
parent 9426b29cc3
commit a93e71fe20
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/baotou/controller/WorkerAdmissionController.java
View File

@ -627,6 +627,9 @@ public class WorkerAdmissionController {
setUploadFileName(finalUnzip, nameIdCardMap, "体检报告", con -> { setUploadFileName(finalUnzip, nameIdCardMap, "体检报告", con -> {
con.getLeft().setExaminationImage(con.getRight()); con.getLeft().setExaminationImage(con.getRight());
}); });
setUploadFileName(finalUnzip, nameIdCardMap, "二级、三级培训证明", con -> {
con.getLeft().setTwoTrainProof(con.getRight());
});
return Result.success(vos); return Result.success(vos);
} catch (Exception e) { } catch (Exception e) {
log.error("", e); log.error("", e);

2
src/main/java/com/zhgd/xmgl/modules/baotou/entity/vo/UploadZipWorkAdmissionVo.java
View File

@ -244,4 +244,6 @@ public class UploadZipWorkAdmissionVo {
@ApiModelProperty(value = "支部名称Id") @ApiModelProperty(value = "支部名称Id")
private Long branchId; private Long branchId;
private String branchIdStr; private String branchIdStr;
@ApiModelProperty(value = "二级、三级培训证明")
private java.lang.String twoTrainProof;
} }

8
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PartyConstructionMemberServiceImpl.java
View File

@ -149,14 +149,14 @@ public class PartyConstructionMemberServiceImpl extends ServiceImpl<PartyConstru
List<PartyConstructionMember> mans = members.stream().filter(m -> Objects.equals(m.getSex(), 1)).collect(Collectors.toList()); List<PartyConstructionMember> mans = members.stream().filter(m -> Objects.equals(m.getSex(), 1)).collect(Collectors.toList());
stats.setMenNum(mans.size()); stats.setMenNum(mans.size());
stats.setWomenNum(members.size() - mans.size()); stats.setWomenNum(members.size() - mans.size());
stats.setMenPercent(NumberUtil.div(stats.getMenNum(), stats.getTotal(), 2)); stats.setMenPercent(NumberUtil.mul(NumberUtil.div(stats.getMenNum(), stats.getTotal(), 2), new BigDecimal("100")));
stats.setWomenPercent(NumberUtil.div(stats.getWomenNum(), stats.getTotal(), 2)); stats.setWomenPercent(NumberUtil.mul(NumberUtil.div(stats.getWomenNum(), stats.getTotal(), 2), new BigDecimal("100")));
List<PartyConstructionMember> dzs = members.stream().filter(m -> Optional.ofNullable(Convert.toInt(m.getEducationalBackground())).map(x -> x >= 5).orElse(false)).collect(Collectors.toList()); List<PartyConstructionMember> dzs = members.stream().filter(m -> Optional.ofNullable(Convert.toInt(m.getEducationalBackground())).map(x -> x >= 5).orElse(false)).collect(Collectors.toList());
List<PartyConstructionMember> sss = members.stream().filter(m -> !Objects.equals(m.getNation(), "汉族")).collect(Collectors.toList()); List<PartyConstructionMember> sss = members.stream().filter(m -> !Objects.equals(m.getNation(), "汉族")).collect(Collectors.toList());
stats.setDzNum(dzs.size()); stats.setDzNum(dzs.size());
stats.setSsNum(sss.size()); stats.setSsNum(sss.size());
stats.setDzPercent(NumberUtil.div(stats.getDzNum(), stats.getTotal(), 2)); stats.setDzPercent(NumberUtil.mul(NumberUtil.div(stats.getDzNum(), stats.getTotal(), 2), new BigDecimal("100")));
stats.setSsPercent(NumberUtil.div(stats.getSsNum(), stats.getTotal(), 2)); stats.setSsPercent(NumberUtil.mul(NumberUtil.div(stats.getSsNum(), stats.getTotal(), 2), new BigDecimal("100")));
} }
return stats; return stats;
} }

3
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/WorkerAdmissionServiceImpl.java
View File

@ -454,7 +454,8 @@ public class WorkerAdmissionServiceImpl extends ServiceImpl<WorkerAdmissionMappe
"人员资质", "人员资质",
"人员资质验证", "人员资质验证",
"身份证国徽面", "身份证国徽面",
"身份证人像面文件夹").forEach(o -> { "身份证人像面文件夹",
"二级、三级培训证明").forEach(o -> {
FileUtil.mkdir(new File(dir, o)); FileUtil.mkdir(new File(dir, o));
}); });
ExcelUtils.exportExcelWorkAdmissionTemplate(response, epcInfos, enterpriseInfos, deviceUnits, postWorkTypes, certTypeList, groupList, new File(dir, "人员入场导入模板.xlsx"), organizations); ExcelUtils.exportExcelWorkAdmissionTemplate(response, epcInfos, enterpriseInfos, deviceUnits, postWorkTypes, certTypeList, groupList, new File(dir, "人员入场导入模板.xlsx"), organizations);

2
src/main/java/com/zhgd/xmgl/util/FlowSeviceUtil.java
View File

@ -453,11 +453,11 @@ public class FlowSeviceUtil {
instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr(); instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr();
} else if (Objects.equals(customStatus, 2)) { } else if (Objects.equals(customStatus, 2)) {
instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr(); instanceQuery.or().startedBy(userId + "").involvedUser(userId + "").endOr();
instanceQuery.finished();
} }
Executor.builder() Executor.builder()
//customStatus 1待催办2已办结3审批进行中4审批被撤销5审批被驳回 //customStatus 1待催办2已办结3审批进行中4审批被撤销5审批被驳回
.ifTrueNext(Objects.equals(customStatus, 1), instanceQuery::unfinished) .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); .ifNotBlankNext(Objects.equals(customStatus, 5) ? ProcessStatus.REFUSE.toString() : null, instanceQuery::processInstanceBusinessStatus);
instanceQuery.count(); instanceQuery.count();
return instanceQuery; return instanceQuery;