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

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #205.
This commit is contained in:
hejinbo
2023-11-13 16:18:36 +08:00
committed by Gitea
parent 1a51edfa8a de3fc04a05
commit 8a7dfec1d6
6 changed files with 235 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java
+3 -3
View File
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.wisdomarbitrate; package com.ruoyi.web.controller.wisdomarbitrate;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.CaseApplication;
import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
@@ -24,11 +25,10 @@ public class CaseLogRecordController extends BaseController {
*/ */
// @PreAuthorize("@ss.hasPermi('caseLog:list')") // @PreAuthorize("@ss.hasPermi('caseLog:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(CaseLogRecord caseLogRecord) public AjaxResult list(CaseLogRecord caseLogRecord)
{ {
startPage();
List<CaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); List<CaseLogRecord> list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord);
return getDataTable(list); return AjaxResult.success(list);
} }
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+60 -114
View File
@@ -37,8 +37,7 @@ import com.ruoyi.system.service.ISysUserService;
* @author ruoyi * @author ruoyi
*/ */
@Service @Service
public class SysUserServiceImpl implements ISysUserService public class SysUserServiceImpl implements ISysUserService {
{
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired @Autowired
@@ -73,8 +72,7 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@DataScope(deptAlias = "d", userAlias = "u") @DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList(SysUser user) public List<SysUser> selectUserList(SysUser user) {
{
return userMapper.selectUserList(user); return userMapper.selectUserList(user);
} }
@@ -91,8 +89,7 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@DataScope(deptAlias = "d", userAlias = "u") @DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectAllocatedList(SysUser user) public List<SysUser> selectAllocatedList(SysUser user) {
{
return userMapper.selectAllocatedList(user); return userMapper.selectAllocatedList(user);
} }
@@ -104,8 +101,7 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@DataScope(deptAlias = "d", userAlias = "u") @DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUnallocatedList(SysUser user) public List<SysUser> selectUnallocatedList(SysUser user) {
{
return userMapper.selectUnallocatedList(user); return userMapper.selectUnallocatedList(user);
} }
@@ -116,8 +112,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserByUserName(String userName) public SysUser selectUserByUserName(String userName) {
{
return userMapper.selectUserByUserName(userName); return userMapper.selectUserByUserName(userName);
} }
@@ -128,8 +123,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 用户对象信息 * @return 用户对象信息
*/ */
@Override @Override
public SysUser selectUserById(Long userId) public SysUser selectUserById(Long userId) {
{
return userMapper.selectUserById(userId); return userMapper.selectUserById(userId);
} }
@@ -140,11 +134,9 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public String selectUserRoleGroup(String userName) public String selectUserRoleGroup(String userName) {
{
List<SysRole> list = roleMapper.selectRolesByUserName(userName); List<SysRole> list = roleMapper.selectRolesByUserName(userName);
if (CollectionUtils.isEmpty(list)) if (CollectionUtils.isEmpty(list)) {
{
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -157,11 +149,9 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public String selectUserPostGroup(String userName) public String selectUserPostGroup(String userName) {
{
List<SysPost> list = postMapper.selectPostsByUserName(userName); List<SysPost> list = postMapper.selectPostsByUserName(userName);
if (CollectionUtils.isEmpty(list)) if (CollectionUtils.isEmpty(list)) {
{
return StringUtils.EMPTY; return StringUtils.EMPTY;
} }
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@@ -174,12 +164,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean checkUserNameUnique(SysUser user) public boolean checkUserNameUnique(SysUser user) {
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName()); SysUser info = userMapper.checkUserNameUnique(user.getUserName());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@@ -192,12 +180,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return * @return
*/ */
@Override @Override
public boolean checkPhoneUnique(SysUser user) public boolean checkPhoneUnique(SysUser user) {
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@@ -210,12 +196,10 @@ public class SysUserServiceImpl implements ISysUserService
* @return * @return
*/ */
@Override @Override
public boolean checkEmailUnique(SysUser user) public boolean checkEmailUnique(SysUser user) {
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail()); SysUser info = userMapper.checkEmailUnique(user.getEmail());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
{
return UserConstants.NOT_UNIQUE; return UserConstants.NOT_UNIQUE;
} }
return UserConstants.UNIQUE; return UserConstants.UNIQUE;
@@ -227,10 +211,8 @@ public class SysUserServiceImpl implements ISysUserService
* @param user 用户信息 * @param user 用户信息
*/ */
@Override @Override
public void checkUserAllowed(SysUser user) public void checkUserAllowed(SysUser user) {
{ if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
{
throw new ServiceException("不允许操作超级管理员用户"); throw new ServiceException("不允许操作超级管理员用户");
} }
} }
@@ -241,15 +223,12 @@ public class SysUserServiceImpl implements ISysUserService
* @param userId 用户id * @param userId 用户id
*/ */
@Override @Override
public void checkUserDataScope(Long userId) public void checkUserDataScope(Long userId) {
{ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
{
SysUser user = new SysUser(); SysUser user = new SysUser();
user.setUserId(userId); user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user); List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users)) if (StringUtils.isEmpty(users)) {
{
throw new ServiceException("没有权限访问用户数据！"); throw new ServiceException("没有权限访问用户数据！");
} }
} }
@@ -263,21 +242,20 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@Transactional @Transactional
public AjaxResult insertUser(SysUser user) public AjaxResult insertUser(SysUser user) {
{
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
Long[] postIds = user.getPostIds(); Long[] postIds = user.getPostIds();
if(deptId!=null){ if (deptId != null) {
SysDept dept = sysDeptMapper.selectDeptById(deptId); SysDept dept = sysDeptMapper.selectDeptById(deptId);
Integer deptType = dept.getDeptType(); Integer deptType = dept.getDeptType();
if(deptType.intValue()==1){ if (deptType.intValue() == 1) {
SysPost sysPost = postMapper.selectPostByPostCode("jbr"); SysPost sysPost = postMapper.selectPostByPostCode("jbr");
Long postId = sysPost.getPostId(); Long postId = sysPost.getPostId();
if(postIds.length>0){ if (postIds.length > 0) {
boolean isContain = Arrays.asList(postIds).contains(postId); boolean isContain = Arrays.asList(postIds).contains(postId);
if(isContain){ if (isContain) {
List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId); List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
if(sysUsers!=null&&sysUsers.size()>0){ if (sysUsers != null && sysUsers.size() > 0) {
return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！");
} }
} }
@@ -301,8 +279,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean registerUser(SysUser user) public boolean registerUser(SysUser user) {
{
return userMapper.insertUser(user) > 0; return userMapper.insertUser(user) > 0;
} }
@@ -314,21 +291,20 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@Transactional @Transactional
public AjaxResult updateUser(SysUser user) public AjaxResult updateUser(SysUser user) {
{
Long deptId = user.getDeptId(); Long deptId = user.getDeptId();
Long[] postIds = user.getPostIds(); Long[] postIds = user.getPostIds();
if(deptId!=null){ if (deptId != null) {
SysDept dept = sysDeptMapper.selectDeptById(deptId); SysDept dept = sysDeptMapper.selectDeptById(deptId);
Integer deptType = dept.getDeptType(); Integer deptType = dept.getDeptType();
if(deptType.intValue()==1){ if (deptType != null && deptType.intValue() == 1) {
SysPost sysPost = postMapper.selectPostByPostCode("jbr"); SysPost sysPost = postMapper.selectPostByPostCode("jbr");
Long postId = sysPost.getPostId(); Long postId = sysPost.getPostId();
if(postIds.length>0){ if (postIds.length > 0) {
boolean isContain = Arrays.asList(postIds).contains(postId); boolean isContain = Arrays.asList(postIds).contains(postId);
if(isContain){ if (isContain) {
List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId); List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
if(sysUsers!=null&&sysUsers.size()>0){ if (sysUsers != null && sysUsers.size() > 0) {
return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！");
} }
} }
@@ -357,8 +333,7 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@Transactional @Transactional
public void insertUserAuth(Long userId, Long[] roleIds) public void insertUserAuth(Long userId, Long[] roleIds) {
{
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
insertUserRole(userId, roleIds); insertUserRole(userId, roleIds);
} }
@@ -370,8 +345,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateUserStatus(SysUser user) public int updateUserStatus(SysUser user) {
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
@@ -382,8 +356,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateUserProfile(SysUser user) public int updateUserProfile(SysUser user) {
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
@@ -395,8 +368,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public boolean updateUserAvatar(String userName, String avatar) public boolean updateUserAvatar(String userName, String avatar) {
{
return userMapper.updateUserAvatar(userName, avatar) > 0; return userMapper.updateUserAvatar(userName, avatar) > 0;
} }
@@ -407,8 +379,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int resetPwd(SysUser user) public int resetPwd(SysUser user) {
{
return userMapper.updateUser(user); return userMapper.updateUser(user);
} }
@@ -420,8 +391,7 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int resetUserPwd(String userName, String password) public int resetUserPwd(String userName, String password) {
{
return userMapper.resetUserPwd(userName, password); return userMapper.resetUserPwd(userName, password);
} }
@@ -430,8 +400,7 @@ public class SysUserServiceImpl implements ISysUserService
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserRole(SysUser user) public void insertUserRole(SysUser user) {
{
this.insertUserRole(user.getUserId(), user.getRoleIds()); this.insertUserRole(user.getUserId(), user.getRoleIds());
} }
@@ -440,15 +409,12 @@ public class SysUserServiceImpl implements ISysUserService
* *
* @param user 用户对象 * @param user 用户对象
*/ */
public void insertUserPost(SysUser user) public void insertUserPost(SysUser user) {
{
Long[] posts = user.getPostIds(); Long[] posts = user.getPostIds();
if (StringUtils.isNotEmpty(posts)) if (StringUtils.isNotEmpty(posts)) {
{
// 新增用户与岗位管理 // 新增用户与岗位管理
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length); List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
for (Long postId : posts) for (Long postId : posts) {
{
SysUserPost up = new SysUserPost(); SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId()); up.setUserId(user.getUserId());
up.setPostId(postId); up.setPostId(postId);
@@ -464,14 +430,11 @@ public class SysUserServiceImpl implements ISysUserService
* @param userId 用户ID * @param userId 用户ID
* @param roleIds 角色组 * @param roleIds 角色组
*/ */
public void insertUserRole(Long userId, Long[] roleIds) public void insertUserRole(Long userId, Long[] roleIds) {
{ if (StringUtils.isNotEmpty(roleIds)) {
if (StringUtils.isNotEmpty(roleIds))
{
// 新增用户与角色管理 // 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length); List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
for (Long roleId : roleIds) for (Long roleId : roleIds) {
{
SysUserRole ur = new SysUserRole(); SysUserRole ur = new SysUserRole();
ur.setUserId(userId); ur.setUserId(userId);
ur.setRoleId(roleId); ur.setRoleId(roleId);
@@ -489,8 +452,7 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@Transactional @Transactional
public int deleteUserById(Long userId) public int deleteUserById(Long userId) {
{
// 删除用户与角色关联 // 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId); userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表 // 删除用户与岗位表
@@ -506,10 +468,8 @@ public class SysUserServiceImpl implements ISysUserService
*/ */
@Override @Override
@Transactional @Transactional
public int deleteUserByIds(Long[] userIds) public int deleteUserByIds(Long[] userIds) {
{ for (Long userId : userIds) {
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId)); checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId); checkUserDataScope(userId);
} }
@@ -529,10 +489,8 @@ public class SysUserServiceImpl implements ISysUserService
* @return 结果 * @return 结果
*/ */
@Override @Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
{ if (StringUtils.isNull(userList) || userList.size() == 0) {
if (StringUtils.isNull(userList) || userList.size() == 0)
{
throw new ServiceException("导入用户数据不能为空！"); throw new ServiceException("导入用户数据不能为空！");
} }
int successNum = 0; int successNum = 0;
@@ -540,23 +498,18 @@ public class SysUserServiceImpl implements ISysUserService
StringBuilder successMsg = new StringBuilder(); StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword"); String password = configService.selectConfigByKey("sys.user.initPassword");
for (SysUser user : userList) for (SysUser user : userList) {
{ try {
try
{
// 验证是否存在这个用户 // 验证是否存在这个用户
SysUser u = userMapper.selectUserByUserName(user.getUserName()); SysUser u = userMapper.selectUserByUserName(user.getUserName());
if (StringUtils.isNull(u)) if (StringUtils.isNull(u)) {
{
BeanValidators.validateWithException(validator, user); BeanValidators.validateWithException(validator, user);
user.setPassword(SecurityUtils.encryptPassword(password)); user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName); user.setCreateBy(operName);
userMapper.insertUser(user); userMapper.insertUser(user);
successNum++; successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功"); successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
} } else if (isUpdateSupport) {
else if (isUpdateSupport)
{
BeanValidators.validateWithException(validator, user); BeanValidators.validateWithException(validator, user);
checkUserAllowed(u); checkUserAllowed(u);
checkUserDataScope(u.getUserId()); checkUserDataScope(u.getUserId());
@@ -565,28 +518,21 @@ public class SysUserServiceImpl implements ISysUserService
userMapper.updateUser(user); userMapper.updateUser(user);
successNum++; successNum++;
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功"); successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
} } else {
else
{
failureNum++; failureNum++;
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在"); failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
} }
} } catch (Exception e) {
catch (Exception e)
{
failureNum++; failureNum++;
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
failureMsg.append(msg + e.getMessage()); failureMsg.append(msg + e.getMessage());
log.error(msg, e); log.error(msg, e);
} }
} }
if (failureNum > 0) if (failureNum > 0) {
{
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString()); throw new ServiceException(failureMsg.toString());
} } else {
else
{
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
} }
return successMsg.toString(); return successMsg.toString();
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java
+15 -15
View File
@@ -154,7 +154,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
} }
//管辖权异议 //管辖权异议
Integer objectiJuris = caseApplication1.getObjectiJuris(); Integer objectiJuris = caseApplication1.getObjectiJuris();
String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《管辖异议申请书》，认为" +
"，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。";
if (objectiJuris == null) { if (objectiJuris == null) {
datas.put("jurisdictionalObjection", null); datas.put("jurisdictionalObjection", null);
@@ -284,12 +284,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
} }
} }
} }
datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实");
if (arbitrateRecord1 != null) {
datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); datas.put("factDetermi", "被申请人欠款属实");
datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); datas.put("arbitrateThink", " 被申请人应按约定还款");
datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); datas.put("rulingFollows", "被申请人依法偿还申请人欠款");
}
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear()); String year = Integer.toString(now.getYear());
datas.put("year", year); datas.put("year", year);
@@ -603,7 +603,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
try { try {
Boolean aBoolean = emailOutUtil.sendEmil(appEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); Boolean aBoolean = emailOutUtil.sendEmil(appEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null);
Boolean aBoolean1 = emailOutUtil.sendEmil(resEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); Boolean aBoolean1 = emailOutUtil.sendEmil(resEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null);
if (aBoolean && aBoolean1){ if (aBoolean && aBoolean1) {
return Boolean.TRUE; return Boolean.TRUE;
} }
} catch (Exception e) { } catch (Exception e) {
@@ -739,7 +739,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
} }
//管辖权异议 //管辖权异议
Integer objectiJuris = caseApplication1.getObjectiJuris(); Integer objectiJuris = caseApplication1.getObjectiJuris();
String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《管辖异议申请书》，认为" +
"，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。";
if (objectiJuris == null) { if (objectiJuris == null) {
datas.put("jurisdictionalObjection", null); datas.put("jurisdictionalObjection", null);
@@ -870,12 +870,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
} }
} }
} }
datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实");
if (arbitrateRecord1 != null) {
datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); datas.put("factDetermi", "被申请人欠款属实");
datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); datas.put("arbitrateThink", "被申请人应按约定还款");
datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); datas.put("rulingFollows", "被申请人依法偿还申请人欠款");
}
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear()); String year = Integer.toString(now.getYear());
datas.put("year", year); datas.put("year", year);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java
+39 -30
View File
@@ -185,6 +185,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// //
caseApplication.setIdCard(String.valueOf(sysUser.getIdCard())); caseApplication.setIdCard(String.valueOf(sysUser.getIdCard()));
} }
if (role.getRoleName().equals("申请人")) {
//
caseApplication.setNameId(String.valueOf(sysUser.getDeptId()));
}
} }
@@ -278,7 +282,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
@Transactional @Transactional
public int updateHeardate(CaseApplication caseApplication) { public int updateHeardate(CaseApplication caseApplication) {
// caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); // caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR);
int rows = caseApplicationMapper.submitCaseApplication(caseApplication); int rows = caseApplicationMapper.submitCaseApplication(caseApplication);
//1975139 修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信 //1975139 修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信
//发送短信通知 //发送短信通知
@@ -288,7 +292,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
// 发送开庭日期通知短信 // 发送开庭日期通知短信
sendHearDateMessage(caseApplication, request, "1975139"); sendHearDateMessage(caseApplication, request, "1975139");
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION_METHOD, ""); CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, "");
return rows; return rows;
} }
@@ -531,44 +535,51 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
caseLogRecord5.setCaseNode(5); caseLogRecord5.setCaseNode(5);
caseLogRecord5.setCaseNodeName("组庭审核"); caseLogRecord5.setCaseNodeName("组庭审核");
caseLogRecord5.setContent("法律顾问将进行组庭审核"); caseLogRecord5.setContent("法律顾问将进行组庭审核");
CaseLogRecord caseLogRecord6 = new CaseLogRecord(); CaseLogRecord caseLogRecord6 = new CaseLogRecord();
caseLogRecord6.setCaseNode(6); caseLogRecord6.setCaseNode(6);
caseLogRecord6.setCaseNodeName("修改开庭时间");
caseLogRecord6.setContent("部门长将修改开庭时间");
CaseLogRecord caseLogRecord7 = new CaseLogRecord();
caseLogRecord6.setCaseNode(7);
caseLogRecord6.setCaseNodeName("组庭确定"); caseLogRecord6.setCaseNodeName("组庭确定");
caseLogRecord6.setContent("部门长将进行组庭确定"); caseLogRecord6.setContent("部门长将进行组庭确定");
CaseLogRecord caseLogRecord7 = new CaseLogRecord();
caseLogRecord7.setCaseNode(7); CaseLogRecord caseLogRecord8 = new CaseLogRecord();
caseLogRecord7.setCaseNode(8);
caseLogRecord7.setCaseNodeName("审核仲裁方式"); caseLogRecord7.setCaseNodeName("审核仲裁方式");
caseLogRecord7.setContent("仲裁员将进行审核仲裁方式"); caseLogRecord7.setContent("仲裁员将进行审核仲裁方式");
CaseLogRecord caseLogRecord8 = new CaseLogRecord(); CaseLogRecord caseLogRecord9 = new CaseLogRecord();
caseLogRecord8.setCaseNode(8); caseLogRecord8.setCaseNode(9);
caseLogRecord8.setCaseNodeName("开庭审理"); caseLogRecord8.setCaseNodeName("开庭审理");
caseLogRecord8.setContent("仲裁员将进行开庭审理"); caseLogRecord8.setContent("仲裁员将进行开庭审理");
CaseLogRecord caseLogRecord9 = new CaseLogRecord(); CaseLogRecord caseLogRecord11 = new CaseLogRecord();
caseLogRecord9.setCaseNode(9); caseLogRecord9.setCaseNode(11);
caseLogRecord9.setCaseNodeName("书面审理"); caseLogRecord9.setCaseNodeName("书面审理");
caseLogRecord9.setContent("仲裁员将进行书面审理"); caseLogRecord9.setContent("仲裁员将进行书面审理");
CaseLogRecord caseLogRecord11 = new CaseLogRecord(); CaseLogRecord caseLogRecord12 = new CaseLogRecord();
caseLogRecord11.setCaseNode(11); caseLogRecord11.setCaseNode(12);
caseLogRecord11.setCaseNodeName("核验仲裁文书"); caseLogRecord11.setCaseNodeName("核验仲裁文书");
caseLogRecord11.setContent("法律顾问将进行核验仲裁文书"); caseLogRecord11.setContent("法律顾问将进行核验仲裁文书");
CaseLogRecord caseLogRecord12 = new CaseLogRecord(); CaseLogRecord caseLogRecord13 = new CaseLogRecord();
caseLogRecord12.setCaseNode(12); caseLogRecord12.setCaseNode(13);
caseLogRecord12.setCaseNodeName("确认仲裁文书"); caseLogRecord12.setCaseNodeName("确认仲裁文书");
caseLogRecord12.setContent("仲裁员将进行确认仲裁文书"); caseLogRecord12.setContent("仲裁员将进行确认仲裁文书");
CaseLogRecord caseLogRecord13 = new CaseLogRecord(); CaseLogRecord caseLogRecord14 = new CaseLogRecord();
caseLogRecord13.setCaseNode(13); caseLogRecord13.setCaseNode(14);
caseLogRecord13.setCaseNodeName("仲裁文书签名"); caseLogRecord13.setCaseNodeName("仲裁文书签名");
caseLogRecord13.setContent("仲裁员将进行仲裁文书签名"); caseLogRecord13.setContent("仲裁员将进行仲裁文书签名");
CaseLogRecord caseLogRecord14 = new CaseLogRecord(); CaseLogRecord caseLogRecord15 = new CaseLogRecord();
caseLogRecord14.setCaseNode(14); caseLogRecord14.setCaseNode(15);
caseLogRecord14.setCaseNodeName("仲裁文书用印"); caseLogRecord14.setCaseNodeName("仲裁文书用印");
caseLogRecord14.setContent("部门长将进行仲裁文书用印"); caseLogRecord14.setContent("部门长将进行仲裁文书用印");
CaseLogRecord caseLogRecord15 = new CaseLogRecord(); CaseLogRecord caseLogRecord16 = new CaseLogRecord();
caseLogRecord15.setCaseNode(15); caseLogRecord15.setCaseNode(16);
caseLogRecord15.setCaseNodeName("仲裁文书送达"); caseLogRecord15.setCaseNodeName("仲裁文书送达");
caseLogRecord15.setContent("法律顾问将进行仲裁文书送达"); caseLogRecord15.setContent("法律顾问将进行仲裁文书送达");
CaseLogRecord caseLogRecord16 = new CaseLogRecord(); CaseLogRecord caseLogRecord17 = new CaseLogRecord();
caseLogRecord16.setCaseNode(16); caseLogRecord16.setCaseNode(17);
caseLogRecord16.setCaseNodeName("案件归档"); caseLogRecord16.setCaseNodeName("案件归档");
caseLogRecord16.setContent("法律顾问将进行案件归档"); caseLogRecord16.setContent("法律顾问将进行案件归档");
@@ -2117,13 +2128,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
datas.put("hearDay", null); datas.put("hearDay", null);
} }
datas.put("appArbitrationClaims", caseApplication.getArbitratClaims()); datas.put("appArbitrationClaims", caseApplication.getArbitratClaims());
if (arbitrateRecord1 != null) { datas.put("evidenDetermi", "认定为申请人证据充足");
datas.put("evidenDetermi", arbitrateRecord1.getEvidenDetermi()); datas.put("factDetermi", "被申请人欠款属实");
datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); datas.put("caseSketch", "申请人所求通过");
datas.put("caseSketch", arbitrateRecord1.getCaseSketch()); datas.put("arbitrateThink", "被申请人应按约定还款");
datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); datas.put("rulingFollows", "被申请人依法偿还申请人欠款");
datas.put("rulingFollows", arbitrateRecord1.getRulingFollows());
}
datas.put("legalProvisions", "仲裁法"); datas.put("legalProvisions", "仲裁法");
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear()); String year = Integer.toString(now.getYear());
@@ -2215,7 +2224,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
public int pendTralSure(CaseApplication caseApplication) { public int pendTralSure(CaseApplication caseApplication) {
// caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); // caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD);
Integer isAgreePendTral = caseApplication.getIsAgreePendTral(); Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
int rows = 0; int rows = 0;
//同意组庭 //同意组庭
@@ -2257,9 +2266,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication);
String caseNum = caseApplicationselect.getCaseNum(); String caseNum = caseApplicationselect.getCaseNum();
Date hearDate = caseApplicationselect.getHearDate(); //Date hearDate = caseApplicationselect.getHearDate();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String hearDatestr = dateFormat.format(hearDate); String hearDatestr = null;
String arbitratorId = caseApplicationselect.getArbitratorId(); String arbitratorId = caseApplicationselect.getArbitratorId();
// List<Arbitrator> arbitratorList = new ArrayList<>(); // List<Arbitrator> arbitratorList = new ArrayList<>();
if (StringUtils.isNotEmpty(arbitratorId)) { if (StringUtils.isNotEmpty(arbitratorId)) {
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java
+10 -12
View File
@@ -72,12 +72,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
if (opinion == 0) { //拒绝 if (opinion == 0) { //拒绝
if (arbitratMethod == 2) { if (arbitratMethod == 2) {
caseApplication1.setArbitratMethod(1); // 更改仲裁方式 caseApplication1.setArbitratMethod(1); // 更改仲裁方式
//修改案件状态为待开庭审理 //修改案件状态修改开庭时间
caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
//修改案件状态为待修改开庭时间 //修改案件状态为待修改开庭时间
// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); // caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
} else { } else {
caseApplication1.setArbitratMethod(2); caseApplication1.setArbitratMethod(2);
@@ -95,12 +95,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, ""); CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, "");
} else { } else {
//修改案件状态为待开庭审理 //修改案件状态为待修改开庭时间
caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
//修改案件状态为待修改开庭时间 //修改案件状态为待修改开庭时间
// caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); // caseApplication1.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE);
// 新增日志 // 新增日志
CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.MODIFY_HEARDATE, "");
} }
} }
@@ -533,12 +533,10 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
} }
} }
} }
datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实");
if (arbitrateRecord1 != null) { datas.put("factDetermi", "被申请人欠款属实");
datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); datas.put("arbitrateThink", " 被申请人应按约定还款");
datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); datas.put("rulingFollows", "被申请人依法偿还申请人欠款");
datas.put("rulingFollows", arbitrateRecord1.getRulingFollows());
}
LocalDate now = LocalDate.now(); LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear()); String year = Integer.toString(now.getYear());
datas.put("year", year); datas.put("year", year);
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java
+73
View File
@@ -282,6 +282,79 @@ public class FixSelectFlowDetailUtils {
e.printStackTrace(); e.printStackTrace();
} }
} }
/* public static void main(String[] args) throws Exception {
Gson gson = new Gson();
SealSignRecord sealSignRecord = new SealSignRecord();
sealSignRecord.setCaseAppliId(1350L);
sealSignRecord.setSignFlowid("24ca7172f1a242238937d952c2e7fbff");
EsignHttpResponse signFlowDetail = SignAward.signFlowDetail(sealSignRecord);
JsonObject signFlowDetailJsonObject = gson.fromJson(signFlowDetail.getBody(), JsonObject.class);
JsonObject flowDetailData = signFlowDetailJsonObject.getAsJsonObject("data");
JsonArray signersArray = flowDetailData.get("signers").getAsJsonArray();
Integer psnsignStatus = null;
Integer orgsignStatus = null;
for (int j = 0; j < signersArray.size(); j++) {
JsonObject signerObject = (JsonObject) signersArray.get(j);
if (!(signerObject.get("psnSigner").toString()).equals("null")) {
JsonObject psnSignerData = signerObject.getAsJsonObject("psnSigner");
if (psnSignerData != null) {
psnsignStatus = signerObject.get("signStatus").getAsInt();
}
}
if (!(signerObject.get("orgSigner").toString()).equals("null")) {
JsonObject orgSignerData = signerObject.getAsJsonObject("orgSigner");
if (orgSignerData != null) {
orgsignStatus = signerObject.get("signStatus").getAsInt();
}
}
}
if ((psnsignStatus.intValue() == 2) && (orgsignStatus.intValue() == 2)) {
//下载审核完成的裁决书，
String signFlowId = "24ca7172f1a242238937d952c2e7fbff";
EsignHttpResponse fileDownload = SaaSAPIFileUtils.fileDownloadUrl(signFlowId);
JsonObject fileDownloadJsonObject = gson.fromJson(fileDownload.getBody(), JsonObject.class);
JsonObject fileDownloadData = fileDownloadJsonObject.getAsJsonObject("data");
JsonArray filesArray = fileDownloadData.get("files").getAsJsonArray();
if (filesArray != null && filesArray.size() > 0) {
JsonObject fileObject = (JsonObject) filesArray.get(0);
String fileDownloadUrl = fileObject.get("downloadUrl").toString();
System.out.println(fileDownloadUrl);
String filearbitraUrl = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1);
System.out.println(filearbitraUrl);
LocalDate now = LocalDate.now();
String year = Integer.toString(now.getYear());
String month = String.format("%02d", now.getMonthValue());
String day = String.format("%02d", now.getDayOfMonth());
String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day;
String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf";
String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName;
String savePath = "/home/ruoyi/uploadPath/upload/";
// 创建日期目录
File saveFolder = new File(saveFolderPath);
if (!saveFolder.exists()) {
saveFolder.mkdirs();
}
String resultFilePath = saveFolderPath + "/" + fileName;
File resultFilePathFile = new File(resultFilePath);
if (!resultFilePathFile.exists()) {
resultFilePathFile.createNewFile();
}
String fileDownloadUrlnew = fileDownloadUrl.substring(1, fileDownloadUrl.length() - 1);
boolean downLoadFile = FileTransformation.downLoadFileByUrl(fileDownloadUrlnew, resultFilePath);
if (downLoadFile) {
System.out.println("chenggong ===============");
}
}
}
}*/
} }