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

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseApplicationController.java

@@ -48,10 +48,18 @@ public class MsCaseApplicationController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo page(MsCaseApplicationReq req)
     {
-        //startPage();
         List<MsCaseApplicationVO> list = caseApplicationService.list(req);
         return getDataTable(list);
     }
+    /**
+     * 首页待办数量
+     */
+    @GetMapping("/todoCount")
+    public AjaxResult todoCount()
+    {
+        CaseToDoCountVO vo=  caseApplicationService.todoCount();
+        return success(vo);
+    }
     /**
      * 根据登录人返回用户信息
      */
@@ -79,10 +87,10 @@ public class MsCaseApplicationController extends BaseController {
      * 根据身份证号获取性别和出生日期
      */
     @GetMapping("/getInfoByIdCard")
-    public AjaxResult getInfoByIdCard(@RequestParam("idCard") String idCard)
+    public AjaxResult getInfoByIdCard(@RequestParam(value = "idCard" ,required = false) String idCard)
     {
         if(StrUtil.isEmpty(idCard)){
-            error("参数校验失败");
+            error("身份证号不能为空");
         }
         if(!IdcardUtil.isValidCard(idCard)){
             error("身份证不合法，请输入正确的身份证号");
@@ -145,6 +153,7 @@ public class MsCaseApplicationController extends BaseController {
      * @return
      * @throws IOException
      */
+
     @PostMapping("/uploadCaseZipFile")
     public AjaxResult uploadCaseZipFile(@RequestParam("file") MultipartFile file, @RequestParam("templateId")  Long templateId) throws IOException {
         if(file.isEmpty()||templateId==null){
@@ -152,6 +161,20 @@ public class MsCaseApplicationController extends BaseController {
         }
         return caseApplicationService.uploadCaseZipFile(file,templateId);
     }
+    /**
+     * 用户信息压缩包导入
+     * @param file
+     * @return
+     * @throws IOException
+     */
+    @Anonymous
+    @PostMapping("/userIdentify")
+    public AjaxResult userIdentify(@RequestParam("file") MultipartFile file) throws IOException {
+        if(file.isEmpty()){
+            return error("参数不能为空");
+        }
+        return caseApplicationService.userIdentify(file);
+    }
 
     /**
      * 生成调解申请书
@@ -218,8 +241,8 @@ public class MsCaseApplicationController extends BaseController {
      * @return
      */
     @GetMapping("/listMediator")
-    public AjaxResult listMediator( ) {
-        return caseApplicationService.listMediator();
+    public AjaxResult listMediator( @RequestParam(value = "caseAppliId",required = false) Long caseAppliId) {
+        return caseApplicationService.listMediator(caseAppliId);
     }
     /**
      * 保存预约

ruoyi-common/src/main/java/com/ruoyi/common/enums/AnnexTypeEnum.java

@@ -20,6 +20,7 @@ public enum AnnexTypeEnum implements EnumsInterface {
     MEDIATION_FILES(8, "调解资料"),
     RES_PAYMENT_RECEIPT(9, "被申请人缴费单"),
     SEAL_PICTURE(10, "印章图片"),
+    FLOW_SVG(11, "流程节点SVG"),
 
 
     ;

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -16,8 +16,9 @@ public class MimeTypeUtils
     public static final String IMAGE_BMP = "image/bmp";
 
     public static final String IMAGE_GIF = "image/gif";
-    
-    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+    public static final String IMAGE_SVG = "image/svg";
+
+    public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png","svg" };
 
     public static final String[] FLASH_EXTENSION = { "swf", "flv" };
 
@@ -28,7 +29,7 @@ public class MimeTypeUtils
 
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png","svg",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
@@ -52,6 +53,8 @@ public class MimeTypeUtils
                 return "bmp";
             case IMAGE_GIF:
                 return "gif";
+            case IMAGE_SVG:
+                return "svg";
             default:
                 return "";
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/flow/MsCaseFlow.java

@@ -1,10 +1,11 @@
 package com.ruoyi.system.domain.entity.flow;
 
-import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.persistence.*;
+
 @Getter
 @Setter
 @ToString
@@ -51,4 +52,9 @@ public class MsCaseFlow {
      */
     @Column(name = "button_auth_flag")
     private String buttonAuthFlag;
+    /**
+     * svg路径
+     */
+    @Column(name = "file_name")
+    private String fileName;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/flow/MsCaseFlowVO.java

@@ -5,7 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
 import java.util.List;
 
 
@@ -57,6 +56,13 @@ public class MsCaseFlowVO {
      * 按钮权限标识符
      */
     private String buttonAuthFlag;
-
+    /**
+     * 角色名
+     */
     private String roleName;
+    /**
+     * svg图片路径
+     */
+    private String fileName;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/flow/CaseFlowServiceImpl.java

@@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.entity.flow.MsCaseFlow;
 import com.ruoyi.system.domain.entity.flow.MsCaseFlowRoleRelated;
 import com.ruoyi.system.domain.vo.flow.MsCaseFlowSearchVO;
@@ -14,12 +13,15 @@ import com.ruoyi.system.mapper.flow.MsCaseFlowMapper;
 import com.ruoyi.system.mapper.flow.MsCaseFlowRoleRelatedMapper;
 import com.ruoyi.system.util.NewStringUtil;
 import com.ruoyi.system.util.TableDataUtil;
-import org.bouncycastle.crypto.DataLengthException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -40,15 +42,12 @@ public class CaseFlowServiceImpl implements CaseFlowService {
      */
     @Override
     public Object queryCaseFlowInfo(MsCaseFlowSearchVO caseFlowSearchVO) {
-        //查询某个案件流程节点信息
-        if (caseFlowSearchVO.getId() != null) {
-            return msCaseFlowMapper.selectByPrimaryKey(caseFlowSearchVO.getId());
-        } else if (caseFlowSearchVO == null) {
-            //查询所有案件流程节点信息
-            return msCaseFlowMapper.selectAll();
-        } else if (caseFlowSearchVO.getPageNum() == null || caseFlowSearchVO.getPageSize() == null) {
+        if (caseFlowSearchVO == null || caseFlowSearchVO.getPageNum() == null || caseFlowSearchVO.getPageSize() == null) {
             //查询所有案件流程节点信息
             return msCaseFlowMapper.selectAll();
+        } else if (caseFlowSearchVO.getId() != null) {
+            //查询某个案件流程节点信息
+            return msCaseFlowMapper.selectByPrimaryKey(caseFlowSearchVO.getId());
         } else {
             //分页查询案件流程节点信息
             Map<Integer, List<SysRole>> sysRoleMap = queryRoleByFlowId(null);
@@ -125,6 +124,27 @@ public class CaseFlowServiceImpl implements CaseFlowService {
         return map;
     }
 
+    /**
+     * 本地图片装64
+     * @param imgPath
+     * @return
+     * @throws Exception
+     */
+    public static String convertToBase64( String imgPath)  {
+        byte[] data = null;
+        // 读取图片字节数组
+        try {
+            imgPath=imgPath.replace("/profile/upload", "/home/ruoyi/uploadPath/upload/");
+            InputStream in = Files.newInputStream(Paths.get(imgPath));
+            data = new byte[in.available()];
+            in.read(data);
+            in.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // 返回Base64编码过的字节数组字符串
+        return Base64.getEncoder().encodeToString(Objects.requireNonNull(data));
+    }
     /**
      * 新增或编辑案件流程节点信息
      *
@@ -133,6 +153,7 @@ public class CaseFlowServiceImpl implements CaseFlowService {
      */
     @Override
     public Boolean saveCaseFlow(MsCaseFlowVO caseFlowVO) {
+
         if (caseFlowVO.getId() != null) {
             //更新案件流程信息
             MsCaseFlow msCaseFlow = new MsCaseFlow();
@@ -228,6 +249,8 @@ public class CaseFlowServiceImpl implements CaseFlowService {
         return false;
     }
 
+
+
     /**
      * 排序案件流程节点
      *

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAudit.java

@@ -64,5 +64,6 @@ public class MsCaseAudit {
     /**
      * 拒绝原因
      */
+    @Column(name = "reason")
     private String reason;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/CaseToDoCount.java

@@ -0,0 +1,30 @@
+package com.ruoyi.wisdomarbitrate.domain.vo.mscase;
+
+import lombok.Data;
+
+/**
+ * @Classname CaseToDoCount
+ * @Description 代办案件数量
+ * @Version 1.0.0
+ * @Date 2024/1/15 15:48
+ * @Created wangqiong
+ */
+@Data
+public class CaseToDoCount {
+    /**
+     * 流程表id
+     */
+    private Integer caseFlowId;
+    /**
+     * 流程状态
+     */
+    private String caseStatusName;
+    /**
+     * 数量
+     */
+    private Long caseCount;
+    /**
+     * base64
+     */
+    private String fileName;
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/CaseToDoCountVO.java

@@ -0,0 +1,21 @@
+package com.ruoyi.wisdomarbitrate.domain.vo.mscase;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Classname CaseToDoCountVO
+ * @Description 代办案件数量返回VO
+ * @Version 1.0.0
+ * @Date 2024/1/15 15:48
+ * @Created wangqiong
+ */
+@Data
+public class CaseToDoCountVO {
+    /**
+     * 待办数量
+     */
+    private List<CaseToDoCount> toDoCountList;
+
+}

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MediatorVO.java

@@ -31,4 +31,8 @@ public class MediatorVO {
      * 已办数量
      */
     private Long completeAmount;
+    /**
+     * 是否回显，true为回显，false为不回显
+     */
+    private Boolean EchoFlag=false;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.wisdomarbitrate.mapper.mscase;
 
 import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication;
+import com.ruoyi.wisdomarbitrate.domain.vo.mscase.CaseToDoCount;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq;
 import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO;
 import org.apache.ibatis.annotations.Param;
@@ -160,4 +161,47 @@ public interface MsCaseApplicationMapper extends Mapper<MsCaseApplication> {
      */
     @Select("select max(room_id) maxRoomId from ms_reserved_conference")
     Long selectMaxRoomId();
+
+    /**
+     * 待办数量
+     * @param o
+     * @return
+     */
+    @Select(" <script> SELECT c.case_flow_id caseFlowId,count(c.id) caseCount " +
+            "FROM ms_case_application c " +
+            "join ms_case_affiliate a on c.id=a.case_appli_id <where> " +
+            "<if test=\"req.mediatorId != null \">" +
+            "    AND c.mediator_id = #{req.mediatorId} " +
+            "</if> "
+            +
+            "<if test='req.applicantFlag != null and req.applicationOrganIds != null and req.applicationOrganIds.size() > 0  '> and  (a.application_id in" +
+            "<foreach item='organId' index='index' collection='req.applicationOrganIds' open='(' separator=',' close=')'>" +
+            "#{organId}" +
+            "</foreach> or a.contact_telphone_agent=#{req.contactTelphoneAgent} )" +
+            "</if> "
+            +
+            "<if test='caseStatusNames != null and caseStatusNames.size() > 0 '> and  c.case_status_name in" +
+            "<foreach item='caseStatus' index='index' collection='caseStatusNames' open='(' separator=',' close=')'>" +
+            "#{caseStatus}" +
+            "</foreach>" +
+            "</if> " +
+            "<if test=\"req.batchNumber != null and req.batchNumber != ''\">" +
+            "    AND c.batch_number = #{req.batchNumber} " +
+            "</if> " +
+            "<if test=\"req.caseFlowId != null \">" +
+            "    AND c.case_flow_id = #{req.caseFlowId} " +
+            "</if> "
+            +
+            "<if test=\"req.mediationMethod != null \">" +
+            "    AND c.mediation_method = #{req.mediationMethod} " +
+            "</if> "
+            + "<if test=\"req.respondentIdentityNum != null and req.respondentIdentityNum != ''\">" +
+            "    AND a.respondent_identity_num = #{req.respondentIdentityNum} " +
+            "</if> "
+             +
+            "        </where> " +
+            "group by c.case_flow_id,c.case_status_name"+
+            " </script>"
+    )
+    List<CaseToDoCount> todoCount(@Param("req")MsCaseApplicationReq req, @Param("caseStatusNames") List<String> caseStatusNames);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java

@@ -31,6 +31,6 @@ public interface MsCaseLogRecordMapper extends Mapper<MsCaseLogRecord> {
         " </script>")
     List<MsCaseLogRecordVO> selectCaseLogRecordList(@Param("caseLogRecord") MsCaseLogRecord caseLogRecord);
 
-    @Select("SELECT group_concat( DISTINCT t.createNickName) createNickName,t.nodeName content,t.nodeId,t.sort FROM (SELECT l.create_nick_name createNickName ,f.node_name nodeName,f.node_id nodeId, f.sort FROM ms_case_log_record l left join ms_case_flow f on l.case_node  = f.node_id WHERE l.case_appli_id  = #{caseAppliId} and f.node_name is not null ) t group by t.nodeName,t.nodeId,t.sort  order by t.sort ")
+    @Select("SELECT group_concat( DISTINCT t.createNickName) createNickName,t.nodeName content,t.nodeId,t.sort ,t.caseStatusName  FROM (SELECT l.create_nick_name createNickName ,f.node_name nodeName,f.node_id nodeId, f.sort, f.case_status_name caseStatusName FROM ms_case_log_record l left join ms_case_flow f on l.case_node  = f.node_id WHERE l.case_appli_id  = #{caseAppliId} and f.node_name is not null ) t group by t.nodeName,t.nodeId,t.sort ,t.caseStatusName   order by t.sort ")
     List<MsCaseLogRecordVO> selectCaseLogRecordListCaseProgress(Long caseAppliId);
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseApplicationService.java

@@ -9,10 +9,7 @@ import com.ruoyi.wisdomarbitrate.domain.dto.sendrecord.SmsSendRecord;
 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.vo.mscase.BookingVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationReq;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO;
-import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseAttachVO;
+import com.ruoyi.wisdomarbitrate.domain.vo.mscase.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -32,6 +29,11 @@ public interface MsCaseApplicationService {
      * @return
      */
     List<MsCaseApplicationVO> list(MsCaseApplicationReq req);
+    /**
+     * 首页待办数量
+     * @return
+     */
+    CaseToDoCountVO todoCount();
 
     /**
      * 根据id查询案件
@@ -74,6 +76,13 @@ public interface MsCaseApplicationService {
      */
     AjaxResult uploadCaseZipFile(MultipartFile file, Long templateId);
 
+    /**
+     * 用户信息压缩包导入
+     * @param file
+     * @return
+     */
+    AjaxResult userIdentify(MultipartFile file);
+
     /**
      * 生成调解申请书
      * @param req
@@ -138,7 +147,7 @@ public interface MsCaseApplicationService {
      * 查询调解员
      * @return
      */
-    AjaxResult listMediator();
+    AjaxResult listMediator(Long caseAppliId);
     /**
      * 保存预约
      * @param
@@ -234,5 +243,4 @@ public interface MsCaseApplicationService {
      */
     List<SmsSendRecord> getSmsSendRecord(SmsSendRecord smsSendRecord);
 
-
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java

@@ -465,12 +465,13 @@ public class MsSignSealServiceImpl implements MsSignSealService {
         List<MsCaseLogRecordVO> recordsNew = new ArrayList<>();
         if (records != null && records.size() > 0) {
             for (MsCaseLogRecordVO msCaseLogRecordVO : records) {
-                String content = msCaseLogRecordVO.getContent();
+//                String content = msCaseLogRecordVO.getContent();
+                String content = msCaseLogRecordVO.getCaseStatusName();
                 if(StringUtils.isNotEmpty(content)){
                     if(content.equals("结束")){
                         recordsNew.add(msCaseLogRecordVO);
                     }else {
-                        if(!content.equals(msCaseFlow.getNodeName())){
+                        if(!content.equals(msCaseFlow.getCaseStatusName())){
                             recordsNew.add(msCaseLogRecordVO);
                         }else{
                             break;
@@ -695,9 +696,9 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 SendMailRecord sendMailRecord = new SendMailRecord();
                 sendMailRecord.setCaseId(id);
                 sendMailRecord.setMailAddress(appEmail);
-                sendMailRecord.setMailContent("您好，审核后的裁决书在附件中请查阅");
+                sendMailRecord.setMailContent("您好，审核后的调解书在附件中请查阅");
 //        sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅");
-                sendMailRecord.setMailName("签署后的裁决书");
+                sendMailRecord.setMailName("签署后的调解书");
                 sendMailRecord.setSendTime(new Date());
                 sendMailRecord.setCreateBy(SecurityUtils.getUsername());
                 if (appEmailFlag) {
@@ -713,8 +714,8 @@ public class MsSignSealServiceImpl implements MsSignSealService {
                 sendMailRecord1.setCaseId(id);
                 sendMailRecord1.setMailAddress(resEmail);
 //        sendMailRecord.setMailContent("您好，您的{"+caseApplication1.getCaseNum()+"}案件，审核后的裁决书在附件中请查阅");
-                sendMailRecord1.setMailContent("您好，审核后的裁决书在附件中请查阅");
-                sendMailRecord1.setMailName("签署后的裁决书");
+                sendMailRecord1.setMailContent("您好，审核后的调解书在附件中请查阅");
+                sendMailRecord1.setMailName("签署后的调解书");
                 sendMailRecord1.setSendTime(new Date());
                 sendMailRecord1.setCreateBy(SecurityUtils.getUsername());
                 if (resEmailFlag) {