pssr 根据人名导入userid

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -121,6 +121,10 @@ public class TPssrAirtightController extends BaseController {
                         entity.setAirtightPressure(cellValue);
                     }else if (j == 4) {
                         entity.setStandard(cellValue);
+                    }else if (j == 5) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 6) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -113,6 +113,10 @@ public class TPssrAnalyzerController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
+                    }else if (j == 2) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 3) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -131,6 +131,10 @@ public class TPssrBlindController extends BaseController {
                         entity.setLocation(cellValue);
                     } else if (j == 10) {
                         entity.setStartupStatus(cellValue);
+                    }else if (j == 11) {
+                        entity.setInConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 12) {
+                        entity.setInConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -124,6 +124,10 @@ public class TPssrCircuitController extends BaseController {
                         entity.setCircuitSize(cellValue);
                     } else if (j == 7) {
                         entity.setRightStatus(cellValue);
+                    }else if (j == 8) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 9) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -116,6 +116,10 @@ public class TPssrCleaningController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 2) {
                         entity.setDevType(cellValue);
+                    }else if (j == 3) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 4) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -129,6 +129,10 @@ public class TPssrFrameController extends BaseController {
                         }
                     } else if (j == 9) {
                         entity.setRemarks(cellValue);
+                    }else if (j == 10) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 11) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -117,6 +117,10 @@ public class TPssrFranklinismController extends BaseController {
                         }
                     } else if (j == 3) {
                         entity.setRemarks(cellValue);
+                    }else if (j == 4) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 5) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -109,6 +109,10 @@ public class TPssrGasdetectorController extends BaseController {
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
                         entity.setDevNo(cellValue);
+                    }else if (j == 1) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 2) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -117,6 +117,10 @@ public class TPssrHygieneController extends BaseController {
                         }
                     } else if (j == 3) {
                         entity.setRemarks(cellValue);
+                    }else if (j == 4) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 5) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -125,6 +125,10 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                         } else if ("液位计".equals(cellValue)) {
                             entity.setDevType("2");
                         }
+                    }else if (j == 3) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 4) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -113,6 +113,10 @@ public class TPssrLaboratoryController extends BaseController {
                         entity.setName(cellValue);
                     } else if (j == 2) {
                         entity.setSerialNumber(cellValue);
+                    }else if (j == 3) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 4) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -119,6 +119,10 @@ public class TPssrMeasureController extends BaseController {
                         entity.setDevName(cellValue);
                     } else if (j == 2) {
                         entity.setProMeasure(cellValue);
+                    }else if (j == 3) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 4) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -112,6 +112,10 @@ public class TPssrMotorController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
+                    }else if (j == 2) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 3) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -118,6 +118,10 @@ public class TPssrNitrogenController extends BaseController {
                         entity.setSampleName(cellValue);
                     } else if (j == 3) {
                         entity.setDewPointValue(cellValue);
+                    }else if (j == 4) {
+                        entity.setConfirm1(userService.selectPssrUserIdByNickName(cellValue));
+                    }else if (j == 5) {
+                        entity.setConfirm2(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -460,6 +460,8 @@ public class TPssrOverhaulExchangerController extends BaseController {
                         entity.setWorkDes(cellValue);
                     } else if (j == 3) {
                         entity.setPidNo(cellValue);
+                    }else if (j == 4) {
+                        entity.setConfirmedPerson(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -126,6 +126,8 @@ public class TPssrOverhaulFilterController extends BaseController {
                         entity.setFlangeSize(cellValue);
                     } else if (j == 5) {
                         entity.setChangeClean(cellValue);
+                    }else if (j == 6) {
+                        entity.setRespPerson(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -122,6 +122,8 @@ public class TPssrOverhaulTowerController extends BaseController {
                         entity.setWorkDes(cellValue);
                     } else if (j == 3) {
                         entity.setPidNo(cellValue);
+                    }else if (j == 4) {
+                        entity.setConfirmedPerson(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -129,6 +129,8 @@ public class TPssrOverhaulValveController extends BaseController {
                         entity.setPidNo(cellValue);
                     } else if (j == 5) {
                         entity.setChangeType(cellValue);
+                    }else if (j == 6) {
+                        entity.setIdentifyingPerson(userService.selectPssrUserIdByNickName(cellValue));
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/system/service/ISysUserService.java

@@ -56,6 +56,8 @@ public interface ISysUserService
      */
     public SysUser selectUserByUserName(String userName);
 
+    public String selectPssrUserIdByNickName(String nickName);
+
     /**
      * 通过用户ID查询用户
      *

master/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java

@@ -10,6 +10,7 @@ import com.ruoyi.project.system.domain.*;
 import com.ruoyi.project.system.mapper.*;
 import com.ruoyi.project.system.service.ISysConfigService;
 import com.ruoyi.project.system.service.ISysUserService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -130,6 +131,17 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserByUserName(userName);
     }
 
+    @Override
+    public String selectPssrUserIdByNickName(String nickName) {
+        SysUser user = new SysUser();
+        user.setNickName(nickName);
+        List<SysUser> sysUsers = userMapper.selectPssrUserList(user);
+        if (CollectionUtils.isNotEmpty(sysUsers) && sysUsers.size() == 1) {
+            return sysUsers.get(0).getUserId().toString();
+        }
+        return null;
+    }
+
     /**
      * 通过用户ID查询用户
      *

master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -230,6 +230,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		START WITH dept_id in (10040,10000,108)
 		CONNECT BY PRIOR dept_id = parent_id
 		)
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat(concat('%',#{nickName}),'%')
+		</if>
 	</select>
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">