change %!s(int64=3) %!d(string=hai) anos
pai
achega
6aaec91a73

+ 11 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformController.java

@@ -194,4 +194,15 @@ public class InformController extends BaseController {
         return toAjax(iInformService.updateByEditBo(bo) ? 1 : 0);
     }
 
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation("修改【请填写功能名称】")
+    @PreAuthorize("@ss.hasPermi('system:inform:edit')")
+    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @PostMapping("editClassifyId")
+    public AjaxResult<Void> editClassifyId(@RequestBody InformEditBo bo) {
+        return toAjax(iInformService.editClassifyId(bo) ? 1 : 0);
+    }
+
 }

+ 20 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformEditBo.java

@@ -4,7 +4,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -21,6 +24,11 @@ public class InformEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long informId;
 
+    /** 是否发送未购买的学员 1发送 2只发送购买过得学员 */
+    @ApiModelProperty("是否发送未购买的学员 1发送 2只发送购买过得学员(全都买了也传1)")
+    @NotNull
+    private Long orderStatus;
+
     /** 1 学员通知 */
     @ApiModelProperty("1 学员通知")
     private Integer informType;
@@ -62,4 +70,16 @@ public class InformEditBo {
     @ApiModelProperty("1已发布 0未发布 -1删除")
     private Integer status;
 
+    /** 添加题库 */
+    @ApiModelProperty("添加课程节")
+    private List<InformCourseAddBo> informCourseAddBo;
+
+    /** 添加试卷 */
+    @ApiModelProperty("添加试卷")
+    private List<InformExamAddBo> informExamAddBo;
+
+    /** 用户id */
+    @ApiModelProperty("用户id")
+    private Long[] userId;
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformService.java

@@ -61,4 +61,6 @@ public interface IInformService extends IService<Inform> {
     List<CourseInformVo> listGoodsCourse(GoodsQueryBo bo);
 
 	List<GoodsInformAttachedVo> bankList(GoodsAttachedQueryBo bo);
+
+	boolean editClassifyId(InformEditBo bo);
 }

+ 42 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformServiceImpl.java

@@ -21,6 +21,9 @@ import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.mapper.GoodsAttachedMapper;
 import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
 import com.zhongzheng.modules.inform.bo.*;
+import com.zhongzheng.modules.inform.domain.InformCourse;
+import com.zhongzheng.modules.inform.domain.InformExam;
+import com.zhongzheng.modules.inform.domain.InformUser;
 import com.zhongzheng.modules.inform.service.IInformCourseService;
 import com.zhongzheng.modules.inform.service.IInformExamService;
 import com.zhongzheng.modules.inform.service.IInformUserService;
@@ -161,6 +164,37 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
         Inform update = BeanUtil.toBean(bo, Inform.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
+        LambdaQueryWrapper<InformExam> lqw = Wrappers.lambdaQuery();
+        lqw.eq( InformExam::getInformId, update.getInformId());
+        iInformExamService.remove(lqw);
+        LambdaQueryWrapper<InformCourse> informCount = Wrappers.lambdaQuery();
+        informCount.eq(InformCourse::getInformId, update.getInformId());
+        iInformCourseService.remove(informCount);
+        LambdaQueryWrapper<InformUser> informUser = Wrappers.lambdaQuery();
+        informUser.eq(InformUser::getInformId, update.getInformId());
+        iInformUserService.remove(informUser);
+        for (InformExamAddBo informExamAddBo : bo.getInformExamAddBo()) {
+            informExamAddBo.setInformId(update.getInformId());
+            iInformExamService.insertByAddBo(informExamAddBo);
+        }
+        for (InformCourseAddBo informCourseAddBo : bo.getInformCourseAddBo()) {
+            informCourseAddBo.setInformId(update.getInformId());
+            iInformCourseService.insertByAddBo(informCourseAddBo);
+        }
+        for (Long userId : bo.getUserId()) {
+            if (bo.getOrderStatus().equals(2)) {
+                Integer integer = selectNumList(userId, bo.getInformExamAddBo(), bo.getInformCourseAddBo());
+                if (integer.equals(0)){
+                    continue;
+                }
+            }
+            InformUserAddBo informUserAddBo = new InformUserAddBo();
+            informUserAddBo.setInformId(update.getInformId());
+            informUserAddBo.setUserId(userId);
+            informUserAddBo.setCreateTime(DateUtils.getNowTime());
+            informUserAddBo.setUpdateTime(DateUtils.getNowTime());
+            iInformUserService.insertByAddBo(informUserAddBo);
+        }
         return this.updateById(update);
     }
 
@@ -265,6 +299,14 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
         return goodsInformAttachedVos;
     }
 
+    @Override
+    public boolean editClassifyId(InformEditBo bo) {
+        Inform update = BeanUtil.toBean(bo, Inform.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
 
     /**
      * 实体类转化成视图对象