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 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!431
This commit is contained in:
super_liu
2022-03-27 17:30:27 +08:00
parent 7902f3ea19 51a49d194b
commit 4807ecde20
2 changed files with 7 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/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+2 -2
View File
@@ -49,12 +49,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
@Override @Override
public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) { public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
esRevisePlan.getPager().setRowCount(count);
if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){ if(StringUtils.isNotBlank(esRevisePlan.getPlanStatus())){
List<String> list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList()); List<String> list= Arrays.stream(esRevisePlan.getPlanStatus().split(",")).map(String::trim).collect(Collectors.toList());
esRevisePlan.setPlanStatusList(list); esRevisePlan.setPlanStatusList(list);
} }
Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
esRevisePlan.getPager().setRowCount(count);
List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan); List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
return esRevisePlans; return esRevisePlans;
} }
adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+5 -2
View File
@@ -86,8 +86,11 @@
<if test="area != null and area != ''"> <if test="area != null and area != ''">
and area = #{area} and area = #{area}
</if> </if>
<if test="planStatus != null and planStatus != ''"> <if test="planStatusList != null">
and plan_status = #{planStatus} and plan_status in
<foreach collection="planStatusList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if> </if>
<if test="reviseStatus != null and reviseStatus != ''"> <if test="reviseStatus != null and reviseStatus != ''">
and revise_status = #{reviseStatus} and revise_status = #{reviseStatus}