From d7c9a117b5ef1c4a4083bc051ea0da48724de80c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 5 Jan 2022 15:44:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/Impl/SarPublicIdeaServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java index 2a9b9275..28c53f45 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/service/Impl/SarPublicIdeaServiceImpl.java @@ -47,11 +47,19 @@ public class SarPublicIdeaServiceImpl extends ServiceImpl selectAllP(Integer p, Integer size, String category, String cname, Date start, Date end, String type) { QueryWrapper list = new QueryWrapper<>(); if ("1".equals(type)) { - list.like(StringUtils.isNotEmpty(category), "category", category) - .like(StringUtils.isNotEmpty(cname), "cid", cname) - .ge(start != null, "start_time", start) - .le(end != null, "end_time", end) - .orderByDesc("start_time"); + if (start!=null && end !=null){ + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .ge(start != null, "start_time", start) + .le(end != null, "end_time", end) + .orderByDesc("start_time"); + }else { + list.like(StringUtils.isNotEmpty(category), "category", category) + .like(StringUtils.isNotEmpty(cname), "cid", cname) + .le(start != null, "start_time", start) + .ge(end != null, "end_time", end) + .orderByDesc("start_time"); + } } else { list.like(StringUtils.isNotEmpty(category), "category", category) .like(StringUtils.isNotEmpty(cname), "cname", cname) From 055b3a7fc5419cd3b710afe949c2b9f710c5cecf Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 5 Jan 2022 16:18:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=20=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarPublicIdeaAllController.java | 6 +++++- .../sarStandIdea/dao/SarPublicIdeaAllDao.java | 2 ++ .../sarStandIdea/SarPublicIdeaAllMapper.xml | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java index 7c8206fc..dbd56663 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java @@ -118,7 +118,11 @@ public class SarPublicIdeaAllController extends BaseController response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); List data=new ArrayList<>(); if (!StringUtils.isEmpty(cid)){ - data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type); + if (null!=type) { + data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type); + }else { + data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type); + } } List standExcel=new ArrayList<>(); List standExcel2=new ArrayList<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java index d361e5ee..2f4ffad1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java @@ -28,4 +28,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper { Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId); List getPublicAllIdea(@Param("cid") String cid,@Param("type")String type); + + List getPublicAllIdeaExport(@Param("cid") String cid,@Param("type")String type); } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index 7809c344..a9f5c8c2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -46,4 +46,19 @@ ORDER BY part_code ASC + + From a956ea2526389bb268e97c0ba0a2324f4373b1f4 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 5 Jan 2022 17:53:15 +0800 Subject: [PATCH 3/4] feat: There is no way the, --- .../esRevisePlan/entity/EsRevisePlan.java | 4 ++++ .../controller/TsInstitutionController.java | 6 ++++++ .../sarInstitution/dao/TsInstitutionDao.java | 2 ++ .../service/ITsInstitutionService.java | 2 ++ .../impl/TsInstitutionServiceImpl.java | 7 +++++++ .../esRevisePlan/EsRevisePlanMapper.xml | 1 + .../sarInstitution/TsInstitutionMapper.xml | 20 +++++++++++++++++++ 7 files changed, 42 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index 9fb2b8e5..e355d68a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -94,6 +94,10 @@ public class EsRevisePlan extends BasePage { //企标类别 private String standType; + // 标准编号 + private String standNum; + + @ApiModelProperty(value = "企标类别") private String esMatingRelations; private String esStandRelations; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index 606e6e98..9028d757 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -80,6 +80,12 @@ public class TsInstitutionController extends BaseController { return Result.success(); } + @ApiOperation("根据部门ID获取部门下所有用户") + @GetMapping("/getInstitutionIdToDept") + public List getInstitutionIdToDept(String institutionIds,String userName){ + return tsInstitutionService.getInstitutionIdToDept(institutionIds,userName); + } + @ApiOperation("获得下一级的部门和人员") @GetMapping("/getNext") public List getNext(String institutionId,String userName){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index 619e6efd..c2565c52 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper { */ List selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName); + List selectNextUsers(@Param("institutionIds") List institutionIds,@Param("userName") String userName); + List selectNextUserByIds(@Param("ids") List ids); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java index 892228b0..92409ed4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java @@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService { */ public List getNext(String institutionId,String userName); + public List getInstitutionIdToDept(String institutionIds,String userName); + public List getNextById(String ids); /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 5f117ceb..d3e52881 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -200,6 +200,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitutionIdToDept(String institutionIds,String userName){ + List strings=new ArrayList<>(Arrays.asList(institutionIds.split(","))); + List tsUsers=tsInstitutionDao.selectNextUsers(strings,userName); + return tsUsers; + } + /** * 通过部门id获得这个部门下的下一级部门 * @return diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index a6f35511..6128110c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -209,6 +209,7 @@ es_revise_plan.buss_sort, sar_bussioness_stand.STAND_CODE as rqbName, sar_bussioness_stand.STAND_SORT as standType, + sar_bussioness_stand.stand_number as standNum, (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName, (SELECT GROUP_CONCAT(UNAME) from ts_user WHERE find_in_set(USID,drafter) ) as drafterName, (SELECT GROUP_CONCAT(ts_dictype.DIC_TYPE_NAME) from ts_dictype WHERE find_in_set(ts_dictype.DIC_TYPE_CODE,area) ) as areaName, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index 5e8f9d90..fdf3da7b 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -35,6 +35,26 @@ WHERE parent_id=#{institutionId} + +