diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java index ed36ebde..361864bd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/dao/SarLawsAttrDetailedListDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.dao; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; +import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarLawsAttrDetailedList; import com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -23,7 +24,7 @@ public interface SarLawsAttrDetailedListDao extends BaseMapper selectLawsId(@Param("standId") String standId,@Param("param3") Integer page,@Param("param2") Integer size); //根据标准id查出数据 - List selectLawsById(@Param("param1") List LawsIds, @Param("standName") String standName); + List selectLawsById(@Param("param1") List LawsIds, @Param("sarFindDto") SarFindDto sarFindDto); //根据标准id查出数据 List selectLawsByIdC(@Param("param1") List LawsIds, @Param("standName") String standName,@Param("standType")String standType); //查询时间 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java index 1b1af5f2..3357aebb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/SarFindDto.java @@ -1,9 +1,5 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.entity; -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -18,13 +14,13 @@ public class SarFindDto { private int Size; private String id; private String standName; - private String standNumber; +// private String standNumber; private String standEnName; private String typeApplicable; private String NYLX; - private String putTime; - private String XCXSSRQGJ; - private String ZCCSSRQGJ; +// private String putTime; +// private String XCXSSRQGJ; +// private String ZCCSSRQGJ; private String ZRBM; private String SYCPX; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index 6dfd5fbf..40385d8d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -43,7 +43,7 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto.getStandName()); + List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("stand_id",lawsDto.getId()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index e9e145da..9a04b236 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -24,9 +24,10 @@ import org.springframework.stereotype.Service; import java.util.*; import static com.adc.da.login.util.UserUtils.getUserName; + /** *

- * 服务实现类 + * 服务实现类 *

* * @author szc @@ -49,8 +50,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl idList) { QueryWrapper wrapper = new QueryWrapper<>(); - for (String id:idList){ - wrapper.eq("detailed_list_id",id); + for (String id : idList) { + wrapper.eq("detailed_list_id", id); sarLawsAttrDetailedListDao.delete(wrapper); } sarLawsDetailedListDao.deleteBatchIds(idList); @@ -59,6 +60,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); switch (addDetailedDto.getSortKey()) { case "1": sarLawsDetailedList.setCountryArea(addDetailedDto.getCountryArea()); + if (addDetailedDto.getInforlist()!=null){ + if (addDetailedDto.getInforlist().contains(",")){ + String[] id = addDetailedDto.getInforlist().split(","); + String[] putTime = addDetailedDto.getInforlist1().split(","); + String[] zcc = addDetailedDto.getInforlist2().split(","); + String[] xcx = addDetailedDto.getInforlist3().split(","); + for (int a =0;a< id.length;a++){ + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])){ + dto.setPutTime(null); + }else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])){ + dto.setXcxssrqgj(null); + }else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])){ + dto.setZccssrqgj(null); + }else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + dto.setPutTime(addDetailedDto.getInforlist1()); + dto.setXcxssrqgj(addDetailedDto.getInforlist2()); + dto.setZccssrqgj(addDetailedDto.getInforlist3()); + timeDto.add(dto); + } + }else { + timeDto=null; + } + break; case "2": sarLawsDetailedList.setProjectName(addDetailedDto.getProjectName()); + if (addDetailedDto.getInforlist() != null){ + if (addDetailedDto.getInforlist().contains(",")){ + String[] id = addDetailedDto.getInforlist().split(","); + for (String standId:id){ + TimeDto dto = new TimeDto(); + dto.setStandId(standId); + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + timeDto.add(dto); + } + }else { + timeDto=null; + } + break; case "3": sarLawsDetailedList.setDetailedList(addDetailedDto.getDetailedList()); + if (addDetailedDto.getInforlist() != null){ + if (addDetailedDto.getInforlist().contains(",")){ + String[] id = addDetailedDto.getInforlist().split(","); + for (String standId:id){ + TimeDto dto = new TimeDto(); + dto.setStandId(standId); + timeDto.add(dto); + } + }else { + TimeDto dto = new TimeDto(); + dto.setStandId(addDetailedDto.getInforlist()); + timeDto.add(dto); + } + }else { + timeDto=null; + } break; default: break; @@ -89,42 +163,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (addDetailedDto.getInforlist().indexOf(",") >= 0){ - String[] id = addDetailedDto.getInforlist().split(","); - String[] putTime = addDetailedDto.getInforlist1().split(","); - String[] zcc = addDetailedDto.getInforlist2().split(","); - String[] xcx = addDetailedDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ - TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ - dto.setPutTime(null); - }else { - dto.setPutTime(putTime[a]); - } - if ("\"".equals(putTime[a])){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("\"".equals(putTime[a])){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } - timeDto.add(dto); - } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(addDetailedDto.getInforlist()); - dto.setPutTime(addDetailedDto.getInforlist1()); - dto.setXcxssrqgj(addDetailedDto.getInforlist2()); - dto.setZccssrqgj(addDetailedDto.getInforlist3()); - timeDto.add(dto); - } - service.insertDetailedList(sarLawsDetailedList.getId(),timeDto); } catch (Exception e) { @@ -136,41 +174,41 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl AllSelectD(Integer page, Integer pageSize, String sortKey, - String countryArea,String projectName, - String detailedList,String detailedListName) { + String countryArea, String projectName, + String detailedList, String detailedListName) { QueryWrapper 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); + 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); - }else if ("3".equals(sortKey)){ - wrapper.like(StringUtils.isNotEmpty(detailedList),"detailed_list_state",detailedList). - like(StringUtils.isNotEmpty(detailedListName),"detailed_list_name",detailedListName); + } else if ("3".equals(sortKey)) { + wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list_state", detailedList). + like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName); } - wrapper.eq("sort_key",sortKey); + wrapper.eq("sort_key", sortKey); Page pageRes = new Page<>(page, pageSize); IPage userIPage = sarLawsDetailedListDao.selectPage(pageRes, wrapper); - if ("1".equals(sortKey)){ - Map map= iDicTypeEOService.getDicTypeListCode(); - List list= userIPage.getRecords(); - List> arr = (List>)map.get("COUNTRY"); - for (SarLawsDetailedList list1:list){ - if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")){ + if ("1".equals(sortKey)) { + Map map = iDicTypeEOService.getDicTypeListCode(); + List list = userIPage.getRecords(); + List> arr = (List>) map.get("COUNTRY"); + for (SarLawsDetailedList list1 : list) { + if (StringUtils.isNotBlank(list1.getCountryArea()) && list1.getCountryArea().contains(",")) { String[] split = list1.getCountryArea().split(","); StringBuilder builder = new StringBuilder(); - for (String s:split){ - for (Map map1:arr) { - if (map1.get("value").equals(s)){ - s=map1.get("label"); - builder.append(s+","); + for (String s : split) { + for (Map map1 : arr) { + if (map1.get("value").equals(s)) { + s = map1.get("label"); + builder.append(s + ","); break; } } } - String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + String completedString = builder.delete(builder.length() - 1, builder.length()).toString(); list1.setCountryArea(completedString); } } @@ -229,42 +267,44 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl timeDto = new ArrayList<>(); - if (detailedUpDto.getInforlist().indexOf(",") >= 0){ - String[] id = detailedUpDto.getInforlist().split(","); - String[] putTime = detailedUpDto.getInforlist1().split(","); - String[] zcc = detailedUpDto.getInforlist2().split(","); - String[] xcx = detailedUpDto.getInforlist3().split(","); - for (int a =0;a< id.length;a++){ + if (null != detailedUpDto.getInforlist()) { + detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1)); + List timeDto = new ArrayList<>(); + if (detailedUpDto.getInforlist().indexOf(",") >= 0) { + String[] id = detailedUpDto.getInforlist().split(","); + String[] putTime = detailedUpDto.getInforlist1().split(","); + String[] zcc = detailedUpDto.getInforlist2().split(","); + String[] xcx = detailedUpDto.getInforlist3().split(","); + for (int a = 0; a < id.length; a++) { + TimeDto dto = new TimeDto(); + dto.setStandId(id[a]); + if ("\"".equals(putTime[a])) { + dto.setPutTime(null); + } else { + dto.setPutTime(putTime[a]); + } + if ("\"".equals(putTime[a])) { + dto.setXcxssrqgj(null); + } else { + dto.setXcxssrqgj(xcx[a]); + } + if ("\"".equals(putTime[a])) { + dto.setZccssrqgj(null); + } else { + dto.setZccssrqgj(zcc[a]); + } + timeDto.add(dto); + } + } else { TimeDto dto = new TimeDto(); - dto.setStandId(id[a]); - if ("\"".equals(putTime[a])){ - dto.setPutTime(null); - }else { - dto.setPutTime(putTime[a]); - } - if ("\"".equals(putTime[a])){ - dto.setXcxssrqgj(null); - }else { - dto.setXcxssrqgj(xcx[a]); - } - if ("\"".equals(putTime[a])){ - dto.setZccssrqgj(null); - }else { - dto.setZccssrqgj(zcc[a]); - } + dto.setStandId(detailedUpDto.getInforlist()); + dto.setPutTime(detailedUpDto.getInforlist1()); + dto.setXcxssrqgj(detailedUpDto.getInforlist2()); + dto.setZccssrqgj(detailedUpDto.getInforlist3()); timeDto.add(dto); } - }else { - TimeDto dto = new TimeDto(); - dto.setStandId(detailedUpDto.getInforlist()); - dto.setPutTime(detailedUpDto.getInforlist1()); - dto.setXcxssrqgj(detailedUpDto.getInforlist2()); - dto.setZccssrqgj(detailedUpDto.getInforlist3()); - timeDto.add(dto); + service.updateDetailedLaws(detailedUpDto.getId(), timeDto); } - service.updateDetailedLaws(detailedUpDto.getId(), timeDto); return "修改成功"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 6f861693..f88e9faa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -136,8 +136,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("product_line","project_manager","uName"); - wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid group by sar_stand_project_library.product_line"); + wrapper.select("distinct product_line","project_manager as projectManager","uName"); + wrapper.last("inner join ts_user t on sar_stand_project_library.project_manager=t.usid"); Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index f45817e6..347f77df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -140,12 +140,15 @@ public class SarStandUnqualified extends BaseEntity { @ApiModelProperty(value = "质量工程师") + @TableField(exist=false) private String qaEngineerName; @ApiModelProperty(value = "认证工程师") + @TableField(exist=false) private String authEngineerName; @ApiModelProperty(value = "责任工程师") + @TableField(exist=false) private String dutyEngineerName; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index b8a5e760..6dbff739 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -2,18 +2,38 @@ - SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - - (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') - or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')) + + (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%') + or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')) + and + + + a.STAND_EN_NAME LIKE concat ('%',#{sarFindDto.standEnName,jdbcType=VARCHAR},'%') + and + + + b.CLLX LIKE concat ('%',#{sarFindDto.typeApplicable,jdbcType=VARCHAR},'%') + and + + + b.NYLX LIKE concat ('%',#{sarFindDto.NYLX,jdbcType=VARCHAR},'%') + and + + + b.ZRBM LIKE concat ('%',#{sarFindDto.ZRBM,jdbcType=VARCHAR},'%') + and + + + b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%') and a.ID IN - + #{item} @@ -41,13 +61,8 @@ order by number - + - INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES + INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES - (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR}) + (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR})