协议批量修改状态 用户账户查询

src/main/java/com/ydtech/modules/admin/controller/SysUserBankController.java

@@ -74,10 +74,10 @@ public class SysUserBankController extends BaseController {
         return HttpResult.ok("审核成功");
     }
 
-    @GetMapping("getUserBankList")
+    @PostMapping("/getUserBankList")
     @ApiOperation("返回卡包")
-    public HttpResult<List<SysUserBankCard>> getUserBankList() {
-        return bankCardService.getUserBankList();
+    public HttpResult<List<SysUserBankCard>> getUserBankList(@RequestBody SysUserBankCard sysUserBankCard) {
+        return bankCardService.getUserBankList(sysUserBankCard);
     }
 
 

src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java

@@ -21,7 +21,7 @@ public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
 
     SysUserBankCard getByBankNumber(@Param("fromBankCardId") String bankNumber);
 
-    List<SysUserBankCard> getUserBankList(String userId);
+    List<SysUserBankCard> getUserBankList(@Param("sysUserBankCard") SysUserBankCard sysUserBankCard);
 }
 
 

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -68,6 +68,9 @@ public class SysUserAccountVo {
     private BigDecimal promotionAmountPayment;
 
 
+    @ApiModelProperty(value = "用户姓名")
+    private String  userName;
+
     @ApiModelProperty(value = "部门id")
     private String  deptId;
 

src/main/java/com/ydtech/modules/admin/service/SysUserBankCardService.java

@@ -33,7 +33,7 @@ public interface SysUserBankCardService extends IService<SysUserBankCard> {
 
     void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO);
 
-    HttpResult<List<SysUserBankCard>> getUserBankList();
+    HttpResult<List<SysUserBankCard>> getUserBankList(SysUserBankCard sysUserBankCard);
 
 
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

@@ -129,9 +129,9 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
     }
 
     @Override
-    public HttpResult<List<SysUserBankCard>> getUserBankList() {
-        String userId = BaseController.getUser().getId();
-        List<SysUserBankCard> sysUserBankCardList = baseMapper.getUserBankList(userId);
+    public HttpResult<List<SysUserBankCard>> getUserBankList(SysUserBankCard sysUserBankCard) {
+        sysUserBankCard.setUserId(BaseController.getUser().getId());
+        List<SysUserBankCard> sysUserBankCardList = baseMapper.getUserBankList(sysUserBankCard);
         return HttpResult.ok("success", sysUserBankCardList);
     }
 }

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -82,13 +82,13 @@ public class PtlAgreementController extends BaseController {
 
     @PostMapping("/batch")
     @ApiOperation("批量修改协议是否启用状态")
-    public HttpResult<Object> batchRevise(@RequestParam("agreementIds") String[] agreementIds, String validStatus) {
+    public HttpResult<Object> batchRevise(@RequestBody PltAgreementBatchVo pltAgreementBatchVo) {
         String userName = getUserName();
         List<PtlAgreement> ptlAgreements = new ArrayList<>();
-        for (String agreementId : agreementIds) {
+        for (String agreementId : pltAgreementBatchVo.getAgreementIds()) {
             PtlAgreement ptlAgreement = new PtlAgreement();
             ptlAgreement.setId(agreementId);
-            ptlAgreement.setValidStatus(validStatus);
+            ptlAgreement.setValidStatus(pltAgreementBatchVo.getValidStatus());
             ptlAgreements.add(ptlAgreement);
         }
         boolean b = ptlAgreementService.updateBatchById(ptlAgreements);

src/main/java/com/ydtech/modules/protocol/entity/vo/PltAgreementBatchVo.java

@@ -0,0 +1,16 @@
+package com.ydtech.modules.protocol.entity.vo;
+
+import com.ydtech.modules.protocol.entity.dto.PltAgreementSchemeSaveDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("协议启用实体")
+public class PltAgreementBatchVo {
+        @ApiModelProperty("协议ids")
+        private String[] agreementIds;
+        @ApiModelProperty("启用/禁用")
+        private String validStatus;
+
+}

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -133,8 +133,12 @@
             <if test="id !=null  and id != ''">
                 and a.id=#{id}
             </if>
-
-
+            <if test="mobile !=null  and mobile != ''">
+                and su.mobile=#{mobile}
+            </if>
+            <if test="userName !=null  and userName != ''">
+                and su.name=#{userName}
+            </if>
             <if test="userId !=null  and userId != ''">
                 and a.user_id=#{userId}
             </if>

src/main/resources/mapper/modules/admin/SysUserAccountMapper.xml

@@ -128,6 +128,9 @@
             <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
                 and b.dept_id like concat(#{sysUserAccountVo.deptId},'%')
             </if>
+            <if test="sysUserAccountVo.userName != null and sysUserAccountVo.userName != ''">
+                and b.name = #{sysUserAccountVo.userName}
+            </if>
             <if test="sysUserAccountVo.bankNumber != null and sysUserAccountVo.bankNumber != ''">
                 and c.bank_number = #{sysUserAccountVo.bankNumber}
             </if>

src/main/resources/mapper/modules/admin/SysUserBankCardMapper.xml

@@ -55,11 +55,16 @@
                   a.bank_account as "bankAccount",
                   a.bank_address as "bankAddress",
                   a.is_default as "isDefault",
-                  a.user_id as "userId"
+                  a.user_id as "userId",
+                  a.audit_status as "auditStatus"
             from  sys_user_bank_card a
             <where>
-                <if test="userId !=null and  userId  !=''">
-                    a.user_id =#{userId}
+            1=1
+                <if test="sysUserBankCard.userId !=null and  sysUserBankCard.userId  !=''">
+                    and a.user_id =#{sysUserBankCard.userId}
+                </if>
+                <if test="sysUserBankCard.auditStatus !=null and  sysUserBankCard.auditStatus  !=''">
+                     and a.audit_status =#{sysUserBankCard.auditStatus}
                 </if>
             </where>