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
This commit is contained in:
super_liu
2022-01-08 17:34:18 +08:00
parent 46ba3ef7d3 5f67b22e7c
commit 1a520f0d76
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandCompareHisEOServiceImpl.java
+5
View File
@@ -243,6 +243,10 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ
sarItemsCompareHisEO.setCreateTime(new Date()); sarItemsCompareHisEO.setCreateTime(new Date());
sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);
} }
SarStandCompareHisEO sarStandCompareHisEO =new SarStandCompareHisEO();
sarStandCompareHisEO.setId(standHisId);
sarStandCompareHisEO.setCompareStatus("比对完成");
sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO);
return resultMap; return resultMap;
} }
@@ -377,6 +381,7 @@ public class SarStandCompareHisEOServiceImpl implements SarStandCompareHisEOServ
sarItemsCompareHisEO.setCreateTime(new Date()); sarItemsCompareHisEO.setCreateTime(new Date());
sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO); sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);
} }
return resultMap; return resultMap;
} }
@Async @Async
adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandCompareHisEOMapper.xml
+1 -1
View File
@@ -258,7 +258,7 @@
</select> </select>
<!-- 查询SAR_STAND_COMPARE_HIS列表 --> <!-- 查询SAR_STAND_COMPARE_HIS列表 -->
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage"> <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
select <include refid="Base_Column_List" /> from select <include refid="Base_Column_List" /> from
(select tmp_tb.* from (select tmp_tb.* from
(select <include refid="Base_Column_List" /> from SAR_STAND_COMPARE_HIS (select <include refid="Base_Column_List" /> from SAR_STAND_COMPARE_HIS