车型项目库查询bug
This commit is contained in:
yuezhihang
+1
-1
@@ -22,7 +22,7 @@ import java.util.List;
|
||||
public interface SarLawsAttrDetailedListDao extends BaseMapper<SarLawsAttrDetailedList> {
|
||||
|
||||
//根据清单id，查出标准的id并排序
|
||||
List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size);
|
||||
List<String> selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size,@Param("sar") SarFindDto sarFindDto);
|
||||
//根据标准id查出数据
|
||||
List<LawsDto> selectLawsById(@Param("param1") List<String> LawsIds, @Param("sarFindDto") SarFindDto sarFindDto);
|
||||
//根据标准id查出数据用于清单查询
|
||||
|
||||
+3
@@ -23,5 +23,8 @@ public class SarFindDto {
|
||||
// private String ZCCSSRQGJ;
|
||||
private String zrbm;
|
||||
private String sycpx;
|
||||
private String standSort;
|
||||
private String standType;
|
||||
private String standNumber;
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
|
||||
wrapper.eq("detailed_list_id", sarFindDto.getId());
|
||||
IPage<SarLawsAttrDetailedList> selectPage = sarLawsAttrDetailedListDao.selectPage(pageRes,wrapper);
|
||||
//查询标准id
|
||||
List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize());
|
||||
List<String> lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto);
|
||||
if (CollectionUtils.isEmpty(lawsIds)){
|
||||
return null;
|
||||
}
|
||||
|
||||
+2
-2
@@ -94,10 +94,10 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
|
||||
public ResponseMessage getAllStand(Integer page,Integer pageSize, String sortKey,
|
||||
String countryArea, String projectName,
|
||||
String detailedList,
|
||||
String detailedListName) {
|
||||
String detailedListName,String carType) {
|
||||
if (StringUtils.isNotEmpty(sortKey)) {
|
||||
IPage<SarLawsDetailedList> publicList1 = sarLawsDetailedListService.AllSelectD(page, pageSize, sortKey,
|
||||
countryArea, projectName, detailedList, detailedListName);
|
||||
countryArea, projectName, detailedList, detailedListName,carType);
|
||||
List<SarLawsDetailedList> list= publicList1.getRecords();//从封装中取出数据
|
||||
List<FindFileNameDto> list1;//继承类集合实现
|
||||
list1 = BeanConverUtil.converList(list,FindFileNameDto.class);//将原来类的数据赋给继承类
|
||||
|
||||
+2
-1
@@ -40,5 +40,6 @@ public class AddDetailedDto {
|
||||
private String inforlist2;
|
||||
@ApiModelProperty(value = "新车型实施时间")
|
||||
private String inforlist3;
|
||||
|
||||
@ApiModelProperty(value = "车辆类别")
|
||||
private String carType;
|
||||
}
|
||||
|
||||
+3
@@ -81,5 +81,8 @@ public class SarLawsDetailedList extends BaseEntity {
|
||||
@TableField("file_id")
|
||||
private String fileIds;
|
||||
|
||||
@ApiModelProperty(value = "附件id")
|
||||
@TableField("car_type")
|
||||
private String carType;
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ public interface ISarLawsDetailedListService extends IService<SarLawsDetailedLis
|
||||
String add(AddDetailedDto addDetailedDto);
|
||||
IPage<SarLawsDetailedList> AllSelectD(Integer pages, Integer size, String sortKey,
|
||||
String countryArea,String projectName,
|
||||
String detailedList, String detailedListName);
|
||||
String detailedList, String detailedListName,String carType);
|
||||
// IPage<SarLawsDetailedList> selectAllP(Integer pages,Integer size,String sortKey);
|
||||
|
||||
String updateList(DetailedUpDto detailedUpDto);
|
||||
|
||||
+4
-2
@@ -73,6 +73,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
.remark(addDetailedDto.getRemark())
|
||||
.updatePeople(getUserName())
|
||||
.fileIds(addDetailedDto.getFileIds())
|
||||
.carType(addDetailedDto.getCarType())
|
||||
.build();
|
||||
List<TimeDto> timeDto = new ArrayList<>();
|
||||
switch (addDetailedDto.getSortKey()) {
|
||||
@@ -144,14 +145,15 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
|
||||
@Override
|
||||
public IPage<SarLawsDetailedList> AllSelectD(Integer page, Integer pageSize, String sortKey,
|
||||
String countryArea, String projectName,
|
||||
String detailedList, String detailedListName) {
|
||||
String detailedList, String detailedListName,String carType) {
|
||||
QueryWrapper<SarLawsDetailedList> wrapper = new QueryWrapper<>();
|
||||
if ("1".equals(sortKey)) {
|
||||
wrapper.like(StringUtils.isNotEmpty(countryArea), "country_area", countryArea).
|
||||
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
|
||||
} else if ("2".equals(sortKey)) {
|
||||
wrapper.like(StringUtils.isNotEmpty(projectName), "project_name", projectName).
|
||||
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
|
||||
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName).
|
||||
like(StringUtils.isNotEmpty(carType), "car_type", carType);
|
||||
|
||||
} else if ("3".equals(sortKey)) {
|
||||
wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList).
|
||||
|
||||
+1
-2
@@ -52,8 +52,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
|
||||
|
||||
@GetMapping("/queryProjectWorkFlow")
|
||||
@ApiOperation("车型/项目库")
|
||||
public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,
|
||||
SarStandProjectLibraryDto sarDto) {
|
||||
public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {
|
||||
IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto);
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
map.put("Maintenance",MaintenanceList);
|
||||
|
||||
+15
-1
@@ -65,10 +65,24 @@
|
||||
|
||||
<select id="selectLawsId" resultType="string">
|
||||
select stand_id from sar_laws_attr_detailed_list
|
||||
LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
|
||||
<where>
|
||||
<if test="standId != null">
|
||||
and detailed_list_id = #{standId,jdbcType=VARCHAR}
|
||||
and detailed_list_id = #{standId}
|
||||
</if>
|
||||
<if test="sar.standSort != null">
|
||||
and si.STAND_SORT = #{sar.standSort}
|
||||
</if>
|
||||
<if test="sar.standType != null">
|
||||
and si.STAND_TYPE = #{sar.standType}
|
||||
</if>
|
||||
<if test="sar.standNumber != null">
|
||||
and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
|
||||
</if>
|
||||
<if test="sar.standName != null">
|
||||
and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')
|
||||
</if>
|
||||
|
||||
</where>
|
||||
order by number
|
||||
LIMIT #{param3} , #{param2};
|
||||
|
||||
Reference in New Issue
Block a user