diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java index 6cc330d..e67a1b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseLogRecordController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.wisdomarbitrate; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord; @@ -24,11 +25,10 @@ public class CaseLogRecordController extends BaseController { */ // @PreAuthorize("@ss.hasPermi('caseLog:list')") @GetMapping("/list") - public TableDataInfo list(CaseLogRecord caseLogRecord) + public AjaxResult list(CaseLogRecord caseLogRecord) { - startPage(); List list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); - return getDataTable(list); + return AjaxResult.success(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 6f83e37..978e99f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -33,12 +33,11 @@ import com.ruoyi.system.service.ISysUserService; /** * 用户 业务层处理 - * + * * @author ruoyi */ @Service -public class SysUserServiceImpl implements ISysUserService -{ +public class SysUserServiceImpl implements ISysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); @Autowired @@ -67,14 +66,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询用户列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @Override @DataScope(deptAlias = "d", userAlias = "u") - public List selectUserList(SysUser user) - { + public List selectUserList(SysUser user) { return userMapper.selectUserList(user); } @@ -85,66 +83,60 @@ public class SysUserServiceImpl implements ISysUserService /** * 根据条件分页查询已分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @Override @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) - { + public List selectAllocatedList(SysUser user) { return userMapper.selectAllocatedList(user); } /** * 根据条件分页查询未分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @Override @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) - { + public List selectUnallocatedList(SysUser user) { return userMapper.selectUnallocatedList(user); } /** * 通过用户名查询用户 - * + * * @param userName 用户名 * @return 用户对象信息 */ @Override - public SysUser selectUserByUserName(String userName) - { + public SysUser selectUserByUserName(String userName) { return userMapper.selectUserByUserName(userName); } /** * 通过用户ID查询用户 - * + * * @param userId 用户ID * @return 用户对象信息 */ @Override - public SysUser selectUserById(Long userId) - { + public SysUser selectUserById(Long userId) { return userMapper.selectUserById(userId); } /** * 查询用户所属角色组 - * + * * @param userName 用户名 * @return 结果 */ @Override - public String selectUserRoleGroup(String userName) - { + public String selectUserRoleGroup(String userName) { List list = roleMapper.selectRolesByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); @@ -152,16 +144,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 查询用户所属岗位组 - * + * * @param userName 用户名 * @return 结果 */ @Override - public String selectUserPostGroup(String userName) - { + public String selectUserPostGroup(String userName) { List list = postMapper.selectPostsByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); @@ -169,17 +159,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户名称是否唯一 - * + * * @param user 用户信息 * @return 结果 */ @Override - public boolean checkUserNameUnique(SysUser user) - { + public boolean checkUserNameUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); 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.UNIQUE; @@ -192,12 +180,10 @@ public class SysUserServiceImpl implements ISysUserService * @return */ @Override - public boolean checkPhoneUnique(SysUser user) - { + public boolean checkPhoneUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); 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.UNIQUE; @@ -210,12 +196,10 @@ public class SysUserServiceImpl implements ISysUserService * @return */ @Override - public boolean checkEmailUnique(SysUser user) - { + public boolean checkEmailUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); 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.UNIQUE; @@ -223,33 +207,28 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户是否允许操作 - * + * * @param user 用户信息 */ @Override - public void checkUserAllowed(SysUser user) - { - if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) - { + public void checkUserAllowed(SysUser user) { + if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) { throw new ServiceException("不允许操作超级管理员用户"); } } /** * 校验用户是否有数据权限 - * + * * @param userId 用户id */ @Override - public void checkUserDataScope(Long userId) - { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) - { + public void checkUserDataScope(Long userId) { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) { SysUser user = new SysUser(); user.setUserId(userId); List users = SpringUtils.getAopProxy(this).selectUserList(user); - if (StringUtils.isEmpty(users)) - { + if (StringUtils.isEmpty(users)) { throw new ServiceException("没有权限访问用户数据！"); } } @@ -257,27 +236,26 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override @Transactional - public AjaxResult insertUser(SysUser user) - { + public AjaxResult insertUser(SysUser user) { Long deptId = user.getDeptId(); Long[] postIds = user.getPostIds(); - if(deptId!=null){ + if (deptId != null) { SysDept dept = sysDeptMapper.selectDeptById(deptId); Integer deptType = dept.getDeptType(); - if(deptType.intValue()==1){ + if (deptType.intValue() == 1) { SysPost sysPost = postMapper.selectPostByPostCode("jbr"); Long postId = sysPost.getPostId(); - if(postIds.length>0){ + if (postIds.length > 0) { boolean isContain = Arrays.asList(postIds).contains(postId); - if(isContain){ - List sysUsers = userMapper.selectUserByDeptId(deptId); - if(sysUsers!=null&&sysUsers.size()>0){ + if (isContain) { + List sysUsers = userMapper.selectUserByDeptId(deptId); + if (sysUsers != null && sysUsers.size() > 0) { return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); } } @@ -296,39 +274,37 @@ public class SysUserServiceImpl implements ISysUserService /** * 注册用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override - public boolean registerUser(SysUser user) - { + public boolean registerUser(SysUser user) { return userMapper.insertUser(user) > 0; } /** * 修改保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override @Transactional - public AjaxResult updateUser(SysUser user) - { + public AjaxResult updateUser(SysUser user) { Long deptId = user.getDeptId(); Long[] postIds = user.getPostIds(); - if(deptId!=null){ + if (deptId != null) { SysDept dept = sysDeptMapper.selectDeptById(deptId); Integer deptType = dept.getDeptType(); - if(deptType.intValue()==1){ + if (deptType != null && deptType.intValue() == 1) { SysPost sysPost = postMapper.selectPostByPostCode("jbr"); Long postId = sysPost.getPostId(); - if(postIds.length>0){ + if (postIds.length > 0) { boolean isContain = Arrays.asList(postIds).contains(postId); - if(isContain){ - List sysUsers = userMapper.selectUserByDeptId(deptId); - if(sysUsers!=null&&sysUsers.size()>0){ + if (isContain) { + List sysUsers = userMapper.selectUserByDeptId(deptId); + if (sysUsers != null && sysUsers.size() > 0) { return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个！"); } } @@ -351,104 +327,94 @@ public class SysUserServiceImpl implements ISysUserService /** * 用户授权角色 - * - * @param userId 用户ID + * + * @param userId 用户ID * @param roleIds 角色组 */ @Override @Transactional - public void insertUserAuth(Long userId, Long[] roleIds) - { + public void insertUserAuth(Long userId, Long[] roleIds) { userRoleMapper.deleteUserRoleByUserId(userId); insertUserRole(userId, roleIds); } /** * 修改用户状态 - * + * * @param user 用户信息 * @return 结果 */ @Override - public int updateUserStatus(SysUser user) - { + public int updateUserStatus(SysUser user) { return userMapper.updateUser(user); } /** * 修改用户基本信息 - * + * * @param user 用户信息 * @return 结果 */ @Override - public int updateUserProfile(SysUser user) - { + public int updateUserProfile(SysUser user) { return userMapper.updateUser(user); } /** * 修改用户头像 - * + * * @param userName 用户名 - * @param avatar 头像地址 + * @param avatar 头像地址 * @return 结果 */ @Override - public boolean updateUserAvatar(String userName, String avatar) - { + public boolean updateUserAvatar(String userName, String avatar) { return userMapper.updateUserAvatar(userName, avatar) > 0; } /** * 重置用户密码 - * + * * @param user 用户信息 * @return 结果 */ @Override - public int resetPwd(SysUser user) - { + public int resetPwd(SysUser user) { return userMapper.updateUser(user); } /** * 重置用户密码 - * + * * @param userName 用户名 * @param password 密码 * @return 结果 */ @Override - public int resetUserPwd(String userName, String password) - { + public int resetUserPwd(String userName, String password) { return userMapper.resetUserPwd(userName, password); } /** * 新增用户角色信息 - * + * * @param user 用户对象 */ - public void insertUserRole(SysUser user) - { + public void insertUserRole(SysUser user) { this.insertUserRole(user.getUserId(), user.getRoleIds()); } /** * 新增用户岗位信息 - * + * * @param user 用户对象 */ - public void insertUserPost(SysUser user) - { + public void insertUserPost(SysUser user) { Long[] posts = user.getPostIds(); - if (StringUtils.isNotEmpty(posts)) - { + if (StringUtils.isNotEmpty(posts)) { // 新增用户与岗位管理 List list = new ArrayList(posts.length); - for (Long postId : posts) - { + for (Long postId : posts) { SysUserPost up = new SysUserPost(); up.setUserId(user.getUserId()); up.setPostId(postId); @@ -460,18 +426,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户角色信息 - * - * @param userId 用户ID + * + * @param userId 用户ID * @param roleIds 角色组 */ - public void insertUserRole(Long userId, Long[] roleIds) - { - if (StringUtils.isNotEmpty(roleIds)) - { + public void insertUserRole(Long userId, Long[] roleIds) { + if (StringUtils.isNotEmpty(roleIds)) { // 新增用户与角色管理 List list = new ArrayList(roleIds.length); - for (Long roleId : roleIds) - { + for (Long roleId : roleIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); @@ -483,14 +446,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户ID删除用户 - * + * * @param userId 用户ID * @return 结果 */ @Override @Transactional - public int deleteUserById(Long userId) - { + public int deleteUserById(Long userId) { // 删除用户与角色关联 userRoleMapper.deleteUserRoleByUserId(userId); // 删除用户与岗位表 @@ -500,16 +462,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 批量删除用户信息 - * + * * @param userIds 需要删除的用户ID * @return 结果 */ @Override @Transactional - public int deleteUserByIds(Long[] userIds) - { - for (Long userId : userIds) - { + public int deleteUserByIds(Long[] userIds) { + for (Long userId : userIds) { checkUserAllowed(new SysUser(userId)); checkUserDataScope(userId); } @@ -522,17 +482,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 导入用户数据 - * - * @param userList 用户数据列表 + * + * @param userList 用户数据列表 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 + * @param operName 操作用户 * @return 结果 */ @Override - public String importUser(List userList, Boolean isUpdateSupport, String operName) - { - if (StringUtils.isNull(userList) || userList.size() == 0) - { + public String importUser(List userList, Boolean isUpdateSupport, String operName) { + if (StringUtils.isNull(userList) || userList.size() == 0) { throw new ServiceException("导入用户数据不能为空！"); } int successNum = 0; @@ -540,23 +498,18 @@ public class SysUserServiceImpl implements ISysUserService StringBuilder successMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder(); String password = configService.selectConfigByKey("sys.user.initPassword"); - for (SysUser user : userList) - { - try - { + for (SysUser user : userList) { + try { // 验证是否存在这个用户 SysUser u = userMapper.selectUserByUserName(user.getUserName()); - if (StringUtils.isNull(u)) - { + if (StringUtils.isNull(u)) { BeanValidators.validateWithException(validator, user); user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); userMapper.insertUser(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); - } - else if (isUpdateSupport) - { + } else if (isUpdateSupport) { BeanValidators.validateWithException(validator, user); checkUserAllowed(u); checkUserDataScope(u.getUserId()); @@ -565,28 +518,21 @@ public class SysUserServiceImpl implements ISysUserService userMapper.updateUser(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); - } - else - { + } else { failureNum++; failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); } - } - catch (Exception e) - { + } catch (Exception e) { failureNum++; String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; failureMsg.append(msg + e.getMessage()); log.error(msg, e); } } - if (failureNum > 0) - { + if (failureNum > 0) { failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); throw new ServiceException(failureMsg.toString()); - } - else - { + } else { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); 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 ff37315..11f25a4 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 @@ -154,7 +154,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //管辖权异议 Integer objectiJuris = caseApplication1.getObjectiJuris(); - String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + + String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《管辖异议申请书》，认为" + "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; if (objectiJuris == null) { datas.put("jurisdictionalObjection", null); @@ -284,21 +284,21 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } } - datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); - if (arbitrateRecord1 != null) { - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实"); + + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("arbitrateThink", " 被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); + LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); datas.put("year", year); String month = String.format("%02d", now.getMonthValue()); String day = String.format("%02d", now.getDayOfMonth()); String modalFilePath = "/data/arbitrate-document/template/新裁决书模板.docx"; - // String modalFilePath = "D:/develop/新裁决书模板.docx"; + // String modalFilePath = "D:/develop/新裁决书模板.docx"; String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; - // String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; + // String saveFolderPath = "D:/data/" + year + "/" + month + "/" + day; String fileName = UUID.randomUUID().toString().replace("-", "") + ".docx"; String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; String resultFilePath = saveFolderPath + "/" + fileName; @@ -603,7 +603,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { try { Boolean aBoolean = emailOutUtil.sendEmil(appEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); Boolean aBoolean1 = emailOutUtil.sendEmil(resEmail, "您好，审核后的裁决书在附件中请查阅", "签署后的裁决书", fileList, null); - if (aBoolean && aBoolean1){ + if (aBoolean && aBoolean1) { return Boolean.TRUE; } } catch (Exception e) { @@ -739,7 +739,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } //管辖权异议 Integer objectiJuris = caseApplication1.getObjectiJuris(); - String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《XX管辖异议申请书》，认为XXXXXX" + + String jurisdictionalObjection = "本案受理后，被申请人向仲裁委提交了《管辖异议申请书》，认为" + "，仲裁委经审理，当庭驳回了被申请人的管辖异议申请，并告知被申请人具体的事实和理由将在裁决书中一并列明。"; if (objectiJuris == null) { datas.put("jurisdictionalObjection", null); @@ -870,12 +870,12 @@ public class AdjudicationServiceImpl implements IAdjudicationService { } } } - datas.put("applicaCrossOpin", caseApplication1.getApplicaCrossOpin()); - if (arbitrateRecord1 != null) { - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实"); + + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("arbitrateThink", "被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); + LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); datas.put("year", year); 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 b45733f..ea4f4aa 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 @@ -185,6 +185,10 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { // 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 public int updateHeardate(CaseApplication caseApplication) { // caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); - caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); + caseApplication.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); int rows = caseApplicationMapper.submitCaseApplication(caseApplication); //1975139 修改开庭时间通知 尊敬的{1}用户，您的{2}仲裁案件，开庭日期已改为{3}，请知晓，如非本人操作，请忽略本短信 //发送短信通知 @@ -288,7 +292,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { // 发送开庭日期通知短信 sendHearDateMessage(caseApplication, request, "1975139"); // 新增日志 - CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CHECK_ARBITRATION_METHOD, ""); + CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_OPENCOURT_HEAR, ""); return rows; } @@ -531,44 +535,51 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { caseLogRecord5.setCaseNode(5); caseLogRecord5.setCaseNodeName("组庭审核"); caseLogRecord5.setContent("法律顾问将进行组庭审核"); + CaseLogRecord caseLogRecord6 = new CaseLogRecord(); caseLogRecord6.setCaseNode(6); + caseLogRecord6.setCaseNodeName("修改开庭时间"); + caseLogRecord6.setContent("部门长将修改开庭时间"); + + CaseLogRecord caseLogRecord7 = new CaseLogRecord(); + caseLogRecord6.setCaseNode(7); caseLogRecord6.setCaseNodeName("组庭确定"); caseLogRecord6.setContent("部门长将进行组庭确定"); - CaseLogRecord caseLogRecord7 = new CaseLogRecord(); - caseLogRecord7.setCaseNode(7); + + CaseLogRecord caseLogRecord8 = new CaseLogRecord(); + caseLogRecord7.setCaseNode(8); caseLogRecord7.setCaseNodeName("审核仲裁方式"); caseLogRecord7.setContent("仲裁员将进行审核仲裁方式"); - CaseLogRecord caseLogRecord8 = new CaseLogRecord(); - caseLogRecord8.setCaseNode(8); + CaseLogRecord caseLogRecord9 = new CaseLogRecord(); + caseLogRecord8.setCaseNode(9); caseLogRecord8.setCaseNodeName("开庭审理"); caseLogRecord8.setContent("仲裁员将进行开庭审理"); - CaseLogRecord caseLogRecord9 = new CaseLogRecord(); - caseLogRecord9.setCaseNode(9); + CaseLogRecord caseLogRecord11 = new CaseLogRecord(); + caseLogRecord9.setCaseNode(11); caseLogRecord9.setCaseNodeName("书面审理"); caseLogRecord9.setContent("仲裁员将进行书面审理"); - CaseLogRecord caseLogRecord11 = new CaseLogRecord(); - caseLogRecord11.setCaseNode(11); + CaseLogRecord caseLogRecord12 = new CaseLogRecord(); + caseLogRecord11.setCaseNode(12); caseLogRecord11.setCaseNodeName("核验仲裁文书"); caseLogRecord11.setContent("法律顾问将进行核验仲裁文书"); - CaseLogRecord caseLogRecord12 = new CaseLogRecord(); - caseLogRecord12.setCaseNode(12); + CaseLogRecord caseLogRecord13 = new CaseLogRecord(); + caseLogRecord12.setCaseNode(13); caseLogRecord12.setCaseNodeName("确认仲裁文书"); caseLogRecord12.setContent("仲裁员将进行确认仲裁文书"); - CaseLogRecord caseLogRecord13 = new CaseLogRecord(); - caseLogRecord13.setCaseNode(13); + CaseLogRecord caseLogRecord14 = new CaseLogRecord(); + caseLogRecord13.setCaseNode(14); caseLogRecord13.setCaseNodeName("仲裁文书签名"); caseLogRecord13.setContent("仲裁员将进行仲裁文书签名"); - CaseLogRecord caseLogRecord14 = new CaseLogRecord(); - caseLogRecord14.setCaseNode(14); + CaseLogRecord caseLogRecord15 = new CaseLogRecord(); + caseLogRecord14.setCaseNode(15); caseLogRecord14.setCaseNodeName("仲裁文书用印"); caseLogRecord14.setContent("部门长将进行仲裁文书用印"); - CaseLogRecord caseLogRecord15 = new CaseLogRecord(); - caseLogRecord15.setCaseNode(15); + CaseLogRecord caseLogRecord16 = new CaseLogRecord(); + caseLogRecord15.setCaseNode(16); caseLogRecord15.setCaseNodeName("仲裁文书送达"); caseLogRecord15.setContent("法律顾问将进行仲裁文书送达"); - CaseLogRecord caseLogRecord16 = new CaseLogRecord(); - caseLogRecord16.setCaseNode(16); + CaseLogRecord caseLogRecord17 = new CaseLogRecord(); + caseLogRecord16.setCaseNode(17); caseLogRecord16.setCaseNodeName("案件归档"); caseLogRecord16.setContent("法律顾问将进行案件归档"); @@ -2117,13 +2128,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { datas.put("hearDay", null); } datas.put("appArbitrationClaims", caseApplication.getArbitratClaims()); - if (arbitrateRecord1 != null) { - datas.put("evidenDetermi", arbitrateRecord1.getEvidenDetermi()); - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("caseSketch", arbitrateRecord1.getCaseSketch()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("evidenDetermi", "认定为申请人证据充足"); + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("caseSketch", "申请人所求通过"); + datas.put("arbitrateThink", "被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); datas.put("legalProvisions", "仲裁法"); LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); @@ -2215,7 +2224,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { public int pendTralSure(CaseApplication caseApplication) { // caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); - caseApplication.setCaseStatus(CaseApplicationConstants.MODIFY_HEARDATE); + caseApplication.setCaseStatus(CaseApplicationConstants.CHECK_ARBITRATION_METHOD); Integer isAgreePendTral = caseApplication.getIsAgreePendTral(); int rows = 0; //同意组庭 @@ -2257,9 +2266,9 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { CaseApplication caseApplicationselect = caseApplicationMapper.selectCaseApplication(caseApplication); String caseNum = caseApplicationselect.getCaseNum(); - Date hearDate = caseApplicationselect.getHearDate(); + //Date hearDate = caseApplicationselect.getHearDate(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String hearDatestr = dateFormat.format(hearDate); + String hearDatestr = null; String arbitratorId = caseApplicationselect.getArbitratorId(); // List arbitratorList = new ArrayList<>(); if (StringUtils.isNotEmpty(arbitratorId)) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java index 3a9f0d8..d942a5d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseArbitrateServiceImpl.java @@ -72,12 +72,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { if (opinion == 0) { //拒绝 if (arbitratMethod == 2) { caseApplication1.setArbitratMethod(1); // 更改仲裁方式 - //修改案件状态为待开庭审理 - caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + //修改案件状态修改开庭时间 + 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 { caseApplication1.setArbitratMethod(2); @@ -95,12 +95,12 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService { CaseLogUtils.insertCaseLog(caseApplication.getId(), CaseApplicationConstants.PENDING_WRIITEN_HEAR, ""); } else { - //修改案件状态为待开庭审理 - caseApplication1.setCaseStatus(CaseApplicationConstants.PENDING_OPENCOURT_HEAR); + //修改案件状态为待修改开庭时间 + 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()); - if (arbitrateRecord1 != null) { - datas.put("factDetermi", arbitrateRecord1.getFactDetermi()); - datas.put("arbitrateThink", arbitrateRecord1.getArbitrateThink()); - datas.put("rulingFollows", arbitrateRecord1.getRulingFollows()); - } + datas.put("applicaCrossOpin", "被申请人证据不足,无法说明事实"); + datas.put("factDetermi", "被申请人欠款属实"); + datas.put("arbitrateThink", " 被申请人应按约定还款"); + datas.put("rulingFollows", "被申请人依法偿还申请人欠款"); LocalDate now = LocalDate.now(); String year = Integer.toString(now.getYear()); datas.put("year", year); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java index cc01887..b566476 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/FixSelectFlowDetailUtils.java @@ -282,6 +282,79 @@ public class FixSelectFlowDetailUtils { 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 ==============="); + } + } + } + }*/ }