评价计划调整，增加月份绑定

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

@@ -6,6 +6,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.xjrsoft.common.enums.DeleteMark;
+import com.xjrsoft.common.enums.EvaluateTypeEnum;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
@@ -13,7 +15,6 @@ 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;
-import com.xjrsoft.module.evaluate.dto.MakeEvaluateItemDto;
 import com.xjrsoft.module.evaluate.dto.UpdateEvaluateManageDto;
 import com.xjrsoft.module.evaluate.entity.EvaluateManage;
 import com.xjrsoft.module.evaluate.entity.EvaluateTemplate;
@@ -21,7 +22,6 @@ 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.evaluate.vo.MakeEvaluateItemVo;
 import com.xjrsoft.module.system.entity.DictionaryDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,7 +53,8 @@ public class EvaluateManageController {
 
 
     private final IEvaluateManageService evaluateManageService;
-    private final IEvaluateTemplateService evaluateTemplateService;
+    private final IEvaluateTemplateService templateService;
+
 
     @GetMapping(value = "/page")
     @ApiOperation(value="评价管理列表(分页)")
@@ -120,6 +121,21 @@ public class EvaluateManageController {
     @ApiOperation(value = "新增评价管理")
     @SaCheckPermission("evaluatemanage:add")
     public RT<Boolean> add(@Valid @RequestBody AddEvaluateManageDto dto){
+
+        EvaluateTemplate evaluateTemplate = templateService.getById(dto.getEvaluateTemplateId());
+        if(evaluateTemplate.getEvaluateType().equals(EvaluateTypeEnum.TEACHER_EVALUATE_CLASS.getCode())){
+            List<EvaluateManage> list = evaluateManageService.list(
+                    new QueryWrapper<EvaluateManage>().lambda()
+                            .eq(EvaluateManage::getYear, dto.getYear())
+                            .eq(EvaluateManage::getMonth, dto.getMonth())
+                            .eq(EvaluateManage::getEvaluateTemplateId, dto.getEvaluateTemplateId())
+                            .eq(EvaluateManage::getDeleteMark, DeleteMark.NODELETE.getCode())
+            );
+            if(!list.isEmpty()){
+                return RT.error("该模板已有同月份的计划");
+            }
+        }
+
         EvaluateManage evaluateManage = BeanUtil.toBean(dto, EvaluateManage.class);
         evaluateManage.setCreateDate(new Date());
         evaluateManage.setCreateUserId(StpUtil.getLoginIdAsLong());

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

@@ -70,4 +70,10 @@ public class AddEvaluateManageDto implements Serializable {
     @ApiModelProperty("状态（-1：未发布，1：进行中，0，暂停）")
     private Integer status;
 
+    @ApiModelProperty("年份")
+    private Integer year;
+
+    @ApiModelProperty("月份")
+    private Integer month;
+
 }

src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateManage.java

@@ -136,4 +136,9 @@ public class EvaluateManage implements Serializable {
     @EntityMapping(thisField = "id", joinField = "evaluateManageId")
     private List<EvaluateExecuter> evaluateExecuterList;
 
+    @ApiModelProperty("年份")
+    private Integer year;
+
+    @ApiModelProperty("月份")
+    private Integer month;
 }

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

@@ -137,6 +137,7 @@ public class EvaluateObjectServiceImpl extends MPJBaseServiceImpl<EvaluateObject
     }
 
     @Override
+    @Transactional
     public Boolean save(SaveEvaluateObjectDto dto) {
         //获取当前评价管理的类型
         MPJLambdaWrapper<EvaluateManage> evaluateManageMPJLambdaWrapper = new MPJLambdaWrapper<>();