FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/origin/Three' into origin/Three

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
This commit is contained in:
liao
2021-11-18 11:15:08 +08:00
parent 6f1161e89e 9c2b5408ea
commit 3ae99e744b
18 changed files with 157 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
+3 -3
View File
@@ -42,7 +42,7 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
}
@ApiOperation("多条件查询")
@PostMapping("queryAllAssocCosts")
@GetMapping("queryAllAssocCosts")
public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询
List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost);
PageInfo<WgdAssocCost> pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts);
@@ -56,7 +56,7 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
}
@ApiOperation("编辑")
@PostMapping("modAssocCost")
@PutMapping("modAssocCost")
ResponseMessage<Object> updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑
return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost));
}
@@ -74,7 +74,7 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
}
@ApiOperation("批量删除")
@GetMapping("delAssocCosts")
@DeleteMapping("delAssocCosts")
ResponseMessage<Object> deleteWgdAssocCosts(String ids){//批量删除
return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids));
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
+3 -6
View File
@@ -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<WgdAssocInfo> {
return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
}
@PostMapping("queryAllAssocInfos")
@GetMapping("queryAllAssocInfos")
public ResponseMessage<Object> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询
List<WgdAssocInfo> wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo);
PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos);
@@ -63,7 +60,7 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
}
@GetMapping("delAssocInfos")
@PostMapping("delAssocInfos")
ResponseMessage<Object> deleteWgdAssocInfos(String ids){//批量删除
return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids));
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
+67
View File
@@ -0,0 +1,67 @@
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.*;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import java.util.List;
/**
* <p>
* 委员信息数据统计 前端控制器
* </p>
*
* @author zcr
* @since 2021-11-12
*/
@RestController
@Api(description = "|WgdCommiInfo|")
@RequestMapping("api/wgdCensusZ/wgd-commi-info")
public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
@Autowired
IWgdCommiInfoService iWgdCommiInfoService;
@GetMapping("getAllCommiInfos")
public ResponseMessage<Object> getAllWgdCommiInfos(){//查询所有
return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
}
@GetMapping("queryAllCommiInfos")
public ResponseMessage<Object> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询
List<WgdCommiInfo> wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo);
PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos);
return Result.success(pageInfo);
}
@GetMapping("getCommiInfoById")
public ResponseMessage<Object> getWgdCommiInfoById(String id) {//查询详情
return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
}
@PostMapping("modCommiInfo")
ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
}
@PostMapping("addCommiInfo")
ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
}
@GetMapping("delCommiInfo")
ResponseMessage<Object> deleteWgdCommiInfo(String id){//删除
return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
}
@PostMapping("delCommiInfos")
ResponseMessage<Object> deleteWgdCommiInfos(String ids){//批量删除
return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
+4 -7
View File
@@ -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<WgdExReviseCost> {
return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
}
@PostMapping("queryAllExReviseCosts")
@GetMapping("queryAllExReviseCosts")
public ResponseMessage<Object> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询
List<WgdExReviseCost> wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost);
PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts);
@@ -48,7 +45,7 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
}
@PostMapping("modExReviseCost")
@PutMapping("modExReviseCost")
ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
}
@@ -63,7 +60,7 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
}
@GetMapping("delExReviseCosts")
@DeleteMapping("delExReviseCosts")
ResponseMessage<Object> deleteWgdExReviseCosts(String ids){//批量删除
return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids));
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
+16 -20
View File
@@ -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<WgdMeetCost> {
@Autowired
IWgdMeetCostService iWgdMeetCostService;
@GetMapping("getAllMeetCosts")
public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
}
@PostMapping("queryAllMeetCosts")
@GetMapping("queryAllMeetCosts")
public ResponseMessage<Object> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询
PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost));
return Result.success(pageInfo);
}
@GetMapping("getMeetCostById")
public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
}
@PostMapping("modMeetCost")
@PutMapping("modMeetCost")
ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
}
@@ -56,13 +43,22 @@ public class WgdMeetCostController extends BaseController<WgdMeetCost> {
return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
}
@DeleteMapping("delMeetCosts")
ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
}
@GetMapping("getAllMeetCosts")
public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
}
@GetMapping("getMeetCostById")
public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
}
@GetMapping("delMeetCost")
ResponseMessage<Object> deleteWgdMeetCost(String id){//删除
return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id));
}
@GetMapping("delMeetCosts")
ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java
+1 -1
View File
@@ -24,5 +24,5 @@ public interface WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
int updateOne(WgdAssocInfo wgdAssocInfo);//编辑
int insertOne(WgdAssocInfo wgdAssocInfo);//插入
int deleteOne(String id);//删除
int deleteBatch();//批量删除
int deleteBatch(String[] ids);//批量删除
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java
+1 -1
View File
@@ -25,5 +25,5 @@ public interface WgdCommiInfoDao extends BaseMapper<WgdCommiInfo> {
int updateOne(WgdCommiInfo wgdCommiInfo);//编辑
int insertOne(WgdCommiInfo wgdCommiInfo);//插入
int deleteOne(String id);//删除
int deleteBatch();//批量删除
int deleteBatch(String[] ids);//批量删除
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java
+1 -1
View File
@@ -25,5 +25,5 @@ public interface WgdExReviseCostDao extends BaseMapper<WgdExReviseCost> {
int updateOne(WgdExReviseCost wgdExReviseCost);//编辑
int insertOne(WgdExReviseCost wgdExReviseCost);//插入
int deleteOne(String id);//删除
int deleteBatch();//批量删除
int deleteBatch(String[] ids);//批量删除
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java
+1 -1
View File
@@ -25,5 +25,5 @@ public interface WgdMeetCostDao extends BaseMapper<WgdMeetCost> {
int updateOne(WgdMeetCost wgdMeetCost);//编辑
int insertOne(WgdMeetCost wgdMeetCost);//插入
int deleteOne(String id);//删除
int deleteBatch();//批量删除
int deleteBatch(String[] ids);//批量删除
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
+2 -1
View File
@@ -59,6 +59,7 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
@Override
public int deleteWgdAssocInfos(String ids) {
return wgdAssocInfoDao.deleteBatch();
String[] str = ids.split(",");
return wgdAssocInfoDao.deleteBatch(str);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
+2 -1
View File
@@ -62,6 +62,7 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
@Override
public int deleteWgdCommiInfos(String ids) {
return wgdCommiInfoDao.deleteBatch();
String[] str = ids.split(",");
return wgdCommiInfoDao.deleteBatch(str);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
+2 -1
View File
@@ -61,6 +61,7 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
@Override
public int deleteWgdExReviseCosts(String ids) {
return wgdExReviseCostDao.deleteBatch();
String[] str = ids.split(",");
return wgdExReviseCostDao.deleteBatch(str);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
+2 -1
View File
@@ -60,6 +60,7 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
@Override
public int deleteWgdMeetCosts(String ids) {
return wgdMeetCostDao.deleteBatch();
String[] str = ids.split(",");
return wgdMeetCostDao.deleteBatch(str);
}
}