|
@@ -89,6 +89,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
|
|
|
@Override
|
|
|
public int deletePlan(String id) {
|
|
|
+ QueryWrapper<PlanItem> itemQueryWrapper = new QueryWrapper<>();
|
|
|
+ itemQueryWrapper.eq("plan_id",id);
|
|
|
+ planItemMapper.delete(itemQueryWrapper);
|
|
|
QueryWrapper<Plan> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("plan_id",id);
|
|
|
return planMapper.delete(queryWrapper);
|
|
@@ -252,7 +255,7 @@ public class PlanServiceImpl implements PlanService {
|
|
|
PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
|
|
|
QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
|
|
|
planQueryWrapper.eq("appkey",bo.getAppkey());
|
|
|
- planQueryWrapper.eq("commercialId",bo.getCommercialId());
|
|
|
+ planQueryWrapper.eq("commercial_id",bo.getCommercialId());
|
|
|
if (bo.getText() != null)
|
|
|
planQueryWrapper.like("plan_id",bo.getText())
|
|
|
.or()
|
|
@@ -288,9 +291,9 @@ public class PlanServiceImpl implements PlanService {
|
|
|
.or()
|
|
|
.like("equipment_name",bo.getText());
|
|
|
if (bo.getStartTime() != null)
|
|
|
- statisticsQueryWrapper.apply("DATE_FORMAT(plan_start_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
+ statisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m-%d %H:%i:%s') >= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
|
if (bo.getEndTime() != null)
|
|
|
- statisticsQueryWrapper.apply("DATE_FORMAT(plan_end_time,'%Y-%m-%d %H:%i:%s') > DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
+ statisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m-%d %H:%i:%s') <= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
|
|
|
List<PlanPushStatistics> list = planPushStatisticsMapper.selectList(statisticsQueryWrapper);
|
|
|
List<PlanPushStatisticsListVo> vos = new ArrayList<>();
|
|
|
for (PlanPushStatistics statistics : list){
|
|
@@ -319,8 +322,20 @@ public class PlanServiceImpl implements PlanService {
|
|
|
equipmentQueryWrapper.like("equipment_id",bo.getText())
|
|
|
.or()
|
|
|
.like("equipment_name",bo.getText());
|
|
|
- if (bo.getAddrCodes() != null)
|
|
|
- equipmentQueryWrapper.in("addr_code",bo.getAddrCodes());
|
|
|
+ if (bo.getAddrCodes() != null){
|
|
|
+ for (String addrCode : bo.getAddrCodes()){
|
|
|
+ String province = String.valueOf(addrCode.charAt(0))+String.valueOf(addrCode.charAt(1));
|
|
|
+ String city = String.valueOf(addrCode.charAt(2))+String.valueOf(addrCode.charAt(3));
|
|
|
+ String district = String.valueOf(addrCode.charAt(4))+String.valueOf(addrCode.charAt(5));
|
|
|
+ if (district.equals("00")){
|
|
|
+ if (city.equals("00"))
|
|
|
+ equipmentQueryWrapper.or().likeRight("addr_code",province);
|
|
|
+ else
|
|
|
+ equipmentQueryWrapper.or().likeRight("addr_code",province+city);
|
|
|
+ }else
|
|
|
+ equipmentQueryWrapper.or().likeRight("addr_code",province+city+district);
|
|
|
+ }
|
|
|
+ }
|
|
|
return new PageInfo(equipmentMapper.selectList(equipmentQueryWrapper));
|
|
|
}
|
|
|
}
|