Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateManageController.java

@@ -1,11 +1,14 @@
 package com.xjrsoft.module.evaluate.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.evaluate.dto.AddEvaluateManageDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateManageChangeStatusDto;
 import com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto;
@@ -16,19 +19,14 @@ import com.xjrsoft.module.evaluate.service.IEvaluateManageService;
 import com.xjrsoft.module.evaluate.service.IEvaluateTemplateService;
 import com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo;
 import com.xjrsoft.module.evaluate.vo.EvaluateManageVo;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.DeleteMapping;
-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.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -60,14 +58,20 @@ public class EvaluateManageController {
     @ApiOperation(value="根据id查询评价管理信息")
     @SaCheckPermission("evaluatemanage:detail")
     public RT<EvaluateManageVo> info(@RequestParam Long id){
-        EvaluateManage evaluateManage = evaluateManageService.getByIdDeep(id);
-        if (evaluateManage == null) {
+        MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();
+        evaluateManageMPJLambdaWrapper
+                .selectAs(DictionaryDetail::getName, EvaluateManageVo::getCreateFrequencyCN)
+                .select(EvaluateManage.class, x -> VoToColumnUtil.fieldsToColumns(EvaluateManageVo.class).contains(x.getProperty()))
+                .eq(EvaluateManage::getId, id)
+                .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, EvaluateManage::getCreateFrequency)
+                .disableSubLogicDel();
+        EvaluateManageVo evaluateManageVo = evaluateManageService.selectJoinOne(EvaluateManageVo.class, evaluateManageMPJLambdaWrapper);
+        if (evaluateManageVo == null) {
            return RT.error("找不到此数据！");
         }
-        EvaluateTemplate evaluateTemplate = evaluateTemplateService.getById(evaluateManage.getEvaluateTemplateId());
-        EvaluateManageVo manageVo = BeanUtil.toBean(evaluateManage, EvaluateManageVo.class);
-        manageVo.setEvaluateType(evaluateTemplate.getEvaluateType());
-        return RT.ok(manageVo);
+        EvaluateTemplate evaluateTemplate = evaluateTemplateService.getById(evaluateManageVo.getEvaluateTemplateId());
+        evaluateManageVo.setEvaluateType(evaluateTemplate.getEvaluateType());
+        return RT.ok(evaluateManageVo);
     }
 
     @PostMapping(value = "/change-status")
@@ -78,6 +82,13 @@ public class EvaluateManageController {
             Boolean release = evaluateManageService.release(dto.getId());
             return RT.ok(release);
         }
+        if(dto.getStatus() == 0){
+            EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
+            evaluateManage.setModifyDate(new Date());
+            evaluateManage.setModifyUserId(StpUtil.getLoginIdAsLong());
+
+            return RT.ok(evaluateManageService.updateById(evaluateManage));
+        }
 
         return RT.ok(true);
     }
@@ -88,6 +99,8 @@ public class EvaluateManageController {
     @SaCheckPermission("evaluatemanage:add")
     public RT<Boolean> add(@Valid @RequestBody AddEvaluateManageDto dto){
         EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
+        evaluateManage.setCreateDate(new Date());
+        evaluateManage.setCreateUserId(StpUtil.getLoginIdAsLong());
         boolean isSuccess = evaluateManageService.add(evaluateManage);
         return RT.ok(isSuccess);
     }

src/main/java/com/xjrsoft/module/evaluate/controller/EvaluateWriteController.java

@@ -53,6 +53,26 @@ public class EvaluateWriteController {
         return RT.ok(pageOutput);
     }
 
+    @GetMapping(value = "/index-page")
+    @ApiOperation(value="评价管理首页列表(分页)")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<PageOutput<EvaluateWritePageVo>> indexPage(@Valid EvaluateWritePageDto dto){
+        dto.setLoginUserId(StpUtil.getLoginIdAsLong());
+        Page<EvaluateWritePageVo> page = evaluateManageService.getMobileIndexPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<EvaluateWritePageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateWritePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/result-page")
+    @ApiOperation(value="评价结果页列表(分页)")
+    @SaCheckPermission("evaluatemanage:detail")
+    public RT<PageOutput<EvaluateWritePageVo>> resultPage(@Valid EvaluateWritePageDto dto){
+        dto.setLoginUserId(StpUtil.getLoginIdAsLong());
+        Page<EvaluateWritePageVo> page = evaluateManageService.getMobileIndexPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<EvaluateWritePageVo> pageOutput = ConventPage.getPageOutput(page, EvaluateWritePageVo.class);
+        return RT.ok(pageOutput);
+    }
+
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询评价项信息")
     @SaCheckPermission("evaluateitem:detail")
@@ -87,6 +107,4 @@ public class EvaluateWriteController {
         String isSuccess = evaluateResultService.saveBatch(dto);
         return RT.ok(isSuccess);
     }
-
-
 }

src/main/java/com/xjrsoft/module/evaluate/dto/AddEvaluateManageDto.java

@@ -54,6 +54,16 @@ public class AddEvaluateManageDto implements Serializable {
     */
     @ApiModelProperty("结束时间")
     private Date endTime;
+    /**
+     * 是否自动生成（0:否，1:是）
+     */
+    @ApiModelProperty("是否自动生成（0:否，1:是）")
+    private Integer isAutoCreate;
+    /**
+     * 生成频率（xjr_dictionary_detail[create_frequency]）
+     */
+    @ApiModelProperty("生成频率（xjr_dictionary_detail[create_frequency]）")
+    private String createFrequency;
     /**
     * 状态（1：进行中，0，暂停）
     */

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateManagePageDto.java

@@ -27,6 +27,9 @@ public class EvaluateManagePageDto extends PageInput {
     @ApiModelProperty("评价类型")
     private String evaluateType;
 
+    @ApiModelProperty("管理名称")
+    private String name;
+
     @ApiModelProperty("状态(-1:未发布,0:暂停,1:进行中,2:已结束)")
     private Integer status;
 

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateObjectListDto.java

@@ -35,6 +35,4 @@ public class EvaluateObjectListDto implements Serializable {
 
     @ApiModelProperty("评价类型")
     private String evaluateType;
-
-
 }

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateTemplatePageDto.java

@@ -23,7 +23,7 @@ import java.util.Map;
 @EqualsAndHashCode(callSuper = false)
 public class EvaluateTemplatePageDto extends PageInput {
     @ApiModelProperty("使用部门")
-    public Map<Long, String> deptIds;
+    public String deptIds;
 
     @ApiModelProperty("评价类型")
     public String evaluateType;

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateWritePageDto.java

@@ -19,6 +19,6 @@ public class EvaluateWritePageDto extends PageInput {
     @ApiModelProperty("状态（1：已评分，0：未评分）")
     private Integer status;
 
-    @ApiModelProperty("登录者id（前端不传，后端传）")
+    @ApiModelProperty(value = "登录者id（前端不传，后端传）", hidden = true)
     private Long loginUserId;
 }

src/main/java/com/xjrsoft/module/evaluate/mapper/EvaluateManageMapper.java

@@ -42,6 +42,8 @@ public interface EvaluateManageMapper extends MPJBaseMapper<EvaluateManage> {
      */
     Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
 
+    Page<EvaluateWritePageVo> getMobileIndexPage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
+
     EvaluateWriteVo getWriteInfo(Long id);
 
 

src/main/java/com/xjrsoft/module/evaluate/service/IEvaluateManageService.java

@@ -62,6 +62,8 @@ public interface IEvaluateManageService extends MPJBaseService<EvaluateManage> {
 
     Page<EvaluateWritePageVo> getMobilePage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
 
+    Page<EvaluateWritePageVo> getMobileIndexPage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto);
+
     EvaluateWriteVo getWriteInfo(Long id);
 
     //查询题目信息

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java

@@ -18,10 +18,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -90,18 +87,15 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
             EvaluateManageItem manageItem = BeanUtil.toBean(evaluateItem, EvaluateManageItem.class);
             manageItem.setEvaluateManageId(evaluateManage.getId());
             manageItem.setEvaluateItemId(manageItem.getId());
+            manageItem.setCreateDate(new Date());
+            manageItem.setCreateUserId(StpUtil.getLoginIdAsLong());
             evaluateManageItemMapper.insert(manageItem);
         }
         //将评价管理状态改为进行中
         evaluateManage.setStatus(1);
+        evaluateManage.setModifyDate(new Date());
+        evaluateManage.setModifyUserId(StpUtil.getLoginIdAsLong());
 
-        //设置两个定时器
-        //第一个定时器控制结束
-
-        //第二个定时器控制定时生成新的评价
-        if(evaluateManage.getIsAutoCreate() != null && evaluateManage.getIsAutoCreate() == 1 && evaluateManage.getCreateFrequency() != null){
-
-        }
         evaluateManageMapper.updateById(evaluateManage);
         return true;
     }
@@ -149,6 +143,11 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
         return mobilePage;
     }
 
+    public Page<EvaluateWritePageVo> getMobileIndexPage(Page<EvaluateWritePageDto> page, EvaluateWritePageDto dto) {
+        Page<EvaluateWritePageVo> mobilePage = evaluateManageMapper.getMobilePage(page, dto);
+        return mobilePage;
+    }
+
     @Override
     public EvaluateWriteVo getWriteInfo(Long id) {
         return evaluateManageMapper.getWriteInfo(id);

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateTemplateServiceImpl.java

@@ -54,7 +54,7 @@ public class EvaluateTemplateServiceImpl extends MPJBaseServiceImpl<EvaluateTemp
             StringBuilder deptName = new StringBuilder();
             for (int i = 0; i < deptIds.length; i ++){
                 if(i > 0){
-                    deptName .append(",");
+                    deptName.append(",");
                     deptIdSb.append(",");
                 }
                 deptName.append(departmentMap.get(deptIds[i]));

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManagePageVo.java

@@ -29,11 +29,16 @@ public class EvaluateManagePageVo {
     */
     @ApiModelProperty("发布部门")
     private String orgName;
+    /**
+     * 评价类型-中文
+     */
+    @ApiModelProperty("评价类型-中文")
+    private String evaluateType;
     /**
     * 评价类型-中文
     */
     @ApiModelProperty("评价类型-中文")
-    private String evaluateTypeCn;
+    private String evaluateTypeCN;
     /**
     * 评价名称
     */

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateManageVo.java

@@ -3,13 +3,8 @@ package com.xjrsoft.module.evaluate.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
-import com.xjrsoft.module.evaluate.entity.EvaluateObject;
-import com.xjrsoft.module.evaluate.entity.EvaluateExecuter;
+import java.util.List;
 
 /**
 * @title: 评价管理表单出参
@@ -68,8 +63,21 @@ public class EvaluateManageVo {
     */
     @ApiModelProperty("状态（1：进行中，0，暂停）")
     private Integer status;
-
-
+    /**
+     * 是否自动生成（0:否，1:是）
+     */
+    @ApiModelProperty("是否自动生成（0:否，1:是）")
+    private Integer isAutoCreate;
+    /**
+     * 生成频率（xjr_dictionary_detail[create_frequency]）
+     */
+    @ApiModelProperty("生成频率（xjr_dictionary_detail[create_frequency]）")
+    private String createFrequency;
+    /**
+     * 生成频率（xjr_dictionary_detail[create_frequency]）
+     */
+    @ApiModelProperty("生成频率（xjr_dictionary_detail[create_frequency]）")
+    private String createFrequencyCN;
     /**
     * evaluateObject
     */

src/main/java/com/xjrsoft/module/evaluate/vo/EvaluateWritePageVo.java

@@ -39,17 +39,21 @@ public class EvaluateWritePageVo {
      */
     @ApiModelProperty("参评对象编号")
     private String evaluateUserId;
+    /**
+     * 评价类型-中文
+     */
+    @ApiModelProperty("评价类型-中文")
+    private String evaluateType;
     /**
     * 评价类型-中文
     */
     @ApiModelProperty("评价类型-中文")
-    private String evaluateTypeCn;
+    private String evaluateTypeCN;
     /**
     * 评价名称
     */
     @ApiModelProperty("评价名称")
     private String name;
-
     /**
     * 开始时间
     */
@@ -70,4 +74,7 @@ public class EvaluateWritePageVo {
 
     @ApiModelProperty("状态（-1：未发布，0：暂停，1：进行中，2：结束）")
     private Integer status;
+
+    @ApiModelProperty("状态（0：表示该用户所有都已经评价）")
+    private Integer ratedCount;
 }

src/main/java/com/xjrsoft/module/student/controller/QuotaFormulaRuleController.java

@@ -58,16 +58,6 @@ public class QuotaFormulaRuleController {
         return RT.ok(pageOutput);
     }
 
-    @GetMapping(value = "/quotaPage")
-    @ApiOperation(value="绑定指标列表")
-    @SaCheckPermission("quotaformularule:detail")
-    public RT<PageOutput<QuotaFormulaRulePageVo>> quotaPage(@Valid QuotaFormulaRulePageDto dto){
-
-        Page<QuotaFormulaRulePageVo> page = quotaFormulaRuleService.getQuota(new Page<>(dto.getLimit(), dto.getSize()), dto);
-        PageOutput<QuotaFormulaRulePageVo> pageOutput = ConventPage.getPageOutput(page, QuotaFormulaRulePageVo.class);
-        return RT.ok(pageOutput);
-    }
-
     @GetMapping(value = "/info")
     @ApiOperation(value="根据id查询指标公式规则管理信息")
     @SaCheckPermission("quotaformularule:detail")

src/main/java/com/xjrsoft/module/student/service/IQuotaFormulaRuleService.java

@@ -20,5 +20,4 @@ import java.util.List;
 
 public interface IQuotaFormulaRuleService extends MPJBaseService<QuotaFormulaRule> {
     Page<QuotaFormulaRulePageVo> getPage(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto);
-    Page<QuotaFormulaRulePageVo> getQuota(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto);
 }

src/main/java/com/xjrsoft/module/student/service/impl/QuotaFormulaRuleServiceImpl.java

@@ -30,9 +30,4 @@ public class QuotaFormulaRuleServiceImpl extends MPJBaseServiceImpl<QuotaFormula
     public Page<QuotaFormulaRulePageVo> getPage(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto) {
         return quotaFormulaRuleMapper.getPage(page, dto);
     }
-
-    @Override
-    public Page<QuotaFormulaRulePageVo> getQuota(Page<QuotaFormulaRulePageDto> page, QuotaFormulaRulePageDto dto) {
-        return quotaFormulaRuleMapper.getQuota(page, dto);
-    }
 }

src/main/resources/mapper/evaluate/EvaluateManageMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.evaluate.mapper.EvaluateManageMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateManagePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateManagePageVo">
-        SELECT t1.id,t2.name AS semester_name,t4.name AS org_name,t5.name AS evaluate_type_cn,t1.name,t1.start_time,t1.end_time,t1.status FROM evaluate_manage t1
+        SELECT t1.id,t2.name AS semester_name,t4.name AS org_name,t3.evaluate_type,t5.name AS evaluate_type_cn,t1.name,t1.start_time,t1.end_time,t1.status FROM evaluate_manage t1
         LEFT JOIN base_semester t2 ON t2.id = t1.base_semester_id
         LEFT JOIN evaluate_template t3 ON t3.id = t1.evaluate_template_id
         LEFT JOIN xjr_department t4 ON t4.id = t1.org_id
@@ -28,8 +28,12 @@
         <if test="dto.endTime != null">
             and #{dto.endTime} >= t1.end_time
         </if>
+        <if test="dto.name != null and dto.name != ''">
+            and t1.name like concat('%', #{dto.name}, '%')
+        </if>
         ORDER BY t1.create_date DESC
     </select>
+
     <select id="getList" parameterType="com.xjrsoft.module.room.dto.RoomPageDto" resultType="com.xjrsoft.module.room.vo.RoomExcelVo">
     </select>
     <select id="getMaxSortCode" resultType="java.lang.Integer">
@@ -63,6 +67,29 @@
           and t3.user_id = #{dto.loginUserId}
     </select>
 
+    <select id="getMobileIndexPage" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateWritePageVo">
+        select
+            t.id as evaluateManageId,
+            t.name,
+            t2.evaluate_type,
+            t4.name as evaluateTypeCN,
+            (select
+                 count(tb3.status)
+             from evaluate_manage tb1
+                      left join evaluate_executer tb3 on tb3.evaluate_manage_id = tb1.id
+             where tb1.delete_mark = 0
+               and tb3.delete_mark = 0
+               and tb3.id = t3.id
+               and tb1.id = t.id) as ratedCount
+        from evaluate_manage t
+                 left join evaluate_template t2 on t2.id = t.evaluate_template_id
+                 left join evaluate_executer t3 on t3.evaluate_manage_id = t.id
+                 left join xjr_dictionary_detail t4 on t4.code = t2.evaluate_type
+        where t.delete_mark = 0
+          and t3.delete_mark = 0
+          and t3.user_id = #{dto.loginUserId}
+    </select>
+
     <select id="getWriteInfo" parameterType="com.xjrsoft.module.evaluate.dto.EvaluateWritePageDto" resultType="com.xjrsoft.module.evaluate.vo.EvaluateWriteVo">
         select t1.id, t1.name,t2.total as sumScore,t1.start_time,t1.end_time,
                (SELECT COUNT(id) FROM evaluate_manage_item a WHERE t1.delete_mark = 0 AND a.evaluate_manage_id = t1.id) AS item_count

src/main/resources/mapper/student/QuotaFormulaRuleMapper.xml

@@ -4,30 +4,13 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.student.mapper.QuotaFormulaRuleMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto" resultType="com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo">
-        select t.id, t.name, t.formula
+        select t.id, t.name, t.formula, GROUP_CONCAT(t1.name SEPARATOR ',') AS bind_quota
         from quota_formula_rule t
+        LEFT JOIN xjr_dictionary_detail t1 ON FIND_IN_SET(t1.code, t.bind_quota)
         where t.delete_mark = 0
+        GROUP BY t.id
         order by t.create_date
     </select>
-
-    <select id="getQuota" parameterType="com.xjrsoft.module.student.dto.QuotaFormulaRulePageDto" resultType="com.xjrsoft.module.student.vo.QuotaFormulaRulePageVo">
-        SELECT
-            t.id,
-            GROUP_CONCAT(t1.name SEPARATOR ',') AS bind_quota
-        FROM
-            quota_formula_rule t
-                LEFT JOIN
-            xjr_dictionary_detail t1
-            ON
-                t1.item_id = 1752246376061272065
-        WHERE
-            t.delete_mark = 0
-          AND FIND_IN_SET(t1.code, t.bind_quota)
-        GROUP BY
-            t.id
-        ORDER BY
-            MAX(t.create_date);
-    </select>
 </mapper>