FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!311
This commit is contained in:
王夏晖
2021-12-21 20:48:33 +08:00
parent 75d89f16d7 5e1df05c6b
commit a79b7cbb2f
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java
+2
View File
@@ -45,5 +45,7 @@ public class SapMeeting{
private String files;//附件 json
private String place;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3 -3
View File
@@ -613,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
tsUserQW.select("UNAME")
.in("USID",valArr);
List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
value= String.join(",", stringList);
value= String.join(",", stringList.isEmpty() ? valArr : stringList);
break;
}
//通过id绑定责任部门师名称
@@ -622,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
tsPositionQW.select("name")
.in("id",valArr);
List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
value = String.join(",", stringList);
value= String.join(",", stringList.isEmpty() ? valArr : stringList);
break;
}
default:value = dicTypeEODao.getDicNamesByCodes(valArr);
}
entry.setValue(value);
entry.setValue(value == null ? String.join(",",valArr) : value);
}
}
}
adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml
+3 -1
View File
@@ -3,7 +3,7 @@
<mapper namespace="com.adc.da.slrs.sapMeetInfo.dao.SapMeetingDao">
<sql id="BaseSelect">
id,title,date,content,type,attend,files
id,title,date,content,type,attend,files,place
</sql>
<sql id="Search">
type = #{type}
@@ -19,6 +19,7 @@
<if test="type != null">type,</if>
<if test="attend != null">attend,</if>
<if test="files != null">files,</if>
<if test="place != null">place,</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -29,6 +30,7 @@
<if test="type != null">#{type},</if>
<if test="attend != null">#{attend},</if>
<if test="files != null">#{files},</if>
<if test="place != null">#{place},</if>
</trim>
</insert>