diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index d45e9c89..0874ac00 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -32,6 +32,7 @@ create table pay_committee_info preparation_unit varchar(100) null comment '筹建单位', committee_name varchar(100) null comment '委员会名称', member_number int null comment '委员数量', + del_flag int null comment '逻辑删除标识', constraint Index_1 unique (id) ) @@ -85,6 +86,8 @@ create table pay_committee_member_info other_languages_and_proficiency_levels varchar(100) null comment '其他语言及熟练程度', is_academician varchar(100) null comment '是否工程院院士', is_academy_of_sciences varchar(100) null comment '是否科学院院士', + del_flag int null comment '逻辑删除标识', + constraint Index_1 unique (id) ) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java index b792c6f2..518adc18 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java @@ -7,6 +7,7 @@ import com.jero.committee.entity.PayCommitteeInfo; import com.jero.committee.service.PayCommitteeInfoService; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; @@ -50,6 +51,9 @@ public class PayCommitteeInfoController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payCommitteeInfo, req.getParameterMap()); + queryWrapper.lambda() + .eq(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_0) + .orderByAsc(PayCommitteeInfo::getCommitteeNumber); Page page = new Page<>(pageNo, pageSize); IPage pageList = payCommitteeInfoService.page(page, queryWrapper); return Result.OK(pageList); @@ -68,15 +72,6 @@ public class PayCommitteeInfoController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payCommitteeMemberInfo, req.getParameterMap()); + String committeeNumber = payCommitteeMemberInfo.getCommitteeNumber(); + String positionOfStandardsCommittee = payCommitteeMemberInfo.getPositionOfStandardsCommittee(); + queryWrapper.lambda() + .eq(PayCommitteeMemberInfo::getCommitteeNumber,committeeNumber) + .eq(PayCommitteeMemberInfo::getDelFlag, CommonConstant.DEL_FLAG_0) + .eq(StringUtils.isNotBlank(positionOfStandardsCommittee), PayCommitteeMemberInfo::getPositionOfStandardsCommittee, positionOfStandardsCommittee) + .orderByAsc(PayCommitteeMemberInfo::getNumber); Page page = new Page<>(pageNo, pageSize); IPage pageList = payCommitteeMemberInfoService.page(page, queryWrapper); for (PayCommitteeMemberInfo record : pageList.getRecords()) { @@ -86,9 +95,9 @@ public class PayCommitteeMemberInfoController extends JeroController wrapper = new LambdaUpdateWrapper<>(); + wrapper.set(PayCommitteeMemberInfo::getDelFlag, CommonConstant.DEL_FLAG_1); + committeeMemberInfoService.update(wrapper); + LambdaUpdateWrapper wrapper1 = new LambdaUpdateWrapper<>(); + wrapper1.set(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_1); + this.update(wrapper1); JSONObject jsonObject = ZxdUtil.getWyh(); JSONObject result = jsonObject.getJSONObject("result"); List committeeMemberInfoList = JSONArray.parseArray(result.getString("commiteeMemberInfoList"), CommitteeMemberInfoDTO.class); @@ -133,6 +142,8 @@ public class PayCommitteeInfoService extends ServiceImpl