Browse Source

Revert "Revert "导入时加案件名称""

This reverts commit 9c8bb4b00d089cc54c9da51b5afff2d1d9dd9b5f.
18792927508 2 years ago
parent
commit
07a3dea9cc

+ 4
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java View File

16
 
16
 
17
     /** ID */
17
     /** ID */
18
     private Long id;
18
     private Long id;
19
+    /** 案件名称 */
20
+    @Excel(name = "案件名称")
21
+    private String caseName;
19
     /** 案件编号 */
22
     /** 案件编号 */
20
 //    @Excel(name = "案件编号")
23
 //    @Excel(name = "案件编号")
21
     private String caseNum;
24
     private String caseNum;
127
     /** 仲裁员名称 */
130
     /** 仲裁员名称 */
128
     private String arbitratorName;
131
     private String arbitratorName;
129
 
132
 
130
-    /** 案件名称 */
131
-    private String caseName;
133
+
132
 
134
 
133
     /** 案件描述 */
135
     /** 案件描述 */
134
     private String caseDescribe;
136
     private String caseDescribe;

+ 6
- 0
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java View File

1472
      * @param failureMsg
1472
      * @param failureMsg
1473
      */
1473
      */
1474
     private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
1474
     private void validBaseColumn(CaseApplication caseApplication, StringBuilder failureMsg) {
1475
+        if( StrUtil.isEmpty(caseApplication.getCaseName())){
1476
+            failureMsg.append("【案件名称】字段不能为空;");
1477
+        }else if(caseApplication.getCaseName().length()>50){
1478
+            failureMsg.append("【案件名称】字段超出指定长度,最大长度为50;");
1479
+        }
1475
         BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount();
1480
         BigDecimal caseSubjectAmount = caseApplication.getCaseSubjectAmount();
1476
         if(null== caseSubjectAmount){
1481
         if(null== caseSubjectAmount){
1477
             failureMsg.append("【案件标的】字段不合法;");
1482
             failureMsg.append("【案件标的】字段不合法;");
2391
     private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
2396
     private void copyCaseApplication(CaseApplication caseApplicationinsertDiffer, CaseApplication caseApplicationNew) {
2392
         caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
2397
         caseApplicationNew.setArbitratClaims(caseApplicationinsertDiffer.getArbitratClaims());
2393
         caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
2398
         caseApplicationNew.setCaseNum(caseApplicationinsertDiffer.getCaseNum());
2399
+        caseApplicationNew.setCaseName(caseApplicationinsertDiffer.getCaseName());
2394
         caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount());
2400
         caseApplicationNew.setCaseSubjectAmount(caseApplicationinsertDiffer.getCaseSubjectAmount());
2395
         caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate());
2401
         caseApplicationNew.setLoanStartDate(caseApplicationinsertDiffer.getLoanStartDate());
2396
         caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate());
2402
         caseApplicationNew.setLoanEndDate(caseApplicationinsertDiffer.getLoanEndDate());

+ 2
- 1
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseApplicationMapper.xml View File

372
 
372
 
373
     <insert id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
373
     <insert id="insertCaseApplication" parameterType="CaseApplication" useGeneratedKeys="true" keyProperty="id">
374
         insert into case_application(
374
         insert into case_application(
375
-
375
+        <if test="caseName != null  and caseName != ''">case_name ,</if>
376
         <if test="caseNum != null and caseNum != ''">case_num,</if>
376
         <if test="caseNum != null and caseNum != ''">case_num,</if>
377
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
377
         <if test="caseSubjectAmount != null">case_subject_amount,</if>
378
         register_date,
378
         register_date,
400
         <if test="importFlag != null ">import_flag,</if>
400
         <if test="importFlag != null ">import_flag,</if>
401
         create_time
401
         create_time
402
         )values(
402
         )values(
403
+        <if test="caseName != null and caseName != ''">#{caseName},</if>
403
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
404
         <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
404
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
405
         <if test="caseSubjectAmount != null">#{caseSubjectAmount},</if>
405
         sysdate(),
406
         sysdate(),