xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'deng' into deng-release

Browse Source 
# Conflicts:
#	src/main/java/com/sipai/controller/equipment/MaintenancePlanController.java
This commit is contained in:
Timer
2026-04-04 01:18:42 +08:00
parent 785654a510 dafda57a0e
commit b0e2e58d93
13 changed files with 1776 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sipai/controller/user/UserController.java
View File

@ -17,6 +17,7 @@ import io.swagger.annotations.*;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.activiti.engine.RepositoryService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -866,6 +867,9 @@ public class UserController {
public String getUsersByIds(HttpServletRequest request, Model model) {
String userIds = request.getParameter("userIds");
List<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')");
if (CollectionUtils.isNotEmpty(list)){
list = list.stream().filter(u -> StringUtils.isNotBlank(u.getId())).collect(toList());
}
JSONArray json = JSONArray.fromObject(list);
model.addAttribute("result", json);
return "result";

11
src/main/java/com/sipai/controller/work/MPointController.java
View File

@ -4152,8 +4152,15 @@ public class MPointController {
for (int i = 0; i < ids.length; i++) {
com.alibaba.fastjson.JSONObject jsonObject2 = new com.alibaba.fastjson.JSONObject();
//通过es查询bizid
MPoint mPoint_es = mPointService.selectById(ids[i]);
//通过数据库查询测点（优先通过unitId和测点编码查询）
MPoint mPoint_es = mPointService.selectById(unitId, ids[i]);
if (mPoint_es == null) {
// 尝试通过测点编码查询
List<MPoint> mPointList = mPointService.selectListByWhere(unitId, "where mpointcode='" + ids[i] + "'");
if (mPointList != null && mPointList.size() > 0) {
mPoint_es = mPointList.get(0);
}
}
if (mPoint_es != null) {
unitId = mPoint_es.getBizid();