From 7e16815b2d665f7047e53b41ad9eec3e687d3e04 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 16 Nov 2021 16:19:56 +0800 Subject: [PATCH 1/9] ~ --- .../controller/WgdCgfyController.java | 2 +- .../controller/WgdCommiInfoController.java | 70 ------------------- .../service/impl/WgdCommiInfoServiceImpl.java | 1 - 3 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java index 93648137..e3a2d245 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -26,7 +26,7 @@ import java.util.List; */ @RestController @Api(description = "|WgdCgfy|") -@RequestMapping("/wgdCensusLeo/wgd-cgfy") +@RequestMapping("api/wgdCensusLeo/wgd-cgfy") public class WgdCgfyController extends BaseController { @Autowired diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java deleted file mode 100644 index b3df81d3..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.adc.da.slrs.wgdCensusZ.controller; - - -import com.adc.da.http.PageInfo; -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; -import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; -import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; -import com.adc.da.base.web.BaseController; - -import java.util.List; - -/** -*

- * 委员信息数据统计 前端控制器 - *

-* -* @author zcr -* @since 2021-11-12 -*/ -@RestController -@Api(description = "|WgdCommiInfo|") -@RequestMapping("api/wgdCensusZ/wgd-commi-info") -public class WgdCommiInfoController extends BaseController { - @Autowired - IWgdCommiInfoService iWgdCommiInfoService; - - @GetMapping("getAllCommiInfos") - public ResponseMessage getAllWgdCommiInfos(){//查询所有 - return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); - } - - @PostMapping("queryAllCommiInfos") - public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 - List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); - PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos); - return Result.success(pageInfo); - } - - @GetMapping("getCommiInfoById") - public ResponseMessage getWgdCommiInfoById(String id) {//查询详情 - return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id)); - } - - @PostMapping("modCommiInfo") - ResponseMessage updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 - return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo)); - } - - @PostMapping("addCommiInfo") - ResponseMessage insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 - return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo)); - } - - @GetMapping("delCommiInfo") - ResponseMessage deleteWgdCommiInfo(String id){//删除 - return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); - } - - @GetMapping("delCommiInfos") - ResponseMessage deleteWgdCommiInfos(String ids){//批量删除 - return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids)); - } -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java index fbea8d2a..a3d4d6af 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java @@ -25,7 +25,6 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl getAllWgdCommiInfos() { return wgdCommiInfoDao.selectAll(); From bca00a0b5dab62c0db29ce409acfc2e8f4cd94fd Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 16 Nov 2021 17:29:49 +0800 Subject: [PATCH 2/9] ~ --- .../controller/WgdCgfyController.java | 33 +++++++++---------- .../controller/WgdFyfyController.java | 16 ++++----- .../controller/WgdSrbController.java | 16 ++++----- .../controller/WgdWbtjController.java | 16 ++++----- .../controller/WgdWbxdController.java | 16 ++++----- .../controller/WgdZcbController.java | 16 ++++----- .../service/impl/WgdCgfyServiceImpl.java | 4 +-- 7 files changed, 58 insertions(+), 59 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java index e3a2d245..854680d8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -1,70 +1,69 @@ package com.adc.da.slrs.wgdCensusLeo.controller; -import com.adc.da.base.web.BaseController; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; -import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RestController; +import com.adc.da.base.web.BaseController; import java.util.List; /** -*

- * 采购费用信息统计 前端控制器 - *

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

+ * 委员信息数据统计 前端控制器 + *

+ * + * @author zcr + * @since 2021-11-12 + */ @RestController @Api(description = "|WgdCgfy|") @RequestMapping("api/wgdCensusLeo/wgd-cgfy") public class WgdCgfyController extends BaseController { - @Autowired IWgdCgfyService iWgdCgfyService; - @GetMapping("getAllCgfys") + @GetMapping("/getAllCgfys") public ResponseMessage getAllWgdCgfys(){//查询所有 return Result.success(iWgdCgfyService.getAllWgdCgfys()); } - @PostMapping("queryAllCgfys") + @PostMapping("/queryAllCgfys") public ResponseMessage queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询 List wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy); PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys); return Result.success(pageInfo); } - @GetMapping("getCgfyById") + @GetMapping("/getCgfyById") public ResponseMessage getWgdCgfyById(String id) {//查询详情 return Result.success(iWgdCgfyService.getWgdCgfyById(id)); } - @PostMapping("modCgfy") + @PostMapping("/modCgfy") ResponseMessage updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑 return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy)); } - @PostMapping("addCgfy") + @PostMapping("/addCgfy") ResponseMessage insertWgdCgfy(WgdCgfy WgdCgfy) {//插入 return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy)); } - @GetMapping("delCgfy") + @GetMapping("/delCgfy") ResponseMessage deleteWgdCgfy(String id){//删除 return Result.success(iWgdCgfyService.deleteWgdCgfy(id)); } - @GetMapping("delCgfys") + @GetMapping("/delCgfys") ResponseMessage deleteWgdCgfys(String ids){//批量删除 return Result.success(iWgdCgfyService.deleteWgdCgfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java index be878baa..7ffb5987 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -26,44 +26,44 @@ import java.util.List; */ @RestController @Api(description = "|WgdFyfy|") -@RequestMapping("/wgdCensusLeo/wgd-fyfy") +@RequestMapping("api/wgdCensusLeo/wgd-fyfy") public class WgdFyfyController extends BaseController { @Autowired IWgdFyfyService iWgdFyfyService; - @GetMapping("getAllFyfys") + @GetMapping("/getAllFyfys") public ResponseMessage getAllWgdFyfys(){//查询所有 return Result.success(iWgdFyfyService.getAllWgdFyfys()); } - @PostMapping("queryAllFyfys") + @PostMapping("/queryAllFyfys") public ResponseMessage queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询 List wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy); PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys); return Result.success(pageInfo); } - @GetMapping("getFyfyById") + @GetMapping("/getFyfyById") public ResponseMessage getWgdFyfyById(String id) {//查询详情 return Result.success(iWgdFyfyService.getWgdFyfyById(id)); } - @PostMapping("modFyfy") + @PostMapping("/modFyfy") ResponseMessage updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑 return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy)); } - @PostMapping("addFyfy") + @PostMapping("/addFyfy") ResponseMessage insertWgdFyfy(WgdFyfy WgdFyfy) {//插入 return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy)); } - @GetMapping("delFyfy") + @GetMapping("/delFyfy") ResponseMessage deleteWgdFyfy(String id){//删除 return Result.success(iWgdFyfyService.deleteWgdFyfy(id)); } - @GetMapping("delFyfys") + @GetMapping("/delFyfys") ResponseMessage deleteWgdFyfys(String ids){//批量删除 return Result.success(iWgdFyfyService.deleteWgdFyfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java index 53a5d130..08fd79b4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -26,44 +26,44 @@ import java.util.List; */ @RestController @Api(description = "|WgdSrb|") -@RequestMapping("/wgdCensusLeo/wgd-srb") +@RequestMapping("api/wgdCensusLeo/wgd-srb") public class WgdSrbController extends BaseController { @Autowired IWgdSrbService iWgdSrbService; - @GetMapping("getAllSrbs") + @GetMapping("/getAllSrbs") public ResponseMessage getAllWgdSrbs(){//查询所有 return Result.success(iWgdSrbService.getAllWgdSrbs()); } - @PostMapping("queryAllSrbs") + @PostMapping("/queryAllSrbs") public ResponseMessage queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询 List wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb); PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs); return Result.success(pageInfo); } - @GetMapping("getSrbById") + @GetMapping("/getSrbById") public ResponseMessage getWgdSrbById(String id) {//查询详情 return Result.success(iWgdSrbService.getWgdSrbById(id)); } - @PostMapping("modSrb") + @PostMapping("/modSrb") ResponseMessage updateWgdSrb(WgdSrb WgdSrb) {//编辑 return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb)); } - @PostMapping("addSrb") + @PostMapping("/addSrb") ResponseMessage insertWgdSrb(WgdSrb WgdSrb) {//插入 return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb)); } - @GetMapping("delSrb") + @GetMapping("/delSrb") ResponseMessage deleteWgdSrb(String id){//删除 return Result.success(iWgdSrbService.deleteWgdSrb(id)); } - @GetMapping("delSrbs") + @GetMapping("/delSrbs") ResponseMessage deleteWgdSrbs(String ids){//批量删除 return Result.success(iWgdSrbService.deleteWgdSrbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java index e581b18d..55da40a6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -26,44 +26,44 @@ import java.util.List; */ @RestController @Api(description = "|WgdWbtj|") -@RequestMapping("/wgdCensusLeo/wgd-wbtj") +@RequestMapping("api/wgdCensusLeo/wgd-wbtj") public class WgdWbtjController extends BaseController { @Autowired IWgdWbtjService iWgdWbtjService; - @GetMapping("getAllWbtjs") + @GetMapping("/getAllWbtjs") public ResponseMessage getAllWgdWbtjs(){//查询所有 return Result.success(iWgdWbtjService.getAllWgdWbtjs()); } - @PostMapping("queryAllWbtjs") + @PostMapping("/queryAllWbtjs") public ResponseMessage queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询 List wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj); PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs); return Result.success(pageInfo); } - @GetMapping("getWbtjById") + @GetMapping("/getWbtjById") public ResponseMessage getWgdWbtjById(String id) {//查询详情 return Result.success(iWgdWbtjService.getWgdWbtjById(id)); } - @PostMapping("modWbtj") + @PostMapping("/modWbtj") ResponseMessage updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑 return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj)); } - @PostMapping("addWbtj") + @PostMapping("/addWbtj") ResponseMessage insertWgdWbtj(WgdWbtj WgdWbtj) {//插入 return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj)); } - @GetMapping("delWbtj") + @GetMapping("/delWbtj") ResponseMessage deleteWgdWbtj(String id){//删除 return Result.success(iWgdWbtjService.deleteWgdWbtj(id)); } - @GetMapping("delWbtjs") + @GetMapping("/delWbtjs") ResponseMessage deleteWgdWbtjs(String ids){//批量删除 return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java index 36566cd7..9909be49 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -26,44 +26,44 @@ import java.util.List; */ @RestController @Api(description = "|WgdWbxd|") -@RequestMapping("/wgdCensusLeo/wgd-wbxd") +@RequestMapping("api/wgdCensusLeo/wgd-wbxd") public class WgdWbxdController extends BaseController { @Autowired IWgdWbxdService iWgdWbxdService; - @GetMapping("getAllWbxds") + @GetMapping("/getAllWbxds") public ResponseMessage getAllWgdWbxds(){//查询所有 return Result.success(iWgdWbxdService.getAllWgdWbxds()); } - @PostMapping("queryAllWbxds") + @PostMapping("/queryAllWbxds") public ResponseMessage queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询 List wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd); PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds); return Result.success(pageInfo); } - @GetMapping("getWbxdById") + @GetMapping("/getWbxdById") public ResponseMessage getWgdWbxdById(String id) {//查询详情 return Result.success(iWgdWbxdService.getWgdWbxdById(id)); } - @PostMapping("modWbxd") + @PostMapping("/modWbxd") ResponseMessage updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑 return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd)); } - @PostMapping("addWbxd") + @PostMapping("/addWbxd") ResponseMessage insertWgdWbxd(WgdWbxd WgdWbxd) {//插入 return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd)); } - @GetMapping("delWbxd") + @GetMapping("/delWbxd") ResponseMessage deleteWgdWbxd(String id){//删除 return Result.success(iWgdWbxdService.deleteWgdWbxd(id)); } - @GetMapping("delWbxds") + @GetMapping("/delWbxds") ResponseMessage deleteWgdWbxds(String ids){//批量删除 return Result.success(iWgdWbxdService.deleteWgdWbxds(ids)); } 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 d42fb3a0..9763f584 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 @@ -26,44 +26,44 @@ import java.util.List; */ @RestController @Api(description = "|WgdZcb|") -@RequestMapping("/wgdCensusLeo/wgd-zcb") +@RequestMapping("api/wgdCensusLeo/wgd-zcb") public class WgdZcbController extends BaseController { @Autowired IWgdZcbService iWgdZcbService; - @GetMapping("getAllZcbs") + @GetMapping("/getAllZcbs") public ResponseMessage getAllWgdZcbs(){//查询所有 return Result.success(iWgdZcbService.getAllWgdZcbs()); } - @PostMapping("queryAllZcbs") + @PostMapping("/queryAllZcbs") public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); return Result.success(pageInfo); } - @GetMapping("getZcbById") + @GetMapping("/getZcbById") public ResponseMessage getWgdZcbById(String id) {//查询详情 return Result.success(iWgdZcbService.getWgdZcbById(id)); } - @PostMapping("modZcb") + @PostMapping("/modZcb") ResponseMessage updateWgdZcb(WgdZcb WgdZcb) {//编辑 return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb)); } - @PostMapping("addZcb") + @PostMapping("/addZcb") ResponseMessage insertWgdZcb(WgdZcb WgdZcb) {//插入 return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb)); } - @GetMapping("delZcb") + @GetMapping("/delZcb") ResponseMessage deleteWgdZcb(String id){//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } - @GetMapping("delZcbs") + @GetMapping("/delZcbs") ResponseMessage deleteWgdZcbs(String ids){//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java index 4150dc78..fe6d36fc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.wgdCensusLeo.service.impl; import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao; import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import com.adc.da.util.MD5Util; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +39,7 @@ public class WgdCgfyServiceImpl extends ServiceImpl impleme @Override public WgdCgfy getWgdCgfyById(String id) { - return wgdCgfyDao.selectOne(id); + return wgdCgfyDao.selectById(id); } @Override @@ -59,7 +60,6 @@ public class WgdCgfyServiceImpl extends ServiceImpl impleme @Override public int deleteWgdCgfys(String ids) { - String[] str = ids.split(","); return wgdCgfyDao.deleteBatch(); } } From 9c2b5408ea6c1e09394905d6602a843f73afdcbe Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 17 Nov 2021 17:18:37 +0800 Subject: [PATCH 3/9] =?UTF-8?q?zcr:=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WgdAssocCostController.java | 6 +-- .../controller/WgdAssocInfoController.java | 9 ++--- .../controller/WgdCommiInfoController.java | 9 ++--- .../controller/WgdExReviseCostController.java | 11 ++---- .../controller/WgdMeetCostController.java | 36 ++++++++---------- .../slrs/wgdCensusZ/dao/WgdAssocInfoDao.java | 2 +- .../slrs/wgdCensusZ/dao/WgdCommiInfoDao.java | 2 +- .../wgdCensusZ/dao/WgdExReviseCostDao.java | 2 +- .../slrs/wgdCensusZ/dao/WgdMeetCostDao.java | 2 +- .../service/impl/WgdAssocInfoServiceImpl.java | 3 +- .../service/impl/WgdCommiInfoServiceImpl.java | 3 +- .../impl/WgdExReviseCostServiceImpl.java | 3 +- .../service/impl/WgdMeetCostServiceImpl.java | 3 +- .../mapper/wgdCensusZ/WgdAssocCostMapper.xml | 20 +++++----- .../mapper/wgdCensusZ/WgdAssocInfoMapper.xml | 18 ++++----- .../mapper/wgdCensusZ/WgdCommiInfoMapper.xml | 18 ++++----- .../wgdCensusZ/WgdExReviseCostMapper.xml | 38 +++++++++---------- .../mapper/wgdCensusZ/WgdMeetCostMapper.xml | 16 ++++---- 18 files changed, 93 insertions(+), 108 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java index 8b2563c1..09891730 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java @@ -42,7 +42,7 @@ public class WgdAssocCostController extends BaseController { } @ApiOperation("多条件查询") - @PostMapping("queryAllAssocCosts") + @GetMapping("queryAllAssocCosts") public ResponseMessage queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询 List wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost); PageInfo pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts); @@ -56,7 +56,7 @@ public class WgdAssocCostController extends BaseController { } @ApiOperation("编辑") - @PostMapping("modAssocCost") + @PutMapping("modAssocCost") ResponseMessage updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑 return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost)); } @@ -74,7 +74,7 @@ public class WgdAssocCostController extends BaseController { } @ApiOperation("批量删除") - @GetMapping("delAssocCosts") + @DeleteMapping("delAssocCosts") ResponseMessage deleteWgdAssocCosts(String ids){//批量删除 return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java index 0823966b..58412a42 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -6,12 +6,9 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos()); } - @PostMapping("queryAllAssocInfos") + @GetMapping("queryAllAssocInfos") public ResponseMessage queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询 List wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo); PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos); @@ -63,7 +60,7 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id)); } - @GetMapping("delAssocInfos") + @PostMapping("delAssocInfos") ResponseMessage deleteWgdAssocInfos(String ids){//批量删除 return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java index b3df81d3..f3cfb998 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); } - @PostMapping("queryAllCommiInfos") + @GetMapping("queryAllCommiInfos") public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos); @@ -63,7 +60,7 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); } - @GetMapping("delCommiInfos") + @PostMapping("delCommiInfos") ResponseMessage deleteWgdCommiInfos(String ids){//批量删除 return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java index b76d0ab5..512331d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts()); } - @PostMapping("queryAllExReviseCosts") + @GetMapping("queryAllExReviseCosts") public ResponseMessage queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询 List wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost); PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts); @@ -48,7 +45,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id)); } - @PostMapping("modExReviseCost") + @PutMapping("modExReviseCost") ResponseMessage updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost)); } @@ -63,7 +60,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id)); } - @GetMapping("delExReviseCosts") + @DeleteMapping("delExReviseCosts") ResponseMessage deleteWgdExReviseCosts(String ids){//批量删除 return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java index 449692a3..54a32c15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; @@ -30,23 +27,13 @@ public class WgdMeetCostController extends BaseController { @Autowired IWgdMeetCostService iWgdMeetCostService; - @GetMapping("getAllMeetCosts") - public ResponseMessage getAllWgdMeetCosts(){//查询所有 - return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); - } - - @PostMapping("queryAllMeetCosts") + @GetMapping("queryAllMeetCosts") public ResponseMessage queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询 PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost)); return Result.success(pageInfo); } - @GetMapping("getMeetCostById") - public ResponseMessage getWgdMeetCostById(String id) {//查询详情 - return Result.success(iWgdMeetCostService.getWgdMeetCostById(id)); - } - - @PostMapping("modMeetCost") + @PutMapping("modMeetCost") ResponseMessage updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost)); } @@ -56,13 +43,22 @@ public class WgdMeetCostController extends BaseController { return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost)); } + @DeleteMapping("delMeetCosts") + ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 + return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); + } + + @GetMapping("getAllMeetCosts") + public ResponseMessage getAllWgdMeetCosts(){//查询所有 + return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); + } + @GetMapping("getMeetCostById") + public ResponseMessage getWgdMeetCostById(String id) {//查询详情 + return Result.success(iWgdMeetCostService.getWgdMeetCostById(id)); + } @GetMapping("delMeetCost") ResponseMessage deleteWgdMeetCost(String id){//删除 return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id)); } - @GetMapping("delMeetCosts") - ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 - return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java index 48431efb..3491ed99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java @@ -24,5 +24,5 @@ public interface WgdAssocInfoDao extends BaseMapper { int updateOne(WgdAssocInfo wgdAssocInfo);//编辑 int insertOne(WgdAssocInfo wgdAssocInfo);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java index 36980275..08aa17eb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java @@ -25,5 +25,5 @@ public interface WgdCommiInfoDao extends BaseMapper { int updateOne(WgdCommiInfo wgdCommiInfo);//编辑 int insertOne(WgdCommiInfo wgdCommiInfo);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java index 2d67546e..2fa84fb6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java @@ -25,5 +25,5 @@ public interface WgdExReviseCostDao extends BaseMapper { int updateOne(WgdExReviseCost wgdExReviseCost);//编辑 int insertOne(WgdExReviseCost wgdExReviseCost);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java index 71610aa1..d5139ab3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java @@ -25,5 +25,5 @@ public interface WgdMeetCostDao extends BaseMapper { int updateOne(WgdMeetCost wgdMeetCost);//编辑 int insertOne(WgdMeetCost wgdMeetCost);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java index a6bade22..e862229c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -59,6 +59,7 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl - and sc_name like concat('%',#{scName},'%') - - - and ssc_name like concat('%',#{sscName},'%') - - - and wg_name like concat('%',#{wgName},'%') + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) and pay_standard = #{payStandard} @@ -77,16 +75,16 @@ wg_name = #{wgName}, - + pay_standard = #{payStandard}, - + pay_reality = #{payReality}, - + cost_outlay = #{costOutlay}, - + annual_payment = #{annualPayment}, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml index e8ff3351..e7214efc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml @@ -19,13 +19,11 @@ and id = #{id} - and sc_name like concat('%',#{scName},'%') - - - and ssc_name like concat('%',#{sscName},'%') - - - and wg_name like concat('%',#{wgName},'%') + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) and role = #{role} @@ -43,10 +41,10 @@ and leader = #{leader} - and ini_time = #{iniTime} + and DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d') - and cur_time = #{curTime} + and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d') and cost_standard = #{costStandard} @@ -55,7 +53,7 @@ and cost_outlay = #{costOutlay} - and last_pay_time = #{lastPayTime} + and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d') and pay_period = #{payPeriod} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml index e9bf66fc..d3708885 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml @@ -19,13 +19,11 @@ and unit = #{unit} - and sc_name = #{scName} - - - and ssc_name = #{sscName} - - - and wg_name = #{wgName} + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) and role = #{role} @@ -34,7 +32,7 @@ and attend = #{attend} - and cur_time = #{curTime} + and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d') and job = #{job} @@ -234,9 +232,9 @@ delete from wgd_commi_info where id = #{id} - + delete from wgd_commi_info where id in - + #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml index f7060895..f176790c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml @@ -50,19 +50,19 @@ update wgd_ex_revise_cost - + type = #{type}, - + pro_id = #{proId}, - + pro_name = #{proName}, - + cost = #{cost}, - + cost_outlay = #{costOutlay}, @@ -71,43 +71,43 @@ insert into wgd_ex_revise_cost - + id, - + type, - - pro_id + + pro_id, - + pro_name, - + cost, - + cost_outlay, values - + #{id}, - + #{type}, - + #{proId}, - + #{proName}, - + #{cost}, - + #{costOutlay}, @@ -115,7 +115,7 @@ delete from wgd_ex_revise_cost where id = #{id} - + delete from wgd_ex_revise_cost where id in #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml index f8499871..f948663d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml @@ -22,7 +22,7 @@ and meet_name = #{meetName} - and meet_time = #{meetTime} + and DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d') and pay_standard = #{payStandard} @@ -54,22 +54,22 @@ update wgd_meet_cost - + unit = #{unit}, - + meet_name = #{meetName}, - + meet_time = #{meetTime}, - + pay_standard = #{payStandard}, - + pay_reality = #{payReality}, - + cost_outlay = #{costOutlay}, @@ -128,7 +128,7 @@ delete from wgd_meet_cost where id = #{id} - + delete from wgd_meet_cost where id in #{id} From 6f1161e89ee8e6e9957083fddb8d2f404a4a97d9 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Thu, 18 Nov 2021 11:14:34 +0800 Subject: [PATCH 4/9] ~ --- .../wgdCensusLeo/controller/WgdCgfyController.java | 11 ++++------- .../wgdCensusLeo/controller/WgdFyfyController.java | 11 ++++------- .../wgdCensusLeo/controller/WgdSrbController.java | 11 ++++------- .../wgdCensusLeo/controller/WgdWbtjController.java | 11 ++++------- .../wgdCensusLeo/controller/WgdWbxdController.java | 11 ++++------- .../wgdCensusLeo/controller/WgdZcbController.java | 11 ++++------- 6 files changed, 24 insertions(+), 42 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java index 854680d8..78241ecc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdCgfyController extends BaseController { return Result.success(iWgdCgfyService.getAllWgdCgfys()); } - @PostMapping("/queryAllCgfys") + @GetMapping("/queryAllCgfys") public ResponseMessage queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询 List wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy); PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys); @@ -58,12 +55,12 @@ public class WgdCgfyController extends BaseController { return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy)); } - @GetMapping("/delCgfy") + @DeleteMapping("/delCgfy") ResponseMessage deleteWgdCgfy(String id){//删除 return Result.success(iWgdCgfyService.deleteWgdCgfy(id)); } - @GetMapping("/delCgfys") + @DeleteMapping("/delCgfys") ResponseMessage deleteWgdCgfys(String ids){//批量删除 return Result.success(iWgdCgfyService.deleteWgdCgfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java index 7ffb5987..e176458c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdFyfyController extends BaseController { return Result.success(iWgdFyfyService.getAllWgdFyfys()); } - @PostMapping("/queryAllFyfys") + @GetMapping("/queryAllFyfys") public ResponseMessage queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询 List wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy); PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys); @@ -58,12 +55,12 @@ public class WgdFyfyController extends BaseController { return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy)); } - @GetMapping("/delFyfy") + @DeleteMapping("/delFyfy") ResponseMessage deleteWgdFyfy(String id){//删除 return Result.success(iWgdFyfyService.deleteWgdFyfy(id)); } - @GetMapping("/delFyfys") + @DeleteMapping("/delFyfys") ResponseMessage deleteWgdFyfys(String ids){//批量删除 return Result.success(iWgdFyfyService.deleteWgdFyfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java index 08fd79b4..0c5547f3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdSrbController extends BaseController { return Result.success(iWgdSrbService.getAllWgdSrbs()); } - @PostMapping("/queryAllSrbs") + @GetMapping("/queryAllSrbs") public ResponseMessage queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询 List wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb); PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs); @@ -58,12 +55,12 @@ public class WgdSrbController extends BaseController { return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb)); } - @GetMapping("/delSrb") + @DeleteMapping("/delSrb") ResponseMessage deleteWgdSrb(String id){//删除 return Result.success(iWgdSrbService.deleteWgdSrb(id)); } - @GetMapping("/delSrbs") + @DeleteMapping("/delSrbs") ResponseMessage deleteWgdSrbs(String ids){//批量删除 return Result.success(iWgdSrbService.deleteWgdSrbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java index 55da40a6..0c386d6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdWbtjController extends BaseController { return Result.success(iWgdWbtjService.getAllWgdWbtjs()); } - @PostMapping("/queryAllWbtjs") + @GetMapping("/queryAllWbtjs") public ResponseMessage queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询 List wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj); PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs); @@ -58,12 +55,12 @@ public class WgdWbtjController extends BaseController { return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj)); } - @GetMapping("/delWbtj") + @DeleteMapping("/delWbtj") ResponseMessage deleteWgdWbtj(String id){//删除 return Result.success(iWgdWbtjService.deleteWgdWbtj(id)); } - @GetMapping("/delWbtjs") + @DeleteMapping("/delWbtjs") ResponseMessage deleteWgdWbtjs(String ids){//批量删除 return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java index 9909be49..72a64e4e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdWbxdController extends BaseController { return Result.success(iWgdWbxdService.getAllWgdWbxds()); } - @PostMapping("/queryAllWbxds") + @GetMapping("/queryAllWbxds") public ResponseMessage queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询 List wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd); PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds); @@ -58,12 +55,12 @@ public class WgdWbxdController extends BaseController { return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd)); } - @GetMapping("/delWbxd") + @DeleteMapping("/delWbxd") ResponseMessage deleteWgdWbxd(String id){//删除 return Result.success(iWgdWbxdService.deleteWgdWbxd(id)); } - @GetMapping("/delWbxds") + @DeleteMapping("/delWbxds") ResponseMessage deleteWgdWbxds(String ids){//批量删除 return Result.success(iWgdWbxdService.deleteWgdWbxds(ids)); } 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 9763f584..3556f79f 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 @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdZcbController extends BaseController { return Result.success(iWgdZcbService.getAllWgdZcbs()); } - @PostMapping("/queryAllZcbs") + @GetMapping("/queryAllZcbs") public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs); @@ -58,12 +55,12 @@ public class WgdZcbController extends BaseController { return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb)); } - @GetMapping("/delZcb") + @DeleteMapping("/delZcb") ResponseMessage deleteWgdZcb(String id){//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } - @GetMapping("/delZcbs") + @DeleteMapping("/delZcbs") ResponseMessage deleteWgdZcbs(String ids){//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } From 71a686b92bddcf532824b6bbdfa50e89749bdc63 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 18 Nov 2021 11:22:01 +0800 Subject: [PATCH 5/9] =?UTF-8?q?zcr:=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8-=20+=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slrs/wgdCensusZ/controller/WgdAssocInfoController.java | 5 +++++ .../slrs/wgdCensusZ/controller/WgdCommiInfoController.java | 5 +++++ .../wgdCensusZ/controller/WgdExReviseCostController.java | 5 +++++ .../slrs/wgdCensusZ/controller/WgdMeetCostController.java | 5 +++++ .../mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml | 7 +++++-- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java index 58412a42..05d0ab24 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -5,6 +5,7 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; @@ -33,6 +34,7 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos()); } + @ApiOperation("查询") @GetMapping("queryAllAssocInfos") public ResponseMessage queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询 List wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo); @@ -45,11 +47,13 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id)); } + @ApiOperation("更改") @PostMapping("modAssocInfo") ResponseMessage updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑 return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo)); } + @ApiOperation("添加") @PostMapping("addAssocInfo") ResponseMessage insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入 return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo)); @@ -60,6 +64,7 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id)); } + @ApiOperation("删除") @PostMapping("delAssocInfos") ResponseMessage deleteWgdAssocInfos(String ids){//批量删除 return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java index f3cfb998..019ab366 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); } + @ApiOperation("查询") @GetMapping("queryAllCommiInfos") public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); @@ -45,11 +47,13 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id)); } + @ApiOperation("更新") @PostMapping("modCommiInfo") ResponseMessage updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo)); } + @ApiOperation("添加") @PostMapping("addCommiInfo") ResponseMessage insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo)); @@ -60,6 +64,7 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); } + @ApiOperation("删除") @PostMapping("delCommiInfos") ResponseMessage deleteWgdCommiInfos(String ids){//批量删除 return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java index 512331d0..be484788 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts()); } + @ApiOperation("查询") @GetMapping("queryAllExReviseCosts") public ResponseMessage queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询 List wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost); @@ -45,11 +47,13 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id)); } + @ApiOperation("更改") @PutMapping("modExReviseCost") ResponseMessage updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost)); } + @ApiOperation("插入") @PostMapping("addExReviseCost") ResponseMessage insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入 return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost)); @@ -60,6 +64,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id)); } + @ApiOperation("删除") @DeleteMapping("delExReviseCosts") ResponseMessage deleteWgdExReviseCosts(String ids){//批量删除 return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java index 54a32c15..c6f4a9e2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -27,22 +28,26 @@ public class WgdMeetCostController extends BaseController { @Autowired IWgdMeetCostService iWgdMeetCostService; + @ApiOperation("查询") @GetMapping("queryAllMeetCosts") public ResponseMessage queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询 PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost)); return Result.success(pageInfo); } + @ApiOperation("更新") @PutMapping("modMeetCost") ResponseMessage updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost)); } + @ApiOperation("添加") @PostMapping("addMeetCost") ResponseMessage insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入 return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost)); } + @ApiOperation("删除") @DeleteMapping("delMeetCosts") ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml index e7214efc..5d81cb64 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml @@ -11,7 +11,7 @@ id,sc_name,ssc_name,wg_name,role,attend,standard,charge,leader,ini_time, cur_time,cost_standard,cost_outlay,last_pay_time,pay_period,handler, department,as_proper,as_status,as_contact,tel,mail, - p17,p18,p19,p20,p21,p22,p23,p34,p25,p26,p27,p28,p29,p30,p31,p32 + p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32 WHERE 1=1 @@ -88,6 +88,7 @@ + - + update wgd_assoc_info @@ -215,6 +216,7 @@ where id = #{id} + insert into wgd_assoc_info @@ -454,6 +456,7 @@ delete from wgd_assoc_info where id = #{id} + delete from wgd_assoc_info where id in From 9e43e3a7c50910814e35792a072aa05d0d793380 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Thu, 18 Nov 2021 14:49:48 +0800 Subject: [PATCH 6/9] feat: There is no way the, --- .../mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index b3792ef9..8dbe6b55 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -754,9 +754,9 @@ and ( - (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', - SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '') - or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%') + (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-', + SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '') + or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR = '') or (stand_name like concat(concat('%',#{page.standNumber}),'%')) ) From 5abbc7edd94e27644ad7d552d949ec70d77c2f93 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Fri, 19 Nov 2021 11:19:42 +0800 Subject: [PATCH 7/9] ~ --- .../controller/WgdCgfyController.java | 9 ++++++-- .../controller/WgdFyfyController.java | 9 ++++++-- .../controller/WgdSrbController.java | 9 ++++++-- .../controller/WgdWbtjController.java | 9 ++++++-- .../controller/WgdWbxdController.java | 9 ++++++-- .../controller/WgdZcbController.java | 9 ++++++-- .../da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdSrbDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java | 2 +- .../da/slrs/wgdCensusLeo/dao/WgdZcbDao.java | 2 +- .../da/slrs/wgdCensusLeo/entity/WgdSrb.java | 4 ++-- .../da/slrs/wgdCensusLeo/entity/WgdZcb.java | 2 +- .../service/impl/WgdCgfyServiceImpl.java | 3 ++- .../service/impl/WgdFyfyServiceImpl.java | 2 +- .../service/impl/WgdSrbServiceImpl.java | 2 +- .../service/impl/WgdWbtjServiceImpl.java | 2 +- .../service/impl/WgdWbxdServiceImpl.java | 2 +- .../service/impl/WgdZcbServiceImpl.java | 2 +- .../mapper/wgdCensusLeo/WgdCgfyMapper.xml | 3 +++ .../mapper/wgdCensusLeo/WgdFyfyMapper.xml | 21 ++++++++++++++++++- .../mapper/wgdCensusLeo/WgdSrbMapper.xml | 7 +++++++ .../mapper/wgdCensusLeo/WgdWbtjMapper.xml | 7 +++++++ .../mapper/wgdCensusLeo/WgdWbxdMapper.xml | 7 +++++++ .../mapper/wgdCensusLeo/WgdZcbMapper.xml | 7 +++++++ 26 files changed, 109 insertions(+), 28 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java index 78241ecc..ca9b942d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdCgfyController extends BaseController { return Result.success(iWgdCgfyService.getAllWgdCgfys()); } + @ApiOperation("查询") @GetMapping("/queryAllCgfys") public ResponseMessage queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询 List wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy); @@ -45,22 +47,25 @@ public class WgdCgfyController extends BaseController { return Result.success(iWgdCgfyService.getWgdCgfyById(id)); } + @ApiOperation("更新") @PostMapping("/modCgfy") ResponseMessage updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑 return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy)); } + @ApiOperation("添加") @PostMapping("/addCgfy") ResponseMessage insertWgdCgfy(WgdCgfy WgdCgfy) {//插入 return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy)); } - @DeleteMapping("/delCgfy") + @PostMapping("/delCgfy") ResponseMessage deleteWgdCgfy(String id){//删除 return Result.success(iWgdCgfyService.deleteWgdCgfy(id)); } - @DeleteMapping("/delCgfys") + @ApiOperation("删除") + @PostMapping("/delCgfys") ResponseMessage deleteWgdCgfys(String ids){//批量删除 return Result.success(iWgdCgfyService.deleteWgdCgfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java index e176458c..37873d6f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy; import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdFyfyController extends BaseController { return Result.success(iWgdFyfyService.getAllWgdFyfys()); } + @ApiOperation("查询") @GetMapping("/queryAllFyfys") public ResponseMessage queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询 List wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy); @@ -45,22 +47,25 @@ public class WgdFyfyController extends BaseController { return Result.success(iWgdFyfyService.getWgdFyfyById(id)); } + @ApiOperation("更新") @PostMapping("/modFyfy") ResponseMessage updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑 return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy)); } + @ApiOperation("添加") @PostMapping("/addFyfy") ResponseMessage insertWgdFyfy(WgdFyfy WgdFyfy) {//插入 return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy)); } - @DeleteMapping("/delFyfy") + @PostMapping("/delFyfy") ResponseMessage deleteWgdFyfy(String id){//删除 return Result.success(iWgdFyfyService.deleteWgdFyfy(id)); } - @DeleteMapping("/delFyfys") + @ApiOperation("删除") + @PostMapping("/delFyfys") ResponseMessage deleteWgdFyfys(String ids){//批量删除 return Result.success(iWgdFyfyService.deleteWgdFyfys(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java index 0c5547f3..51249bbf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdSrbController extends BaseController { return Result.success(iWgdSrbService.getAllWgdSrbs()); } + @ApiOperation("查询") @GetMapping("/queryAllSrbs") public ResponseMessage queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询 List wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb); @@ -45,22 +47,25 @@ public class WgdSrbController extends BaseController { return Result.success(iWgdSrbService.getWgdSrbById(id)); } + @ApiOperation("更新") @PostMapping("/modSrb") ResponseMessage updateWgdSrb(WgdSrb WgdSrb) {//编辑 return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb)); } + @ApiOperation("添加") @PostMapping("/addSrb") ResponseMessage insertWgdSrb(WgdSrb WgdSrb) {//插入 return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb)); } - @DeleteMapping("/delSrb") + @PostMapping("/delSrb") ResponseMessage deleteWgdSrb(String id){//删除 return Result.success(iWgdSrbService.deleteWgdSrb(id)); } - @DeleteMapping("/delSrbs") + @ApiOperation("删除") + @PostMapping("/delSrbs") ResponseMessage deleteWgdSrbs(String ids){//批量删除 return Result.success(iWgdSrbService.deleteWgdSrbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java index 0c386d6c..28694017 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdWbtjController extends BaseController { return Result.success(iWgdWbtjService.getAllWgdWbtjs()); } + @ApiOperation("查询") @GetMapping("/queryAllWbtjs") public ResponseMessage queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询 List wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj); @@ -45,22 +47,25 @@ public class WgdWbtjController extends BaseController { return Result.success(iWgdWbtjService.getWgdWbtjById(id)); } + @ApiOperation("更新") @PostMapping("/modWbtj") ResponseMessage updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑 return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj)); } + @ApiOperation("添加") @PostMapping("/addWbtj") ResponseMessage insertWgdWbtj(WgdWbtj WgdWbtj) {//插入 return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj)); } - @DeleteMapping("/delWbtj") + @PostMapping("/delWbtj") ResponseMessage deleteWgdWbtj(String id){//删除 return Result.success(iWgdWbtjService.deleteWgdWbtj(id)); } - @DeleteMapping("/delWbtjs") + @ApiOperation("删除") + @PostMapping("/delWbtjs") ResponseMessage deleteWgdWbtjs(String ids){//批量删除 return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java index 72a64e4e..dbb61d9f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdWbxdController extends BaseController { return Result.success(iWgdWbxdService.getAllWgdWbxds()); } + @ApiOperation("查询") @GetMapping("/queryAllWbxds") public ResponseMessage queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询 List wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd); @@ -45,22 +47,25 @@ public class WgdWbxdController extends BaseController { return Result.success(iWgdWbxdService.getWgdWbxdById(id)); } + @ApiOperation("更新") @PostMapping("/modWbxd") ResponseMessage updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑 return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd)); } + @ApiOperation("添加") @PostMapping("/addWbxd") ResponseMessage insertWgdWbxd(WgdWbxd WgdWbxd) {//插入 return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd)); } - @DeleteMapping("/delWbxd") + @PostMapping("/delWbxd") ResponseMessage deleteWgdWbxd(String id){//删除 return Result.success(iWgdWbxdService.deleteWgdWbxd(id)); } - @DeleteMapping("/delWbxds") + @ApiOperation("删除") + @PostMapping("/delWbxds") ResponseMessage deleteWgdWbxds(String ids){//批量删除 return Result.success(iWgdWbxdService.deleteWgdWbxds(ids)); } 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 3556f79f..49cbfd3d 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 @@ -6,6 +6,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb; import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; @@ -33,6 +34,7 @@ public class WgdZcbController extends BaseController { return Result.success(iWgdZcbService.getAllWgdZcbs()); } + @ApiOperation("查询") @GetMapping("/queryAllZcbs") public ResponseMessage queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询 List wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb); @@ -45,22 +47,25 @@ public class WgdZcbController extends BaseController { return Result.success(iWgdZcbService.getWgdZcbById(id)); } + @ApiOperation("更新") @PostMapping("/modZcb") ResponseMessage updateWgdZcb(WgdZcb WgdZcb) {//编辑 return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb)); } + @ApiOperation("添加") @PostMapping("/addZcb") ResponseMessage insertWgdZcb(WgdZcb WgdZcb) {//插入 return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb)); } - @DeleteMapping("/delZcb") + @PostMapping("/delZcb") ResponseMessage deleteWgdZcb(String id){//删除 return Result.success(iWgdZcbService.deleteWgdZcb(id)); } - @DeleteMapping("/delZcbs") + @ApiOperation("删除") + @PostMapping("/delZcbs") ResponseMessage deleteWgdZcbs(String ids){//批量删除 return Result.success(iWgdZcbService.deleteWgdZcbs(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java index b9cecd23..ea2981fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java @@ -22,5 +22,5 @@ public interface WgdCgfyDao extends BaseMapper { int updateOne(WgdCgfy wgdCgfy);//编辑 int insertOne(WgdCgfy wgdCgfy);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java index 70532885..ca20525c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java @@ -28,5 +28,5 @@ public interface WgdFyfyDao extends BaseMapper { int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java index b30aa0b0..d3989678 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java @@ -22,5 +22,5 @@ public interface WgdSrbDao extends BaseMapper { int updateOne(WgdSrb wgdSrb);//编辑 int insertOne(WgdSrb wgdSrb);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java index 8b432eb2..14577768 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java @@ -22,5 +22,5 @@ public interface WgdWbtjDao extends BaseMapper { int updateOne(WgdWbtj wgdWbtj);//编辑 int insertOne(WgdWbtj wgdWbtj);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java index d20d355e..50b4917d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java @@ -22,5 +22,5 @@ public interface WgdWbxdDao extends BaseMapper { int updateOne(WgdWbxd wgdWbxd);//编辑 int insertOne(WgdWbxd wgdWbxd);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java index a2c3773d..2af97d73 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java @@ -22,5 +22,5 @@ public interface WgdZcbDao extends BaseMapper { int updateOne(WgdZcb wgdZcb);//编辑 int insertOne(WgdZcb wgdZcb);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java index b1df6e0e..ab802653 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java @@ -39,11 +39,11 @@ public class WgdSrb extends BasePage { private String source; @ApiModelProperty(value = "补助金额") - private String money; + private String cost; @ApiModelProperty(value = "入账时间") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String data; + private String time; } 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 20e2e9cf..a47c4c65 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 @@ -32,7 +32,7 @@ public class WgdZcb extends BasePage { private String name; @ApiModelProperty(value = "支出金额") - private String money; + private String cost; @ApiModelProperty(value = "用途") private String use; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java index fe6d36fc..3845fc23 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java @@ -60,6 +60,7 @@ public class WgdCgfyServiceImpl extends ServiceImpl impleme @Override public int deleteWgdCgfys(String ids) { - return wgdCgfyDao.deleteBatch(); + String[] str = ids.split(","); + return wgdCgfyDao.deleteBatch(str); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java index 08e12353..9de7a613 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java @@ -60,6 +60,6 @@ public class WgdFyfyServiceImpl extends ServiceImpl impleme @Override public int deleteWgdFyfys(String ids) { String[] str = ids.split(","); - return wgdFyfyDao.deleteBatch(); + return wgdFyfyDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java index 138551e6..44498d8f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java @@ -60,6 +60,6 @@ public class WgdSrbServiceImpl extends ServiceImpl implements @Override public int deleteWgdSrbs(String ids) { String[] str = ids.split(","); - return wgdSrbDao.deleteBatch(); + return wgdSrbDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java index 70c65e7c..123c943c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java @@ -60,6 +60,6 @@ public class WgdWbtjServiceImpl extends ServiceImpl impleme @Override public int deleteWgdWbtjs(String ids) { String[] str = ids.split(","); - return wgdWbtjDao.deleteBatch(); + return wgdWbtjDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java index fa887a85..74bb2122 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java @@ -60,6 +60,6 @@ public class WgdWbxdServiceImpl extends ServiceImpl impleme @Override public int deleteWgdWbxds(String ids) { String[] str = ids.split(","); - return wgdWbxdDao.deleteBatch(); + return wgdWbxdDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java index ca0338c4..920d07e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java @@ -60,6 +60,6 @@ public class WgdZcbServiceImpl extends ServiceImpl implements @Override public int deleteWgdZcbs(String ids) { String[] str = ids.split(","); - return wgdZcbDao.deleteBatch(); + return wgdZcbDao.deleteBatch(str); } } \ No newline at end of file diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml index c56391f0..8798b6e3 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml @@ -32,6 +32,9 @@ and cost = #{cost} + + select count(*) from wgd_fyfy + + + select count(*) from wgd_srb + + + select count(*) from wgd_wbtj + + + select count(*) from wgd_wbxd + + + select count(*) from wgd_zcb + + From d23f7478ae380d369eb42ffa64238ee3d694d6f0 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 19 Nov 2021 16:51:10 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E4=BB=A5?= =?UTF-8?q?=E5=8F=8Abug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsInstitutionController.java | 6 ++++++ .../sarInstitution/dao/TsInstitutionDao.java | 2 ++ .../service/ITsInstitutionService.java | 2 ++ .../service/impl/TsInstitutionServiceImpl.java | 7 +++++++ .../SarStandProjectLibraryController.java | 5 +++-- .../dao/SarStandProjectLibraryDao.java | 1 + .../sarStandProjectLibrary/dao/standDTO.java | 11 +++++++++++ .../service/SarStandProjectLibraryService.java | 3 ++- .../impl/SarStandProjectLibraryServiceImpl.java | 14 ++++++++++++-- .../sarInstitution/TsInstitutionMapper.xml | 16 ++++++++++++++++ 10 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java 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 b3887516..606e6e98 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 @@ -86,6 +86,12 @@ public class TsInstitutionController extends BaseController { return tsInstitutionService.getNext(institutionId,userName); } + @ApiOperation("获得下一级的部门和人员") + @GetMapping("/getNextById") + public List getNextById(String ids){ + return tsInstitutionService.getNextById(ids); + } + @ApiOperation("获得第一级部门目录") @GetMapping("/getFirstInstitution") public List getFirstInstitution(){ 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 bc0b5780..619e6efd 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 selectNextUserByIds(@Param("ids") List ids); + List selectTreeByIds(@Param("rootIds") List rootIds); 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 48d24c8b..892228b0 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 getNextById(String ids); + /** * 获得第一级的部门 * @return 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 ce821462..5f117ceb 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 @@ -216,6 +216,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl getNextById(String ids){ + List strings=new ArrayList<>(Arrays.asList(ids.split(","))); + List tsUsers=tsInstitutionDao.selectNextUserByIds(strings); + + return tsUsers; + } + public List getFirst(){ //查询第一层机构 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 077f5e0f..a2c3cd93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; @@ -100,8 +101,8 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize); + public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, standDTO standDTO){ + IPage list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize, standDTO); // 创建一个新的list集合，用于存储去重后的元素 List listTemp = new ArrayList(); for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index eff55660..73a61e1c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -30,4 +30,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStand(); List updateByProjectId(@Param("id")String id, @Param("version")String version); void deleteByProjectId(@Param("projectId")String projectId); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java new file mode 100644 index 00000000..a5e5ea27 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java @@ -0,0 +1,11 @@ +package com.adc.da.slrs.sarStandProjectLibrary.dao; + +import lombok.Data; + +@Data +public class standDTO { + + private String uname; + + private String productLine; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index ccee2c44..e1487e33 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,7 +18,7 @@ public interface SarStandProjectLibraryService { List queryNotMaintenanceProjectsolostar(String type); Map solostar(); List queryById(String id); - IPage queryProjectManager(int current, int pageSize); + IPage queryProjectManager(int current, int pageSize, standDTO standDTO); List queryByProductLine(String productLine); List queryStandId(String standId); IPage queryStandInfo(int current, int pageSize, String standId, String cars); 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 2553c394..ef5124ef 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 @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; import com.adc.da.ocr.util.UUIDUtils; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo; +import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO; import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; @@ -260,11 +261,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager(int current, int pageSize) { + public IPage queryProjectManager(int current, int pageSize, standDTO standDTO) { + StringBuilder stringBuilder=new StringBuilder(); + stringBuilder.append("where 1=1 "); + if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){ + stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' "); + } + if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){ + stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' "); + } + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName"); wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" + - " and sar_stand_project_library.product_line IS not NULL"); + " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString()); 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/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index aedae23d..d466c37e 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 @@ -48,6 +48,22 @@ + +