diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java index 649984d..aeb4f62 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java @@ -1,5 +1,6 @@ package com.ruoyi.wisdomarbitrate.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; @@ -41,15 +42,16 @@ public class CaseAffiliate extends BaseEntity { /** * 被申请人出生年月日 */ - private String responBirth; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date responBirth; -// public Date getResponBirth() { -// return responBirth; -// } -// -// public void setResponBirth(Date responBirth) { -// this.responBirth = responBirth; -// } + public Date getResponBirth() { + return responBirth; + } + + public void setResponBirth(Date responBirth) { + this.responBirth = responBirth; + } public String getCompLegalPerson() { return compLegalPerson; @@ -75,13 +77,7 @@ public class CaseAffiliate extends BaseEntity { this.responSex = responSex; } - public String getResponBirth() { - return responBirth; - } - public void setResponBirth(String responBirth) { - this.responBirth = responBirth; - } /** 身份证号 */ @Excel(name = "身份证号") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java index 962ade2..19ea0dd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java @@ -624,9 +624,19 @@ public class CaseApplication extends BaseEntity { /** 被申请人主体信息-性别 */ @Excel(name = "被申请人主体信息-性别",width = 26) private String responSex; + + public Date getResponBirth() { + return responBirth; + } + + public void setResponBirth(Date responBirth) { + this.responBirth = responBirth; + } + /** 被申请人主体信息-出生年月日 */ @Excel(name = "被申请人主体信息-出生年月日",width = 26) - private String responBirth; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date responBirth; public String getCompLegalPerson() { return compLegalPerson; @@ -652,13 +662,7 @@ public class CaseApplication extends BaseEntity { this.responSex = responSex; } - public String getResponBirth() { - return responBirth; - } - public void setResponBirth(String responBirth) { - this.responBirth = responBirth; - } /** 联系电话 */ @Excel(name = "被申请人主体信息-联系电话",width = 26) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 63397e7..044854d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java @@ -94,8 +94,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { datas.put("resName", affiliate.getName()); datas.put("resAddress", affiliate.getContactAddress()); datas.put("resSex", affiliate.getResponSex()); -// datas.put("resDateOfBirth", responBirthdatestr); - datas.put("resDateOfBirth", "1987-03-05"); + datas.put("resDateOfBirth", affiliate.getResponBirth()); datas.put("resContactAddress", null); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 50a3e9a..26e4836 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -127,25 +127,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { ){ return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); } - if(role.getRoleName().equals("仲裁委") - ||role.getRoleName().equals("部门长")){ - List caseStatusList=new ArrayList<>(); - caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); - caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); - caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); - caseApplication.setDeptHeadStatus(caseStatusList); - } - if(role.getRoleName().equals("仲裁员")){ - caseApplication.setUserId(String.valueOf(userId)); - } +// if(role.getRoleName().equals("仲裁委") +// ||role.getRoleName().equals("部门长")){ +// List caseStatusList=new ArrayList<>(); +// caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); +// caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); +// caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); +// caseApplication.setDeptHeadStatus(caseStatusList); +// } +// if(role.getRoleName().equals("仲裁员")){ +// caseApplication.setUserId(String.valueOf(userId)); +// } if(role.getRoleName().equals("财务")){ caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); } - if(role.getRoleName().equals("法律顾问")){ - // 查询角色有关的用户部门 - List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); - caseApplication.setDeptIds(deptIds); - } +// if(role.getRoleName().equals("法律顾问")){ +// // 查询角色有关的用户部门 +// List deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); +// caseApplication.setDeptIds(deptIds); +// } if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){ // 查询角色有关的用户部门 caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java index cfade82..3b0a8dd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java @@ -91,12 +91,7 @@ public class SignAward { // System.out.println(signFlowDetailJsonObject); -// String responBirth = "Wed Feb 03 00:00:00 CST 1988"; - String responBirth = "2023-10-10 05:49:36"; - Date responBirthdate= DateUtils.parseDate(responBirth); -// String responBirthdatestr= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,responBirthdate); - String responBirthdatestr= DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,responBirthdate); - System.out.println(responBirthdatestr); + } diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml index 0991056..baae6c8 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml @@ -128,7 +128,7 @@ - or(t.identity_type=1 and t.case_status =#{financeStatus}) + (t.identity_type=1 and t.case_status =#{financeStatus}) @@ -220,7 +220,7 @@ - or( t.identity_type=1 and t.case_status =#{financeStatus}) + ( t.identity_type=1 and t.case_status =#{financeStatus})