通知列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformClassifyController.java

@@ -54,18 +54,6 @@ public class InformClassifyController extends BaseController {
         return getDataTable(list);
     }
 
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:classify:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<InformClassifyVo> export(InformClassifyQueryBo bo) {
-        List<InformClassifyVo> list = iInformClassifyService.queryList(bo);
-        ExcelUtil<InformClassifyVo> util = new ExcelUtil<InformClassifyVo>(InformClassifyVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
 
     /**
      * 获取【请填写功能名称】详细信息
@@ -94,19 +82,9 @@ public class InformClassifyController extends BaseController {
     @ApiOperation("修改【请填写功能名称】")
     @PreAuthorize("@ss.hasPermi('system:classify:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody InformClassifyEditBo bo) {
         return toAjax(iInformClassifyService.updateByEditBo(bo) ? 1 : 0);
     }
 
-    /**
-     * 删除【请填写功能名称】
-     */
-    @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:classify:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{classifyIds}")
-    public AjaxResult<Void> remove(@PathVariable Long[] classifyIds) {
-        return toAjax(iInformClassifyService.deleteWithValidByIds(Arrays.asList(classifyIds), true) ? 1 : 0);
-    }
 }

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

@@ -29,12 +29,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * 【请填写功能名称】Controller
+ * 【通知】Controller
  * 
  * @author ruoyi
  * @date 2021-11-23
  */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
+@Api(value = "【通知】控制器", tags = {"【通知】管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
 @RequestMapping("/system/inform")
@@ -43,9 +43,9 @@ public class InformController extends BaseController {
     private final IInformService iInformService;
 
     /**
-     * 查询【请填写功能名称】列表
+     * 查询【通知】列表
      */
-    @ApiOperation("查询【请填写功能名称】列表")
+    @ApiOperation("查询【通知】列表")
     @PreAuthorize("@ss.hasPermi('system:inform:list')")
     @GetMapping("/list")
     public TableDataInfo<InformVo> list(InformQueryBo bo) {
@@ -55,9 +55,9 @@ public class InformController extends BaseController {
     }
 
     /**
-     * 获取【请填写功能名称】详细信息
+     * 获取【通知】详细信息
      */
-    @ApiOperation("获取【请填写功能名称】详细信息")
+    @ApiOperation("获取【通知】详细信息")
     @PreAuthorize("@ss.hasPermi('system:inform:query')")
     @GetMapping("/{informId}")
     public AjaxResult<InformVo> getInfo(@PathVariable("informId" ) Long informId) {
@@ -65,9 +65,9 @@ public class InformController extends BaseController {
     }
 
     /**
-     * 新增【请填写功能名称】
+     * 新增【通知】
      */
-    @ApiOperation("新增【请填写功能名称】")
+    @ApiOperation("新增【通知】")
     @PreAuthorize("@ss.hasPermi('system:inform:add')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
@@ -76,9 +76,9 @@ public class InformController extends BaseController {
     }
 
     /**
-     * 修改【请填写功能名称】
+     * 修改【通知】
      */
-    @ApiOperation("修改【请填写功能名称】")
+    @ApiOperation("修改【通知】")
     @PreAuthorize("@ss.hasPermi('system:inform:edit')")
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PostMapping("edit")

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformAddBo.java

@@ -51,9 +51,19 @@ public class InformAddBo {
     /** 1已发布 0未发布 -1删除 */
     @ApiModelProperty("1已发布 0未发布 -1删除")
     private Integer status;
+    /** 指派操作者 */
+    @ApiModelProperty("指派操作者")
+    private String createBy;
 
-
-    /** 1已发布 0未发布 -1删除 */
-    @ApiModelProperty("添加题库")
+    /** 添加题库 */
+    @ApiModelProperty("添加课程节")
     private InformCourseAddBo informCourseAddBo;
+
+    /** 添加试卷 */
+    @ApiModelProperty("添加试卷")
+    private InformExamAddBo informExamAddBo;
+
+    /** 用户id */
+    @ApiModelProperty("用户id")
+    private Long[] userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformClassifyQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -44,5 +45,5 @@ public class InformClassifyQueryBo extends BaseEntity {
 	private String classifyName;
 	/** 1使用 0未使用 */
 	@ApiModelProperty("1使用 0未使用")
-	private Integer status;
+	private List<Integer> status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserAddBo.java

@@ -36,4 +36,7 @@ public class InformUserAddBo {
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserEditBo.java

@@ -41,5 +41,9 @@ public class InformUserEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;
 
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long informId;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserQueryBo.java

@@ -48,4 +48,8 @@ public class InformUserQueryBo extends BaseEntity {
 	/** 已读回执 1已读 0未读 */
 	@ApiModelProperty("已读回执 1已读 0未读")
 	private Integer receiptStatus;
+
+	/** $column.columnComment */
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/Inform.java

@@ -50,4 +50,8 @@ private static final long serialVersionUID=1L;
     private String affiche;
     /** 1已发布 0未发布 -1删除 */
     private Integer status;
+
+    /** 指派操作者 */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/domain/InformUser.java

@@ -40,4 +40,6 @@ private static final long serialVersionUID=1L;
     /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+    /** $column.columnComment */
+    private Long informId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformClassifyServiceImpl.java

@@ -41,7 +41,7 @@ public class InformClassifyServiceImpl extends ServiceImpl<InformClassifyMapper,
         LambdaQueryWrapper<InformClassify> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getParentId() != null, InformClassify::getParentId, bo.getParentId());
         lqw.like(StrUtil.isNotBlank(bo.getClassifyName()), InformClassify::getClassifyName, bo.getClassifyName());
-        lqw.eq(bo.getStatus() != null, InformClassify::getStatus, bo.getStatus());
+        lqw.in(bo.getStatus() != null, InformClassify::getStatus, bo.getStatus());
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -3,6 +3,12 @@ package com.zhongzheng.modules.inform.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.modules.inform.bo.InformUserAddBo;
+import com.zhongzheng.modules.inform.service.IInformCourseService;
+import com.zhongzheng.modules.inform.service.IInformExamService;
+import com.zhongzheng.modules.inform.service.IInformUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,6 +21,7 @@ import com.zhongzheng.modules.inform.domain.Inform;
 import com.zhongzheng.modules.inform.mapper.InformMapper;
 import com.zhongzheng.modules.inform.vo.InformVo;
 import com.zhongzheng.modules.inform.service.IInformService;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -30,6 +37,15 @@ import java.util.stream.Collectors;
 @Service
 public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> implements IInformService {
 
+    @Autowired
+    private IInformCourseService iInformCourseService;
+
+    @Autowired
+    private IInformExamService iInformExamService;
+
+    @Autowired
+    private IInformUserService iInformUserService;
+
     @Override
     public InformVo queryById(Long informId){
         Inform db = this.baseMapper.selectById(informId);
@@ -72,12 +88,27 @@ public class InformServiceImpl extends ServiceImpl<InformMapper, Inform> impleme
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByAddBo(InformAddBo bo) {
         Inform add = BeanUtil.toBean(bo, Inform.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
+        add.setCreateBy(SecurityUtils.getUsername());
+        boolean save = this.save(add);
+        bo.getInformCourseAddBo().setInformId(add.getInformId());
+        iInformCourseService.insertByAddBo(bo.getInformCourseAddBo());
+        bo.getInformExamAddBo().setInformId(add.getInformId());
+        iInformExamService.insertByAddBo(bo.getInformExamAddBo());
+        for (Long userId : bo.getUserId()) {
+            InformUserAddBo informUserAddBo = new InformUserAddBo();
+            informUserAddBo.setInformId(add.getInformId());
+            informUserAddBo.setUserId(userId);
+            informUserAddBo.setCreateTime(DateUtils.getNowTime());
+            informUserAddBo.setUpdateTime(DateUtils.getNowTime());
+            iInformUserService.insertByAddBo(informUserAddBo);
+        }
+        return save;
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformUserVo.java

@@ -40,4 +40,8 @@ public class InformUserVo {
 	@Excel(name = "已读回执 1已读 0未读")
 	@ApiModelProperty("已读回执 1已读 0未读")
 	private Integer receiptStatus;
+	/** $column.columnComment */
+	@Excel(name = "已读回执 1已读 0未读")
+	@ApiModelProperty("$column.columnComment")
+	private Long informId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/vo/InformVo.java

@@ -1,5 +1,7 @@
 package com.zhongzheng.modules.inform.vo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -60,4 +62,9 @@ public class InformVo {
 	@Excel(name = "1已发布 0未发布 -1删除")
 	@ApiModelProperty("1已发布 0未发布 -1删除")
 	private Integer status;
+
+	/** 发布者*/
+	@Excel(name = "发布者")
+	@ApiModelProperty("发布者")
+	private String createBy;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -191,9 +191,9 @@ public class UserVo {
 	@Excel(name = "公司名称")
 	@ApiModelProperty("公司名称")
 	private String companyName;
-	/** 名族 */
-	@Excel(name = "名族")
-	@ApiModelProperty("名族")
+	/** 民族 */
+	@Excel(name = "民族")
+	@ApiModelProperty("民族")
 	private String nation;
 	/** 户口性质 */
 	@Excel(name = "户口性质 1農村 2城鎮")

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -218,6 +218,9 @@
         <if test="gradeId != null and gradeId !='' ">
             and cgu.grade_id = #{gradeId}
         </if>
+        <if test="periodStatus != null and periodStatus !='' ">
+            and cgu.period_status = #{periodStatus}
+        </if>
         order by cgu.update_time
     </select>