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!573
This commit is contained in:
super_liu
2022-08-17 11:18:14 +08:00
parent dd1be531a5 f14a6f2c62
commit 65a4124615
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java
+12 -7
View File
@@ -48,22 +48,26 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
QueryWrapper<SarPublicIdea> list = new QueryWrapper<>(); QueryWrapper<SarPublicIdea> list = new QueryWrapper<>();
if ("1".equals(type)) { if ("1".equals(type)) {
if (start!=null && end !=null){ if (start!=null && end !=null){
String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname) .like(StringUtils.isNotEmpty(cname), "cid", cname)
.ge(start != null, "start_time", start) .ge(start != null, "start_time", date1)
.le(end != null, "end_time", end) .le(end != null, "end_time", date2)
.orderByDesc("start_time"); .orderByDesc("start_time");
}else if (start!=null){ }else if (start!=null){
String date1 = (new SimpleDateFormat("yyyy-MM-dd")).format(start);
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname) .like(StringUtils.isNotEmpty(cname), "cid", cname)
.le(start != null, "start_time", start) .le(start != null, "start_time", date1)
.ge(start != null, "end_time", start) .ge(start != null, "end_time", date1)
.orderByDesc("start_time"); .orderByDesc("start_time");
}else if (end!=null){ }else if (end!=null){
String date2 = (new SimpleDateFormat("yyyy-MM-dd")).format(end);
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cid", cname) .like(StringUtils.isNotEmpty(cname), "cid", cname)
.le(end != null, "start_time", end) .le(end != null, "start_time", date2)
.ge(end != null, "end_time", end) .ge(end != null, "end_time", date2)
.orderByDesc("start_time"); .orderByDesc("start_time");
}else { }else {
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
@@ -71,9 +75,10 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl<SarPublicIdeaDao, SarP
.orderByDesc("start_time"); .orderByDesc("start_time");
} }
} else { } else {
String date = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date());
list.like(StringUtils.isNotEmpty(category), "category", category) list.like(StringUtils.isNotEmpty(category), "category", category)
.like(StringUtils.isNotEmpty(cname), "cname", cname) .like(StringUtils.isNotEmpty(cname), "cname", cname)
.ge("end_time", new Date()) .ge("end_time", date)
.orderByAsc("end_time"); .orderByAsc("end_time");
} }
Page<SarPublicIdea> page = new Page<>(p, size); Page<SarPublicIdea> page = new Page<>(p, size);
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+1
View File
@@ -386,6 +386,7 @@
<if test="pager.orderCondition != null and pager.orderCondition != ''" > <if test="pager.orderCondition != null and pager.orderCondition != ''" >
${pager.orderCondition} ${pager.orderCondition}
</if> </if>
order by SAR_BUSSIONESS_STAND.stand_year desc
</select> </select>
<select id="queryByBussStateSync" resultMap="BaseResultMap" <select id="queryByBussStateSync" resultMap="BaseResultMap"
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+1
View File
@@ -1565,6 +1565,7 @@
<if test="sychronId != null"> <if test="sychronId != null">
and id != #{sychronId} and id != #{sychronId}
</if> </if>
order by SAR_STANDARDS_INFO.stand_year desc
</select> </select>
<select id="queryStandInfoByList" resultMap="BaseResultMap"> <select id="queryStandInfoByList" resultMap="BaseResultMap">