From 5739c85c96cdfaaaf22b7fe0ee338f13f13b90e7 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Mon, 13 Dec 2021 17:04:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=88=86?= =?UTF-8?q?=E6=A0=87=E5=A7=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCaseCommitteeSubitemController.java | 36 +++++++++++ .../controller/PayCaseCouncilController.java | 5 -- .../PayCaseCouncilSubitemController.java | 64 +++++++++++++++---- .../java/com/jero/data/entity/FindByName.java | 3 + .../com/jero/data/entity/councilList.java | 3 + .../mapper/PayCaseCommitteeSubitemMapper.java | 2 + .../mapper/PayCaseCouncilSubitemMapper.java | 1 + .../xml/PayCaseCommitteeSubitemMapper.xml | 43 +++++++++++++ .../xml/PayCaseCouncilSubitemMapper.xml | 40 +++++++++++- .../IPayCaseCommitteeSubitemService.java | 3 + .../IPayCaseCouncilSubitemService.java | 2 + .../PayCaseCommitteeSubitemServiceImpl.java | 5 ++ .../PayCaseCouncilSubitemServiceImpl.java | 5 ++ .../PayResearchProjectController.java | 30 ++++----- .../project/entity/PayResearchProject.java | 2 +- 15 files changed, 208 insertions(+), 36 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index f5b994b5..6e89786d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -112,6 +112,42 @@ public class PayCaseCommitteeSubitemController extends JeroController findTwo( + @RequestParam(name="fenBiaoWeiName",required =false) String fenBiaoWeiName, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + //模糊查询%_特殊字符bug + String fenBiaoWeiNames = oConvertUtils.replaceAllPercent(fenBiaoWeiName); + LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payCaseCommitteeSubitemService.listThreeTwo(page,sysUser.getId(),fenBiaoWeiNames); + if (!CollectionUtils.isEmpty(pageList.getRecords())) { + try { + pageList.getRecords().forEach(p -> { + if (!CollectionUtils.isEmpty(p.getList())) { + for (ChildrenFindByName q:p.getList() + ) { + if (!org.apache.commons.lang3.StringUtils.isBlank(q.getPhone())){ + q.setPhone(PasswordUtil.decrypt(q.getPhone())); + } + } + } + }); + + } catch (Exception e) { + log.error("手机号、邮箱解密异常！", e); + } + } + return Result.OK(pageList); + } /** * 列表查询 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java index a734f11f..a2e55476 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java @@ -1,12 +1,7 @@ package com.jero.data.controller; -import java.util.Arrays; import java.util.List; -import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java index 40352e4e..a6a619b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -98,6 +98,42 @@ public class PayCaseCouncilSubitemController extends JeroController findTwo( + @RequestParam(name="councilName",required =false) String councilName, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + //模糊查询%_特殊字符bug + String councilNames = oConvertUtils.replaceAllPercent(councilName); + LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payCaseCouncilSubitemService.listThreeTwo(page,sysUser.getId(),councilNames); + if (!CollectionUtils.isEmpty(pageList.getRecords())) { + try { + pageList.getRecords().forEach(p -> { + if (!CollectionUtils.isEmpty(p.getList())) { + for ( subCouncil q:p.getList() + ) { + if (!org.apache.commons.lang3.StringUtils.isBlank(q.getPhone())){ + q.setPhone(PasswordUtil.decrypt(q.getPhone())); + } + } + } + }); + + } catch (Exception e) { + log.error("手机号、邮箱解密异常！", e); + } + } + return Result.OK(pageList); + } /** * 添加 */ @@ -138,20 +174,20 @@ public class PayCaseCouncilSubitemController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { -// this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(","))); -// return Result.OK("批量删除成功!"); -// } + /** + * 批量删除 + * + * @param ids + * @return + */ + @RequiresPermissions("council:batchDel") + @AutoLog(value = "理事会成员-批量删除") + @ApiOperation(value="理事会成员-批量删除", notes="理事会成员-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } // // /** // * 通过id查询 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java index 0acd1e07..02efaa5b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/FindByName.java @@ -21,6 +21,9 @@ public class FindByName implements Serializable { @ApiModelProperty(value = "备注") private java.lang.String remarks; + @ApiModelProperty(value = "负责人") + private java.lang.String principal; + @ApiModelProperty(value = "子目录分标委成员") private List list; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java index 60ddcd8d..6d1ca68f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java @@ -18,6 +18,9 @@ public class councilList implements Serializable { @ApiModelProperty(value = "目标简称") private String remarks; + @ApiModelProperty(value = "负责人") + private java.lang.String principal; + @ApiModelProperty(value = "理事会成员") private List list; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java index cc71e30e..18f1e2e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeSubitemMapper.java @@ -31,5 +31,7 @@ public interface PayCaseCommitteeSubitemMapper extends BaseMapper chooseExcel(ArrayList idList); + IPage listThreeTwo(Page page,@Param("id") String id, @Param("fenBiaoWeiNames")String fenBiaoWeiNames); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java index ab4fd9a5..c51cb490 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java @@ -26,4 +26,5 @@ public interface PayCaseCouncilSubitemMapper extends BaseMapper listForExcel(@Param("contactsNames")String contactsNames, @Param("companyNames")String companyNames,@Param("councilNames") String councilNames); + IPage listThreeTwo(Page page, @Param("id")String id,@Param("councilNames") String councilNames); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 057ea90a..3641058d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -104,4 +104,47 @@ + + + + + + + + + + + + + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml index 8579c044..97019c29 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -92,7 +92,45 @@ + - + + + + + + + + + + + + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java index d5386709..9458c9fa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java @@ -30,4 +30,7 @@ public interface IPayCaseCommitteeSubitemService extends IService listForExcel(String name, String companyName, String councilName); List chooseExcel(ArrayList idList); + + IPage listThreeTwo(Page page, String id, String fenBiaoWeiNames); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java index 8da94f32..be368776 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java @@ -25,4 +25,6 @@ public interface IPayCaseCouncilSubitemService extends IService chooseExcel(ArrayList idList); + IPage listThreeTwo(Page page, String id, String councilNames); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java index 35f84b86..e12fa74c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -55,4 +55,9 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl chooseExcel(ArrayList idList) { return payCaseCommitteeSubitemMapper.chooseExcel(idList); } + + @Override + public IPage listThreeTwo(Page page, String id, String fenBiaoWeiNames) { + return payCaseCommitteeSubitemMapper.listThreeTwo(page,id,fenBiaoWeiNames); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java index f463d547..b5303955 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -42,5 +42,10 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl listThreeTwo(Page page, String id, String councilNames) { + return payCaseCouncilSubitemMapper.listThreeTwo(page,id,councilNames); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java index 70c06d31..f2d50ff3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayResearchProjectController.java @@ -21,12 +21,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** - * @Description: pay_research_project + * @Description: 在研项目 * @Author: jeecg-boot * @Date: 2021-12-13 * @Version: V1.0 */ -@Api(tags="pay_research_project") +@Api(tags="在研项目") @RestController @RequestMapping("/payResearchProject/payResearchProject") @Slf4j @@ -43,8 +43,8 @@ public class PayResearchProjectController extends JeroController queryPageList(PayResearchProject payResearchProject, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -62,8 +62,8 @@ public class PayResearchProjectController extends JeroController add(@RequestBody PayResearchProject payResearchProject) { payResearchProjectService.save(payResearchProject); @@ -76,8 +76,8 @@ public class PayResearchProjectController extends JeroController edit(@RequestBody PayResearchProject payResearchProject) { payResearchProjectService.updateById(payResearchProject); @@ -90,8 +90,8 @@ public class PayResearchProjectController extends JeroController delete(@RequestParam(name="id",required=true) String id) { payResearchProjectService.removeById(id); @@ -104,8 +104,8 @@ public class PayResearchProjectController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.payResearchProjectService.removeByIds(Arrays.asList(ids.split(","))); @@ -118,8 +118,8 @@ public class PayResearchProjectController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { PayResearchProject payResearchProject = payResearchProjectService.getById(id); @@ -137,7 +137,7 @@ public class PayResearchProjectController extends JeroController