完善

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -35,6 +35,10 @@ public class RepairApplicationForm implements Serializable {
      * 设备id
      */
     private String sbId;
+    /**
+     * 设备使用位置
+     */
+    private String sbCph;
     /**
      * 是否停机: 1-是 2-否
      */

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -7,7 +7,7 @@
         user1.real_name as repairUserName,
         user2.real_name as checkUserName,
         sb.name as sbName,part.name as partName,
-        sb.no as sbNo, sb.model_id as modelId,
+        sb.no as sbNo, sb.cph as sbCph, sb.model_id as modelId,
         error.name as repairErrorTypeName
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairApplicationFormDTO"

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -1083,6 +1083,7 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
         List<SbInfo> list = mapper.selectByExample(weekend);
         List<SbInfoVO> voList = BeanConverterUtil.copyListProperties(list, SbInfoVO.class);
         List<SysDept> deptList = deptMapper.selectAll();
+        List<SysUser> userList = sysUserMapper.selectAll();
         for(SbInfoVO vo:voList){
             if (vo.getUseCompany() != null) {
                 deptList.forEach(sysDept -> {
@@ -1100,6 +1101,14 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
                     }
                 });
             }
+            if (vo.getRepairUser() != null) {
+                userList.forEach(sysUser -> {
+                    if (sysUser.getUserId().equals(vo.getRepairUser())) {
+                        vo.setRepairUserName(sysUser.getRealName());
+                        return;
+                    }
+                });
+            }
         }
         return voList;
     }

platform-service/src/main/java/com/platform/service/util/CodeFileUtils.java

@@ -49,10 +49,7 @@ public class CodeFileUtils {
 
         QrcodeConfig config = new QrcodeConfig()
                 .setBorderSize(2)
-                .setPadding(10)
-                .setMasterColor("#00BFFF")
-                .setLogoBorderColor("#B0C4DE");
-
+                .setPadding(2);
         SimpleQrcodeGenerator simpleQrcodeGenerator = new SimpleQrcodeGenerator(config);
         if (StringUtils.isNotBlank(logPath)) {
             simpleQrcodeGenerator