fix 题库导入

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -76,18 +76,27 @@ public class UserSubscribeController extends BaseController {
         return getDataTable(list);
     }
 
-
-
     /**
      * 修改用户预约考试
      */
     @ApiOperation("批量取消预约，批量选考试登记状态,批量修改预约状态，批量前培账号开通")
     @PreAuthorize("@ss.hasPermi('system:subscribe:edit')")
     @Log(title = "用户预约考试", businessType = BusinessType.UPDATE)
+    @PostMapping("editMore")
+    public AjaxResult<Void> editMore(@RequestBody List<UserAppSubscribeEditBo> list) {
+        return toAjax(iUserSubscribeService.updateByEditMoreBo(list) ? 1 : 0);
+    }
+
+    /**
+     * 修改用户预约考试
+     */
+    /*@ApiOperation("批量取消预约，批量选考试登记状态,批量修改预约状态，批量前培账号开通")
+    @PreAuthorize("@ss.hasPermi('system:subscribe:edit')")
+    @Log(title = "用户预约考试", businessType = BusinessType.UPDATE)
     @PostMapping("edit")
     public AjaxResult<Void> edit(@RequestBody UserSubscribeEditBo bo) {
         return toAjax(iUserSubscribeService.updateByEditBo(bo) ? 1 : 0);
-    }
+    }*/
 
     /**
      * 修改用户预约考试

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/bo/QuestionModuleQueryBo.java

@@ -65,5 +65,5 @@ public class QuestionModuleQueryBo extends BaseEntity {
 	@ApiModelProperty("项目ID")
 	private Long projectId;
 	@ApiModelProperty("关键词")
-	private String searchKey;
+	private String key;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeEditBo.java

@@ -21,6 +21,9 @@ public class UserSubscribeEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long[] subscribeId;
 
+    @ApiModelProperty("id")
+    private Long id;
+
     /** 绑定的商品 */
     @ApiModelProperty("绑定的商品")
     private Long goodsId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java

@@ -48,6 +48,9 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 	 */
 	Boolean updateByEditBo(UserSubscribeEditBo bo);
 
+	Boolean updateByEditMoreBo(List<UserAppSubscribeEditBo> list);
+
+
 	Boolean updateByEditSingleBo(UserAppSubscribeEditBo bo);
 
 	/**

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -309,6 +309,67 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         return true;
     }
 
+    @Override
+    public Boolean updateByEditMoreBo(List<UserAppSubscribeEditBo> list) {
+        boolean b = false;
+        for(UserAppSubscribeEditBo editBo : list){
+            Long subscribe = editBo.getSubscribeId();
+            UserSubscribeVo userSubscribeVo = this.queryById(subscribe);
+            UserSubscribe update = new UserSubscribe();
+            update.setSubscribeId(subscribe);
+            update.setSubscribeStatus(editBo.getSubscribeStatus());
+            if (editBo.getSubscribeStatus() != null && editBo.getSubscribeStatus().equals(2)) {
+                UserSubscribeEditBo userSubscribeEditBo = new UserSubscribeEditBo();
+                Long[] s = new Long[]{
+                        editBo.getSubscribeId()
+                };
+                userSubscribeEditBo.setSubscribeId(s);
+                sendExamcancel(userSubscribeEditBo);
+            }
+            update.setExamStatus(editBo.getExamStatus());
+            update.setRemark(editBo.getRemark());
+            update.setBeforeId(editBo.getBeforeId());
+            update.setBeforeStatus(editBo.getBeforeStatus());
+            if (editBo.getBeforeStatus() != null && editBo.getBeforeStatus().equals(1)){
+                update.setBeforeExpend(1);
+                UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
+                userExamGoodsQueryBo.setGoodsId(userSubscribeVo.getGoodsId());
+                userExamGoodsQueryBo.setUserId(userSubscribeVo.getUserId());
+                List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
+                if (!org.springframework.util.CollectionUtils.isEmpty(userExamGoodsVos)){
+                    UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
+                    UserExamGoods userExamGoods = new UserExamGoods();
+                    userExamGoods.setUpdateTime(DateUtils.getNowTime());
+                    userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
+                    userExamGoods.setExpendBefore(userExamGoodsVo.getExpendBefore()+1);
+                    userExamGoodsService.updateById(userExamGoods);
+                }
+            }
+            else if (editBo.getBeforeStatus() != null && editBo.getBeforeStatus().equals(0)){
+                update.setBeforeExpend(0);
+                if(userSubscribeVo.getBeforeStatus()!=null&&userSubscribeVo.getBeforeStatus().equals(1)){
+                    //之前是标记开通的，返回消耗次数
+                    UserExamGoodsQueryBo userExamGoodsQueryBo = new UserExamGoodsQueryBo();
+                    userExamGoodsQueryBo.setGoodsId(userSubscribeVo.getGoodsId());
+                    userExamGoodsQueryBo.setUserId(userSubscribeVo.getUserId());
+                    List<UserExamGoodsVo> userExamGoodsVos = userExamGoodsService.queryList(userExamGoodsQueryBo);
+                    if (!org.springframework.util.CollectionUtils.isEmpty(userExamGoodsVos)){
+                        UserExamGoodsVo userExamGoodsVo = userExamGoodsVos.get(0);
+                        UserExamGoods userExamGoods = new UserExamGoods();
+                        userExamGoods.setUpdateTime(DateUtils.getNowTime());
+                        userExamGoods.setUserExamGoodsId(userExamGoodsVo.getUserExamGoodsId());
+                        userExamGoods.setExpendBefore(userExamGoodsVo.getExpendBefore()-1);
+                        userExamGoodsService.updateById(userExamGoods);
+                    }
+                }
+
+            }
+            update.setUpdateTime(DateUtils.getNowTime());
+            b = this.updateById(update);
+        }
+        return b;
+    }
+
     //取消预约
     private void sendExamcancel(UserSubscribeEditBo bo) {
         for (Long subscribe : bo.getSubscribeId()) {

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionModuleMapper.xml

@@ -98,8 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="prefixName != null and prefixName != ''">
             AND qm.prefix_name  like concat('%', #{prefixName}, '%')
         </if>
-        <if test="searchKey != null and searchKey != '' ">
-            and (qm.module_name like concat('%', #{searchKey}, '%') or qm.code like concat('%', #{searchKey}, '%') or qm.prefix_name like concat('%', #{searchKey}, '%'))
+        <if test="key != null and key != '' ">
+            and (qm.module_name like concat('%', #{key}, '%') or qm.code like concat('%', #{key}, '%') or qm.prefix_name like concat('%', #{key}, '%'))
         </if>
         ORDER BY qm.module_exam_id DESC
     </select>