diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java index 49cbfd3d..f3f714ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java @@ -15,13 +15,13 @@ import com.adc.da.base.web.BaseController; import java.util.List; /** -*

- * 标准制修订补助资金收支统计支出表 前端控制器 - *

-* -* @author super_liu -* @since 2021-11-12 -*/ + *

+ * 标准制修订补助资金收支统计支出表 前端控制器 + *

+ * + * @author super_liu + * @since 2021-11-12 + */ @RestController @Api(description = "|WgdZcb|") @RequestMapping("api/wgdCensusLeo/wgd-zcb") @@ -30,13 +30,14 @@ public class WgdZcbController extends BaseController { IWgdZcbService iWgdZcbService; @GetMapping("/getAllZcbs") - public ResponseMessage getAllWgdZcbs(){//查询所有 + public ResponseMessage getAllWgdZcbs() {//查询所有 return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") - public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 + public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb) {//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); return Result.success(pageInfo); @@ -60,13 +61,13 @@ public class WgdZcbController extends BaseController { } @PostMapping("/delZcb") - ResponseMessage deleteWgdZcb(String id){//删除 + ResponseMessage deleteWgdZcb(String id) {//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } @ApiOperation("删除") @PostMapping("/delZcbs") - ResponseMessage deleteWgdZcbs(String ids){//批量删除 + ResponseMessage deleteWgdZcbs(String ids) {//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java index a47c4c65..0ee8a508 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java @@ -35,10 +35,9 @@ public class WgdZcb extends BasePage { private String cost; @ApiModelProperty(value = "用途") - private String use; + private String purposes; @ApiModelProperty(value = "详细附件") - private String annex; - + private String annexs; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml index 51767b4d..d834b30d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml @@ -3,7 +3,7 @@ - id,name,cost,use,annex + id,name,cost,purposes,annexs @@ -12,18 +12,17 @@ and id = #{id} - and name like concat('%',#{name},'%') + and name = #{name} - and cost like concat('%',#{cost},'%') + and cost = #{cost} - - and use like concat('%',#{use},'%') + + and purposes = #{purposes} - - and annex = #{annex} + + and annexs = #{annexs} -