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

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -16,6 +16,9 @@ public class CaseApplication  extends BaseEntity {
 
     /** ID */
     private Long id;
+    /** 案件名称 */
+    @Excel(name = "案件名称")
+    private String caseName;
     /** 案件编号 */
 //    @Excel(name = "案件编号")
     private String caseNum;
@@ -127,8 +130,7 @@ public class CaseApplication  extends BaseEntity {
     /** 仲裁员名称 */
     private String arbitratorName;
 
-    /** 案件名称 */
-    private String caseName;
+
 
     /** 案件描述 */
     private String caseDescribe;

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

@@ -582,7 +582,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             for (CaseAttach caseAttach : caseAttachList) {
                 if (caseAttach.getAnnexType() == 3) {
                     String annexName = caseAttach.getAnnexName();
-                    String prefix = "/profile/upload/";
+                    String prefix = "/profile/upload";
                     int startIndex = prefix.length();
                     String path = caseAttach.getAnnexPath() + annexName.substring(startIndex);
                     file = new File(path);

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

@@ -1472,6 +1472,11 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
      * @param failureMsg
      */
     private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
+        if( StrUtil.isEmpty(caseApplication.getCaseName())){
+            failureMsg.append("【案件名称】字段不能为空；");
+        }else if(caseApplication.getCaseName().length()>50){
+            failureMsg.append("【案件名称】字段超出指定长度，最大长度为50；");
+        }
         BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount();
         if(null== caseSubjectAmount){
             failureMsg.append("【案件标的】字段不合法；");
@@ -2391,6 +2396,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
         caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
         caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
+        caseApplicationNew.setCaseName(caseApplicationinsertDiffer.getCaseName());
         caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount());
         caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate());
         caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate());

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml

@@ -372,7 +372,7 @@
 
     <insert id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
         insert into case_application(
-
+        <if test="caseName != null  and caseName != ''">case_name ,</if>
         <if test="caseNum != null and caseNum != ''">case_num,</if>
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
         register_date,
@@ -400,6 +400,7 @@
         <if test="importFlag != null ">import_flag,</if>
         create_time
         )values(
+        <if test="caseName != null and caseName != ''">#{caseName},</if>
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
         sysdate(),

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/DeptIdentifyMapper.xml

@@ -34,6 +34,9 @@
             <if test="deptId != null">
                 AND d.dept_id = #{deptId}
             </if>
+            <if test="userId != null">
+                AND d.user_id = #{userId}
+            </if>
         </where>
     </select>
 

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/SendMailRecordMapper.xml

@@ -25,6 +25,7 @@
                 AND c.case_num = #{caseNum}
             </if>
         </where>
+        order by s.send_time desc
     </select>
 
     <insert id="saveSendMailRecord">