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..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 @@ -1,70 +1,66 @@ 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 org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +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("/wgdCensusLeo/wgd-cgfy") +@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") + @GetMapping("/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") + @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 be878baa..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; @@ -26,44 +23,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") + @GetMapping("/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") + @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 53a5d130..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; @@ -26,44 +23,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") + @GetMapping("/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") + @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 e581b18d..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; @@ -26,44 +23,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") + @GetMapping("/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") + @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 36566cd7..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; @@ -26,44 +23,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") + @GetMapping("/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") + @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 d42fb3a0..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; @@ -26,44 +23,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") + @GetMapping("/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") + @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)); } 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(); } } 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..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,13 +5,11 @@ 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.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 +34,8 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos()); } - @PostMapping("queryAllAssocInfos") + @ApiOperation("查询") + @GetMapping("queryAllAssocInfos") public ResponseMessage queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询 List wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo); PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos); @@ -48,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)); @@ -63,7 +64,8 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id)); } - @GetMapping("delAssocInfos") + @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 b3df81d3..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,12 +6,10 @@ 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.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 +34,8 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); } - @PostMapping("queryAllCommiInfos") + @ApiOperation("查询") + @GetMapping("queryAllCommiInfos") public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos); @@ -48,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)); @@ -63,7 +64,8 @@ public class WgdCommiInfoController extends BaseController { return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); } - @GetMapping("delCommiInfos") + @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 b76d0ab5..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,12 +6,10 @@ 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.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 +34,8 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts()); } - @PostMapping("queryAllExReviseCosts") + @ApiOperation("查询") + @GetMapping("queryAllExReviseCosts") public ResponseMessage queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询 List wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost); PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts); @@ -48,11 +47,13 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id)); } - @PostMapping("modExReviseCost") + @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)); @@ -63,7 +64,8 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id)); } - @GetMapping("delExReviseCosts") + @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 449692a3..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,12 +6,10 @@ 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.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,39 +28,42 @@ public class WgdMeetCostController extends BaseController { @Autowired IWgdMeetCostService iWgdMeetCostService; - @GetMapping("getAllMeetCosts") - public ResponseMessage getAllWgdMeetCosts(){//查询所有 - return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); - } - - @PostMapping("queryAllMeetCosts") + @ApiOperation("查询") + @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") + @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)); + } + + @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 getAllWgdCommiInfos() { return wgdCommiInfoDao.selectAll(); @@ -63,6 +62,7 @@ public class WgdCommiInfoServiceImpl 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..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 @@ -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} @@ -90,6 +88,7 @@ + - + update wgd_assoc_info @@ -217,6 +216,7 @@ where id = #{id} + insert into wgd_assoc_info @@ -456,6 +456,7 @@ delete from wgd_assoc_info where id = #{id} + delete from wgd_assoc_info where id in 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}