SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化生成裁决书接口 #116

Merged
qtz merged 4 commits from qtz3 into dev 2023-10-18 02:47:31 +00:00
Conversation 0 Commits 4 Files Changed 6
+41 -47
6 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c5d45f4cf - Show all commits
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseAffiliate.java
+10 -14
View File
@@ -1,5 +1,6 @@
package com.ruoyi.wisdomarbitrate.domain; package com.ruoyi.wisdomarbitrate.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; 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() { public Date getResponBirth() {
// return responBirth; return responBirth;
// } }
//
// public void setResponBirth(Date responBirth) { public void setResponBirth(Date responBirth) {
// this.responBirth = responBirth; this.responBirth = responBirth;
// } }
public String getCompLegalPerson() { public String getCompLegalPerson() {
return compLegalPerson; return compLegalPerson;
@@ -75,13 +77,7 @@ public class CaseAffiliate extends BaseEntity {
this.responSex = responSex; this.responSex = responSex;
} }
public String getResponBirth() {
return responBirth;
}
public void setResponBirth(String responBirth) {
this.responBirth = responBirth;
}
/** 身份证号 */ /** 身份证号 */
@Excel(name = "身份证号") @Excel(name = "身份证号")
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java
+11 -7
View File
@@ -624,9 +624,19 @@ public class CaseApplication extends BaseEntity {
/** 被申请人主体信息-性别 */ /** 被申请人主体信息-性别 */
@Excel(name = "被申请人主体信息-性别",width = 26) @Excel(name = "被申请人主体信息-性别",width = 26)
private String responSex; private String responSex;
public Date getResponBirth() {
return responBirth;
}
public void setResponBirth(Date responBirth) {
this.responBirth = responBirth;
}
/** 被申请人主体信息-出生年月日 */ /** 被申请人主体信息-出生年月日 */
@Excel(name = "被申请人主体信息-出生年月日",width = 26) @Excel(name = "被申请人主体信息-出生年月日",width = 26)
private String responBirth; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date responBirth;
public String getCompLegalPerson() { public String getCompLegalPerson() {
return compLegalPerson; return compLegalPerson;
@@ -652,13 +662,7 @@ public class CaseApplication extends BaseEntity {
this.responSex = responSex; this.responSex = responSex;
} }
public String getResponBirth() {
return responBirth;
}
public void setResponBirth(String responBirth) {
this.responBirth = responBirth;
}
/** 联系电话 */ /** 联系电话 */
@Excel(name = "被申请人主体信息-联系电话",width = 26) @Excel(name = "被申请人主体信息-联系电话",width = 26)
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+1 -2
View File
@@ -94,8 +94,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
datas.put("resName", affiliate.getName()); datas.put("resName", affiliate.getName());
datas.put("resAddress", affiliate.getContactAddress()); datas.put("resAddress", affiliate.getContactAddress());
datas.put("resSex", affiliate.getResponSex()); datas.put("resSex", affiliate.getResponSex());
// datas.put("resDateOfBirth", responBirthdatestr); datas.put("resDateOfBirth", affiliate.getResponBirth());
datas.put("resDateOfBirth", "1987-03-05");
datas.put("resContactAddress", null); datas.put("resContactAddress", null);
} }
} }
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+16 -16
View File
@@ -127,25 +127,25 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
){ ){
return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication); return caseApplicationMapper.selectAdminCaseApplicationList(caseApplication);
} }
if(role.getRoleName().equals("仲裁委") // if(role.getRoleName().equals("仲裁委")
||role.getRoleName().equals("部门长")){ // ||role.getRoleName().equals("部门长")){
List<Integer> caseStatusList=new ArrayList<>(); // List<Integer> caseStatusList=new ArrayList<>();
caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); // caseStatusList.add(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION); // caseStatusList.add(CaseApplicationConstants.SIGN_ARBITRATION);
caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL); // caseStatusList.add(CaseApplicationConstants.ARBITRATED_SEAL);
caseApplication.setDeptHeadStatus(caseStatusList); // caseApplication.setDeptHeadStatus(caseStatusList);
} // }
if(role.getRoleName().equals("仲裁员")){ // if(role.getRoleName().equals("仲裁员")){
caseApplication.setUserId(String.valueOf(userId)); // caseApplication.setUserId(String.valueOf(userId));
} // }
if(role.getRoleName().equals("财务")){ if(role.getRoleName().equals("财务")){
caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM); caseApplication.setFinanceStatus(CaseApplicationConstants.PENDING_PAYMENT_CONFIRM);
} }
if(role.getRoleName().equals("法律顾问")){ // if(role.getRoleName().equals("法律顾问")){
// 查询角色有关的用户部门 // // 查询角色有关的用户部门
List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId()); // List<Long> deptIds = sysDeptMapper.selectUserDeptListByRoleId(role.getRoleId());
caseApplication.setDeptIds(deptIds); // caseApplication.setDeptIds(deptIds);
} // }
if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){ if(StrUtil.isEmpty(caseApplication.getNameId())&&role.getRoleName().equals("申请人")){
// 查询角色有关的用户部门 // 查询角色有关的用户部门
caseApplication.setNameId(String.valueOf(sysUser.getDeptId())); caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/SignAward.java
+1 -6
View File
@@ -91,12 +91,7 @@ public class SignAward {
// System.out.println(signFlowDetailJsonObject); // 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);
} }
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml
+2 -2
View File
@@ -128,7 +128,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
or(t.identity_type=1 and t.case_status =#{financeStatus}) (t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
</where> </where>
@@ -220,7 +220,7 @@
</if> </if>
<!--财务--> <!--财务-->
<if test="financeStatus != null and financeStatus != ''"> <if test="financeStatus != null and financeStatus != ''">
or( t.identity_type=1 and t.case_status =#{financeStatus}) ( t.identity_type=1 and t.case_status =#{financeStatus})
</if> </if>
</where> </where>