代码提交

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

@@ -1,122 +1,20 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.DeptResponsibility;
-import com.ims.eval.service.IDeptResponsibilityService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 部门目标责任Controller
+ * <p>
+ * 部门目标责任表 前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-@Controller
-@RequestMapping(value = "/eval/ddeptResponsibility")
-public class DeptResponsibilityController extends WebController<IDeptResponsibilityService, DeptResponsibility> {
-
- 	//@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "list")
-	public String list(DeptResponsibility ddeptResponsibility, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "form")
-	public String form(DeptResponsibility ddeptResponsibility, Model model) {
-	    String formView = ddeptResponsibility.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityForm";
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "lov")
-	public String lov(DeptResponsibility ddeptResponsibility, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(ddeptResponsibility,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(DeptResponsibility ddeptResponsibility, MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(ddeptResponsibility,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:ddeptResponsibility:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(ddeptResponsibility,request,response );
-	}
+@RestController
+@RequestMapping("//dept-responsibility")
+public class DeptResponsibilityController {
 
 }

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

@@ -1,122 +1,20 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.DeptResponsibilityTarget;
-import com.ims.eval.service.IDeptResponsibilityTargetService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 目标责任书指标Controller
+ * <p>
+ * 目标责任书指标 前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-@Controller
-@RequestMapping(value = "/eval/deptResponsibilityTarget")
-public class DeptResponsibilityTargetController extends WebController<IDeptResponsibilityTargetService, DeptResponsibilityTarget> {
-
- 	//@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "list")
-	public String list(DeptResponsibilityTarget deptResponsibilityTarget, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/deptResponsibilityTargetList";
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "form")
-	public String form(DeptResponsibilityTarget deptResponsibilityTarget, Model model) {
-	    String formView = deptResponsibilityTarget.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/deptResponsibilityTargetForm";
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "lov")
-	public String lov(DeptResponsibilityTarget deptResponsibilityTarget, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/deptResponsibilityTargetList";
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(DeptResponsibilityTarget deptResponsibilityTarget, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(DeptResponsibilityTarget deptResponsibilityTarget, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(deptResponsibilityTarget,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(DeptResponsibilityTarget deptResponsibilityTarget,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(deptResponsibilityTarget,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:deptResponsibilityTarget:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(DeptResponsibilityTarget deptResponsibilityTarget, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(deptResponsibilityTarget,request,response );
-	}
+@RestController
+@RequestMapping("//dept-responsibility-target")
+public class DeptResponsibilityTargetController {
 
 }

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

@@ -1,122 +1,20 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.EvaluateRule;
-import com.ims.eval.service.IEvaluateRuleService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 考评规则Controller
+ * <p>
+ * 考评规则表 前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-@Controller
-@RequestMapping(value = "/eval/evaluateRule")
-public class EvaluateRuleController extends WebController<IEvaluateRuleService,EvaluateRule> {
-
- 	//@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "list")
-	public String list(EvaluateRule evaluateRule, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateRuleList";
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "form")
-	public String form(EvaluateRule evaluateRule, Model model) {
-	    String formView = evaluateRule.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateRuleForm";
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "lov")
-	public String lov(EvaluateRule evaluateRule, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateRuleList";
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(EvaluateRule evaluateRule, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(EvaluateRule evaluateRule, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(evaluateRule,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(EvaluateRule evaluateRule,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(evaluateRule,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:evaluateRule:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(EvaluateRule evaluateRule, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(evaluateRule,request,response );
-	}
+@RestController
+@RequestMapping("//evaluate-rule")
+public class EvaluateRuleController {
 
 }

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

@@ -1,122 +1,20 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.EvaluateScore;
-import com.ims.eval.service.IEvaluateScoreService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 考评得分Controller
+ * <p>
+ * 考评得分表 前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-@Controller
-@RequestMapping(value = "/eval/evaluateScore")
-public class EvaluateScoreController extends WebController<IEvaluateScoreService, EvaluateScore> {
-
- 	//@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "list")
-	public String list(EvaluateScore evaluateScore, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateScoreList";
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "form")
-	public String form(EvaluateScore evaluateScore, Model model) {
-	    String formView = evaluateScore.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateScoreForm";
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "lov")
-	public String lov(EvaluateScore evaluateScore, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/evaluateScoreList";
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(EvaluateScore evaluateScore, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(EvaluateScore evaluateScore, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(evaluateScore,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(EvaluateScore evaluateScore,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(evaluateScore,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:evaluateScore:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(EvaluateScore evaluateScore, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(evaluateScore,request,response );
-	}
+@RestController
+@RequestMapping("//evaluate-score")
+public class EvaluateScoreController {
 
 }

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

@@ -5,10 +5,13 @@ import com.ims.eval.dao.result.R;
 import com.ims.eval.entity.DataDictionary;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.service.IIndicatorService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -72,4 +75,24 @@ public class IndicatorController {
 	}
 
 
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	//@ImsPreAuth("eval:dataDictionary:remove")
+	@DeleteMapping(value = "/remove/{ids}")
+	@ApiOperation(value = "删除", notes = "删除")
+	public R deleteAll(@PathVariable("ids") String ids) {
+		String[] strings = ids.split(",");
+		boolean b = iIndicatorService.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/controller/ReportController.java

@@ -1,122 +1,20 @@
-/**
- *
- */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-import com.ims.eval.entity.Report;
-import com.ims.eval.service.IReportService;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
+
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
- * 发布公告表Controller
+ * <p>
+ * 发布公告表 前端控制器
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-27
  */
-@Controller
-@RequestMapping(value = "/eval/report")
-public class ReportController extends WebController<IReportService,Report> {
-
- 	//@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "list")
-	public String list(Report report, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/reportList";
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "form")
-	public String form(Report report, Model model) {
-	    String formView = report.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "ims/"+formView;
-		}
-		return "ims/ims-eval${ims_eval_suffix}/eval/reportForm";
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "lov")
-	public String lov(Report report, Model model) {
-		return "ims/ims-eval${ims_eval_suffix}/eval/reportList";
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(Report report, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(Report report, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(Report report, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(Report report, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(Report report, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(report,request,response,model);
-	}
-
-    //@ImsPreAuth("eval:report:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(Report report,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(report,excelFile,null,request,response);
-	}
-
-    //@ImsPreAuth("eval:report:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(Report report, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(report,request,response );
-	}
+@RestController
+@RequestMapping("//report")
+public class ReportController {
 
 }

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

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.DeptResponsibility;
-
-/**
- * 部门目标责任DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface DdeptResponsibilityDao extends CrudDao<DeptResponsibility> {
-
-}

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

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.DeptResponsibility;
-
-/**
- * 部门目标责任DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface DeptResponsibilityDao extends CrudDao<DeptResponsibility> {
-
-}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.DeptResponsibility;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 部门目标责任表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface DeptResponsibilityMapper extends BaseMapper<DeptResponsibility> {
+
+}

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

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.DeptResponsibilityTarget;
-
-/**
- * 目标责任书指标DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface DeptResponsibilityTargetDao extends CrudDao<DeptResponsibilityTarget> {
-
-}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.DeptResponsibilityTarget;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 目标责任书指标 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface DeptResponsibilityTargetMapper extends BaseMapper<DeptResponsibilityTarget> {
+
+}

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

@@ -1,17 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.EvaluateRule;
-
-
-/**
- * 考评规则DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface EvaluateRuleDao extends CrudDao<EvaluateRule> {
-
-}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluateRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评规则表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface EvaluateRuleMapper extends BaseMapper<EvaluateRule> {
+
+}

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

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.EvaluateScore;
-
-/**
- * 考评得分DAO接口
- * @author wang
- * @version 2023-02-23
- */
-public interface EvaluateScoreDao extends CrudDao<EvaluateScore> {
-
-}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.EvaluateScore;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 考评得分表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface EvaluateScoreMapper extends BaseMapper<EvaluateScore> {
+
+}

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

@@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author wang
  * @since 2023-02-26
  */
-@Mapper
 public interface IndicatorDictionaryMapper extends BaseMapper<IndicatorDictionary> {
 
 }

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

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.eval.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.eval.entity.Report;
-
-/**
- * 发布公告表DAO接口
- * @author wang
- * @version 2023-02-25
- */
-public interface ReportDao extends CrudDao<Report> {
-
-}

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

@@ -0,0 +1,16 @@
+package com.ims.eval.dao;
+
+import com.ims.eval.entity.Report;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 发布公告表 Mapper 接口
+ * </p>
+ *
+ * @author wang
+ * @since 2023-02-27
+ */
+public interface ReportMapper extends BaseMapper<Report> {
+
+}

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

@@ -1,157 +1,118 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
-import com.ims.core.entity.DataEntity;
-
-import java.util.Date;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 部门目标责任表Entity
+ * <p>
+ * 部门目标责任表
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-27
  */
-public class DeptResponsibility extends DataEntity<DeptResponsibility> {
-
-	private static final long serialVersionUID = 1L;
-	private String deptId;		// 部门ID
-	private String cycleUnit;		// 周期单位
-	private String checkCycle;		// 周期
-	private Date beginDate;		// 考核开始时间
-	private Date endDate;		// 考核截止时间
-	private String stage;		// 审批状态
-	private String des;		// 描述
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-	private String reviewPeople;		// 复审人
-	private Date reviewPeopleTime;		// 复审时间
-	private String reviewOpinion;		// 复审意见
-	private String finalReviewPeople;		// 终审人
-	private Date finalReviewPeopleTime;		// 终审时间
-	private String finalReviewOpinion;		// 终审意见
-	private String remark;		// 备注
-
-
-	public DeptResponsibility() {
-		super();
-	}
-
-	public DeptResponsibility(String id){
-		super(id);
-	}
-
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	public String getCycleUnit() {
-		return cycleUnit;
-	}
-
-	public void setCycleUnit(String cycleUnit) {
-		this.cycleUnit = cycleUnit;
-	}
-	public String getCheckCycle() {
-		return checkCycle;
-	}
-
-	public void setCheckCycle(String checkCycle) {
-		this.checkCycle = checkCycle;
-	}
-	public Date getBeginDate() {
-		return beginDate;
-	}
-
-	public void setBeginDate(Date beginDate) {
-		this.beginDate = beginDate;
-	}
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-	public String getStage() {
-		return stage;
-	}
-
-	public void setStage(String stage) {
-		this.stage = stage;
-	}
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	public String getReviewPeople() {
-		return reviewPeople;
-	}
-
-	public void setReviewPeople(String reviewPeople) {
-		this.reviewPeople = reviewPeople;
-	}
-	public Date getReviewPeopleTime() {
-		return reviewPeopleTime;
-	}
-
-	public void setReviewPeopleTime(Date reviewPeopleTime) {
-		this.reviewPeopleTime = reviewPeopleTime;
-	}
-	public String getReviewOpinion() {
-		return reviewOpinion;
-	}
-
-	public void setReviewOpinion(String reviewOpinion) {
-		this.reviewOpinion = reviewOpinion;
-	}
-	public String getFinalReviewPeople() {
-		return finalReviewPeople;
-	}
-
-	public void setFinalReviewPeople(String finalReviewPeople) {
-		this.finalReviewPeople = finalReviewPeople;
-	}
-	public Date getFinalReviewPeopleTime() {
-		return finalReviewPeopleTime;
-	}
-
-	public void setFinalReviewPeopleTime(Date finalReviewPeopleTime) {
-		this.finalReviewPeopleTime = finalReviewPeopleTime;
-	}
-	public String getFinalReviewOpinion() {
-		return finalReviewOpinion;
-	}
-
-	public void setFinalReviewOpinion(String finalReviewOpinion) {
-		this.finalReviewOpinion = finalReviewOpinion;
-	}
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeptResponsibility extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 周期单位
+     */
+    private String cycleUnit;
+
+    /**
+     * 周期
+     */
+    private String checkCycle;
+
+    /**
+     * 考核开始时间
+     */
+    private LocalDate beginDate;
+
+    /**
+     * 考核截止时间
+     */
+    private LocalDate endDate;
+
+    /**
+     * 审批状态
+     */
+    private String stage;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 创建时间
+     */
+    private LocalDate createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDate updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 复审人
+     */
+    private String reviewPeople;
+
+    /**
+     * 复审时间
+     */
+    private LocalDate reviewPeopleTime;
+
+    /**
+     * 复审意见
+     */
+    private String reviewOpinion;
+
+    /**
+     * 终审人
+     */
+    private String finalReviewPeople;
+
+    /**
+     * 终审时间
+     */
+    private LocalDate finalReviewPeopleTime;
+
+    /**
+     * 终审意见
+     */
+    private String finalReviewOpinion;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
 
 }

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

@@ -1,317 +1,208 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
-import com.ims.core.entity.DataEntity;
-
 import java.math.BigDecimal;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 目标责任书指标Entity
+ * <p>
+ * 目标责任书指标
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-27
  */
-public class DeptResponsibilityTarget extends DataEntity<DeptResponsibilityTarget> {
-
-	private static final long serialVersionUID = 1L;
-	private String responsibilityId;		// 目标责任书ID
-	private String indicatorId;		// 指标ID
-	private BigDecimal quantizationTarget;		// 量化目标
-	private BigDecimal quantizationTargetActual;		// 量化目标完成值
-	private String evaluationTarget;		// 评价目标
-	private BigDecimal evaluationTargetActual;		// 评价目标完成值
-	private BigDecimal monthThreshold;		// 月度预警零界值
-	private BigDecimal seasonThreshold;		// 季度预警零界值
-	private BigDecimal yearThreshold;		// 年度预警零界值
-	private BigDecimal direction;		// 方向
-	private BigDecimal orderNum;		// 排序
-	private String remark;		// 备注
-	private BigDecimal target1;		// 一月目标
-	private BigDecimal actual1;		// 一月完成值
-	private BigDecimal target2;		// 二月目标
-	private BigDecimal actual2;		// 二月完值
-	private BigDecimal target3;		// 三月目标
-	private BigDecimal actual3;		// 三月完成值
-	private BigDecimal target4;		// 四月目标
-	private BigDecimal actual4;		// 四月完成值
-	private BigDecimal target5;		// 五月目标
-	private BigDecimal actual5;		// 五月完成值
-	private BigDecimal target6;		// 六月目标
-	private BigDecimal actual6;		// 六月完成值
-	private BigDecimal target7;		// 七月目标
-	private BigDecimal actual7;		// 七月完成值
-	private BigDecimal target8;		// 八月目标
-	private BigDecimal actual8;		// 八月完成值
-	private BigDecimal target9;		// 九月目标
-	private BigDecimal actual9;		// 九月完成值
-	private BigDecimal target10;		// 十月目标
-	private BigDecimal actual10;		// 十月完成值
-	private BigDecimal target11;		// 十一月目标
-	private BigDecimal actual11;		// 十一月完成值
-	private BigDecimal target12;		// 十二月目标
-	private BigDecimal actual12;		// 十二月完成值
-
-
-	public DeptResponsibilityTarget() {
-		super();
-	}
-
-	public DeptResponsibilityTarget(String id){
-		super(id);
-	}
-
-	public String getResponsibilityId() {
-		return responsibilityId;
-	}
-
-	public void setResponsibilityId(String responsibilityId) {
-		this.responsibilityId = responsibilityId;
-	}
-	public String getIndicatorId() {
-		return indicatorId;
-	}
-
-	public void setIndicatorId(String indicatorId) {
-		this.indicatorId = indicatorId;
-	}
-	public BigDecimal getQuantizationTarget() {
-		return quantizationTarget;
-	}
-
-	public void setQuantizationTarget(BigDecimal quantizationTarget) {
-		this.quantizationTarget = quantizationTarget;
-	}
-	public BigDecimal getQuantizationTargetActual() {
-		return quantizationTargetActual;
-	}
-
-	public void setQuantizationTargetActual(BigDecimal quantizationTargetActual) {
-		this.quantizationTargetActual = quantizationTargetActual;
-	}
-	public String getEvaluationTarget() {
-		return evaluationTarget;
-	}
-
-	public void setEvaluationTarget(String evaluationTarget) {
-		this.evaluationTarget = evaluationTarget;
-	}
-	public BigDecimal getEvaluationTargetActual() {
-		return evaluationTargetActual;
-	}
-
-	public void setEvaluationTargetActual(BigDecimal evaluationTargetActual) {
-		this.evaluationTargetActual = evaluationTargetActual;
-	}
-	public BigDecimal getMonthThreshold() {
-		return monthThreshold;
-	}
-
-	public void setMonthThreshold(BigDecimal monthThreshold) {
-		this.monthThreshold = monthThreshold;
-	}
-	public BigDecimal getSeasonThreshold() {
-		return seasonThreshold;
-	}
-
-	public void setSeasonThreshold(BigDecimal seasonThreshold) {
-		this.seasonThreshold = seasonThreshold;
-	}
-	public BigDecimal getYearThreshold() {
-		return yearThreshold;
-	}
-
-	public void setYearThreshold(BigDecimal yearThreshold) {
-		this.yearThreshold = yearThreshold;
-	}
-	public BigDecimal getDirection() {
-		return direction;
-	}
-
-	public void setDirection(BigDecimal direction) {
-		this.direction = direction;
-	}
-	public BigDecimal getOrderNum() {
-		return orderNum;
-	}
-
-	public void setOrderNum(BigDecimal orderNum) {
-		this.orderNum = orderNum;
-	}
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	public BigDecimal getTarget1() {
-		return target1;
-	}
-
-	public void setTarget1(BigDecimal target1) {
-		this.target1 = target1;
-	}
-	public BigDecimal getActual1() {
-		return actual1;
-	}
-
-	public void setActual1(BigDecimal actual1) {
-		this.actual1 = actual1;
-	}
-	public BigDecimal getTarget2() {
-		return target2;
-	}
-
-	public void setTarget2(BigDecimal target2) {
-		this.target2 = target2;
-	}
-	public BigDecimal getActual2() {
-		return actual2;
-	}
-
-	public void setActual2(BigDecimal actual2) {
-		this.actual2 = actual2;
-	}
-	public BigDecimal getTarget3() {
-		return target3;
-	}
-
-	public void setTarget3(BigDecimal target3) {
-		this.target3 = target3;
-	}
-	public BigDecimal getActual3() {
-		return actual3;
-	}
-
-	public void setActual3(BigDecimal actual3) {
-		this.actual3 = actual3;
-	}
-	public BigDecimal getTarget4() {
-		return target4;
-	}
-
-	public void setTarget4(BigDecimal target4) {
-		this.target4 = target4;
-	}
-	public BigDecimal getActual4() {
-		return actual4;
-	}
-
-	public void setActual4(BigDecimal actual4) {
-		this.actual4 = actual4;
-	}
-	public BigDecimal getTarget5() {
-		return target5;
-	}
-
-	public void setTarget5(BigDecimal target5) {
-		this.target5 = target5;
-	}
-	public BigDecimal getActual5() {
-		return actual5;
-	}
-
-	public void setActual5(BigDecimal actual5) {
-		this.actual5 = actual5;
-	}
-	public BigDecimal getTarget6() {
-		return target6;
-	}
-
-	public void setTarget6(BigDecimal target6) {
-		this.target6 = target6;
-	}
-	public BigDecimal getActual6() {
-		return actual6;
-	}
-
-	public void setActual6(BigDecimal actual6) {
-		this.actual6 = actual6;
-	}
-	public BigDecimal getTarget7() {
-		return target7;
-	}
-
-	public void setTarget7(BigDecimal target7) {
-		this.target7 = target7;
-	}
-	public BigDecimal getActual7() {
-		return actual7;
-	}
-
-	public void setActual7(BigDecimal actual7) {
-		this.actual7 = actual7;
-	}
-	public BigDecimal getTarget8() {
-		return target8;
-	}
-
-	public void setTarget8(BigDecimal target8) {
-		this.target8 = target8;
-	}
-	public BigDecimal getActual8() {
-		return actual8;
-	}
-
-	public void setActual8(BigDecimal actual8) {
-		this.actual8 = actual8;
-	}
-	public BigDecimal getTarget9() {
-		return target9;
-	}
-
-	public void setTarget9(BigDecimal target9) {
-		this.target9 = target9;
-	}
-	public BigDecimal getActual9() {
-		return actual9;
-	}
-
-	public void setActual9(BigDecimal actual9) {
-		this.actual9 = actual9;
-	}
-	public BigDecimal getTarget10() {
-		return target10;
-	}
-
-	public void setTarget10(BigDecimal target10) {
-		this.target10 = target10;
-	}
-	public BigDecimal getActual10() {
-		return actual10;
-	}
-
-	public void setActual10(BigDecimal actual10) {
-		this.actual10 = actual10;
-	}
-	public BigDecimal getTarget11() {
-		return target11;
-	}
-
-	public void setTarget11(BigDecimal target11) {
-		this.target11 = target11;
-	}
-	public BigDecimal getActual11() {
-		return actual11;
-	}
-
-	public void setActual11(BigDecimal actual11) {
-		this.actual11 = actual11;
-	}
-	public BigDecimal getTarget12() {
-		return target12;
-	}
-
-	public void setTarget12(BigDecimal target12) {
-		this.target12 = target12;
-	}
-	public BigDecimal getActual12() {
-		return actual12;
-	}
-
-	public void setActual12(BigDecimal actual12) {
-		this.actual12 = actual12;
-	}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeptResponsibilityTarget extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 目标责任书ID
+     */
+    private String responsibilityId;
+
+    /**
+     * 指标ID
+     */
+    private String indicatorId;
+
+    /**
+     * 量化目标
+     */
+    private BigDecimal quantizationTarget;
+
+    /**
+     * 量化目标完成值
+     */
+    private BigDecimal quantizationTargetActual;
+
+    /**
+     * 评价目标
+     */
+    private String evaluationTarget;
+
+    /**
+     * 评价目标完成值
+     */
+    private BigDecimal evaluationTargetActual;
+
+    /**
+     * 月度预警零界值
+     */
+    private BigDecimal monthThreshold;
+
+    /**
+     * 季度预警零界值
+     */
+    private BigDecimal seasonThreshold;
+
+    /**
+     * 年度预警零界值
+     */
+    private BigDecimal yearThreshold;
+
+    /**
+     * 方向
+     */
+    private BigDecimal direction;
+
+    /**
+     * 排序
+     */
+    private BigDecimal orderNum;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 一月目标
+     */
+    private BigDecimal target1;
+
+    /**
+     * 一月完成值
+     */
+    private BigDecimal actual1;
+
+    /**
+     * 二月目标
+     */
+    private BigDecimal target2;
+
+    /**
+     * 二月完值
+     */
+    private BigDecimal actual2;
+
+    /**
+     * 三月目标
+     */
+    private BigDecimal target3;
+
+    /**
+     * 三月完成值
+     */
+    private BigDecimal actual3;
+
+    /**
+     * 四月目标
+     */
+    private BigDecimal target4;
+
+    /**
+     * 四月完成值
+     */
+    private BigDecimal actual4;
+
+    /**
+     * 五月目标
+     */
+    private BigDecimal target5;
+
+    /**
+     * 五月完成值
+     */
+    private BigDecimal actual5;
+
+    /**
+     * 六月目标
+     */
+    private BigDecimal target6;
+
+    /**
+     * 六月完成值
+     */
+    private BigDecimal actual6;
+
+    /**
+     * 七月目标
+     */
+    private BigDecimal target7;
+
+    /**
+     * 七月完成值
+     */
+    private BigDecimal actual7;
+
+    /**
+     * 八月目标
+     */
+    private BigDecimal target8;
+
+    /**
+     * 八月完成值
+     */
+    private BigDecimal actual8;
+
+    /**
+     * 九月目标
+     */
+    private BigDecimal target9;
+
+    /**
+     * 九月完成值
+     */
+    private BigDecimal actual9;
+
+    /**
+     * 十月目标
+     */
+    private BigDecimal target10;
+
+    /**
+     * 十月完成值
+     */
+    private BigDecimal actual10;
+
+    /**
+     * 十一月目标
+     */
+    private BigDecimal target11;
+
+    /**
+     * 十一月完成值
+     */
+    private BigDecimal actual11;
+
+    /**
+     * 十二月目标
+     */
+    private BigDecimal target12;
+
+    /**
+     * 十二月完成值
+     */
+    private BigDecimal actual12;
+
 
 }

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

@@ -1,94 +1,79 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
-import com.ims.core.entity.DataEntity;
-
 import java.math.BigDecimal;
-import java.util.Date;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 考评规则Entity
+ * <p>
+ * 考评规则表
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-27
  */
-public class EvaluateRule extends DataEntity<EvaluateRule> {
-
-	private static final long serialVersionUID = 1L;
-	private String des;		// 描述
-	private String indicatorId;		// 指标ID
-	private BigDecimal totalScore;		// 指标总分
-	private String evaluateMethod;		// 评分方式
-	private String evaluateFormula;		// 评分公式
-	private String mappingFunction;		// 隐射函数
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-
-
-	public EvaluateRule() {
-		super();
-	}
-
-	public EvaluateRule(String id){
-		super(id);
-	}
-
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public String getIndicatorId() {
-		return indicatorId;
-	}
-
-	public void setIndicatorId(String indicatorId) {
-		this.indicatorId = indicatorId;
-	}
-	public BigDecimal getTotalScore() {
-		return totalScore;
-	}
-
-	public void setTotalScore(BigDecimal totalScore) {
-		this.totalScore = totalScore;
-	}
-	public String getEvaluateMethod() {
-		return evaluateMethod;
-	}
-
-	public void setEvaluateMethod(String evaluateMethod) {
-		this.evaluateMethod = evaluateMethod;
-	}
-	public String getEvaluateFormula() {
-		return evaluateFormula;
-	}
-
-	public void setEvaluateFormula(String evaluateFormula) {
-		this.evaluateFormula = evaluateFormula;
-	}
-	public String getMappingFunction() {
-		return mappingFunction;
-	}
-
-	public void setMappingFunction(String mappingFunction) {
-		this.mappingFunction = mappingFunction;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluateRule extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 指标ID
+     */
+    private String indicatorId;
+
+    /**
+     * 指标总分
+     */
+    private BigDecimal totalScore;
+
+    /**
+     * 评分方式
+     */
+    private String evaluateMethod;
+
+    /**
+     * 评分公式
+     */
+    private String evaluateFormula;
+
+    /**
+     * 隐射函数
+     */
+    private String mappingFunction;
+
+    /**
+     * 创建时间
+     */
+    private LocalDate createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDate updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
 
 }

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

@@ -1,126 +1,99 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
-import com.ims.core.entity.DataEntity;
-
 import java.math.BigDecimal;
-import java.util.Date;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 考评得分Entity
+ * <p>
+ * 考评得分表
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-27
  */
-public class EvaluateScore extends DataEntity<EvaluateScore> {
-
-	private static final long serialVersionUID = 1L;
-	private String des;		// 描述
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-	private String evaluateCycle;		// 考评类型（年度考评，季度考评，月度考评）
-	private String evaluateType;		// 考评性质（0:预考评；1正式考评）
-	private String deptId;		// 部门ID
-	private String responsibilityId;		// 责任书ID
-	private BigDecimal sysScore;		// 系统评分
-	private BigDecimal reviewScore;		// 复审评分
-	private String reviewPeople;		// 复审人
-	private Date reviewPeopleTime;		// 复审时间
-	private String reviewOpinion;		// 复审意见
-
-
-	public EvaluateScore() {
-		super();
-	}
-
-	public EvaluateScore(String id){
-		super(id);
-	}
-
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	public String getEvaluateCycle() {
-		return evaluateCycle;
-	}
-
-	public void setEvaluateCycle(String evaluateCycle) {
-		this.evaluateCycle = evaluateCycle;
-	}
-	public String getEvaluateType() {
-		return evaluateType;
-	}
-
-	public void setEvaluateType(String evaluateType) {
-		this.evaluateType = evaluateType;
-	}
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	public String getResponsibilityId() {
-		return responsibilityId;
-	}
-
-	public void setResponsibilityId(String responsibilityId) {
-		this.responsibilityId = responsibilityId;
-	}
-	public BigDecimal getSysScore() {
-		return sysScore;
-	}
-
-	public void setSysScore(BigDecimal sysScore) {
-		this.sysScore = sysScore;
-	}
-	public BigDecimal getReviewScore() {
-		return reviewScore;
-	}
-
-	public void setReviewScore(BigDecimal reviewScore) {
-		this.reviewScore = reviewScore;
-	}
-	public String getReviewPeople() {
-		return reviewPeople;
-	}
-
-	public void setReviewPeople(String reviewPeople) {
-		this.reviewPeople = reviewPeople;
-	}
-	public Date getReviewPeopleTime() {
-		return reviewPeopleTime;
-	}
-
-	public void setReviewPeopleTime(Date reviewPeopleTime) {
-		this.reviewPeopleTime = reviewPeopleTime;
-	}
-	public String getReviewOpinion() {
-		return reviewOpinion;
-	}
-
-	public void setReviewOpinion(String reviewOpinion) {
-		this.reviewOpinion = reviewOpinion;
-	}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EvaluateScore extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 创建时间
+     */
+    private LocalDate createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDate updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 考评类型（年度考评，季度考评，月度考评）
+     */
+    private String evaluateCycle;
+
+    /**
+     * 考评性质（0:预考评；1正式考评）
+     */
+    private String evaluateType;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 责任书ID
+     */
+    private String responsibilityId;
+
+    /**
+     * 系统评分
+     */
+    private BigDecimal sysScore;
+
+    /**
+     * 复审评分
+     */
+    private BigDecimal reviewScore;
+
+    /**
+     * 复审人
+     */
+    private String reviewPeople;
+
+    /**
+     * 复审时间
+     */
+    private LocalDate reviewPeopleTime;
+
+    /**
+     * 复审意见
+     */
+    private String reviewOpinion;
+
 
 }

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

@@ -1,85 +1,73 @@
-/**
- *
- */
 package com.ims.eval.entity;
 
-import com.ims.core.entity.DataEntity;
-
-import java.util.Date;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDate;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
- * 发布公告表Entity
+ * <p>
+ * 发布公告表
+ * </p>
+ *
  * @author wang
- * @version 2023-02-25
+ * @since 2023-02-27
  */
-public class Report extends DataEntity<Report> {
-
-	private static final long serialVersionUID = 1L;
-	private String reportTitle;		// 公告标题
-	private String des;		// 描述
-	private Date publishTime;		// 公告发布时间
-	private String reportPath;		// 报告保存路径
-	private String deptId;		// 发布公告部门
-	private Date createTime;		// 创建时间
-	private Date updateTime;		// 更新时间
-
-
-	public Report() {
-		super();
-	}
-
-	public Report(String id){
-		super(id);
-	}
-
-	public String getReportTitle() {
-		return reportTitle;
-	}
-
-	public void setReportTitle(String reportTitle) {
-		this.reportTitle = reportTitle;
-	}
-	public String getDes() {
-		return des;
-	}
-
-	public void setDes(String des) {
-		this.des = des;
-	}
-	public Date getPublishTime() {
-		return publishTime;
-	}
-
-	public void setPublishTime(Date publishTime) {
-		this.publishTime = publishTime;
-	}
-	public String getReportPath() {
-		return reportPath;
-	}
-
-	public void setReportPath(String reportPath) {
-		this.reportPath = reportPath;
-	}
-	public String getDeptId() {
-		return deptId;
-	}
-
-	public void setDeptId(String deptId) {
-		this.deptId = deptId;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	public Date getUpdateTime() {
-		return updateTime;
-	}
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Report extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 公告标题
+     */
+    private String reportTitle;
+
+    /**
+     * 描述
+     */
+    private String des;
+
+    /**
+     * 公告发布时间
+     */
+    private LocalDate publishTime;
+
+    /**
+     * 报告保存路径
+     */
+    private String reportPath;
+
+    /**
+     * 发布公告部门
+     */
+    private String deptId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDate createTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDate updateTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
 
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
 
 }

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

@@ -1,18 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.DeptResponsibility;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 部门目标责任Service
+ * <p>
+ * 部门目标责任表 服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-
-public interface IDeptResponsibilityService extends ICrudService<DeptResponsibility> {
+public interface IDeptResponsibilityService extends IService<DeptResponsibility> {
 
 }

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

@@ -1,18 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.DeptResponsibilityTarget;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 目标责任书指标Service
+ * <p>
+ * 目标责任书指标 服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-
-public interface IDeptResponsibilityTargetService extends ICrudService<DeptResponsibilityTarget> {
+public interface IDeptResponsibilityTargetService extends IService<DeptResponsibilityTarget> {
 
 }

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

@@ -1,18 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.EvaluateRule;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 考评规则Service
+ * <p>
+ * 考评规则表 服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-
-public interface IEvaluateRuleService extends ICrudService<EvaluateRule> {
+public interface IEvaluateRuleService extends IService<EvaluateRule> {
 
 }

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

@@ -1,18 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.EvaluateScore;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 考评得分Service
+ * <p>
+ * 考评得分表 服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-
-public interface IEvaluateScoreService extends ICrudService<EvaluateScore> {
+public interface IEvaluateScoreService extends IService<EvaluateScore> {
 
 }

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

@@ -1,19 +1,16 @@
-/**
- *
- */
 package com.ims.eval.service;
 
-
-import com.ims.core.service.ICrudService;
 import com.ims.eval.entity.Report;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * 公告发布Service
+ * <p>
+ * 发布公告表 服务类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
-
-public interface IReportService extends ICrudService<Report> {
+public interface IReportService extends IService<Report> {
 
 }

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

@@ -1,75 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.DdeptResponsibilityDao;
 import com.ims.eval.entity.DeptResponsibility;
+import com.ims.eval.dao.DeptResponsibilityMapper;
 import com.ims.eval.service.IDeptResponsibilityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
 
 /**
- * 部门目标责任Service
+ * <p>
+ * 部门目标责任表 服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
 @Service
-@Transactional(readOnly = true)
-public class DeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptResponsibilityDao, DeptResponsibility> implements IDeptResponsibilityService {
-
- 	public DeptResponsibility get(DeptResponsibility ddeptResponsibility) {
-		return super.get(ddeptResponsibility);
-	}
-
-    public List<DeptResponsibility> findList(DeptResponsibility ddeptResponsibility) {
-        return super.findList(ddeptResponsibility);
-    }
-
-	public List<DeptResponsibility> findAllListM(DeptResponsibility ddeptResponsibility, String dataFilter, String baseFilter, String key, String baseQuery, String specQuery) {
-	 	return super.findAllListM(ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<DeptResponsibility> findPageM(Page<DeptResponsibility> page, DeptResponsibility ddeptResponsibility, String dataFilter, String baseFilter, String key, String baseQuery, String specQuery) {
-		return super.findPageM(page, ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public DeptResponsibility initInsert(DeptResponsibility ddeptResponsibility)  {
-		return super.initInsert(ddeptResponsibility);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(DeptResponsibility ddeptResponsibility) {
-		super.checkSave(ddeptResponsibility);
-	}
-
-	@Transactional(readOnly = false)
-	public DeptResponsibility save(DeptResponsibility ddeptResponsibility, boolean isNewRecord){
-	    if(isNewRecord){
-	        ddeptResponsibility.setId(IdGen.uuid());
-	    }
-		return super.save(ddeptResponsibility,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<DeptResponsibility> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(DeptResponsibility ddeptResponsibility, String baseFilter){
-		super.checkRemove(ddeptResponsibility,baseFilter);
-	}
+public class DeptResponsibilityServiceImpl extends ServiceImpl<DeptResponsibilityMapper, DeptResponsibility> implements IDeptResponsibilityService {
 
-	@Transactional(readOnly = false)
-	public void delete(DeptResponsibility ddeptResponsibility, String baseFilter) {
-		super.delete(ddeptResponsibility,baseFilter);
-	}
 }

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

@@ -1,75 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.DeptResponsibilityTargetDao;
 import com.ims.eval.entity.DeptResponsibilityTarget;
+import com.ims.eval.dao.DeptResponsibilityTargetMapper;
 import com.ims.eval.service.IDeptResponsibilityTargetService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
 
 /**
- * 目标责任书指标Service
+ * <p>
+ * 目标责任书指标 服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
 @Service
-@Transactional(readOnly = true)
-public class DeptResponsibilityTargetServiceImpl extends CrudServiceImpl<DeptResponsibilityTargetDao, DeptResponsibilityTarget> implements IDeptResponsibilityTargetService{
-
- 	public DeptResponsibilityTarget get(DeptResponsibilityTarget deptResponsibilityTarget) {
-		return super.get(deptResponsibilityTarget);
-	}
-
-    public List<DeptResponsibilityTarget> findList(DeptResponsibilityTarget deptResponsibilityTarget) {
-        return super.findList(deptResponsibilityTarget);
-    }
-
-	public List<DeptResponsibilityTarget> findAllListM(DeptResponsibilityTarget deptResponsibilityTarget,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(deptResponsibilityTarget,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<DeptResponsibilityTarget> findPageM(Page<DeptResponsibilityTarget> page, DeptResponsibilityTarget deptResponsibilityTarget,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, deptResponsibilityTarget,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public DeptResponsibilityTarget initInsert(DeptResponsibilityTarget deptResponsibilityTarget)  {
-		return super.initInsert(deptResponsibilityTarget);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(DeptResponsibilityTarget deptResponsibilityTarget) {
-		super.checkSave(deptResponsibilityTarget);
-	}
-
-	@Transactional(readOnly = false)
-	public DeptResponsibilityTarget save(DeptResponsibilityTarget deptResponsibilityTarget, boolean isNewRecord){
-	    if(isNewRecord){
-	        deptResponsibilityTarget.setId(IdGen.uuid());
-	    }
-		return super.save(deptResponsibilityTarget,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<DeptResponsibilityTarget> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(DeptResponsibilityTarget deptResponsibilityTarget,String baseFilter){
-		super.checkRemove(deptResponsibilityTarget,baseFilter);
-	}
+public class DeptResponsibilityTargetServiceImpl extends ServiceImpl<DeptResponsibilityTargetMapper, DeptResponsibilityTarget> implements IDeptResponsibilityTargetService {
 
-	@Transactional(readOnly = false)
-	public void delete(DeptResponsibilityTarget deptResponsibilityTarget,String baseFilter) {
-		super.delete(deptResponsibilityTarget,baseFilter);
-	}
 }

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

@@ -1,75 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.EvaluateRuleDao;
 import com.ims.eval.entity.EvaluateRule;
+import com.ims.eval.dao.EvaluateRuleMapper;
 import com.ims.eval.service.IEvaluateRuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
 
 /**
- * 考评规则Service
+ * <p>
+ * 考评规则表 服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
 @Service
-@Transactional(readOnly = true)
-public class EvaluateRuleServiceImpl extends CrudServiceImpl<EvaluateRuleDao, EvaluateRule> implements IEvaluateRuleService{
-
- 	public EvaluateRule get(EvaluateRule evaluateRule) {
-		return super.get(evaluateRule);
-	}
-
-    public List<EvaluateRule> findList(EvaluateRule evaluateRule) {
-        return super.findList(evaluateRule);
-    }
-
-	public List<EvaluateRule> findAllListM(EvaluateRule evaluateRule,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(evaluateRule,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<EvaluateRule> findPageM(Page<EvaluateRule> page, EvaluateRule evaluateRule,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, evaluateRule,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public EvaluateRule initInsert(EvaluateRule evaluateRule)  {
-		return super.initInsert(evaluateRule);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(EvaluateRule evaluateRule) {
-		super.checkSave(evaluateRule);
-	}
-
-	@Transactional(readOnly = false)
-	public EvaluateRule save(EvaluateRule evaluateRule, boolean isNewRecord){
-	    if(isNewRecord){
-	        evaluateRule.setId(IdGen.uuid());
-	    }
-		return super.save(evaluateRule,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<EvaluateRule> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(EvaluateRule evaluateRule,String baseFilter){
-		super.checkRemove(evaluateRule,baseFilter);
-	}
+public class EvaluateRuleServiceImpl extends ServiceImpl<EvaluateRuleMapper, EvaluateRule> implements IEvaluateRuleService {
 
-	@Transactional(readOnly = false)
-	public void delete(EvaluateRule evaluateRule,String baseFilter) {
-		super.delete(evaluateRule,baseFilter);
-	}
 }

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

@@ -1,75 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.EvaluateScoreDao;
 import com.ims.eval.entity.EvaluateScore;
+import com.ims.eval.dao.EvaluateScoreMapper;
 import com.ims.eval.service.IEvaluateScoreService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
 
 /**
- * 考评得分Service
+ * <p>
+ * 考评得分表 服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
 @Service
-@Transactional(readOnly = true)
-public class EvaluateScoreServiceImpl extends CrudServiceImpl<EvaluateScoreDao, EvaluateScore> implements IEvaluateScoreService{
-
- 	public EvaluateScore get(EvaluateScore evaluateScore) {
-		return super.get(evaluateScore);
-	}
-
-    public List<EvaluateScore> findList(EvaluateScore evaluateScore) {
-        return super.findList(evaluateScore);
-    }
-
-	public List<EvaluateScore> findAllListM(EvaluateScore evaluateScore,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(evaluateScore,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<EvaluateScore> findPageM(Page<EvaluateScore> page, EvaluateScore evaluateScore,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, evaluateScore,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public EvaluateScore initInsert(EvaluateScore evaluateScore)  {
-		return super.initInsert(evaluateScore);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(EvaluateScore evaluateScore) {
-		super.checkSave(evaluateScore);
-	}
-
-	@Transactional(readOnly = false)
-	public EvaluateScore save(EvaluateScore evaluateScore, boolean isNewRecord){
-	    if(isNewRecord){
-	        evaluateScore.setId(IdGen.uuid());
-	    }
-		return super.save(evaluateScore,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<EvaluateScore> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(EvaluateScore evaluateScore,String baseFilter){
-		super.checkRemove(evaluateScore,baseFilter);
-	}
+public class EvaluateScoreServiceImpl extends ServiceImpl<EvaluateScoreMapper, EvaluateScore> implements IEvaluateScoreService {
 
-	@Transactional(readOnly = false)
-	public void delete(EvaluateScore evaluateScore,String baseFilter) {
-		super.delete(evaluateScore,baseFilter);
-	}
 }

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

@@ -57,7 +57,8 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 		qw.lambda().orderByAsc(Indicator::getOrderNum);
 
 		List<Indicator> list = baseMapper.selectList(qw);
-		return null;
+
+		return list;
 	}
 
 	@Override

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

@@ -1,75 +1,20 @@
-/**
- *
- */
 package com.ims.eval.service.impl;
 
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-import com.ims.core.utils.IdGen;
-import com.ims.eval.dao.ReportDao;
 import com.ims.eval.entity.Report;
+import com.ims.eval.dao.ReportMapper;
 import com.ims.eval.service.IReportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
 
 /**
- * 公告发布Service
+ * <p>
+ * 发布公告表 服务实现类
+ * </p>
+ *
  * @author wang
- * @version 2023-02-23
+ * @since 2023-02-27
  */
 @Service
-@Transactional(readOnly = true)
-public class ReportServiceImpl extends CrudServiceImpl<ReportDao, Report> implements IReportService{
-
- 	public Report get(Report report) {
-		return super.get(report);
-	}
-
-    public List<Report> findList(Report report) {
-        return super.findList(report);
-    }
-
-	public List<Report> findAllListM(Report report,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(report,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<Report> findPageM(Page<Report> page, Report report,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, report,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Report initInsert(Report report)  {
-		return super.initInsert(report);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(Report report) {
-		super.checkSave(report);
-	}
-
-	@Transactional(readOnly = false)
-	public Report save(Report report, boolean isNewRecord){
-	    if(isNewRecord){
-	        report.setId(IdGen.uuid());
-	    }
-		return super.save(report,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<Report> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(Report report,String baseFilter){
-		super.checkRemove(report,baseFilter);
-	}
+public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements IReportService {
 
-	@Transactional(readOnly = false)
-	public void delete(Report report,String baseFilter) {
-		super.delete(report,baseFilter);
-	}
 }