From 1230de11ec12e19bd6783819c6b2017d3694a57e Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Tue, 16 Jan 2024 10:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BB=B6=E6=97=A5=E5=BF=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/mapper/SysUserMapper.java | 7 ++++ .../domain/dto/mscase/MsCaseLogRecordDTO.java | 12 +----- .../domain/entity/mscase/MsCaseLogRecord.java | 14 +------ .../mapper/mscase/MsCaseLogRecordMapper.java | 10 +++++ .../impl/MsCaseApplicationServiceImpl.java | 39 +++++++++++++++++++ .../wisdomarbitrate/utils/CaseLogUtils.java | 4 +- .../resources/mapper/system/SysUserMapper.xml | 10 ++++- 7 files changed, 69 insertions(+), 27 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index cb99895..39f6f2a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -166,4 +166,11 @@ public interface SysUserMapper * @return */ int batchSave(@Param("list")List addUsers); + + /** + * 根据角色查询调解员 + * @param roleName + * @return + */ + List selectUserByRole(@Param("roleName") String roleName); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java index a09bd66..60a671f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/dto/mscase/MsCaseLogRecordDTO.java @@ -52,24 +52,14 @@ public class MsCaseLogRecordDTO implements Serializable { */ @Column(name="create_nick_name") private String createNickName; - /** * 创建时间 */ @Column(name="create_time") private Date createTime; - /** - * 更新者 - */ - @Column(name="update_by") - private String updateBy; - /** - * 更新时间 - */ - @Column(name="update_time") - private Date updateTime; + diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java index c99f660..fbadde0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java @@ -1,5 +1,6 @@ package com.ruoyi.wisdomarbitrate.domain.entity.mscase; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -13,6 +14,7 @@ import java.util.Date; @Getter @Setter @ToString +@EqualsAndHashCode @Table(name = "ms_case_log_record") public class MsCaseLogRecord { @Id @@ -55,18 +57,6 @@ public class MsCaseLogRecord { @Column(name = "create_time") private Date createTime; - /** - * 更新者 - */ - @Column(name = "update_by") - private String updateBy; - - /** - * 更新时间 - */ - @Column(name = "update_time") - private Date updateTime; - /** * 备注 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java index 5c86881..4fac408 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java @@ -1,7 +1,17 @@ package com.ruoyi.wisdomarbitrate.mapper.mscase; import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; +import org.apache.ibatis.annotations.Select; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface MsCaseLogRecordMapper extends Mapper { + /** + * 查询调解员已办数量 + * @param collect + * @return + */ + @Select("select create_by createBy,GROUP_CONCAT(DISTINCT case_appli_id) caseAppliId from ms_case_log_record where create_by in('hhl','gyj') group by create_by,case_appli_id") + List selectCompleteByCreateBy(List collect); } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java index 65ee74f..08c501b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseApplicationServiceImpl.java @@ -26,6 +26,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage; import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate; import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication; import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAttach; +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MediatorVO; import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq; import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO; @@ -107,6 +108,8 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { TemplateManageMapper templateManageMapper; @Autowired private SmsRecordMapper smsRecordMapper; + @Autowired + private MsCaseLogRecordMapper caseLogRecordMapper; // 案件基本字段 public static final List CASE_BASE_COLUMN = Arrays.asList("caseSubjectAmount", "arbitratClaims", "facts", "requestRule"); public static final SimpleDateFormat yyyymmddFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -548,6 +551,13 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { return AjaxResult.success("调解申请书生成成功"); } + /** + * 根据批次号查询该流程未锁定案件 + * @param batchNumber + * @param caseFlowId 案件流程id + * @return + */ + public List listByBatchNumber(String batchNumber,Integer caseFlowId) { Example example = new Example(MsCaseFlow.class); example.createCriteria().andEqualTo("batch_number", batchNumber); @@ -559,6 +569,11 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { } + /** + * 批量更新附件 + * @param req + * @return + */ @Override public AjaxResult batchUpdateAttach(MsCaseApplicationVO req) { for (MsCaseAttach attach : req.getCaseAttachList()) { @@ -568,6 +583,13 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { return null; } + /** + * 证据上传 + * @param files + * @param annexType + * @param id + * @return + */ @Override public AjaxResult batchUpload(MultipartFile[] files, Integer annexType, Long id) { List successList = new ArrayList<>(); @@ -668,9 +690,26 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService { return AjaxResult.success("提交成功"); } + /** + * 查询调解员 + * @return + */ @Override public AjaxResult listMediator() { List mediatorVOS = new ArrayList(); + // 查出所有调解员 + List users = userMapper.selectUserByRole("调解员"); + if(CollectionUtil.isEmpty(users)){ + return AjaxResult.error("暂无调解员"); + } + // 查询调解员已办数量 + List recordList=caseLogRecordMapper.selectCompleteByCreateBy(users.stream().map(SysUser::getUserId).collect(Collectors.toList())); + if(CollectionUtil.isNotEmpty(recordList)){ + // 组装成id对应的list + recordList.stream().collect(Collectors.groupingBy(MsCaseLogRecord::getCaseAppliId, Collectors.toList())); + } + // 查询待办数量 + mediatorVOS= msCaseApplicationMapper.listMediator(); return null; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java index 3d9dd73..004b16e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java @@ -35,11 +35,11 @@ public class CaseLogUtils SysUser sysUser = userMapper.selectUserById(loginUser.getUserId()); operLog.setCreateBy(sysUser.getUserName()); operLog.setCreateNickName(sysUser.getNickName()); - operLog.setUpdateBy(sysUser.getUserName()); + }else { operLog.setCreateBy("admin"); operLog.setCreateNickName("管理员"); - operLog.setUpdateBy("admin"); + } operLog.setCaseStatusName(caseStatusName); operLog.setCaseAppliId(caseAppliId); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 99c2ee4..4c44157 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -318,5 +318,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN ms_sys_dept d ON u.dept_id = d.dept_id WHERE ur.role_id = #{roleId} AND d.dept_id = #{deptId}; - - \ No newline at end of file + + + \ No newline at end of file