Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into qtz
This commit is contained in:
qitz
@@ -166,4 +166,11 @@ public interface SysUserMapper
|
||||
* @return
|
||||
*/
|
||||
int batchSave(@Param("list")List<SysUser> addUsers);
|
||||
|
||||
/**
|
||||
* 根据角色查询调解员
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
List<SysUser> selectUserByRole(@Param("roleName") String roleName);
|
||||
}
|
||||
|
||||
+1
-11
@@ -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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+2
-12
@@ -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;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
|
||||
+10
@@ -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<MsCaseLogRecord> {
|
||||
/**
|
||||
* 查询调解员已办数量
|
||||
* @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<MsCaseLogRecord> selectCompleteByCreateBy(List<Long> collect);
|
||||
}
|
||||
+39
@@ -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<String> 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<MsCaseApplication> 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<MsCaseAttach> successList = new ArrayList<>();
|
||||
@@ -668,9 +690,26 @@ public class MsCaseApplicationServiceImpl implements MsCaseApplicationService {
|
||||
return AjaxResult.success("提交成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询调解员
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public AjaxResult listMediator() {
|
||||
List<MediatorVO> mediatorVOS = new ArrayList<MediatorVO>();
|
||||
// 查出所有调解员
|
||||
List<SysUser> users = userMapper.selectUserByRole("调解员");
|
||||
if(CollectionUtil.isEmpty(users)){
|
||||
return AjaxResult.error("暂无调解员");
|
||||
}
|
||||
// 查询调解员已办数量
|
||||
List<MsCaseLogRecord> 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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -319,4 +319,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
WHERE ur.role_id = #{roleId} AND d.dept_id = #{deptId};
|
||||
</select>
|
||||
|
||||
<select id="selectUserByRole" resultType="com.ruoyi.common.core.domain.entity.SysUser">
|
||||
select u.user_id,u.user_name,u.nick_name,u.specialty from ms_sys_user u
|
||||
join ms_sys_user_role ur on ur.user_id =u.user_id
|
||||
join ms_sys_role r on ur.role_id = r.role_id and r.role_name='调解员'
|
||||
where r.del_flag = '0' and r.status='0' and u.del_flag = '0' and u.status='0'
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user