码格式设置createBy和updateBy值，关联查询updateByName的值

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrFormatVO.java

@@ -61,4 +61,7 @@ public class QrFormatVO {
     @ApiModelProperty(value = "修改人id")
     private Long updateBy;
 
+    @ApiModelProperty(value = "修改人名称")
+    private String updateByName;
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrFormatRes.java

@@ -81,5 +81,7 @@ public class ListQrFormatRes extends PageResp implements Serializable {
 		@ApiModelProperty(value = "修改人id")
 		private Long updateBy;
 
+		@ApiModelProperty(value = "修改人名称")
+		private String updateByName;
 	}
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrFormatServiceImpl.java

@@ -1,7 +1,6 @@
 package com.abi.qms.platform.service.impl;
 
 import com.abi.qms.platform.dao.entity.QrFormat;
-import com.abi.qms.platform.dao.enums.QrFormatUniqueStatusEunm;
 import com.abi.qms.platform.dao.enums.QrFormatUseStatusEnum;
 import com.abi.qms.platform.dao.enums.QrFormatVerifyUniqueEnum;
 import com.abi.qms.platform.dao.mapper.QrFormatMapper;
@@ -12,7 +11,7 @@ import com.abi.qms.platform.dto.res.ListQrFormatRes;
 import com.abi.qms.platform.infrastructure.task.VerifyUniqueTask;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.PageUtil;
-import com.abi.qms.platform.service.BoxCodeFormatService;
+import com.abi.qms.platform.infrastructure.util.UserUtil;
 import com.abi.qms.platform.service.QrFormatService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.utils.PojoConverterUtils;
@@ -40,14 +39,11 @@ public class QrFormatServiceImpl implements QrFormatService {
 	@Autowired
 	private ExecutorService executorService;
 
-	@Autowired
-	private BoxCodeFormatService boxCodeFormatService;
-
 	/**
 	 * 保存码格式
 	 */
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public void saveQrFormat(SaveQrFormatReq req) {
 		// 修改码格式时的条件限制
 		QrFormat qrFormat;
@@ -68,21 +64,20 @@ public class QrFormatServiceImpl implements QrFormatService {
 			qrFormatQw.ne("id", req.getId());
 		}
 		Integer count = qrFormatMapper.selectCount(qrFormatQw);
-		if (count.intValue() != 0) {
+		if (!count.equals(0)) {
 			throw new BusinessException("码格式名称已存在");
 		}
 
+		// copy属性值
 		qrFormat = PojoConverterUtils.copy(req, QrFormat.class);
-		PojoConverterUtils.copy(req, qrFormat);
-		// 重复率状态 未验证
-		qrFormat.setUniqueStatus(QrFormatUniqueStatusEunm.UN_VERIFY.getCode());
-		// 使用状态 未使用
-		qrFormat.setUseStatus(QrFormatUseStatusEnum.UN_USE.getCode());
 
-		// 新增or修改 TODO 设置createBy和updateBy
+		// 新增or修改
+		Long userId = UserUtil.getUser().getId();
+		qrFormat.setUpdateBy(userId);
 		if (req.getId() != null) {
 			qrFormatMapper.updateById(qrFormat);
 		} else {
+			qrFormat.setCreateBy(userId);
 			qrFormatMapper.insert(qrFormat);
 		}
 
@@ -121,8 +116,7 @@ public class QrFormatServiceImpl implements QrFormatService {
 		QrFormat qrFormat = qrFormatMapper.selectById(req.getId());
 		AssertUtil.isNull(qrFormat, "码格式不存在");
 
-		GetQrFormatDetailRes res = PojoConverterUtils.copy(qrFormat, GetQrFormatDetailRes.class);
-		return res;
+		return PojoConverterUtils.copy(qrFormat, GetQrFormatDetailRes.class);
 	}
 
 	/**

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrFormatMapper.xml

@@ -27,9 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             qf.id, bd.dept_name, qf.name, qf.data_type, qf.code_variable,
             qf.code_variable_build_class, qf.brief, qf.illustrate, qf.verify_unique,
-            qf.unique_status, qf.use_status, qf.create_time, qf.create_by, qf.update_time, qf.update_by
+            qf.unique_status, qf.use_status, qf.create_time, qf.create_by, qf.update_time, qf.update_by, ui.user_name AS update_by_name
         FROM qr_format qf
         LEFT JOIN base_department bd ON qf.dept_id = bd.id
+        LEFT JOIN user_info ui ON qf.update_by = ui.id
         <where>
             qf.is_delete = 0
             <if test="param.deptId != null">