Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Backend into qtz

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<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;