|
|
|
|
@ -404,6 +404,7 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
|
|
|
|
|
.eq(Objects.nonNull(mailQuery.getSignRoleId()), "w.sign_role_id", mailQuery.getSignRoleId()) |
|
|
|
|
.eq(Objects.nonNull(mailQuery.getSignDeptId()), "w.sign_dept_id", mailQuery.getSignDeptId()) |
|
|
|
|
.eq(StrUtil.isNotBlank(mailQuery.getVerifyIsTrue()), "m.verify_is_true", mailQuery.getVerifyIsTrue()) |
|
|
|
|
.like(StrUtil.isNotBlank(mailQuery.getVerifyPunish()), "m.verify_punish", mailQuery.getVerifyPunish()) |
|
|
|
|
.eq(Objects.nonNull(mailQuery.getVerifyNeedAccountability()), "m.verify_need_accountability", mailQuery.getVerifyNeedAccountability()) |
|
|
|
|
.eq(Objects.nonNull(mailQuery.getSimpleFlowFlag()), "m.simple_flow_flag", mailQuery.getSimpleFlowFlag()) |
|
|
|
|
.eq(Objects.nonNull(mailQuery.getExtensionFlag()), "m.extension_flag", mailQuery.getExtensionFlag()) |
|
|
|
|
@ -836,6 +837,12 @@ public class WorkService extends ServiceImpl<WorkMapper, Work> {
|
|
|
|
|
ledgerExcel.setAppealResult(appealResult); |
|
|
|
|
} |
|
|
|
|
ledgerExcel.setIsQualify(nullToEmpty(m.getQualifiedProcessingStatus())); |
|
|
|
|
if (Objects.nonNull(m.getVerifyNeedAccountability())) { |
|
|
|
|
ledgerExcel.setVerifyNeedAccountability(m.getVerifyNeedAccountability() ? "是" : "否"); |
|
|
|
|
} |
|
|
|
|
if (StrUtil.isNotBlank(m.getVerifyPunish())) { |
|
|
|
|
ledgerExcel.setVerifyPunish(String.join("、", JSON.parseArray(m.getVerifyPunish(), String.class))); |
|
|
|
|
} |
|
|
|
|
list.add(ledgerExcel); |
|
|
|
|
} |
|
|
|
|
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); |
|
|
|
|
|