提交

ims-service/ims-eval/pom.xml

@@ -50,12 +50,6 @@
             <artifactId>apm-toolkit-logback-1.x</artifactId>
             <version>8.5.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.ims.as</groupId>
-            <artifactId>sm-test</artifactId>
-            <version>2.5.0.RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -1,8 +1,15 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ims.eval.entity.OrganizationEvaluationRule;
+import com.ims.eval.entity.dto.result.R;
+import com.ims.eval.service.IOrganizationEvaluationRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -17,4 +24,43 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("//dept-responsibility")
 public class DeptResponsibilityController {
 
+
+
+	@Autowired
+	private IOrganizationEvaluationRuleService organizationEvaluationRuleService;
+
+
+	/**
+	 * @param pageNum          当前页数
+	 * @param pageSize         当前页大小
+	 * @param id               主键
+	 * @param organizationName 考评组织名称
+	 * @param organizationId   考评组织ID
+	 * @param organizationType 考评类别
+	 * @param binSection       业务版块
+	 * @param binStage         业务阶段
+	 * @param evaluationCycle  考评周期
+	 * @param year             年
+	 * @param month            月
+	 * @return
+	 */
+	//@ImsPreAuth("eval:deptResponsibility:view")
+	@GetMapping(value = "list")
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "id", required = false) String id,
+				  @RequestParam(value = "organizationName", required = false) String organizationName,
+				  @RequestParam(value = "organizationId", required = false) String organizationId,
+				  @RequestParam(value = "organizationType", required = false) String organizationType,
+				  @RequestParam(value = "binSection", required = false) String binSection,
+				  @RequestParam(value = "binStage", required = false) String binStage,
+				  @RequestParam(value = "evaluationCycle", required = false) String evaluationCycle,
+				  @RequestParam(value = "year", required = false) String year,
+				  @RequestParam(value = "month", required = false) String month) {
+		IPage<OrganizationEvaluationRule> list = organizationEvaluationRuleService.list2(pageNum, pageSize, id, organizationName, organizationId, organizationType, binSection, binStage, evaluationCycle, year, month);
+		return R.ok().data(list);
+	}
+
+
+
 }

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

@@ -11,7 +11,10 @@ import com.ims.eval.dao.OrganizationEvaluationRuleMapper;
 import com.ims.eval.service.IOrganizationEvaluationRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.io.Serializable;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -142,6 +145,7 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		return list;
 	}
 
+	@Transactional
 	@Override
 	public boolean saveOrUpdate(OrganizationEvaluationRule entity) {
 		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {
@@ -160,4 +164,11 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 
 		return super.saveOrUpdate(entity);
 	}
+
+	@Transactional
+	@Override
+	public boolean removeByIds(Collection<? extends Serializable> idList) {
+		super.removeByIds(idList);
+		return false;
+	}
 }