|
@@ -538,9 +538,17 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
|
|
|
insPlyIncome.setNoNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());
|
|
insPlyIncome.setNoNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());
|
|
|
insPlyIncome.setUserId(insFeeOrderNew.getUserId());
|
|
insPlyIncome.setUserId(insFeeOrderNew.getUserId());
|
|
|
insPlyIncome.setJqStartDate(StringOperations.emptyStringToNull(insAreaCompany.getJqStartDate()));
|
|
insPlyIncome.setJqStartDate(StringOperations.emptyStringToNull(insAreaCompany.getJqStartDate()));
|
|
|
- insPlyIncome.setJqEndDate(StringOperations.emptyStringToNull(insAreaCompany.getJqEndDate()));
|
|
|
|
|
|
|
+ insPlyIncome.setJqEndDate(
|
|
|
|
|
+ StringOperations.emptyStringToNull(
|
|
|
|
|
+ fixDateTime(insAreaCompany.getJqEndDate())
|
|
|
|
|
+ )
|
|
|
|
|
+ );
|
|
|
insPlyIncome.setSyStartDate(StringOperations.emptyStringToNull(insAreaCompany.getSyStartDate()));
|
|
insPlyIncome.setSyStartDate(StringOperations.emptyStringToNull(insAreaCompany.getSyStartDate()));
|
|
|
- insPlyIncome.setSyEndDate(StringOperations.emptyStringToNull(insAreaCompany.getSyEndDate()));
|
|
|
|
|
|
|
+ insPlyIncome.setSyEndDate(
|
|
|
|
|
+ StringOperations.emptyStringToNull(
|
|
|
|
|
+ fixDateTime(insAreaCompany.getSyEndDate())
|
|
|
|
|
+ )
|
|
|
|
|
+ );
|
|
|
insPlyIncome.setLeaderId(leaderId);
|
|
insPlyIncome.setLeaderId(leaderId);
|
|
|
insPlyIncome.setLeaderName(leaderName);
|
|
insPlyIncome.setLeaderName(leaderName);
|
|
|
this.getDeptId(insPlyIncome);
|
|
this.getDeptId(insPlyIncome);
|
|
@@ -560,6 +568,19 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ public static String fixDateTime(String dateTimeStr) {
|
|
|
|
|
+ if (dateTimeStr == null || !dateTimeStr.endsWith("24:00:00")) {
|
|
|
|
|
+ return dateTimeStr;
|
|
|
|
|
+ }
|
|
|
|
|
+ try {
|
|
|
|
|
+ String[] parts = dateTimeStr.split(" ");
|
|
|
|
|
+ LocalDate date = LocalDate.parse(parts[0]);
|
|
|
|
|
+ return date.plusDays(1).toString() + " 00:00:00";
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ return dateTimeStr; // 异常就原样返回
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private void getDeptId(InsPlyIncome insPlyIncome) {
|
|
private void getDeptId(InsPlyIncome insPlyIncome) {
|
|
|
PtlAgreement ptlAgreement = ptlAgreementService.getById(insPlyIncome.getAgreementId());
|
|
PtlAgreement ptlAgreement = ptlAgreementService.getById(insPlyIncome.getAgreementId());
|
|
|
String deptId = ptlAgreement.getDeptId();
|
|
String deptId = ptlAgreement.getDeptId();
|