考评流程审批判断

ims-service/ims-eval/src/main/java/com/ims/eval/controller/OrganizationYearRatingController.java

@@ -1,9 +1,16 @@
 package com.ims.eval.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.OrganizationYearRating;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IOrganizationYearRatingService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
 
 /**
  * <p>
@@ -17,4 +24,69 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//organization-year-rating")
 public class OrganizationYearRatingController {
 
+
+
+
+	@Autowired
+	private IOrganizationYearRatingService organizationYearRatingService;
+
+	/**
+	 * 查询
+	 * @param pageNum
+	 * @param pageSize
+
+	 * @param yearRatingCode
+	 * @param year
+	 * @return
+	 */
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "yearRatingCode", required = false) String yearRatingCode,
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "des", required = false) String des) {
+		IPage<OrganizationYearRating> list = organizationYearRatingService.list(pageNum, pageSize, yearRatingCode, year, des);
+		return R.ok().data(list);
+	}
+
+
+	@PostMapping(value = "/save")
+	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
+	public R addAll(@RequestBody OrganizationYearRating organizationYearRating) {
+
+		try {
+			boolean b = organizationYearRatingService.saveOrUpdate(organizationYearRating);
+			if (b) {
+				return R.ok().data(b);
+			} else {
+				return R.error().data("保存失败！");
+			}
+		} catch (CustomException e) {
+			return R.customError(e.getMessage()).data("失败！");
+		}
+	}
+
+
+
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@PostMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = organizationYearRatingService.removeByIds(Arrays.asList(strings));
+		if (b) {
+			return R.ok().data(b);
+		} else {
+			return R.error().data("删除失败！");
+		}
+	}
+
+
+
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/dao/OrganizationEvaluationInfoMapper.java

@@ -68,6 +68,12 @@ public interface OrganizationEvaluationInfoMapper extends BaseMapper<Organizatio
 
 
 
+	int selectEvaluationInfoByStateCount(@Param("organizationEvaluationId") String organizationEvaluationId,
+											@Param("deptId") String deptId,
+											@Param("state") List<String> state);
+
+
+
 //	void updateEvaluationInfo(@Param("evaluationInfos")  List<OrganizationEvaluationInfo> evaluationInfos);
 
 

ims-service/ims-eval/src/main/java/com/ims/eval/entity/OrganizationYearRating.java

@@ -1,13 +1,14 @@
 package com.ims.eval.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author wang
@@ -24,6 +25,11 @@ public class OrganizationYearRating extends Model {
      */
     private String id;
 
+	/**
+	 * 编码
+	 */
+	private String yearRatingCode;
+
     /**
      * 年
      */
@@ -42,7 +48,7 @@ public class OrganizationYearRating extends Model {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
+    private Date createTime;
 
     /**
      * 创建者
@@ -52,7 +58,7 @@ public class OrganizationYearRating extends Model {
     /**
      * 更新时间
      */
-    private LocalDateTime updateTime;
+    private Date updateTime;
 
     /**
      * 更新者

ims-service/ims-eval/src/main/java/com/ims/eval/service/IOrganizationYearRatingService.java

@@ -1,5 +1,7 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.OrganizationRatingRule;
 import com.ims.eval.entity.OrganizationYearRating;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IOrganizationYearRatingService extends IService<OrganizationYearRating> {
 
+	IPage<OrganizationYearRating> list(Integer pageNum, Integer pageSize, String yearRatingCode, String year, String des);
+
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/WorkflowMonthServiceImpl.java

@@ -50,10 +50,16 @@ public class WorkflowMonthServiceImpl  implements WorkflowService {
 			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
 			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
 			if(null!=count && count>0){
-				throw new CustomException("当前填报有未审批完的记录！");
+				throw new CustomException("请联系组织人事部进行指标状态确认！");
+			}
+		}
+		if("各部门填报".equals(taskName)){
+			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
+			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
+			if(null!=count && count>0){
+				throw new CustomException("请联系组织人事部进行指标状态确认！");
 			}
 		}
-
 		return true;
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/WorkflowSeasonServiceImpl.java

@@ -45,7 +45,15 @@ public class WorkflowSeasonServiceImpl  implements WorkflowService {
 			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
 			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
 			if(null!=count && count>0){
-				throw new CustomException("当前填报有未审批完的记录！");
+				throw new CustomException("请联系组织人事部进行指标状态确认！");
+			}
+		}
+
+		if("各部门填报".equals(taskName)){
+			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
+			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
+			if(null!=count && count>0){
+				throw new CustomException("请联系组织人事部进行指标状态确认！");
 			}
 		}
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/custom/impl/WorkflowYearsServiceImpl.java

@@ -49,7 +49,15 @@ public class WorkflowYearsServiceImpl implements WorkflowService {
 			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
 			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
 			if(null!=count && count>0){
-				throw new CustomException("当前填报有未审批完的记录！");
+				throw new CustomException("请联系组织人事部进行指标状态确认！");
+			}
+		}
+
+		if("各部门填报".equals(taskName)){
+			List<String> stateList = Arrays.asList("-1", "0"); // 要查询的id列表
+			Integer count = organizationEvaluationInfoService.getEvaluationInfoByStateCount(bizKey,"",stateList);
+			if(null!=count && count>0){
+				throw new CustomException("请联系组织人事部进行指标状态确认！");
 			}
 		}
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationInfoServiceImpl.java

@@ -1260,7 +1260,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 			qw.lambda().in(OrganizationEvaluationInfo::getState, state);
 		}
 
-		Integer count = baseMapper.selectCount(qw);
+//		Integer count = baseMapper.selectCount(qw);
+		Integer count = baseMapper.selectEvaluationInfoByStateCount(organizationEvaluationId,deptId,state);
 		return count;
 
 	}

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationYearRatingServiceImpl.java

@@ -1,5 +1,10 @@
 package com.ims.eval.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ims.common.utils.StringUtils;
+import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.OrganizationYearRating;
 import com.ims.eval.dao.OrganizationYearRatingMapper;
 import com.ims.eval.service.IOrganizationYearRatingService;
@@ -17,4 +22,27 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrganizationYearRatingServiceImpl extends ServiceImpl<OrganizationYearRatingMapper, OrganizationYearRating> implements IOrganizationYearRatingService {
 
+	@Override
+	public IPage<OrganizationYearRating> list(Integer pageNum, Integer pageSize, String yearRatingCode, String year, String des) {
+
+		if (null == pageNum || null == pageSize) {
+			throw new CustomException("分页参数为空");
+		}
+		QueryWrapper<OrganizationYearRating> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(yearRatingCode)) {
+			qw.lambda().like(OrganizationYearRating::getYearRatingCode,yearRatingCode);
+		}
+
+		if (StringUtils.isNotEmpty(year)) {
+			qw.lambda().eq(OrganizationYearRating::getYear,year);
+		}
+
+		if (StringUtils.isNotEmpty(des)) {
+			qw.lambda().eq(OrganizationYearRating::getDes,des);
+		}
+
+		Page<OrganizationYearRating> page = new Page<>(pageNum, pageSize);
+		IPage<OrganizationYearRating> list = baseMapper.selectPage(page, qw);
+		return list;
+	}
 }

ims-service/ims-eval/src/main/resources/mappers/OrganizationEvaluationInfoMapper.xml

@@ -372,6 +372,26 @@
         order by oer.order_num asc
 
     </select>
+    <select id="selectEvaluationInfoByStateCount" resultType="java.lang.Integer">
+
+        select
+        count(*)
+        from organization_evaluation_info ei
+
+        <where>
+
+            <if test="organizationEvaluationId !=null and organizationEvaluationId !=''">
+                and  ei.organization_evaluation_id = #{organizationEvaluationId}
+            </if>
+            <if test="deptId !=null and deptId !=''">
+                and  ei.dept_id = #{deptId}
+            </if>
+            <if test="state !=null">
+                AND ei.state in
+                <foreach item="item" collection="state" separator="," open="(" close=")" index="">'${item}'</foreach>
+            </if>
+        </where>
+    </select>
 
 
 </mapper>