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

Merge remote-tracking branch 'origin/develop_1' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-09-02 09:36:04 +08:00
parent 2ec116944c ee85f48542
commit 0e4d7b6a32
6 changed files with 120 additions and 28 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 -12
View File
@@ -28,7 +28,7 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
@Resource
private EarlyWarningEOServiceImpl earlyWarningEOService;
/**
*
*
* @param newStandPage
* @param newStandPageSize
* @param oldStandPage
@@ -37,8 +37,7 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
* @param newItemsPageSize
* @param oldItemsPage
* @param oldItemsPageSize
* @param applyType
* @return
* @return
* @author zj
* date 2021-06-15
**/
@@ -47,11 +46,11 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
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 = "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) {
IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType);//新车标准预警
IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType);//在产车标准预警
IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType);//新车条款预警
IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType);//在产车条款预警
@RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) {
IPage<EarlyWarningEO> list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警
IPage<EarlyWarningEO> list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警
IPage<EarlyWarningEO> list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警
IPage<EarlyWarningEO> list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警
return getResponseMessage(list1, list2, list3, list4);
}
private ResponseMessage getResponseMessage(IPage<EarlyWarningEO> list1, IPage<EarlyWarningEO> list2, IPage<EarlyWarningEO> list3, IPage<EarlyWarningEO> list4) {
@@ -65,9 +64,9 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
return Result.success("200",listMap);
}
/**
*
*
* @param id
* @return
* @return
* @author zj
* date 2021-06-15
**/
@@ -78,12 +77,12 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
return Result.success("200",power);
}
/**
*
*
* @param newPolicyPage
* @param newPolicyPageSize
* @param oldPolicyPage
* @param oldPolicyPageSize
* @return
* @return
* @author zj
* 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.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
@@ -38,6 +39,7 @@ public class EarlyWarningEO extends BaseEntity {
private String standName;
@TableField("PUT_TIME")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date putTime;
@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;
public interface EarlyWarningEOService extends IService<EarlyWarningEO> {
IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType);
IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType);
IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType);
IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType);
IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO);
IPage<EarlyWarningEO> newPolicyQuery(int current,int pageSize);
IPage<EarlyWarningEO> oldPolicyQuery(int current,int pageSize);
String batchSave(List<EarlyWarningEO> earlyWarningEOS);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java
+76 -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.entity.EarlyWarningEO;
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.metadata.IPage;
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 javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@Service("EarlyWarningEOService")
@@ -35,37 +39,97 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
6：在产车政策预警
*/
@Override
public IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,String applyType){
public IPage<EarlyWarningEO> newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
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());
}
wrapper.eq("mark",1);
return getEarlyWarningEOIPage(current, pageSize, wrapper);
}
@Override
public IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,String applyType){
public IPage<EarlyWarningEO> oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
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());
}
wrapper.eq("mark",2);
return getEarlyWarningEOIPage(current, pageSize, wrapper);
}
@Override
public IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,String applyType){
public IPage<EarlyWarningEO> newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
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());
}
wrapper.eq("mark",3);
return getEarlyWarningEOIPage(current, pageSize, wrapper);
}
@Override
public IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,String applyType){
public IPage<EarlyWarningEO> oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){
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());
}
wrapper.eq("mark",4);
return getEarlyWarningEOIPage(current, pageSize, wrapper);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+15
View File
@@ -162,6 +162,7 @@ public class SarStandardComplianceAssessResultController {
public ResponseMessage<IPage<SarStandardComplianceProductAssess>> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception {
IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
if (eo.getType() != null) queryWrapper.eq("type", eo.getType());
if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName());
if (eo.getProductId() != null) queryWrapper.like("product_id", eo.getProductId());
// if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
@@ -191,6 +192,13 @@ public class SarStandardComplianceAssessResultController {
if (eo.getPosition() == 1) {
IPage<SarInterpretationNationalStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarInterpretationNationalStandard> queryWrapper = new QueryWrapper<>();
//如果查询条件里标准编号不为空，查询
if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber());
//如果查询条件里标准名称不为空，查询
if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName());
//如果查询条件里具体章条不为空，查询
if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem());
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
@@ -200,6 +208,13 @@ public class SarStandardComplianceAssessResultController {
} else {
IPage<SarInterpretationForeignStandard> iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper<SarInterpretationForeignStandard> queryWrapper = new QueryWrapper<>();
//如果查询条件里标准编号不为空，查询
if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber());
//如果查询条件里标准名称不为空，查询
if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName());
//如果查询条件里具体章条不为空，查询
if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem());
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId());
IPage<SarInterpretationForeignStandard> page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java
+12
View File
@@ -21,6 +21,18 @@ public class InterpretationEO {
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "标准编号")
@TableField("STAND_NUMBER")
private String standNumber;
@ApiModelProperty(value = "标准名称")
@TableField("STAND_NAME")
private String standName;
@ApiModelProperty(value = "具体章条")
@TableField("specific_item")
private String specificItem;
@ApiModelProperty(value = "评估时间")
@TableField("INTERPRETATION_TIME")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")