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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!574
This commit is contained in:
super_liu
2022-08-17 17:42:21 +08:00
parent 65a4124615 0005b8aa6e
commit ce9736de6f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+1
View File
@@ -2123,6 +2123,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
map.put("standEnName", verifyObj(sarStandardsInfoEO.getStandEnName())); map.put("standEnName", verifyObj(sarStandardsInfoEO.getStandEnName()));
map.put("standNature", verifyObj(sarStandardsInfoEO.getStandNature())); map.put("standNature", verifyObj(sarStandardsInfoEO.getStandNature()));
map.put("standState", verifyObj(sarStandardsInfoEO.getStandState())); map.put("standState", verifyObj(sarStandardsInfoEO.getStandState()));
map.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatus()));
// if (sarStandardsInfoEO.getIssueTime() != null) { // if (sarStandardsInfoEO.getIssueTime() != null) {
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// String issueStr = format.format(sarStandardsInfoEO.getIssueTime()); // String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
+5 -5
View File
@@ -407,13 +407,13 @@
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap" <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO"> parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
SELECT SELECT
sar_stand_items.* sar_stand_items.*,split_pid(sar_stand_items.ITEMS_NUM,'.') as tt
FROM FROM
sar_stand_items sar_stand_items
<include refid="sarItemWhere"/> <include refid="sarItemWhere"/>
<if test="orderBy !=null and orderBy!=''"> <if test="orderBy !=null and orderBy!=''">
order by sar_stand_items.ITEMS_NUM ${order} order by tt ${order}
</if> </if>
LIMIT ${pager.startIndex-1},${pageSize} LIMIT ${pager.startIndex-1},${pageSize}
</select> </select>