Kaynağa Gözat

fix自定义列

LLL 1 yıl önce
ebeveyn
işleme
c5a8e43cc6

+ 20 - 34
module_kzks/src/main/java/org/jeecg/modules/customColumns/controller/CustomColumnsController.java

@@ -1,48 +1,34 @@
 package org.jeecg.modules.customColumns.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.customColumns.convert.CustomColumnsConvert;
 import org.jeecg.modules.customColumns.dto.CustomColumnsEditDTO;
 import org.jeecg.modules.customColumns.entity.CustomColumns;
 import org.jeecg.modules.customColumns.service.ICustomColumnsService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
  * @Description: 自定义列记录表
  * @Author: jeecg-boot
  * @Date:   2023-08-14
@@ -93,10 +79,10 @@ public class CustomColumnsController extends JeecgController<CustomColumns, ICus
 		 Wrapper<CustomColumns> queryWrapper = new QueryWrapper<>(customColumns);
 		 CustomColumns customColumns1 = customColumnsService.getOne(queryWrapper);
 
-		 customColumns.setId(customColumns1.getId());
-		 customColumns.setCheckedValues(values);
-
-		 customColumnsService.updateById(customColumns);
+		 UpdateWrapper updateWrapper = new UpdateWrapper();
+		 updateWrapper.eq("id", customColumns1.getId());
+		 updateWrapper.set("checked_values", values);
+		 customColumnsService.update(updateWrapper);
 	 }
 
 	/**

+ 37 - 2
pom.xml

@@ -59,9 +59,14 @@
 		<!-- Log4j2爆雷漏洞 -->
 		<log4j2.version>2.17.0</log4j2.version>
 		<logback.version>1.2.9</logback.version>
-		<!-- mapstruct自定义类转换 -->
+
+
 		<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
+		<org.projectlombok.version>1.18.22</org.projectlombok.version>
+
 		<lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
+		<poiti.version>1.10.5</poiti.version>
+		<zxing.version>3.5.1</zxing.version>
 	</properties>
 
 	<modules>
@@ -134,7 +139,19 @@
 	<dependencyManagement>
 		<dependencies>
 
-			<!-- 类转换-->
+			<!-- kzks 模块-->
+			<dependency>
+				<groupId>org.jeecgframework.boot</groupId>
+				<artifactId>module_kzks</artifactId>
+				<version>${jeecgboot.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.deepoove</groupId>
+				<artifactId>poi-tl</artifactId>
+
+				<version>${poiti.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.mapstruct</groupId>
 				<artifactId>mapstruct</artifactId>
@@ -358,6 +375,24 @@
                     <source>1.8</source>
                     <target>1.8</target>
                     <encoding>UTF-8</encoding>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.mapstruct</groupId>
+							<artifactId>mapstruct-processor</artifactId>
+							<version>${org.mapstruct.version}</version>
+						</path>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>${org.projectlombok.version}</version>
+						</path>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok-mapstruct-binding</artifactId>
+							<version>${lombok.mapstruct.binding.version}</version>
+						</path>
+						<!-- other annotation processors -->
+					</annotationProcessorPaths>
                 </configuration>
             </plugin>
             <!-- 打包跳过测试 -->