Merge remote-tracking branch 'origin/origin/Three' into develop_master
This commit is contained in:
+18
-22
@@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 采购费用信息统计 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author super_liu
|
||||
* @since 2021-11-12
|
||||
*/
|
||||
* <p>
|
||||
* 委员信息数据统计 前端控制器
|
||||
* </p>
|
||||
*
|
||||
* @author zcr
|
||||
* @since 2021-11-12
|
||||
*/
|
||||
@RestController
|
||||
@Api(description = "|WgdCgfy|")
|
||||
@RequestMapping("/wgdCensusLeo/wgd-cgfy")
|
||||
@RequestMapping("api/wgdCensusLeo/wgd-cgfy")
|
||||
public class WgdCgfyController extends BaseController<WgdCgfy> {
|
||||
|
||||
@Autowired
|
||||
IWgdCgfyService iWgdCgfyService;
|
||||
|
||||
@GetMapping("getAllCgfys")
|
||||
@GetMapping("/getAllCgfys")
|
||||
public ResponseMessage<Object> getAllWgdCgfys(){//查询所有
|
||||
return Result.success(iWgdCgfyService.getAllWgdCgfys());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllCgfys")
|
||||
@GetMapping("/queryAllCgfys")
|
||||
public ResponseMessage<Object> queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询
|
||||
List<WgdCgfy> wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy);
|
||||
PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys);
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@GetMapping("getCgfyById")
|
||||
@GetMapping("/getCgfyById")
|
||||
public ResponseMessage<Object> getWgdCgfyById(String id) {//查询详情
|
||||
return Result.success(iWgdCgfyService.getWgdCgfyById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modCgfy")
|
||||
@PostMapping("/modCgfy")
|
||||
ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
|
||||
return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
|
||||
}
|
||||
|
||||
@PostMapping("addCgfy")
|
||||
@PostMapping("/addCgfy")
|
||||
ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
|
||||
return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
|
||||
}
|
||||
|
||||
@GetMapping("delCgfy")
|
||||
@DeleteMapping("/delCgfy")
|
||||
ResponseMessage<Object> deleteWgdCgfy(String id){//删除
|
||||
return Result.success(iWgdCgfyService.deleteWgdCgfy(id));
|
||||
}
|
||||
|
||||
@GetMapping("delCgfys")
|
||||
@DeleteMapping("/delCgfys")
|
||||
ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
|
||||
return Result.success(iWgdCgfyService.deleteWgdCgfys(ids));
|
||||
}
|
||||
|
||||
+9
-12
@@ -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<WgdFyfy> {
|
||||
@Autowired
|
||||
IWgdFyfyService iWgdFyfyService;
|
||||
|
||||
@GetMapping("getAllFyfys")
|
||||
@GetMapping("/getAllFyfys")
|
||||
public ResponseMessage<Object> getAllWgdFyfys(){//查询所有
|
||||
return Result.success(iWgdFyfyService.getAllWgdFyfys());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllFyfys")
|
||||
@GetMapping("/queryAllFyfys")
|
||||
public ResponseMessage<Object> queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询
|
||||
List<WgdFyfy> wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy);
|
||||
PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys);
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@GetMapping("getFyfyById")
|
||||
@GetMapping("/getFyfyById")
|
||||
public ResponseMessage<Object> getWgdFyfyById(String id) {//查询详情
|
||||
return Result.success(iWgdFyfyService.getWgdFyfyById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modFyfy")
|
||||
@PostMapping("/modFyfy")
|
||||
ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
|
||||
return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
|
||||
}
|
||||
|
||||
@PostMapping("addFyfy")
|
||||
@PostMapping("/addFyfy")
|
||||
ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
|
||||
return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
|
||||
}
|
||||
|
||||
@GetMapping("delFyfy")
|
||||
@DeleteMapping("/delFyfy")
|
||||
ResponseMessage<Object> deleteWgdFyfy(String id){//删除
|
||||
return Result.success(iWgdFyfyService.deleteWgdFyfy(id));
|
||||
}
|
||||
|
||||
@GetMapping("delFyfys")
|
||||
@DeleteMapping("/delFyfys")
|
||||
ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
|
||||
return Result.success(iWgdFyfyService.deleteWgdFyfys(ids));
|
||||
}
|
||||
|
||||
+9
-12
@@ -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<WgdSrb> {
|
||||
@Autowired
|
||||
IWgdSrbService iWgdSrbService;
|
||||
|
||||
@GetMapping("getAllSrbs")
|
||||
@GetMapping("/getAllSrbs")
|
||||
public ResponseMessage<Object> getAllWgdSrbs(){//查询所有
|
||||
return Result.success(iWgdSrbService.getAllWgdSrbs());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllSrbs")
|
||||
@GetMapping("/queryAllSrbs")
|
||||
public ResponseMessage<Object> queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询
|
||||
List<WgdSrb> wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb);
|
||||
PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs);
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@GetMapping("getSrbById")
|
||||
@GetMapping("/getSrbById")
|
||||
public ResponseMessage<Object> getWgdSrbById(String id) {//查询详情
|
||||
return Result.success(iWgdSrbService.getWgdSrbById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modSrb")
|
||||
@PostMapping("/modSrb")
|
||||
ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
|
||||
return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
|
||||
}
|
||||
|
||||
@PostMapping("addSrb")
|
||||
@PostMapping("/addSrb")
|
||||
ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
|
||||
return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
|
||||
}
|
||||
|
||||
@GetMapping("delSrb")
|
||||
@DeleteMapping("/delSrb")
|
||||
ResponseMessage<Object> deleteWgdSrb(String id){//删除
|
||||
return Result.success(iWgdSrbService.deleteWgdSrb(id));
|
||||
}
|
||||
|
||||
@GetMapping("delSrbs")
|
||||
@DeleteMapping("/delSrbs")
|
||||
ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
|
||||
return Result.success(iWgdSrbService.deleteWgdSrbs(ids));
|
||||
}
|
||||
|
||||
+9
-12
@@ -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<WgdWbtj> {
|
||||
@Autowired
|
||||
IWgdWbtjService iWgdWbtjService;
|
||||
|
||||
@GetMapping("getAllWbtjs")
|
||||
@GetMapping("/getAllWbtjs")
|
||||
public ResponseMessage<Object> getAllWgdWbtjs(){//查询所有
|
||||
return Result.success(iWgdWbtjService.getAllWgdWbtjs());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllWbtjs")
|
||||
@GetMapping("/queryAllWbtjs")
|
||||
public ResponseMessage<Object> queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询
|
||||
List<WgdWbtj> wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj);
|
||||
PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs);
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@GetMapping("getWbtjById")
|
||||
@GetMapping("/getWbtjById")
|
||||
public ResponseMessage<Object> getWgdWbtjById(String id) {//查询详情
|
||||
return Result.success(iWgdWbtjService.getWgdWbtjById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modWbtj")
|
||||
@PostMapping("/modWbtj")
|
||||
ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
|
||||
return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
|
||||
}
|
||||
|
||||
@PostMapping("addWbtj")
|
||||
@PostMapping("/addWbtj")
|
||||
ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
|
||||
return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
|
||||
}
|
||||
|
||||
@GetMapping("delWbtj")
|
||||
@DeleteMapping("/delWbtj")
|
||||
ResponseMessage<Object> deleteWgdWbtj(String id){//删除
|
||||
return Result.success(iWgdWbtjService.deleteWgdWbtj(id));
|
||||
}
|
||||
|
||||
@GetMapping("delWbtjs")
|
||||
@DeleteMapping("/delWbtjs")
|
||||
ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
|
||||
return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids));
|
||||
}
|
||||
|
||||
+9
-12
@@ -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<WgdWbxd> {
|
||||
@Autowired
|
||||
IWgdWbxdService iWgdWbxdService;
|
||||
|
||||
@GetMapping("getAllWbxds")
|
||||
@GetMapping("/getAllWbxds")
|
||||
public ResponseMessage<Object> getAllWgdWbxds(){//查询所有
|
||||
return Result.success(iWgdWbxdService.getAllWgdWbxds());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllWbxds")
|
||||
@GetMapping("/queryAllWbxds")
|
||||
public ResponseMessage<Object> queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询
|
||||
List<WgdWbxd> wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd);
|
||||
PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds);
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@GetMapping("getWbxdById")
|
||||
@GetMapping("/getWbxdById")
|
||||
public ResponseMessage<Object> getWgdWbxdById(String id) {//查询详情
|
||||
return Result.success(iWgdWbxdService.getWgdWbxdById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modWbxd")
|
||||
@PostMapping("/modWbxd")
|
||||
ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
|
||||
return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
|
||||
}
|
||||
|
||||
@PostMapping("addWbxd")
|
||||
@PostMapping("/addWbxd")
|
||||
ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
|
||||
return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
|
||||
}
|
||||
|
||||
@GetMapping("delWbxd")
|
||||
@DeleteMapping("/delWbxd")
|
||||
ResponseMessage<Object> deleteWgdWbxd(String id){//删除
|
||||
return Result.success(iWgdWbxdService.deleteWgdWbxd(id));
|
||||
}
|
||||
|
||||
@GetMapping("delWbxds")
|
||||
@DeleteMapping("/delWbxds")
|
||||
ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
|
||||
return Result.success(iWgdWbxdService.deleteWgdWbxds(ids));
|
||||
}
|
||||
|
||||
+9
-12
@@ -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<WgdZcb> {
|
||||
@Autowired
|
||||
IWgdZcbService iWgdZcbService;
|
||||
|
||||
@GetMapping("getAllZcbs")
|
||||
@GetMapping("/getAllZcbs")
|
||||
public ResponseMessage<Object> getAllWgdZcbs(){//查询所有
|
||||
return Result.success(iWgdZcbService.getAllWgdZcbs());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllZcbs")
|
||||
@GetMapping("/queryAllZcbs")
|
||||
public ResponseMessage<Object> queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询
|
||||
List<WgdZcb> wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb);
|
||||
PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs);
|
||||
return Result.success(pageInfo);
|
||||
}
|
||||
|
||||
@GetMapping("getZcbById")
|
||||
@GetMapping("/getZcbById")
|
||||
public ResponseMessage<Object> getWgdZcbById(String id) {//查询详情
|
||||
return Result.success(iWgdZcbService.getWgdZcbById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modZcb")
|
||||
@PostMapping("/modZcb")
|
||||
ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
|
||||
return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
|
||||
}
|
||||
|
||||
@PostMapping("addZcb")
|
||||
@PostMapping("/addZcb")
|
||||
ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
|
||||
return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
|
||||
}
|
||||
|
||||
@GetMapping("delZcb")
|
||||
@DeleteMapping("/delZcb")
|
||||
ResponseMessage<Object> deleteWgdZcb(String id){//删除
|
||||
return Result.success(iWgdZcbService.deleteWgdZcb(id));
|
||||
}
|
||||
|
||||
@GetMapping("delZcbs")
|
||||
@DeleteMapping("/delZcbs")
|
||||
ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
|
||||
return Result.success(iWgdZcbService.deleteWgdZcbs(ids));
|
||||
}
|
||||
|
||||
+2
-2
@@ -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<WgdCgfyDao, WgdCgfy> 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<WgdCgfyDao, WgdCgfy> impleme
|
||||
|
||||
@Override
|
||||
public int deleteWgdCgfys(String ids) {
|
||||
String[] str = ids.split(",");
|
||||
return wgdCgfyDao.deleteBatch();
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -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));
|
||||
}
|
||||
|
||||
+8
-6
@@ -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<WgdAssocInfo> {
|
||||
return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllAssocInfos")
|
||||
@ApiOperation("查询")
|
||||
@GetMapping("queryAllAssocInfos")
|
||||
public ResponseMessage<Object> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询
|
||||
List<WgdAssocInfo> wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo);
|
||||
PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos);
|
||||
@@ -48,11 +47,13 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
|
||||
return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("更改")
|
||||
@PostMapping("modAssocInfo")
|
||||
ResponseMessage<Object> updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
|
||||
return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo));
|
||||
}
|
||||
|
||||
@ApiOperation("添加")
|
||||
@PostMapping("addAssocInfo")
|
||||
ResponseMessage<Object> insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
|
||||
return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo));
|
||||
@@ -63,7 +64,8 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
|
||||
return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
|
||||
}
|
||||
|
||||
@GetMapping("delAssocInfos")
|
||||
@ApiOperation("删除")
|
||||
@PostMapping("delAssocInfos")
|
||||
ResponseMessage<Object> deleteWgdAssocInfos(String ids){//批量删除
|
||||
return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids));
|
||||
}
|
||||
|
||||
+8
-6
@@ -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<WgdCommiInfo> {
|
||||
return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllCommiInfos")
|
||||
@ApiOperation("查询")
|
||||
@GetMapping("queryAllCommiInfos")
|
||||
public ResponseMessage<Object> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询
|
||||
List<WgdCommiInfo> wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo);
|
||||
PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos);
|
||||
@@ -48,11 +47,13 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
|
||||
return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("更新")
|
||||
@PostMapping("modCommiInfo")
|
||||
ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
|
||||
return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
|
||||
}
|
||||
|
||||
@ApiOperation("添加")
|
||||
@PostMapping("addCommiInfo")
|
||||
ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
|
||||
return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
|
||||
@@ -63,7 +64,8 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
|
||||
return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
|
||||
}
|
||||
|
||||
@GetMapping("delCommiInfos")
|
||||
@ApiOperation("删除")
|
||||
@PostMapping("delCommiInfos")
|
||||
ResponseMessage<Object> deleteWgdCommiInfos(String ids){//批量删除
|
||||
return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids));
|
||||
}
|
||||
|
||||
+9
-7
@@ -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<WgdExReviseCost> {
|
||||
return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllExReviseCosts")
|
||||
@ApiOperation("查询")
|
||||
@GetMapping("queryAllExReviseCosts")
|
||||
public ResponseMessage<Object> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询
|
||||
List<WgdExReviseCost> wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost);
|
||||
PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts);
|
||||
@@ -48,11 +47,13 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
|
||||
return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
|
||||
}
|
||||
|
||||
@PostMapping("modExReviseCost")
|
||||
@ApiOperation("更改")
|
||||
@PutMapping("modExReviseCost")
|
||||
ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
|
||||
return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
|
||||
}
|
||||
|
||||
@ApiOperation("插入")
|
||||
@PostMapping("addExReviseCost")
|
||||
ResponseMessage<Object> insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
|
||||
return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost));
|
||||
@@ -63,7 +64,8 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
|
||||
return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
|
||||
}
|
||||
|
||||
@GetMapping("delExReviseCosts")
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("delExReviseCosts")
|
||||
ResponseMessage<Object> deleteWgdExReviseCosts(String ids){//批量删除
|
||||
return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids));
|
||||
}
|
||||
|
||||
+21
-20
@@ -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<WgdMeetCost> {
|
||||
@Autowired
|
||||
IWgdMeetCostService iWgdMeetCostService;
|
||||
|
||||
@GetMapping("getAllMeetCosts")
|
||||
public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
|
||||
return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
|
||||
}
|
||||
|
||||
@PostMapping("queryAllMeetCosts")
|
||||
@ApiOperation("查询")
|
||||
@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")
|
||||
@ApiOperation("更新")
|
||||
@PutMapping("modMeetCost")
|
||||
ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
|
||||
return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
|
||||
}
|
||||
|
||||
@ApiOperation("添加")
|
||||
@PostMapping("addMeetCost")
|
||||
ResponseMessage<Object> insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
|
||||
return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);//批量删除
|
||||
}
|
||||
|
||||
@@ -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);//批量删除
|
||||
}
|
||||
|
||||
@@ -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);//批量删除
|
||||
}
|
||||
|
||||
@@ -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);//批量删除
|
||||
}
|
||||
|
||||
+2
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -25,7 +25,6 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
|
||||
@Autowired
|
||||
WgdCommiInfoDao wgdCommiInfoDao;
|
||||
|
||||
|
||||
@Override
|
||||
public List<WgdCommiInfo> getAllWgdCommiInfos() {
|
||||
return wgdCommiInfoDao.selectAll();
|
||||
@@ -63,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);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,13 +18,11 @@
|
||||
and id = #{id}
|
||||
</if>
|
||||
<if test="scName != null and scName != ''">
|
||||
and sc_name like concat('%',#{scName},'%')
|
||||
</if>
|
||||
<if test="sscName != null and sscName != ''">
|
||||
and ssc_name like concat('%',#{sscName},'%')
|
||||
</if>
|
||||
<if test="wgName != null and wgName != ''">
|
||||
and wg_name like concat('%',#{wgName},'%')
|
||||
and (
|
||||
sc_name like concat('%',#{scName} ,'%')
|
||||
ssc_name like concat('%',#{scName} ,'%')
|
||||
wg_name like concat('%',#{scName} ,'%')
|
||||
)
|
||||
</if>
|
||||
<if test="payStandard != null and payStandard != ''">
|
||||
and pay_standard = #{payStandard}
|
||||
@@ -77,16 +75,16 @@
|
||||
<if test="wgName != null and wgName != ''">
|
||||
wg_name = #{wgName},
|
||||
</if>
|
||||
<if test="payStandard != null and payStandard != ''">
|
||||
<if test="payStandard != null">
|
||||
pay_standard = #{payStandard},
|
||||
</if>
|
||||
<if test="payReality != null and payReality != ''">
|
||||
<if test="payReality != null">
|
||||
pay_reality = #{payReality},
|
||||
</if>
|
||||
<if test="costOutlay != null and costOutlay != ''">
|
||||
<if test="costOutlay != null">
|
||||
cost_outlay = #{costOutlay},
|
||||
</if>
|
||||
<if test="annualPayment != null and annualPayment != ''">
|
||||
<if test="annualPayment != null">
|
||||
annual_payment = #{annualPayment},
|
||||
</if>
|
||||
</set>
|
||||
|
||||
@@ -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
|
||||
</sql>
|
||||
<sql id="Conditions">
|
||||
WHERE 1=1
|
||||
@@ -19,13 +19,11 @@
|
||||
and id = #{id}
|
||||
</if>
|
||||
<if test="scName != null and scName != ''">
|
||||
and sc_name like concat('%',#{scName},'%')
|
||||
</if>
|
||||
<if test="sscName != null and sscName != ''">
|
||||
and ssc_name like concat('%',#{sscName},'%')
|
||||
</if>
|
||||
<if test="wgName != null and wgName != ''">
|
||||
and wg_name like concat('%',#{wgName},'%')
|
||||
and (
|
||||
sc_name like concat('%',#{scName} ,'%')
|
||||
ssc_name like concat('%',#{scName} ,'%')
|
||||
wg_name like concat('%',#{scName} ,'%')
|
||||
)
|
||||
</if>
|
||||
<if test="role != null and role != ''">
|
||||
and role = #{role}
|
||||
@@ -43,10 +41,10 @@
|
||||
and leader = #{leader}
|
||||
</if>
|
||||
<if test="iniTime != null">
|
||||
and ini_time = #{iniTime}
|
||||
and DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d')
|
||||
</if>
|
||||
<if test="curTime != null">
|
||||
and cur_time = #{curTime}
|
||||
and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
|
||||
</if>
|
||||
<if test="costStandard != null and costStandard != ''">
|
||||
and cost_standard = #{costStandard}
|
||||
@@ -55,7 +53,7 @@
|
||||
and cost_outlay = #{costOutlay}
|
||||
</if>
|
||||
<if test="lastPayTime != null">
|
||||
and last_pay_time = #{lastPayTime}
|
||||
and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d')
|
||||
</if>
|
||||
<if test="payPeriod != null and payPeriod != ''">
|
||||
and pay_period = #{payPeriod}
|
||||
@@ -90,6 +88,7 @@
|
||||
<select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
|
||||
select <include refid="BaseInfo"></include> from wgd_assoc_info
|
||||
</select>
|
||||
<!-- 查询-->
|
||||
<select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
|
||||
select <include refid="BaseInfo"></include> from wgd_assoc_info
|
||||
<include refid="Conditions"></include>
|
||||
@@ -99,7 +98,7 @@
|
||||
select <include refid="BaseInfo"></include> from wgd_assoc_info
|
||||
where id = #{id}
|
||||
</select>
|
||||
|
||||
<!-- 更新-->
|
||||
<update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
|
||||
update wgd_assoc_info
|
||||
<set>
|
||||
@@ -217,6 +216,7 @@
|
||||
</set>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<!-- 新增-->
|
||||
<insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
|
||||
insert into wgd_assoc_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
@@ -456,6 +456,7 @@
|
||||
<delete id="deleteOne" parameterType="java.lang.String">
|
||||
delete from wgd_assoc_info where id = #{id}
|
||||
</delete>
|
||||
<!-- 删除-->
|
||||
<delete id="deleteBatch" parameterType="java.lang.String">
|
||||
delete from wgd_assoc_info where id in
|
||||
<foreach item="id" collection="array" open="(" close=")" separator=",">
|
||||
|
||||
@@ -19,13 +19,11 @@
|
||||
and unit = #{unit}
|
||||
</if>
|
||||
<if test="scName != null and scName != ''">
|
||||
and sc_name = #{scName}
|
||||
</if>
|
||||
<if test="sscName != null and sscName != ''">
|
||||
and ssc_name = #{sscName}
|
||||
</if>
|
||||
<if test="wgName != null and wgName != ''">
|
||||
and wg_name = #{wgName}
|
||||
and (
|
||||
sc_name like concat('%',#{scName} ,'%')
|
||||
ssc_name like concat('%',#{scName} ,'%')
|
||||
wg_name like concat('%',#{scName} ,'%')
|
||||
)
|
||||
</if>
|
||||
<if test="role != null and role != ''">
|
||||
and role = #{role}
|
||||
@@ -34,7 +32,7 @@
|
||||
and attend = #{attend}
|
||||
</if>
|
||||
<if test="curTime != null">
|
||||
and cur_time = #{curTime}
|
||||
and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
|
||||
</if>
|
||||
<if test="job != null and job != ''">
|
||||
and job = #{job}
|
||||
@@ -234,9 +232,9 @@
|
||||
<delete id="deleteOne" parameterType="java.lang.String">
|
||||
delete from wgd_commi_info where id = #{id}
|
||||
</delete>
|
||||
<delete id="deleteBatch">
|
||||
<delete id="deleteBatch" parameterType="java.lang.String">
|
||||
delete from wgd_commi_info where id in
|
||||
<foreach collection="array" item="id" separator="," close=")" open="(">
|
||||
<foreach collection="array" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
+19
-19
@@ -50,19 +50,19 @@
|
||||
<update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
|
||||
update wgd_ex_revise_cost
|
||||
<set>
|
||||
<if test="type != null and type != ''">
|
||||
<if test="type != null">
|
||||
type = #{type},
|
||||
</if>
|
||||
<if test="proId != null and proId != ''">
|
||||
<if test="proId != null">
|
||||
pro_id = #{proId},
|
||||
</if>
|
||||
<if test="proName != null and proName != ''">
|
||||
<if test="proName != null">
|
||||
pro_name = #{proName},
|
||||
</if>
|
||||
<if test="cost != null and cost != ''">
|
||||
<if test="cost != null">
|
||||
cost = #{cost},
|
||||
</if>
|
||||
<if test="costOutlay != null and costOutlay != ''">
|
||||
<if test="costOutlay != null">
|
||||
cost_outlay = #{costOutlay},
|
||||
</if>
|
||||
</set>
|
||||
@@ -71,43 +71,43 @@
|
||||
<insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
|
||||
insert into wgd_ex_revise_cost
|
||||
<trim prefix="(" suffixOverrides="," suffix=")">
|
||||
<if test="id != null and id != ''">
|
||||
<if test="id != null">
|
||||
id,
|
||||
</if>
|
||||
<if test="type != null and type != ''">
|
||||
<if test="type != null">
|
||||
type,
|
||||
</if>
|
||||
<if test="proId != null and proId != ''">
|
||||
pro_id
|
||||
<if test="proId != null">
|
||||
pro_id,
|
||||
</if>
|
||||
<if test="proName != null and proName != ''">
|
||||
<if test="proName != null">
|
||||
pro_name,
|
||||
</if>
|
||||
<if test="cost != null and cost != ''">
|
||||
<if test="cost != null">
|
||||
cost,
|
||||
</if>
|
||||
<if test="costOutlay != null and costOutlay != ''">
|
||||
<if test="costOutlay != null">
|
||||
cost_outlay,
|
||||
</if>
|
||||
</trim>
|
||||
values
|
||||
<trim prefix="(" suffixOverrides="," suffix=")">
|
||||
<if test="id != null and id != ''">
|
||||
<if test="id != null">
|
||||
#{id},
|
||||
</if>
|
||||
<if test="type != null and type != ''">
|
||||
<if test="type != null">
|
||||
#{type},
|
||||
</if>
|
||||
<if test="proId != null and proId != ''">
|
||||
<if test="proId != null">
|
||||
#{proId},
|
||||
</if>
|
||||
<if test="proName != null and proName != ''">
|
||||
<if test="proName != null">
|
||||
#{proName},
|
||||
</if>
|
||||
<if test="cost != null and cost != ''">
|
||||
<if test="cost != null">
|
||||
#{cost},
|
||||
</if>
|
||||
<if test="costOutlay != null and costOutlay != ''">
|
||||
<if test="costOutlay != null">
|
||||
#{costOutlay},
|
||||
</if>
|
||||
</trim>
|
||||
@@ -115,7 +115,7 @@
|
||||
<delete id="deleteOne" parameterType="java.lang.String">
|
||||
delete from wgd_ex_revise_cost where id = #{id}
|
||||
</delete>
|
||||
<delete id="deleteBatch">
|
||||
<delete id="deleteBatch" parameterType="java.lang.String">
|
||||
delete from wgd_ex_revise_cost where id in
|
||||
<foreach collection="array" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
and meet_name = #{meetName}
|
||||
</if>
|
||||
<if test="meetTime != null">
|
||||
and meet_time = #{meetTime}
|
||||
and DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d')
|
||||
</if>
|
||||
<if test="payStandard != null and payStandard != ''">
|
||||
and pay_standard = #{payStandard}
|
||||
@@ -54,22 +54,22 @@
|
||||
<update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
|
||||
update wgd_meet_cost
|
||||
<set>
|
||||
<if test="unit != null and unit != ''">
|
||||
<if test="unit != null">
|
||||
unit = #{unit},
|
||||
</if>
|
||||
<if test="meetName != null and meetName != ''">
|
||||
<if test="meetName != null">
|
||||
meet_name = #{meetName},
|
||||
</if>
|
||||
<if test="meetTime != null">
|
||||
<if test="meetTime">
|
||||
meet_time = #{meetTime},
|
||||
</if>
|
||||
<if test="payStandard != null and payStandard != ''">
|
||||
<if test="payStandard != null">
|
||||
pay_standard = #{payStandard},
|
||||
</if>
|
||||
<if test="payReality != null and payReality != ''">
|
||||
<if test="payReality != null">
|
||||
pay_reality = #{payReality},
|
||||
</if>
|
||||
<if test="costOutlay != null and costOutlay != ''">
|
||||
<if test="costOutlay != null">
|
||||
cost_outlay = #{costOutlay},
|
||||
</if>
|
||||
</set>
|
||||
@@ -128,7 +128,7 @@
|
||||
<delete id="deleteOne" parameterType="java.lang.String">
|
||||
delete from wgd_meet_cost where id = #{id}
|
||||
</delete>
|
||||
<delete id="deleteBatch">
|
||||
<delete id="deleteBatch" parameterType="java.lang.String">
|
||||
delete from wgd_meet_cost where id in
|
||||
<foreach collection="array" item="id" open="(" separator="," close=")">
|
||||
#{id}
|
||||
|
||||
Reference in New Issue
Block a user