Merge branch 'qtz3' of SH-Arbitrate/Arbitrate-Backend into dev

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

@@ -457,8 +457,8 @@ public class CaseApplicationController extends BaseController {
      * @throws IOException
      */
     @PostMapping("/uploadCaseZipFile")
-    public AjaxResult uploadCaseZipFile(@RequestParam("file") MultipartFile file) throws IOException {
-        return caseApplicationService.uploadCaseZipFile(file);
+    public AjaxResult uploadCaseZipFile(@RequestParam("file") MultipartFile file,@RequestParam("templateId")  Long templateId) throws IOException {
+        return caseApplicationService.uploadCaseZipFile(file,templateId);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java

@@ -113,7 +113,7 @@ public interface ICaseApplicationService {
 
     AjaxResult deleteRoom(  String roomId);
 
-    AjaxResult uploadCaseZipFile(MultipartFile file);
+    AjaxResult uploadCaseZipFile(MultipartFile file,Long templateId);
 
     /**
      * 根据附件id修改案件id

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

@@ -2989,7 +2989,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
     }
 
     @Override
-    public AjaxResult uploadCaseZipFile(MultipartFile file) {
+    public AjaxResult uploadCaseZipFile(MultipartFile file,Long templateId) {
         if (file.isEmpty()) {
             return AjaxResult.error("请选择要上传的文件");
         }
@@ -3039,6 +3039,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                     // todo 从压缩包中识别各字段填充到数据库
                     //调用新增案件的接口
                     CaseApplication caseApplication = new CaseApplication();
+                    caseApplication.setTemplateId(templateId);
                     //默认案件标的 todo 案件标的是什么
                     caseApplication.setCaseSubjectAmount(new BigDecimal(1));
                     // todo 这些以后要去掉，不在案件基本信息表维护，现在往基本信息表设置字段是因为修改以及查询详情的时候页面中字段是固定的，以后也要动态维护字段

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

@@ -1253,6 +1253,7 @@
         <if test="createBy != null  and createBy != ''">create_by,</if>
         <if test="importFlag != null ">import_flag,</if>
         <if test="version != null ">version,</if>
+        <if test="templateId != null ">template_id,</if>
         interest_rate,
         outstanding_money,
         facts,
@@ -1290,6 +1291,7 @@
         <if test="createBy != null  and createBy != ''">#{createBy},</if>
         <if test="importFlag != null ">#{importFlag},</if>
         <if test="version != null ">#{version},</if>
+        <if test="templateId != null ">#{templateId},</if>
         #{interestRate},
         #{outstandingMoney},
         #{facts},