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

标准预警--加筛选条件

Browse Source
This commit is contained in:
yanyizhou
2021-08-30 17:56:27 +08:00
parent 00a19e76ba
commit de17b97ad9
4 changed files with 105 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java
+11 -11
View File
@@ -28,7 +28,7 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
@Resource @Resource
private EarlyWarningEOServiceImpl earlyWarningEOService; private EarlyWarningEOServiceImpl earlyWarningEOService;
/** /**
* *
* @param newStandPage * @param newStandPage
* @param newStandPageSize * @param newStandPageSize
* @param oldStandPage * @param oldStandPage
@@ -38,7 +38,7 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
* @param oldItemsPage * @param oldItemsPage
* @param oldItemsPageSize * @param oldItemsPageSize
* @param applyType * @param applyType
* @return * @return
* @author zj * @author zj
* date 2021-06-15 * date 2021-06-15
**/ **/
@@ -47,11 +47,11 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize, public ResponseMessage newPageInfo(@RequestParam(defaultValue = "1", value = "newStandPage")int newStandPage, @RequestParam(defaultValue = "10", value = "newStandPageSize") int newStandPageSize,
@RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize, @RequestParam(defaultValue = "1", value = "oldStandPage")int oldStandPage, @RequestParam(defaultValue = "10", value = "oldStandPageSize") int oldStandPageSize,
@RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize, @RequestParam(defaultValue = "1", value = "newItemsPage")int newItemsPage, @RequestParam(defaultValue = "10", value = "newItemsPageSize") int newItemsPageSize,
@RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,String applyType) { @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,String applyType,EarlyWarningEO earlyWarningEO) {
IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType);//新车标准预警 IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType,earlyWarningEO);//新车标准预警
IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType);//在产车标准预警 IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType,earlyWarningEO);//在产车标准预警
IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType);//新车条款预警 IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType,earlyWarningEO);//新车条款预警
IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType);//在产车条款预警 IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType,earlyWarningEO);//在产车条款预警
return getResponseMessage(list1, list2, list3, list4); return getResponseMessage(list1, list2, list3, list4);
} }
private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) { private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) {
@@ -65,9 +65,9 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
return Result.success("200",listMap); return Result.success("200",listMap);
} }
/** /**
* *
* @param id * @param id
* @return * @return
* @author zj * @author zj
* date 2021-06-15 * date 2021-06-15
**/ **/
@@ -78,12 +78,12 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
return Result.success("200",power); return Result.success("200",power);
} }
/** /**
* *
* @param newPolicyPage * @param newPolicyPage
* @param newPolicyPageSize * @param newPolicyPageSize
* @param oldPolicyPage * @param oldPolicyPage
* @param oldPolicyPageSize * @param oldPolicyPageSize
* @return * @return
* @author zj * @author zj
* date 2021-06-15 * date 2021-06-15
**/ **/
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java
+2
View File
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@@ -37,6 +38,7 @@ public class EarlyWarningEO extends BaseEntity {
private String standName; private String standName;
@TableField("PUT_TIME") @TableField("PUT_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date putTime; private Date putTime;
@TableField("APPLY_TYPE") @TableField("APPLY_TYPE")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java
+4 -4
View File
@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;
public interface EarlyWarningEOService extends IService<EarlyWarningEO> { public interface EarlyWarningEOService extends IService<EarlyWarningEO> {
IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType); IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType); IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType); IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType); IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> newPolicyQuery(int current,int pageSize); IPage<EarlyWarningEO> newPolicyQuery(int current,int pageSize);
IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize); IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize);
String batchSave(List<EarlyWarningEO> earlyWarningEOS); String batchSave(List<EarlyWarningEO> earlyWarningEOS);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
+88 -12
View File
@@ -5,6 +5,7 @@ import com.adc.da.scheduled.entity.DataDTO;
import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao;
import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO;
import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService;
import com.adc.da.sys.util.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +15,9 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
@Service("EarlyWarningEOService") @Service("EarlyWarningEOService")
@@ -35,38 +39,110 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
6：在产车政策预警 6：在产车政策预警
*/ */
@Override @Override
public IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType){ public IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){
QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>(); QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
if (applyType!=null&&applyType.length()!=0){ //根据标准编号查询
wrapper.like("APPLY_TYPE",applyType); if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
} }
//根据标准名称查询
if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
}
//根据实施日期查询
if (earlyWarningEO.getPutTime() != null ){
SimpleDateFormat formater = new SimpleDateFormat();
formater.applyPattern("yyyy-MM-dd");
wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
}
//根据适用车型查询
if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
}
// if (applyType!=null&&applyType.length()!=0){
// wrapper.like("APPLY_TYPE",applyType);
// }
wrapper.eq("mark",1); wrapper.eq("mark",1);
return getEarlyWarningEOIPage(current, pageSize, wrapper); return getEarlyWarningEOIPage(current, pageSize, wrapper);
} }
@Override @Override
public IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType){ public IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){
QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>(); QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
if (applyType!=null&&applyType.length()!=0){ //根据标准编号查询
wrapper.like("APPLY_TYPE",applyType); if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
} }
//根据标准名称查询
if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
}
//根据实施日期查询
if (earlyWarningEO.getPutTime() != null ){
SimpleDateFormat formater = new SimpleDateFormat();
formater.applyPattern("yyyy-MM-dd");
wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
}
//根据适用车型查询
if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
}
// if (applyType!=null&&applyType.length()!=0){
// wrapper.like("APPLY_TYPE",applyType);
// }
wrapper.eq("mark",2); wrapper.eq("mark",2);
return getEarlyWarningEOIPage(current, pageSize, wrapper); return getEarlyWarningEOIPage(current, pageSize, wrapper);
} }
@Override @Override
public IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType){ public IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){
QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>(); QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
if (applyType!=null&&applyType.length()!=0){ //根据标准编号查询
wrapper.like("APPLY_TYPE",applyType); if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
} }
//根据标准名称查询
if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
}
//根据实施日期查询
if (earlyWarningEO.getPutTime() != null ){
SimpleDateFormat formater = new SimpleDateFormat();
formater.applyPattern("yyyy-MM-dd");
wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
}
//根据适用车型查询
if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
}
// if (applyType!=null&&applyType.length()!=0){
// wrapper.like("APPLY_TYPE",applyType);
// }
wrapper.eq("mark",3); wrapper.eq("mark",3);
return getEarlyWarningEOIPage(current, pageSize, wrapper); return getEarlyWarningEOIPage(current, pageSize, wrapper);
} }
@Override @Override
public IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType){ public IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){
QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>(); QueryWrapper<EarlyWarningEO> wrapper = new QueryWrapper<>();
if (applyType!=null&&applyType.length()!=0){ //根据标准编号查询
wrapper.like("APPLY_TYPE",applyType); if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){
wrapper.like("STAND_CODE",earlyWarningEO.getStandCode());
} }
//根据标准名称查询
if (earlyWarningEO.getStandName() != null && earlyWarningEO.getStandName().length() != 0){
wrapper.like("STAND_NAME",earlyWarningEO.getStandName());
}
//根据实施日期查询
if (earlyWarningEO.getPutTime() != null ){
SimpleDateFormat formater = new SimpleDateFormat();
formater.applyPattern("yyyy-MM-dd");
wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
}
//根据适用车型查询
if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
wrapper.like("APPLY_TYPE",earlyWarningEO.getApplyType());
}
// if (applyType!=null&&applyType.length()!=0){
// wrapper.like("APPLY_TYPE",applyType);
// }
wrapper.eq("mark",4); wrapper.eq("mark",4);
return getEarlyWarningEOIPage(current, pageSize, wrapper); return getEarlyWarningEOIPage(current, pageSize, wrapper);
} }