From af428949a877e21817237f1e788aa11e12170e75 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 27 Aug 2021 17:33:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=B9=8B=E5=89=8D=E8=A2=AB=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E7=9A=84=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4(=EF=BC=9B=E2=80=B2=E2=8C=92`)~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardComplianceAssessResultController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 48d3f09f..5399ee19 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -162,6 +162,7 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage> selectProduct(SarStandardComplianceProductAssessEO eo) throws Exception { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper 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()); From e443ee61644009313ea4e3e12fd14a9bd8a79b9b Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 15:25:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=A0=87=E5=87=86=E5=8F=B7/?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E7=AB=A0=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...arStandardComplianceAssessResultController.java | 14 ++++++++++++++ .../entity/InterpretationEO.java | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 5399ee19..592055b9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -192,6 +192,13 @@ public class SarStandardComplianceAssessResultController { if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper 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()); @@ -201,6 +208,13 @@ public class SarStandardComplianceAssessResultController { } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper 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 page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java index 2b92fb9a..3b085c4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/InterpretationEO.java @@ -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") From de17b97ad96cd2c72ea9acac22f9f1b93ec535ee Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 17:56:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6--?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 22 ++-- .../entity/EarlyWarningEO.java | 2 + .../service/EarlyWarningEOService.java | 8 +- .../Impl/EarlyWarningEOServiceImpl.java | 100 +++++++++++++++--- 4 files changed, 105 insertions(+), 27 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 22b70ee3..e204002f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -28,7 +28,7 @@ public class EarlyWarningEOController extends BaseController { @Resource private EarlyWarningEOServiceImpl earlyWarningEOService; /** -* +* * @param newStandPage * @param newStandPageSize * @param oldStandPage @@ -38,7 +38,7 @@ public class EarlyWarningEOController extends BaseController { * @param oldItemsPage * @param oldItemsPageSize * @param applyType -* @return +* @return * @author zj * date 2021-06-15 **/ @@ -47,11 +47,11 @@ public class EarlyWarningEOController extends BaseController { 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 list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType);//新车标准预警 - IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType);//在产车标准预警 - IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType);//新车条款预警 - IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType);//在产车条款预警 + @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,String applyType,EarlyWarningEO earlyWarningEO) { + IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType,earlyWarningEO);//新车标准预警 + IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType,earlyWarningEO);//在产车标准预警 + IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType,earlyWarningEO);//新车条款预警 + IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { @@ -65,9 +65,9 @@ public class EarlyWarningEOController extends BaseController { return Result.success("200",listMap); } /** - * + * * @param id - * @return + * @return * @author zj * date 2021-06-15 **/ @@ -78,12 +78,12 @@ public class EarlyWarningEOController extends BaseController { return Result.success("200",power); } /** - * + * * @param newPolicyPage * @param newPolicyPageSize * @param oldPolicyPage * @param oldPolicyPageSize - * @return + * @return * @author zj * date 2021-06-15 **/ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index e33134a9..f2903179 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -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.util.Date; @@ -37,6 +38,7 @@ public class EarlyWarningEO extends BaseEntity { private String standName; @TableField("PUT_TIME") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date putTime; @TableField("APPLY_TYPE") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index 6a32b26f..29910fcd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; public interface EarlyWarningEOService extends IService { - IPage newStandQuery(int current,int pageSize,String applyType); - IPage oldStandQuery(int current,int pageSize,String applyType); - IPage newItemsQuery(int current,int pageSize,String applyType); - IPage oldItemsQuery(int current,int pageSize,String applyType); + IPage newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); + IPage oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); + IPage newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); + IPage oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); IPage newPolicyQuery(int current,int pageSize); IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 0b67b072..94492cb6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -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,38 +39,110 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newStandQuery(int current,int pageSize,String applyType){ + public IPage newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ QueryWrapper 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); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @Override - public IPage oldStandQuery(int current,int pageSize,String applyType){ + public IPage oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ QueryWrapper 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); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @Override - public IPage newItemsQuery(int current,int pageSize,String applyType){ + public IPage newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ QueryWrapper 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); return getEarlyWarningEOIPage(current, pageSize, wrapper); } @Override - public IPage oldItemsQuery(int current,int pageSize,String applyType){ + public IPage oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ QueryWrapper 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); return getEarlyWarningEOIPage(current, pageSize, wrapper); } From 1739a3d555a30be28aeafc3a085597eb8f4d9282 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 30 Aug 2021 18:06:47 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=20=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6--?= =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81=EF=BC=88=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=AA=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BC=A0=E7=9A=84string?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=9C=89=E5=BE=88=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E4=BC=A0=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?bean=EF=BC=8C=E6=88=91=E5=B0=B1=E6=8A=8A=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E4=BC=A0=E7=9A=84string=E9=82=A3=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=A0=E4=BA=86=EF=BC=89=E5=B8=8C=E6=9C=9B=E4=BA=BA?= =?UTF-8?q?=E6=B2=A1=E4=BA=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 11 +++++----- .../service/EarlyWarningEOService.java | 8 ++++---- .../Impl/EarlyWarningEOServiceImpl.java | 20 ++++--------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index e204002f..c364e76e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -37,7 +37,6 @@ public class EarlyWarningEOController extends BaseController { * @param newItemsPageSize * @param oldItemsPage * @param oldItemsPageSize - * @param applyType * @return * @author zj * date 2021-06-15 @@ -47,11 +46,11 @@ public class EarlyWarningEOController extends BaseController { 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,EarlyWarningEO earlyWarningEO) { - IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,applyType,earlyWarningEO);//新车标准预警 - IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,applyType,earlyWarningEO);//在产车标准预警 - IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,applyType,earlyWarningEO);//新车条款预警 - IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,applyType,earlyWarningEO);//在产车条款预警 + @RequestParam(defaultValue = "1", value = "oldItemsPage")int oldItemsPage, @RequestParam(defaultValue = "10", value = "oldItemsPageSize") int oldItemsPageSize,EarlyWarningEO earlyWarningEO) { + IPage list1 = earlyWarningEOService.newStandQuery(newStandPage,newStandPageSize,earlyWarningEO);//新车标准预警 + IPage list2 = earlyWarningEOService.oldStandQuery(oldStandPage,oldStandPageSize,earlyWarningEO);//在产车标准预警 + IPage list3 = earlyWarningEOService.newItemsQuery(newItemsPage,newItemsPageSize,earlyWarningEO);//新车条款预警 + IPage list4 = earlyWarningEOService.oldItemsQuery(oldItemsPage,oldItemsPageSize,earlyWarningEO);//在产车条款预警 return getResponseMessage(list1, list2, list3, list4); } private ResponseMessage getResponseMessage(IPage list1, IPage list2, IPage list3, IPage list4) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index 29910fcd..c037a64c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; public interface EarlyWarningEOService extends IService { - IPage newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); - IPage oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); - IPage newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); - IPage oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO); + IPage newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); + IPage oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); + IPage newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); + IPage oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO); IPage newPolicyQuery(int current,int pageSize); IPage oldPolicyQuery(int current,int pageSize); String batchSave(List earlyWarningEOS); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 94492cb6..6752ce16 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -39,7 +39,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage newStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -59,14 +59,11 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldStandQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage oldStandQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -86,14 +83,11 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl newItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage newItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -113,14 +107,11 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl oldItemsQuery(int current,int pageSize,String applyType,EarlyWarningEO earlyWarningEO){ + public IPage oldItemsQuery(int current,int pageSize,EarlyWarningEO earlyWarningEO){ QueryWrapper wrapper = new QueryWrapper<>(); //根据标准编号查询 if (earlyWarningEO.getStandCode() != null && earlyWarningEO.getStandCode().length() != 0){ @@ -140,9 +131,6 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl Date: Tue, 31 Aug 2021 14:03:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=88=9D=E6=AC=A1=E4=BF=AE=E6=94=B9~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 20 +++++++++++-------- .../da/scheduled/dao/SarStandardInfoDao.java | 2 +- .../da/scheduled/dao/SarStandardItemDao.java | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index c9e0cd00..355af8ff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -54,8 +54,8 @@ public class ScheduledJob { - @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 -// @Scheduled(cron="*/5 * * * * ?") +// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行 + @Scheduled(cron="*/5 * * * * ?") @Async public void WarningSchedulingTasks() { @@ -82,44 +82,48 @@ public class ScheduledJob { LinkedList warningList = new LinkedList<>();//需预警的标准和条款列表集合 //分解单(条款) 新车型 mark=1 - List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ"); + List itemForXCXSSRQ = sarStandardItemDao.selectWithinTerm(term, "XCXSSRQ", "APPLY_ARCTIC"); for (WarningEO warningEO : itemForXCXSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") .setMark("1") - .setPutTime(warningEO.getXCXSSRQ()); + .setPutTime(warningEO.getXCXSSRQ()) + .setApplyType(warningEO.getApplyType()); } warningList.addAll(itemForXCXSSRQ); //分解单(条款) 在产车型 mark=2 - List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ"); + List itemForZCCSSRQ = sarStandardItemDao.selectWithinTerm(term, "ZCCSSRQ", "APPLY_ARCTIC"); for (WarningEO warningEO : itemForZCCSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") .setMark("2") - .setPutTime(warningEO.getZCCSSRQ()); + .setPutTime(warningEO.getZCCSSRQ()) + .setApplyType(warningEO.getApplyType()); } warningList.addAll(itemForZCCSSRQ); //标准 新车型 预警 mark=3 - List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ"); + List standInfoXCXSSRQ = sarStandardInfoDao.selectWithinTerm(term, "XCXSSRQ", "CLLX"); for (WarningEO warningEO : standInfoXCXSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") .setMark("3") .setPutTime(warningEO.getXCXSSRQ()) + .setApplyType(warningEO.getApplyType()) .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); } warningList.addAll(standInfoXCXSSRQ); //标准 在产车型 mark=4 - List standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ"); + List standInfoZCCSSRQ = sarStandardInfoDao.selectWithinTerm(term, "ZCCSSRQ", "CLLX"); for (WarningEO warningEO : standInfoZCCSSRQ) { warningEO.setId(UUIDUtils.randomUUID20()) .setPower("1") .setMark("4") .setPutTime(warningEO.getZCCSSRQ()) + .setApplyType(warningEO.getApplyType()) .setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear()); } warningList.addAll(standInfoZCCSSRQ); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java index 4b2fb0c2..3ad24478 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java @@ -12,7 +12,7 @@ import java.util.List; @Repository public interface SarStandardInfoDao{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(DataDTO date, String str, String CLLX); public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java index 5e5b2fec..9b32eb40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java @@ -11,6 +11,6 @@ import java.util.List; @Repository public interface SarStandardItemDao extends BaseMapper{ - public List selectWithinTerm(DataDTO date, String str); + public List selectWithinTerm(DataDTO date, String str, String applyType); } From ee85f48542c5eddd328435f56d4c78707c5556de Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 1 Sep 2021 14:25:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BC=80=E8=80=80=E5=92=8C=E5=AE=87?= =?UTF-8?q?=E6=AC=A2=E5=86=B2=E7=AA=81=E4=B9=8B=E5=90=8E=E7=9A=84=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java | 2 +- .../main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java index 3ad24478..4b2fb0c2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java @@ -12,7 +12,7 @@ import java.util.List; @Repository public interface SarStandardInfoDao{ - public List selectWithinTerm(DataDTO date, String str, String CLLX); + public List selectWithinTerm(DataDTO date, String str); public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java index 9b32eb40..5e5b2fec 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardItemDao.java @@ -11,6 +11,6 @@ import java.util.List; @Repository public interface SarStandardItemDao extends BaseMapper{ - public List selectWithinTerm(DataDTO date, String str, String applyType); + public List selectWithinTerm(DataDTO date, String str); } From f8de6d895fad23af85b9c7dca5a57b5fdb00c8a9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 2 Sep 2021 15:21:45 +0800 Subject: [PATCH 7/8] feat: There is no way the --- .../com/adc/da/workFlow/controller/WorkFlowController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index fcd59455..34216ab8 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -468,9 +468,9 @@ public class WorkFlowController { Page page= workFlowFeignClient.allProcess(taskCommonQuery); PageInfo pageInfo= new PageInfo(); pageInfo.setPageNo(taskCommonQuery.getCurrent()); - pageInfo.setList(page.getList()); - pageInfo.setCount(page.getCount()); - pageInfo.setPageSize(page.getPageSize()); + pageInfo.setList(page.getList() == null ? new ArrayList<>():page.getList()); + pageInfo.setCount(page.getCount() == null ? 0 : page.getCount()); + pageInfo.setPageSize(page.getPageSize() == null ? 0 : page.getPageSize()); return pageInfo; } From a94b3bea68d5fc43663b678fc10b14d7e9e0c5f9 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 2 Sep 2021 16:54:04 +0800 Subject: [PATCH 8/8] feat: There is no way the --- .../service/impl/SarBussionessStandServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index cf8d22fb..8e784e58 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -393,7 +393,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl changeMap (SarBussionessStand sarStandardsInfoEO,Map map) { - map.put("country",verifyObj(sarStandardsInfoEO.getApplyCountry())); +// map.put("country",verifyObj(sarStandardsInfoEO.getApplyCountry())); map.put("standSort",verifyObj(sarStandardsInfoEO.getStandSort())); map.put("standNumber",verifyObj(sarStandardsInfoEO.getStandCode())); map.put("standYear",verifyObj(sarStandardsInfoEO.getStandYear()));