From 5e09c64e23aabbb714f458d4d7fbc85ad5686465 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 10 Jul 2023 09:22:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=B5=84=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/config/JacksonConfig.java | 3 ++- .../GovInvestmentPaymentController.java | 3 +-- .../GovInvestmentPaymentItemController.java | 3 +++ .../GovInvestmentPaymentStatController.java | 5 +++++ .../InvestmentPaymentItemController.java | 3 +++ .../InvestmentPaymentStatController.java | 5 +++++ .../safety/entity/InvestmentPaymentStat.java | 2 +- .../mapper/InvestmentContractMapper.java | 2 ++ .../mapper/InvestmentPaymentItemMapper.java | 9 ++++----- .../mapper/InvestmentPaymentStatMapper.java | 2 ++ .../service/IInvestmentPaymentService.java | 2 +- .../impl/InvestmentApplyServiceImpl.java | 4 ++++ .../impl/InvestmentPaymentServiceImpl.java | 20 ++++++++++++------- .../impl/ProjectSubItemServiceImpl.java | 2 +- .../magic/api/惠州项目管理政务版/投资管理.ms | 3 ++- .../magic/api/惠州项目管理项目版/支付管理.ms | 4 +++- .../magic/api/惠州项目管理项目版/项目信息.ms | 9 +++++++-- 17 files changed, 59 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/config/JacksonConfig.java b/src/main/java/com/zhgd/xmgl/config/JacksonConfig.java index 9e874cd..201c322 100644 --- a/src/main/java/com/zhgd/xmgl/config/JacksonConfig.java +++ b/src/main/java/com/zhgd/xmgl/config/JacksonConfig.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.config; +import com.fasterxml.jackson.databind.ser.std.NumberSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; @@ -20,6 +21,6 @@ public class JacksonConfig { return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder .serializerByType(Long.class, ToStringSerializer.instance) .serializerByType(Long.TYPE, ToStringSerializer.instance) - .serializerByType(BigDecimal.class, ToStringSerializer.instance); + .serializerByType(BigDecimal.class, NumberSerializer.instance); } } \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java index bc2f435..71841f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java @@ -91,8 +91,7 @@ public class GovInvestmentPaymentController { @ApiOperation(value = " 添加投资支付信息", notes = "添加投资支付信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody InvestmentPaymentVo investmentPaymentVo) { - investmentPaymentService.saveInfo(investmentPaymentVo); - return Result.success("添加成功！"); + return Result.success(investmentPaymentService.saveInfo(investmentPaymentVo)); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java index 987faec..82545b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java @@ -69,6 +69,9 @@ public class GovInvestmentPaymentItemController { @ApiOperation(value = " 列表查询投资支付子项信息", notes = "列表查询投资支付子项信息", httpMethod = "POST") @PostMapping(value = "/list") public Result> queryList(@RequestBody InvestmentPaymentItem investmentPaymentItem) { + if (null == investmentPaymentItem.getInvestmentApplyId()) { + return Result.success(null); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(investmentPaymentItem); List list = investmentPaymentItemService.list(queryWrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java index b786007..80b7d6a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java @@ -11,6 +11,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -46,6 +47,10 @@ public class GovInvestmentPaymentStatController { @ApiImplicitParam(name = "investmentApplyId", value = "投资支付申报ID", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/queryByApplyId") public Result queryPageList(@ApiIgnore @RequestBody Map map) { + String investmentApplyId = MapUtils.getString(map, "investmentApplyId"); + if (StringUtils.isBlank(investmentApplyId)) { + return Result.success(null); + } QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(InvestmentPaymentStat.class, map); return Result.success(investmentPaymentStatService.getOne(queryWrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentItemController.java index a30f65b..15be6d8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentItemController.java @@ -70,6 +70,9 @@ public class InvestmentPaymentItemController { @ApiOperation(value = " 列表查询投资支付子项信息", notes = "列表查询投资支付子项信息", httpMethod = "POST") @PostMapping(value = "/list") public Result> queryList(@RequestBody InvestmentPaymentItem investmentPaymentItem) { + if (null == investmentPaymentItem.getInvestmentApplyId()) { + return Result.success(null); + } QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(investmentPaymentItem); List list = investmentPaymentItemService.list(queryWrapper); return Result.success(list); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentStatController.java index f3cf772..9ecee7a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentPaymentStatController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -47,6 +48,10 @@ public class InvestmentPaymentStatController { @ApiImplicitParam(name = "investmentApplyId", value = "投资支付申报ID", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/queryByApplyId") public Result queryPageList(@ApiIgnore @RequestBody Map map) { + String investmentApplyId = MapUtils.getString(map, "investmentApplyId"); + if (StringUtils.isBlank(investmentApplyId)) { + return Result.success(null); + } QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(InvestmentPaymentStat.class, map); return Result.success(investmentPaymentStatService.getOne(queryWrapper)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/entity/InvestmentPaymentStat.java b/src/main/java/com/zhgd/xmgl/modules/safety/entity/InvestmentPaymentStat.java index 6b3e571..d9dafd7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/entity/InvestmentPaymentStat.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/entity/InvestmentPaymentStat.java @@ -34,7 +34,7 @@ public class InvestmentPaymentStat implements Serializable { */ @Excel(name = "投资支付申报ID", width = 15) @ApiModelProperty(value = "投资支付申报ID") - private Integer investmentApplyId; + private Long investmentApplyId; /** * 含税造价 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentContractMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentContractMapper.java index 906c32c..81f1ed3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentContractMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentContractMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.safety.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.safety.entity.InvestmentContract; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; * @version： V1.0 */ @Mapper +@DataScope public interface InvestmentContractMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentItemMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentItemMapper.java index 0bd4bd0..99e858c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentItemMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentItemMapper.java @@ -1,11 +1,9 @@ package com.zhgd.xmgl.modules.safety.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import com.zhgd.xmgl.modules.safety.entity.InvestmentPaymentItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.safety.entity.InvestmentPaymentItem; +import org.apache.ibatis.annotations.Mapper; /** * @Description: 投资支付子项 @@ -14,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @version： V1.0 */ @Mapper +@DataScope public interface InvestmentPaymentItemMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentStatMapper.java b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentStatMapper.java index a56d69a..7e442aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentStatMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentPaymentStatMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.safety.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.safety.entity.InvestmentPaymentStat; import org.apache.ibatis.annotations.Mapper; @@ -11,6 +12,7 @@ import org.apache.ibatis.annotations.Mapper; * @version： V1.0 */ @Mapper +@DataScope public interface InvestmentPaymentStatMapper extends BaseMapper { } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java index 017e7d3..93b0f2b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java @@ -12,7 +12,7 @@ import com.zhgd.xmgl.modules.safety.vo.InvestmentPaymentVo; */ public interface IInvestmentPaymentService extends IService { - boolean saveInfo(InvestmentPaymentVo investmentPaymentVo); + Long saveInfo(InvestmentPaymentVo investmentPaymentVo); boolean updateInfo(InvestmentPaymentVo investmentPaymentVo); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java index 1512b58..fbcae34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java @@ -48,10 +48,14 @@ public class InvestmentApplyServiceImpl extends ServiceImpl pageList(Map map) { String name = MapUtils.getString(map, "name"); + String projectSn = MapUtils.getString(map, "projectSn"); QueryWrapper wrapper = Wrappers.query(); if (StringUtils.isNotBlank(name)) { wrapper.like("a.name", name); } + if (StringUtils.isNotBlank(projectSn)) { + wrapper.eq("a.project_sn", projectSn); + } Page page = PageUtil.getPage(map); return baseMapper.pageList(page, wrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java index 3a5859b..aab0392 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentServiceImpl.java @@ -35,21 +35,27 @@ public class InvestmentPaymentServiceImpl extends ServiceImpllambdaQuery().eq(Engineering::getEngineeringSn, investmentPaymentVo.getEngineeringSn())).getProjectSn(); investmentPaymentVo.setProjectSn(projectSn); } - // 调整绑定申报列表信息 - build(investmentPaymentVo); - return this.save(investmentPaymentVo); + boolean flag = this.save(investmentPaymentVo); + if (flag) { + // 调整绑定申报列表信息 + build(investmentPaymentVo); + } + return investmentPaymentVo.getId(); } @Override public boolean updateInfo(InvestmentPaymentVo investmentPaymentVo) { - // 调整绑定申报列表信息 - build(investmentPaymentVo); - return this.updateById(investmentPaymentVo); + boolean flag = this.updateById(investmentPaymentVo); + if (flag) { + // 调整绑定申报列表信息 + build(investmentPaymentVo); + } + return flag; } private void build(InvestmentPaymentVo investmentPaymentVo) { diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java index eda4033..2364537 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java @@ -271,7 +271,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl= 0,datediff(end_work_date, now()), 0) residueDay, longitude, latitude FROM project WHERE #project") +var purpose = db.selectValue("SELECT dict_value FROM system_dict_data WHERE dict_type = 'engineering_purpose' AND dict_label = " + result.get("engineering_purpose")) +var style = db.selectValue("SELECT dict_value FROM system_dict_data WHERE dict_type = 'structural_style' AND dict_label = " + result.get("structure_type")) +result.put("engineering_purpose", purpose) +result.put("structure_type", style) +return result; \ No newline at end of file