修改订单记录

zhongzheng-api/src/main/java/com/zhongzheng/controller/inform/InformUserController.java

@@ -0,0 +1,87 @@
+package com.zhongzheng.controller.inform;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.inform.vo.InformUserVo;
+import com.zhongzheng.modules.inform.bo.InformUserQueryBo;
+import com.zhongzheng.modules.inform.bo.InformUserAddBo;
+import com.zhongzheng.modules.inform.bo.InformUserEditBo;
+import com.zhongzheng.modules.inform.service.IInformUserService;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 通知绑定学员Controller
+ * 
+ * @author ruoyi
+ * @date 2021-12-16
+ */
+@Api(value = "我的消息", tags = {"我的消息"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/app/informUser")
+public class InformUserController extends BaseController {
+
+    private final IInformUserService iInformUserService;
+
+    private final WxTokenService wxTokenService;
+
+    /**
+     * 查询通知绑定学员列表
+     */
+    @ApiOperation("查询通知学员列表")
+    @GetMapping("/list")
+    public TableDataInfo<InformUserVo> list(InformUserQueryBo bo) {
+        startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        List<InformUserVo> list = iInformUserService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取通知绑定学员详细信息
+     */
+    @ApiOperation("获取通知学员详细信息")
+    @GetMapping("/{id}")
+    public AjaxResult<InformUserVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iInformUserService.queryById(id));
+    }
+
+
+    /**
+     * 修改通知绑定学员
+     */
+    @ApiOperation("修改通知学员")
+    @Log(title = "通知学员", businessType = BusinessType.UPDATE)
+    @PostMapping()
+    public AjaxResult<Void> edit(@RequestBody InformUserEditBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return toAjax(iInformUserService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsPeriodVo.java

@@ -46,6 +46,11 @@ public class GoodsPeriodVo {
 	@ApiModelProperty("需要重修节数目")
 	private Long rebuild;
 
+	/** 重修节数目 */
+	@Excel(name = "是否确认重修 1已经确认  0未确认")
+	@ApiModelProperty("是否确认重修 1已经确认  0未确认")
+	private Long rebuildStatus;
+
 	@Excel(name = "班级Id")
 	@ApiModelProperty("班级Id")
 	private Long gradeId;

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

@@ -39,4 +39,11 @@ public class InformUserAddBo {
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long informId;
+
+    /** 通知内容无绑定通知 */
+    @ApiModelProperty("通知内容无绑定通知")
+    private String informSystemText;
+    /** 1系统通知 2教务通知 */
+    @ApiModelProperty("1系统通知 2教务通知")
+    private Integer systemStatus;
 }

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

@@ -45,5 +45,12 @@ public class InformUserEditBo {
     @ApiModelProperty("$column.columnComment")
     private Long informId;
 
+    /** 通知内容无绑定通知 */
+    @ApiModelProperty("通知内容无绑定通知")
+    private String informSystemText;
+    /** 1系统通知 2教务通知 */
+    @ApiModelProperty("1系统通知 2教务通知")
+    private Integer systemStatus;
+
 
 }

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

@@ -56,4 +56,11 @@ public class InformUserQueryBo extends BaseEntity {
 	/** $column.columnComment */
 	@ApiModelProperty("$column.columnComment")
 	private Long informId;
+
+	/** 通知内容无绑定通知 */
+	@ApiModelProperty("通知内容无绑定通知")
+	private String informSystemText;
+	/** 1系统通知 2教务通知 */
+	@ApiModelProperty("1系统通知 2教务通知")
+	private Integer systemStatus;
 }

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

@@ -42,4 +42,9 @@ private static final long serialVersionUID=1L;
     private Long updateTime;
     /** $column.columnComment */
     private Long informId;
+
+    /** 通知内容无绑定通知 */
+    private String informSystemText;
+    /** 1系统通知 2教务通知 */
+    private Integer systemStatus;
 }

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

@@ -6,6 +6,13 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo;
 import com.zhongzheng.modules.grade.mapper.ClassGradeUserMapper;
 import com.zhongzheng.modules.grade.vo.ClassGradeUserGoodsVo;
+import com.zhongzheng.modules.inform.bo.InformQueryBo;
+import com.zhongzheng.modules.inform.domain.Inform;
+import com.zhongzheng.modules.inform.mapper.InformMapper;
+import com.zhongzheng.modules.inform.service.IInformCourseService;
+import com.zhongzheng.modules.inform.service.IInformExamService;
+import com.zhongzheng.modules.inform.service.IInformService;
+import com.zhongzheng.modules.inform.vo.InformVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,6 +46,18 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
     @Autowired
     private ClassGradeUserMapper classGradeUserMapper;
 
+    @Autowired
+    private InformMapper informMapper;
+
+    @Autowired
+    private IInformService informService;
+
+    @Autowired
+    private IInformExamService iInformExamService;
+
+ @Autowired
+    private IInformCourseService iInformCourseService;
+
     @Override
     public InformUserVo queryById(Long id){
         InformUser db = this.baseMapper.selectById(id);
@@ -52,7 +71,16 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
         lqw.eq(bo.getSendTime() != null, InformUser::getSendTime, bo.getSendTime());
         lqw.eq(bo.getSendStatus() != null, InformUser::getSendStatus, bo.getSendStatus());
         lqw.eq(bo.getReceiptStatus() != null, InformUser::getReceiptStatus, bo.getReceiptStatus());
-        return entity2Vo(this.list(lqw));
+        List<InformUserVo> informUserVos = entity2Vo(this.list(lqw));
+        for (InformUserVo informUserVo : informUserVos) {
+            if (informUserVo.getSystemStatus() == 2) {
+                InformVo informVo = informService.queryById(informUserVo.getInformId());
+                informVo.setInformExamVo(iInformExamService.queryExam(informVo.getInformId()));
+                informVo.setInformCourseVo(iInformCourseService.queryCourse(informVo.getInformId()));
+                informUserVo.setInformVo(informVo);
+            }
+        }
+        return informUserVos;
     }
 
     /**

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

@@ -61,6 +61,19 @@ public class InformUserVo {
 	@ApiModelProperty("身份证")
 	private Long idCard;
 
+	@Excel(name = "通知绑定")
+	@ApiModelProperty("通知绑定")
+	private InformVo informVo;
+
+	/** 通知内容无绑定通知 */
+	@Excel(name = "通知内容无绑定通知")
+	@ApiModelProperty("通知内容无绑定通知")
+	private String informSystemText;
+	/** 1系统通知 2教务通知 */
+	@Excel(name = "1系统通知 2教务通知")
+	@ApiModelProperty("1系统通知 2教务通知")
+	private Integer systemStatus;
+
 
 	@Excel(name = "班级名称")
 	@ApiModelProperty("班级名称")

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -99,6 +99,7 @@
         <result property="beforeStatus" column="before_status"/>
         <result property="applyName" column="apply_name"/>
         <result property="beforeName" column="before_name"/>
+        <result property="rebuildStatus" column="rebuild_status"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsPeriodStatusVo" id="GoodsPeriodStatusVo">
@@ -326,7 +327,8 @@
             g.goods_id,
             g.goods_name,
             g.`year`,
-            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) as rebuild,
+            (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0 or ups.`status` =3) as rebuild,
+            (case WHEN (SELECT COUNT(1) FROM user_period up LEFT JOIN user_period_status ups on up.id = ups.period_id where up.goods_id = g.goods_id AND ups.period_status =1 and ups.`status` =0) >0 then 0 ELSE 1 end) as rebuild_status,
             cgu.grade_id,
             (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
             (SELECT COUNT(DISTINCT ubr.record_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.type =2 and ubr.report_status =1 and ubr.user_id =cgu.user_id and ubr.grade_id = cg.grade_id) as record_num,