Browse Source

修改打印加配置

DESKTOP-USV654P\pc 4 months ago
parent
commit
9c5e809f31

+ 15 - 6
src/main/java/com/xjrsoft/module/form/controller/FormExecuteController.java

@@ -6,12 +6,14 @@ import cn.hutool.db.Entity;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xjrsoft.common.annotation.XjrLog;
 import com.xjrsoft.common.constant.GlobalConstant;
 import com.xjrsoft.common.exception.MyException;
 import com.xjrsoft.common.handler.FormContentStyleStrategy;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.mybatis.SqlRunnerAdapter;
 import com.xjrsoft.common.utils.DatasourceUtil;
 import com.xjrsoft.common.utils.LocalDateTimeUtil;
 import com.xjrsoft.module.authority.dto.BatchSetDataAuthDto;
@@ -37,6 +39,8 @@ import com.xjrsoft.module.generator.constant.ComponentTypeConstant;
 import com.xjrsoft.module.generator.entity.ColumnConfig;
 import com.xjrsoft.module.generator.entity.TableConfig;
 import com.xjrsoft.module.student.service.IStudentConsumeDateService;
+import com.xjrsoft.module.system.entity.XjrTipsMessage;
+import com.xjrsoft.module.system.service.IXjrTipsMessageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -87,6 +91,7 @@ public class FormExecuteController {
     
     private final IFormTemplateService formTemplateService;
     private final IStudentConsumeDateService studentConsumeDateService;
+    private final IXjrTipsMessageService xjrTipsMessageService;
 
     /**
      * 自定义表单 根据配置获取列表数据 不分页
@@ -309,15 +314,19 @@ public class FormExecuteController {
     @ApiOperation(value = "导入")
     public R importData(@RequestParam String releaseId, @RequestParam MultipartFile file) throws IOException {
 
-        if( "1815674695242059776".equals(releaseId)) {
-            String result = studentConsumeDateService.excelImport(file);
-            if (result.length() > 0) {
-                throw new MyException(result);
+        String sql = "SELECT id,code,value,remark FROM base_system_config WHERE code= 'studentConsumeDate' ";
+        Map<String, Object> systemConfigMap = SqlRunnerAdapter.db().selectOne(sql);
+        if (systemConfigMap != null && systemConfigMap.get("value") != null) {
+            if (systemConfigMap.get("value").equals(releaseId)) {
+                String result = studentConsumeDateService.excelImport(file);
+                if (result.length() > 0) {
+                    throw new MyException(result);
+                }
+                return R.ok("全部成功", true);
             }
-
-            return R.ok("全部成功", true);
         }
 
+
         FormRelease formRelease = formReleaseService.getById(releaseId);
         FormReleaseConfig formReleaseConfig = JSONUtil.toBean(formRelease.getConfigJson(), FormReleaseConfig.class);
         // 配置excel第一行字段名