Merge remote-tracking branch 'origin/origin/Three' into origin/Three
# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
This commit is contained in:
+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));
|
||||
}
|
||||
|
||||
+3
-6
@@ -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));
|
||||
}
|
||||
|
||||
+67
@@ -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));
|
||||
}
|
||||
}
|
||||
+4
-7
@@ -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));
|
||||
}
|
||||
|
||||
+16
-20
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
-1
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
+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>
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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