diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java index 8b2563c1..09891730 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java @@ -42,7 +42,7 @@ public class WgdAssocCostController extends BaseController { } @ApiOperation("多条件查询") - @PostMapping("queryAllAssocCosts") + @GetMapping("queryAllAssocCosts") public ResponseMessage queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询 List wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost); PageInfo pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts); @@ -56,7 +56,7 @@ public class WgdAssocCostController extends BaseController { } @ApiOperation("编辑") - @PostMapping("modAssocCost") + @PutMapping("modAssocCost") ResponseMessage updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑 return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost)); } @@ -74,7 +74,7 @@ public class WgdAssocCostController extends BaseController { } @ApiOperation("批量删除") - @GetMapping("delAssocCosts") + @DeleteMapping("delAssocCosts") ResponseMessage deleteWgdAssocCosts(String ids){//批量删除 return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java index 0823966b..58412a42 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -6,12 +6,9 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos()); } - @PostMapping("queryAllAssocInfos") + @GetMapping("queryAllAssocInfos") public ResponseMessage queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询 List wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo); PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos); @@ -63,7 +60,7 @@ public class WgdAssocInfoController extends BaseController { return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id)); } - @GetMapping("delAssocInfos") + @PostMapping("delAssocInfos") ResponseMessage deleteWgdAssocInfos(String ids){//批量删除 return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java new file mode 100644 index 00000000..f3cfb998 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java @@ -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; + +/** +*

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

+* +* @author zcr +* @since 2021-11-12 +*/ +@RestController +@Api(description = "|WgdCommiInfo|") +@RequestMapping("api/wgdCensusZ/wgd-commi-info") +public class WgdCommiInfoController extends BaseController { + @Autowired + IWgdCommiInfoService iWgdCommiInfoService; + + @GetMapping("getAllCommiInfos") + public ResponseMessage getAllWgdCommiInfos(){//查询所有 + return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos()); + } + + @GetMapping("queryAllCommiInfos") + public ResponseMessage queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询 + List wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo); + PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos); + return Result.success(pageInfo); + } + + @GetMapping("getCommiInfoById") + public ResponseMessage getWgdCommiInfoById(String id) {//查询详情 + return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id)); + } + + @PostMapping("modCommiInfo") + ResponseMessage updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑 + return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo)); + } + + @PostMapping("addCommiInfo") + ResponseMessage insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入 + return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo)); + } + + @GetMapping("delCommiInfo") + ResponseMessage deleteWgdCommiInfo(String id){//删除 + return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id)); + } + + @PostMapping("delCommiInfos") + ResponseMessage deleteWgdCommiInfos(String ids){//批量删除 + return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids)); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java index b76d0ab5..512331d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -36,7 +33,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts()); } - @PostMapping("queryAllExReviseCosts") + @GetMapping("queryAllExReviseCosts") public ResponseMessage queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询 List wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost); PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts); @@ -48,7 +45,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id)); } - @PostMapping("modExReviseCost") + @PutMapping("modExReviseCost") ResponseMessage updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑 return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost)); } @@ -63,7 +60,7 @@ public class WgdExReviseCostController extends BaseController { return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id)); } - @GetMapping("delExReviseCosts") + @DeleteMapping("delExReviseCosts") ResponseMessage deleteWgdExReviseCosts(String ids){//批量删除 return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java index 449692a3..54a32c15 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java @@ -7,11 +7,8 @@ import com.adc.da.http.Result; import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost; import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; @@ -30,23 +27,13 @@ public class WgdMeetCostController extends BaseController { @Autowired IWgdMeetCostService iWgdMeetCostService; - @GetMapping("getAllMeetCosts") - public ResponseMessage getAllWgdMeetCosts(){//查询所有 - return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); - } - - @PostMapping("queryAllMeetCosts") + @GetMapping("queryAllMeetCosts") public ResponseMessage queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询 PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost)); return Result.success(pageInfo); } - @GetMapping("getMeetCostById") - public ResponseMessage getWgdMeetCostById(String id) {//查询详情 - return Result.success(iWgdMeetCostService.getWgdMeetCostById(id)); - } - - @PostMapping("modMeetCost") + @PutMapping("modMeetCost") ResponseMessage updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑 return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost)); } @@ -56,13 +43,22 @@ public class WgdMeetCostController extends BaseController { return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost)); } + @DeleteMapping("delMeetCosts") + ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 + return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); + } + + @GetMapping("getAllMeetCosts") + public ResponseMessage getAllWgdMeetCosts(){//查询所有 + return Result.success(iWgdMeetCostService.getAllWgdMeetCosts()); + } + @GetMapping("getMeetCostById") + public ResponseMessage getWgdMeetCostById(String id) {//查询详情 + return Result.success(iWgdMeetCostService.getWgdMeetCostById(id)); + } @GetMapping("delMeetCost") ResponseMessage deleteWgdMeetCost(String id){//删除 return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id)); } - @GetMapping("delMeetCosts") - ResponseMessage deleteWgdMeetCosts(String ids){//批量删除 - return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids)); - } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java index 48431efb..3491ed99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java @@ -24,5 +24,5 @@ public interface WgdAssocInfoDao extends BaseMapper { int updateOne(WgdAssocInfo wgdAssocInfo);//编辑 int insertOne(WgdAssocInfo wgdAssocInfo);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java index 36980275..08aa17eb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java @@ -25,5 +25,5 @@ public interface WgdCommiInfoDao extends BaseMapper { int updateOne(WgdCommiInfo wgdCommiInfo);//编辑 int insertOne(WgdCommiInfo wgdCommiInfo);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java index 2d67546e..2fa84fb6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java @@ -25,5 +25,5 @@ public interface WgdExReviseCostDao extends BaseMapper { int updateOne(WgdExReviseCost wgdExReviseCost);//编辑 int insertOne(WgdExReviseCost wgdExReviseCost);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java index 71610aa1..d5139ab3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java @@ -25,5 +25,5 @@ public interface WgdMeetCostDao extends BaseMapper { int updateOne(WgdMeetCost wgdMeetCost);//编辑 int insertOne(WgdMeetCost wgdMeetCost);//插入 int deleteOne(String id);//删除 - int deleteBatch();//批量删除 + int deleteBatch(String[] ids);//批量删除 } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java index a6bade22..e862229c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java @@ -59,6 +59,7 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl - and sc_name like concat('%',#{scName},'%') - - - and ssc_name like concat('%',#{sscName},'%') - - - and wg_name like concat('%',#{wgName},'%') + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) and pay_standard = #{payStandard} @@ -77,16 +75,16 @@ wg_name = #{wgName}, - + pay_standard = #{payStandard}, - + pay_reality = #{payReality}, - + cost_outlay = #{costOutlay}, - + annual_payment = #{annualPayment}, diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml index e8ff3351..e7214efc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml @@ -19,13 +19,11 @@ and id = #{id} - and sc_name like concat('%',#{scName},'%') - - - and ssc_name like concat('%',#{sscName},'%') - - - and wg_name like concat('%',#{wgName},'%') + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) and role = #{role} @@ -43,10 +41,10 @@ and leader = #{leader} - and ini_time = #{iniTime} + and DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d') - and cur_time = #{curTime} + and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d') and cost_standard = #{costStandard} @@ -55,7 +53,7 @@ and cost_outlay = #{costOutlay} - and last_pay_time = #{lastPayTime} + and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d') and pay_period = #{payPeriod} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml index e9bf66fc..d3708885 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml @@ -19,13 +19,11 @@ and unit = #{unit} - and sc_name = #{scName} - - - and ssc_name = #{sscName} - - - and wg_name = #{wgName} + and ( + sc_name like concat('%',#{scName} ,'%') + ssc_name like concat('%',#{scName} ,'%') + wg_name like concat('%',#{scName} ,'%') + ) and role = #{role} @@ -34,7 +32,7 @@ and attend = #{attend} - and cur_time = #{curTime} + and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d') and job = #{job} @@ -234,9 +232,9 @@ delete from wgd_commi_info where id = #{id} - + delete from wgd_commi_info where id in - + #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml index f7060895..f176790c 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml @@ -50,19 +50,19 @@ update wgd_ex_revise_cost - + type = #{type}, - + pro_id = #{proId}, - + pro_name = #{proName}, - + cost = #{cost}, - + cost_outlay = #{costOutlay}, @@ -71,43 +71,43 @@ insert into wgd_ex_revise_cost - + id, - + type, - - pro_id + + pro_id, - + pro_name, - + cost, - + cost_outlay, values - + #{id}, - + #{type}, - + #{proId}, - + #{proName}, - + #{cost}, - + #{costOutlay}, @@ -115,7 +115,7 @@ delete from wgd_ex_revise_cost where id = #{id} - + delete from wgd_ex_revise_cost where id in #{id} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml index f8499871..f948663d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml @@ -22,7 +22,7 @@ and meet_name = #{meetName} - and meet_time = #{meetTime} + and DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d') and pay_standard = #{payStandard} @@ -54,22 +54,22 @@ update wgd_meet_cost - + unit = #{unit}, - + meet_name = #{meetName}, - + meet_time = #{meetTime}, - + pay_standard = #{payStandard}, - + pay_reality = #{payReality}, - + cost_outlay = #{costOutlay}, @@ -128,7 +128,7 @@ delete from wgd_meet_cost where id = #{id} - + delete from wgd_meet_cost where id in #{id}