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_1

Browse Source
This commit is contained in:
yanyizhou
2021-09-02 21:20:16 +08:00
parent e8dd9f42cb 0e8238267c
commit b72ed741f0
14 changed files with 153 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
+3 -3
View File
@@ -468,9 +468,9 @@ public class WorkFlowController {
Page page= workFlowFeignClient.allProcess(taskCommonQuery);
PageInfo<BusProcessName> pageInfo= new PageInfo<BusProcessName>();
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;
}
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+4 -2
View File
@@ -96,7 +96,8 @@ public class ScheduledJob {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("1")
.setPutTime(warningEO.getXCXSSRQ());
.setPutTime(warningEO.getXCXSSRQ())
.setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
}
warningList.addAll(itemForXCXSSRQ);
@@ -106,7 +107,8 @@ public class ScheduledJob {
warningEO.setId(UUIDUtils.randomUUID20())
.setPower("1")
.setMark("2")
.setPutTime(warningEO.getZCCSSRQ());
.setPutTime(warningEO.getZCCSSRQ())
.setStandCode(warningEO.getStandSort()+" "+ warningEO.getStandNum()+"-"+ warningEO.getStandYear());
}
warningList.addAll(itemForZCCSSRQ);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+1
View File
@@ -26,5 +26,6 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
Integer selectCountWorkFlow(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
List<String> getAllStands();
List<String> getAllStand();
List<SarStandProjectLibrary> updateByProjectId(@Param("id")String id, @Param("version")String version);
void deleteByProjectId(@Param("projectId")String projectId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java
+3
View File
@@ -72,6 +72,9 @@ public class SarStandProjectLibrary extends BaseEntity {
@TableField(exist = false)
private String uName;
@TableField("detailed_list_version")
private String detailedListVersion;
//标准编号
@TableField(exist = false)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java
+2
View File
@@ -39,4 +39,6 @@ public class SarStandProjectLibraryDto {
private String productLine;
private String detailedListVersion;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+12 -3
View File
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -40,6 +41,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
private SarStandAttrInfoDao sarStandAttrInfoDao;
@Resource
private IDicTypeEOService iDicTypeEOService;
Date version = new Date();
@Override
public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize,
SarStandProjectLibraryDto sarDto) {
@@ -193,8 +197,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
@Override
public IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId, String cars) {
System.out.println(cars);
List<String> ids =new ArrayList<>();
//cars传回值为1时判断是从车型项目库中调取
if ("1".equals(cars)){
ids=sarStandProjectLibraryDao.getAllStand();
}
@@ -218,6 +222,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
System.out.println("总条数"+userIPage1.getTotal());
System.out.println("总页数"+userIPage1.getPages());
QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
if (ids.isEmpty()){
@@ -270,8 +275,12 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
@Override
public void batchInsert(List<StandProjectRelationDto> list) {
sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId());
sarStandProjectLibraryDao.batchInsert(list);
sarStandProjectLibraryDao.deleteByProjectId(list.get(0).getProjectId());
sarStandProjectLibraryDao.batchInsert(list);
sarStandProjectLibraryDao.updateByProjectId(list.get(0).getProjectId(), String.valueOf(version));
}
@Override
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")
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+7
View File
@@ -32,6 +32,13 @@
project_id= #{projectId}
</delete>
<update id="updateByProjectId">
update sar_stand_project_library
<if test="id != null">
set detailed_list_version = #{version} where id = #{id}
</if>
</update>
<select id="selectCount" resultType="java.lang.Integer">
SELECT
count(sar_stand_project_library.id ) as total
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<result column="ZCCSSRQ" property="ZCCSSRQ"/>
<result column="CLLX" property="applyType"/>
<result column="STAND_TYPE" property="standType"/>
<result column="ZRGCS" property="dutyEngineer"/>
<result column="DUTY_ENGINEER" property="dutyEngineer"/>
</resultMap>
<!-- 查询条件 -->
<select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">