Browse Source

代码提交

wangchangsheng 2 years ago
parent
commit
83817ff2c3
53 changed files with 4416 additions and 397 deletions
  1. 1 1
      ims-service/ims-eval/src/main/java/com/ims/eval/service/IReportService.java
  2. 1 1
      ims-service/sm-test/src/main/java/com/ims/ims/sm/SmTest.java
  3. 2 2
      ims-service/sm-test/src/main/java/com/ims/ims/sm/config/ImsDemoConfiguration.java
  4. 1 1
      ims-service/sm-test/src/main/java/com/ims/ims/sm/config/XxlJobConfig.java
  5. 123 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/DdeptResponsibilityController.java
  6. 122 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/DeptResponsibilityTargetController.java
  7. 122 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/EvaluateRuleController.java
  8. 123 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/EvaluateScoreController.java
  9. 123 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorController.java
  10. 125 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorDictionaryController.java
  11. 124 0
      ims-service/sm-test/src/main/java/com/ims/eval/controller/ReportController.java
  12. 16 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/DdeptResponsibilityDao.java
  13. 16 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/DeptResponsibilityTargetDao.java
  14. 17 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/EvaluateRuleDao.java
  15. 16 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/EvaluateScoreDao.java
  16. 16 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDao.java
  17. 16 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDictionaryDao.java
  18. 16 0
      ims-service/sm-test/src/main/java/com/ims/eval/dao/ReportDao.java
  19. 164 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/DdeptResponsibility.java
  20. 316 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/DeptResponsibilityTarget.java
  21. 96 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/EvaluateRule.java
  22. 129 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/EvaluateScore.java
  23. 152 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/Indicator.java
  24. 88 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/IndicatorDictionary.java
  25. 89 0
      ims-service/sm-test/src/main/java/com/ims/eval/entity/Report.java
  26. 4 4
      ims-service/sm-test/src/main/java/com/ims/ims/sm/launch/LauncherServiceImpl.java
  27. 9 0
      ims-service/sm-test/src/main/java/com/ims/eval/props/DemoProperties.java
  28. 18 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IDdeptResponsibilityService.java
  29. 18 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IDeptResponsibilityTargetService.java
  30. 18 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IEvaluateRuleService.java
  31. 18 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IEvaluateScoreService.java
  32. 18 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorDictionaryService.java
  33. 19 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorService.java
  34. 19 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/IReportService.java
  35. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DdeptResponsibilityServiceImpl.java
  36. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DeptResponsibilityTargetServiceImpl.java
  37. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/EvaluateRuleServiceImpl.java
  38. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/EvaluateScoreServiceImpl.java
  39. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorDictionaryServiceImpl.java
  40. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java
  41. 75 0
      ims-service/sm-test/src/main/java/com/ims/eval/service/impl/ReportServiceImpl.java
  42. 0 154
      ims-service/sm-test/src/main/java/com/ims/ims/sm/controller/PubinfoController.java
  43. 0 16
      ims-service/sm-test/src/main/java/com/ims/ims/sm/dao/PubinfoDao.java
  44. 0 120
      ims-service/sm-test/src/main/java/com/ims/ims/sm/entity/Pubinfo.java
  45. 0 21
      ims-service/sm-test/src/main/java/com/ims/ims/sm/service/IPubinfoService.java
  46. 0 77
      ims-service/sm-test/src/main/java/com/ims/ims/sm/service/impl/PubinfoServiceImpl.java
  47. 261 0
      ims-service/sm-test/src/main/resources/mappings/sm/DdeptResponsibilityDao.xml
  48. 418 0
      ims-service/sm-test/src/main/resources/mappings/sm/DeptResponsibilityTargetDao.xml
  49. 197 0
      ims-service/sm-test/src/main/resources/mappings/sm/EvaluateRuleDao.xml
  50. 229 0
      ims-service/sm-test/src/main/resources/mappings/sm/EvaluateScoreDao.xml
  51. 253 0
      ims-service/sm-test/src/main/resources/mappings/sm/IndicatorDao.xml
  52. 189 0
      ims-service/sm-test/src/main/resources/mappings/sm/IndicatorDictionaryDao.xml
  53. 189 0
      ims-service/sm-test/src/main/resources/mappings/sm/ReportDao.xml

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

@@ -18,4 +18,4 @@ import com.ims.eval.dao.ReportDao;
 
 public interface IReportService extends ICrudService<Report> {
 
-}
+}

+ 1 - 1
ims-service/sm-test/src/main/java/com/ims/ims/sm/SmTest.java

@@ -1,4 +1,4 @@
-package com.ims.ims.sm;
+package com.ims.eval;
 
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.cloud.client.SpringCloudApplication;

+ 2 - 2
ims-service/sm-test/src/main/java/com/ims/ims/sm/config/ImsDemoConfiguration.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.ims.ims.sm.config;
+package com.ims.eval.config;
 
 
-import com.ims.ims.sm.props.DemoProperties;
+import com.ims.eval.props.DemoProperties;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;

+ 1 - 1
ims-service/sm-test/src/main/java/com/ims/ims/sm/config/XxlJobConfig.java

@@ -1,4 +1,4 @@
-package com.ims.ims.sm.config;
+package com.ims.eval.config;
 
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import lombok.extern.slf4j.Slf4j;

+ 123 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/DdeptResponsibilityController.java

@@ -0,0 +1,123 @@
+/**
+ *
+ */
+package com.ims.eval.controller;
+
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+
+import com.ims.eval.entity.DdeptResponsibility;
+import com.ims.eval.service.IDdeptResponsibilityService;
+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;
+
+/**
+ * 部门目标责任Controller
+ * @author wang
+ * @version 2023-02-23
+ */
+@Controller
+@RequestMapping(value = "/eval/ddeptResponsibility")
+public class DdeptResponsibilityController extends WebController<IDdeptResponsibilityService, DdeptResponsibility> {
+
+ 	//@ImsPreAuth("eval:ddeptResponsibility:view")
+	@RequestMapping(value = "list")
+	public String list(DdeptResponsibility ddeptResponsibility, Model model) {
+		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
+	}
+
+    //@ImsPreAuth("eval:ddeptResponsibility:view")
+	@RequestMapping(value = "form")
+	public String form(DdeptResponsibility 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(DdeptResponsibility ddeptResponsibility, Model model) {
+		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
+	}
+
+    //@ImsPreAuth("eval:ddeptResponsibility:view")
+	@RequestMapping(value = "data")
+	@ResponseBody
+	public String getData(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility 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(DdeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response) {
+         super.exportFile(ddeptResponsibility,request,response );
+	}
+
+}

+ 122 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/DeptResponsibilityTargetController.java

@@ -0,0 +1,122 @@
+/**
+ *
+ */
+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;
+
+/**
+ * 目标责任书指标Controller
+ * @author wang
+ * @version 2023-02-23
+ */
+@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 );
+	}
+
+}

+ 122 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/EvaluateRuleController.java

@@ -0,0 +1,122 @@
+/**
+ *
+ */
+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;
+
+/**
+ * 考评规则Controller
+ * @author wang
+ * @version 2023-02-23
+ */
+@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 );
+	}
+
+}

+ 123 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/EvaluateScoreController.java

@@ -0,0 +1,123 @@
+/**
+ *
+ */
+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;
+
+/**
+ * 考评得分Controller
+ * @author wang
+ * @version 2023-02-23
+ */
+@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 );
+	}
+
+}

+ 123 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorController.java

@@ -0,0 +1,123 @@
+/**
+ *
+ */
+package com.ims.eval.controller;
+
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.service.IIndicatorService;
+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;
+
+/**
+ * 指标Controller
+ * @author wang
+ * @version 2023-02-23
+ */
+@Controller
+@RequestMapping(value = "/eval/indicator")
+public class IndicatorController extends WebController<IIndicatorService, Indicator> {
+
+ 	//@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "list")
+	public String list(Indicator indicator, Model model) {
+		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorList";
+	}
+
+    //@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "form")
+	public String form(Indicator indicator, Model model) {
+	    String formView = indicator.getFormView();
+	    if(StringUtils.isNotBlank(formView)){
+			return "ims/"+formView;
+		}
+		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorForm";
+	}
+
+    //@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "lov")
+	public String lov(Indicator indicator, Model model) {
+		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorList";
+	}
+
+    //@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "data")
+	@ResponseBody
+	public String getData(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
+        return  super.getData(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "allData")
+	@ResponseBody
+	public String getAllData(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
+        return  super.getAllData(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "get")
+	@ResponseBody
+	public String get(Indicator indicator, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
+        return  super.get(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:edit")
+	@RequestMapping(value = "initInsert")
+	@ResponseBody
+	public String initInsert(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.initInsert(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:edit")
+	@RequestMapping(value = "checkSave")
+	@ResponseBody
+	public String checkSave(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.checkSave(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:edit")
+	@RequestMapping(value = "save")
+	@ResponseBody
+	public String save(Indicator indicator, Model model,  HttpServletRequest request, HttpServletResponse response) {
+		 return super.save(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:remove")
+	@RequestMapping(value = "checkRemove")
+	@ResponseBody
+	public String checkRemove(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.checkRemove(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:remove")
+	@RequestMapping(value = "remove")
+	@ResponseBody
+	public String remove(Indicator indicator, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.remove(indicator,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicator:edit")
+	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@ResponseBody
+	public String importFile(Indicator indicator,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
+         return super.importFile(indicator,excelFile,null,request,response);
+	}
+
+    //@ImsPreAuth("eval:indicator:view")
+	@RequestMapping(value = "export", method= RequestMethod.POST)
+	public void exportFile(Indicator indicator, HttpServletRequest request, HttpServletResponse response) {
+         super.exportFile(indicator,request,response );
+	}
+
+}

+ 125 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/IndicatorDictionaryController.java

@@ -0,0 +1,125 @@
+/**
+ *
+ */
+package com.ims.eval.controller;
+
+import com.ims.core.controller.WebController;
+import com.ims.core.utils.StringUtils;
+
+import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.service.IIndicatorDictionaryService;
+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;
+
+/**
+ * 指标字典表Controller
+ * @author song
+ * @version 2023-02-22
+ */
+@Controller
+@RequestMapping(value = "/eval/indicatorDictionary")
+public class IndicatorDictionaryController extends WebController<IIndicatorDictionaryService, IndicatorDictionary> {
+
+ 	//@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "list")
+	public String list(IndicatorDictionary indicatorDictionary, Model model) {
+		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryList";
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "form")
+	public String form(IndicatorDictionary indicatorDictionary, Model model) {
+	    String formView = indicatorDictionary.getFormView();
+	    if(StringUtils.isNotBlank(formView)){
+			return "ims/"+formView;
+		}
+		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryForm";
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "lov")
+	public String lov(IndicatorDictionary indicatorDictionary, Model model) {
+		return "ims/ims-eval${ims_eval_suffix}/eval/indicatorDictionaryList";
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "data")
+	@ResponseBody
+	public String getData(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
+        return  super.getData(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "allData")
+	@ResponseBody
+	public String getAllData(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
+        System.out.println("jjjjjjjjjjjjjjj");
+		return  super.getAllData(indicatorDictionary,request,response,model);
+	}
+
+
+    //@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "get")
+	@ResponseBody
+	public String get(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
+        return  super.get(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:edit")
+	@RequestMapping(value = "initInsert")
+	@ResponseBody
+	public String initInsert(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.initInsert(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:edit")
+	@RequestMapping(value = "checkSave")
+	@ResponseBody
+	public String checkSave(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.checkSave(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:edit")
+	@RequestMapping(value = "save")
+	@ResponseBody
+	public String save(IndicatorDictionary indicatorDictionary, Model model,  HttpServletRequest request, HttpServletResponse response) {
+		 return super.save(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:remove")
+	@RequestMapping(value = "checkRemove")
+	@ResponseBody
+	public String checkRemove(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.checkRemove(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:remove")
+	@RequestMapping(value = "remove")
+	@ResponseBody
+	public String remove(IndicatorDictionary indicatorDictionary, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return super.remove(indicatorDictionary,request,response,model);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:edit")
+	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@ResponseBody
+	public String importFile(IndicatorDictionary indicatorDictionary,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
+         return super.importFile(indicatorDictionary,excelFile,null,request,response);
+	}
+
+    //@ImsPreAuth("eval:indicatorDictionary:view")
+	@RequestMapping(value = "export", method= RequestMethod.POST)
+	public void exportFile(IndicatorDictionary indicatorDictionary, HttpServletRequest request, HttpServletResponse response) {
+         super.exportFile(indicatorDictionary,request,response );
+	}
+
+}

+ 124 - 0
ims-service/sm-test/src/main/java/com/ims/eval/controller/ReportController.java

@@ -0,0 +1,124 @@
+/**
+ *
+ */
+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;
+
+/**
+ * 公告发布Controller
+ * @author wang
+ * @version 2023-02-23
+ */
+@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 );
+	}
+
+}

+ 16 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/DdeptResponsibilityDao.java

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

+ 16 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/DeptResponsibilityTargetDao.java

@@ -0,0 +1,16 @@
+/**
+ *
+ */
+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> {
+
+}

+ 17 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/EvaluateRuleDao.java

@@ -0,0 +1,17 @@
+/**
+ *
+ */
+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> {
+
+}

+ 16 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/EvaluateScoreDao.java

@@ -0,0 +1,16 @@
+/**
+ *
+ */
+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> {
+
+}

+ 16 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDao.java

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

+ 16 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/IndicatorDictionaryDao.java

@@ -0,0 +1,16 @@
+/**
+ *
+ */
+package com.ims.eval.dao;
+
+import com.ims.core.dao.CrudDao;
+import com.ims.eval.entity.IndicatorDictionary;
+
+/**
+ * 指标字典DAO接口
+ * @author song
+ * @version 2023-02-22
+ */
+public interface IndicatorDictionaryDao extends CrudDao<IndicatorDictionary> {
+
+}

+ 16 - 0
ims-service/sm-test/src/main/java/com/ims/eval/dao/ReportDao.java

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

+ 164 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/DdeptResponsibility.java

@@ -0,0 +1,164 @@
+/**
+ *
+ */
+package com.ims.eval.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ims.core.entity.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 部门目标责任Entity
+ * @author wang
+ * @version 2023-02-23
+ */
+public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
+
+	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 DdeptResponsibility() {
+		super();
+	}
+
+	public DdeptResponsibility(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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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;
+	}
+
+}

+ 316 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/DeptResponsibilityTarget.java

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

+ 96 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/EvaluateRule.java

@@ -0,0 +1,96 @@
+/**
+ *
+ */
+package com.ims.eval.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ims.core.entity.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 考评规则Entity
+ * @author wang
+ * @version 2023-02-23
+ */
+public class EvaluateRule extends DataEntity<EvaluateRule> {
+
+	private static final long serialVersionUID = 1L;
+	private String des;		// 描述
+	private String indicatorId;		// 指标ID
+	private String 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 String getTotalScore() {
+		return totalScore;
+	}
+
+	public void setTotalScore(String 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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+}

+ 129 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/EvaluateScore.java

@@ -0,0 +1,129 @@
+/**
+ *
+ */
+package com.ims.eval.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ims.core.entity.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 考评得分Entity
+ * @author wang
+ * @version 2023-02-23
+ */
+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 String sysScore;		// 系统评分
+	private String 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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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 String getSysScore() {
+		return sysScore;
+	}
+
+	public void setSysScore(String sysScore) {
+		this.sysScore = sysScore;
+	}
+	public String getReviewScore() {
+		return reviewScore;
+	}
+
+	public void setReviewScore(String reviewScore) {
+		this.reviewScore = reviewScore;
+	}
+	public String getReviewPeople() {
+		return reviewPeople;
+	}
+
+	public void setReviewPeople(String reviewPeople) {
+		this.reviewPeople = reviewPeople;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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;
+	}
+
+}

+ 152 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/Indicator.java

@@ -0,0 +1,152 @@
+/**
+ *
+ */
+package com.ims.eval.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ims.core.entity.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 指标Entity
+ * @author wang
+ * @version 2023-02-23
+ */
+public class Indicator extends DataEntity<Indicator> {
+
+	private static final long serialVersionUID = 1L;
+	private String indicatorName;		// 指标名称
+	private String indicatorCede;		// 指标编码
+	private String unit;		// 指标单位
+	private String isQuantified;		// 能否量化
+	private String isAdditional;		// 是否专项
+	private String des;		// 描述
+	private String binSection;		// 业务版块
+	private String binStage;		// 业务阶段
+	private String dept;		// 部门
+	private String company;		// 公司
+	private String enable;		// 是否启用
+	private Date createTime;		// 创建时间
+	private Date updateTime;		// 修改时间
+	private String remark;		// 备注
+	private String orderNum;		// 排序
+
+
+	public Indicator() {
+		super();
+	}
+
+	public Indicator(String id){
+		super(id);
+	}
+
+	public String getIndicatorName() {
+		return indicatorName;
+	}
+
+	public void setIndicatorName(String indicatorName) {
+		this.indicatorName = indicatorName;
+	}
+	public String getIndicatorCede() {
+		return indicatorCede;
+	}
+
+	public void setIndicatorCede(String indicatorCede) {
+		this.indicatorCede = indicatorCede;
+	}
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+	public String getIsQuantified() {
+		return isQuantified;
+	}
+
+	public void setIsQuantified(String isQuantified) {
+		this.isQuantified = isQuantified;
+	}
+	public String getIsAdditional() {
+		return isAdditional;
+	}
+
+	public void setIsAdditional(String isAdditional) {
+		this.isAdditional = isAdditional;
+	}
+	public String getDes() {
+		return des;
+	}
+
+	public void setDes(String des) {
+		this.des = des;
+	}
+	public String getBinSection() {
+		return binSection;
+	}
+
+	public void setBinSection(String binSection) {
+		this.binSection = binSection;
+	}
+	public String getBinStage() {
+		return binStage;
+	}
+
+	public void setBinStage(String binStage) {
+		this.binStage = binStage;
+	}
+	public String getDept() {
+		return dept;
+	}
+
+	public void setDept(String dept) {
+		this.dept = dept;
+	}
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+	public String getEnable() {
+		return enable;
+	}
+
+	public void setEnable(String enable) {
+		this.enable = enable;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public String getOrderNum() {
+		return orderNum;
+	}
+
+	public void setOrderNum(String orderNum) {
+		this.orderNum = orderNum;
+	}
+
+}

+ 88 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/IndicatorDictionary.java

@@ -0,0 +1,88 @@
+/**
+ *
+ */
+package com.ims.eval.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ims.core.entity.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 指标字典Entity
+ * @author song
+ * @version 2023-02-22
+ */
+public class IndicatorDictionary extends DataEntity<IndicatorDictionary> {
+
+	private static final long serialVersionUID = 1L;
+	private String indicatorId;		// 指标ID
+	private String optionCode;		// 选项编码
+	private String optionName;		// 选项名称
+	private String optionOrder;		// 选项顺序
+	private String des;		// 描述
+	private Date createTime;		// 创建时间
+	private Date updateTime;		// 更新时间
+
+
+	public IndicatorDictionary() {
+		super();
+	}
+
+	public IndicatorDictionary(String id){
+		super(id);
+	}
+
+	public String getIndicatorId() {
+		return indicatorId;
+	}
+
+	public void setIndicatorId(String indicatorId) {
+		this.indicatorId = indicatorId;
+	}
+	public String getOptionCode() {
+		return optionCode;
+	}
+
+	public void setOptionCode(String optionCode) {
+		this.optionCode = optionCode;
+	}
+	public String getOptionName() {
+		return optionName;
+	}
+
+	public void setOptionName(String optionName) {
+		this.optionName = optionName;
+	}
+	public String getOptionOrder() {
+		return optionOrder;
+	}
+
+	public void setOptionOrder(String optionOrder) {
+		this.optionOrder = optionOrder;
+	}
+	public String getDes() {
+		return des;
+	}
+
+	public void setDes(String des) {
+		this.des = des;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+}

+ 89 - 0
ims-service/sm-test/src/main/java/com/ims/eval/entity/Report.java

@@ -0,0 +1,89 @@
+/**
+ *
+ */
+package com.ims.eval.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.ims.core.entity.DataEntity;
+
+import java.util.Date;
+
+/**
+ * 公告发布Entity
+ * @author wang
+ * @version 2023-02-23
+ */
+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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	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;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+}

+ 4 - 4
ims-service/sm-test/src/main/java/com/ims/ims/sm/launch/LauncherServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ims.ims.sm.launch;
+package com.ims.eval.launch;
 
 import org.springblade.core.auto.service.AutoService;
 import org.springblade.core.launch.service.LauncherService;
@@ -10,9 +10,9 @@ import java.util.Properties;
 @AutoService(LauncherService.class)
 public class LauncherServiceImpl implements LauncherService {
 	public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
-//
-//		Properties props = System.getProperties();
-//		props.setProperty("spring.cloud.nacos.config.shared-dataids", "test.yaml");
 
+		//NACOS_ADDR=10.65.78.23:8848
+//		Properties props = System.getProperties();
+//		props.setProperty("spring.cloud.nacos.config.shared-dataids", "gddl_dbkp.yaml");
 	}
 }

+ 9 - 0
ims-service/sm-test/src/main/java/com/ims/eval/props/DemoProperties.java

@@ -0,0 +1,9 @@
+package com.ims.eval.props;
+
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+
+@ConfigurationProperties(prefix = "eval")
+public class DemoProperties {
+}

+ 18 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IDdeptResponsibilityService.java

@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.DdeptResponsibility;
+
+/**
+ * 部门目标责任Service
+ * @author wang
+ * @version 2023-02-23
+ */
+
+public interface IDdeptResponsibilityService extends ICrudService<DdeptResponsibility> {
+
+}

+ 18 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IDeptResponsibilityTargetService.java

@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.DeptResponsibilityTarget;
+
+/**
+ * 目标责任书指标Service
+ * @author wang
+ * @version 2023-02-23
+ */
+
+public interface IDeptResponsibilityTargetService extends ICrudService<DeptResponsibilityTarget> {
+
+}

+ 18 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IEvaluateRuleService.java

@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.EvaluateRule;
+
+/**
+ * 考评规则Service
+ * @author wang
+ * @version 2023-02-23
+ */
+
+public interface IEvaluateRuleService extends ICrudService<EvaluateRule> {
+
+}

+ 18 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IEvaluateScoreService.java

@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.EvaluateScore;
+
+/**
+ * 考评得分Service
+ * @author wang
+ * @version 2023-02-23
+ */
+
+public interface IEvaluateScoreService extends ICrudService<EvaluateScore> {
+
+}

+ 18 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorDictionaryService.java

@@ -0,0 +1,18 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.IndicatorDictionary;
+
+/**
+ * 指标字典表Service
+ * @author song
+ * @version 2023-02-22
+ */
+
+public interface IIndicatorDictionaryService extends ICrudService<IndicatorDictionary> {
+
+}

+ 19 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IIndicatorService.java

@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.Indicator;
+
+
+/**
+ * 指标Service
+ * @author wang
+ * @version 2023-02-23
+ */
+
+public interface IIndicatorService extends ICrudService<Indicator> {
+
+}

+ 19 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/IReportService.java

@@ -0,0 +1,19 @@
+/**
+ *
+ */
+package com.ims.eval.service;
+
+
+import com.ims.core.service.ICrudService;
+import com.ims.eval.entity.Report;
+
+
+/**
+ * 公告发布Service
+ * @author wang
+ * @version 2023-02-23
+ */
+
+public interface IReportService extends ICrudService<Report> {
+
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DdeptResponsibilityServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.DdeptResponsibility;
+import com.ims.eval.service.IDdeptResponsibilityService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 部门目标责任Service
+ * @author wang
+ * @version 2023-02-23
+ */
+@Service
+@Transactional(readOnly = true)
+public class DdeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptResponsibilityDao, DdeptResponsibility> implements IDdeptResponsibilityService{
+
+ 	public DdeptResponsibility get(DdeptResponsibility ddeptResponsibility) {
+		return super.get(ddeptResponsibility);
+	}
+
+    public List<DdeptResponsibility> findList(DdeptResponsibility ddeptResponsibility) {
+        return super.findList(ddeptResponsibility);
+    }
+
+	public List<DdeptResponsibility> findAllListM(DdeptResponsibility ddeptResponsibility,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+	 	return super.findAllListM(ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
+	}
+
+	public Page<DdeptResponsibility> findPageM(Page<DdeptResponsibility> page, DdeptResponsibility ddeptResponsibility,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+		return super.findPageM(page, ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
+	}
+
+	public DdeptResponsibility initInsert(DdeptResponsibility ddeptResponsibility)  {
+		return super.initInsert(ddeptResponsibility);
+	}
+
+	@Transactional(readOnly = false)
+	public void checkSave(DdeptResponsibility ddeptResponsibility) {
+		super.checkSave(ddeptResponsibility);
+	}
+
+	@Transactional(readOnly = false)
+	public DdeptResponsibility save(DdeptResponsibility ddeptResponsibility, boolean isNewRecord){
+	    if(isNewRecord){
+	        ddeptResponsibility.setId(IdGen.uuid());
+	    }
+		return super.save(ddeptResponsibility,isNewRecord);
+	}
+
+    @Transactional(readOnly = false)
+    @Override
+    public void insertList(List<DdeptResponsibility> list){
+        super.insertList(list);
+    }
+
+	@Transactional(readOnly = false)
+	public void checkRemove(DdeptResponsibility ddeptResponsibility,String baseFilter){
+		super.checkRemove(ddeptResponsibility,baseFilter);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(DdeptResponsibility ddeptResponsibility,String baseFilter) {
+		super.delete(ddeptResponsibility,baseFilter);
+	}
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/DeptResponsibilityTargetServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.service.IDeptResponsibilityTargetService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 目标责任书指标Service
+ * @author wang
+ * @version 2023-02-23
+ */
+@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);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(DeptResponsibilityTarget deptResponsibilityTarget,String baseFilter) {
+		super.delete(deptResponsibilityTarget,baseFilter);
+	}
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/EvaluateRuleServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.service.IEvaluateRuleService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 考评规则Service
+ * @author wang
+ * @version 2023-02-23
+ */
+@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);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(EvaluateRule evaluateRule,String baseFilter) {
+		super.delete(evaluateRule,baseFilter);
+	}
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/EvaluateScoreServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.service.IEvaluateScoreService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 考评得分Service
+ * @author wang
+ * @version 2023-02-23
+ */
+@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);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(EvaluateScore evaluateScore,String baseFilter) {
+		super.delete(evaluateScore,baseFilter);
+	}
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorDictionaryServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.IndicatorDictionaryDao;
+import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.service.IIndicatorDictionaryService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 指标字典表Service
+ * @author song
+ * @version 2023-02-22
+ */
+@Service
+@Transactional(readOnly = true)
+public class IndicatorDictionaryServiceImpl extends CrudServiceImpl<IndicatorDictionaryDao, IndicatorDictionary> implements IIndicatorDictionaryService{
+
+ 	public IndicatorDictionary get(IndicatorDictionary indicatorDictionary) {
+		return super.get(indicatorDictionary);
+	}
+
+    public List<IndicatorDictionary> findList(IndicatorDictionary indicatorDictionary) {
+        return super.findList(indicatorDictionary);
+    }
+
+	public List<IndicatorDictionary> findAllListM(IndicatorDictionary indicatorDictionary,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+	 	return super.findAllListM(indicatorDictionary,dataFilter,baseFilter,key,baseQuery,specQuery);
+	}
+
+	public Page<IndicatorDictionary> findPageM(Page<IndicatorDictionary> page, IndicatorDictionary indicatorDictionary,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+		return super.findPageM(page, indicatorDictionary,dataFilter,baseFilter,key,baseQuery,specQuery);
+	}
+
+	public IndicatorDictionary initInsert(IndicatorDictionary indicatorDictionary)  {
+		return super.initInsert(indicatorDictionary);
+	}
+
+	@Transactional(readOnly = false)
+	public void checkSave(IndicatorDictionary indicatorDictionary) {
+		super.checkSave(indicatorDictionary);
+	}
+
+	@Transactional(readOnly = false)
+	public IndicatorDictionary save(IndicatorDictionary indicatorDictionary, boolean isNewRecord){
+	    if(isNewRecord){
+	        indicatorDictionary.setId(IdGen.uuid());
+	    }
+		return super.save(indicatorDictionary,isNewRecord);
+	}
+
+    @Transactional(readOnly = false)
+    @Override
+    public void insertList(List<IndicatorDictionary> list){
+        super.insertList(list);
+    }
+
+	@Transactional(readOnly = false)
+	public void checkRemove(IndicatorDictionary indicatorDictionary,String baseFilter){
+		super.checkRemove(indicatorDictionary,baseFilter);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(IndicatorDictionary indicatorDictionary,String baseFilter) {
+		super.delete(indicatorDictionary,baseFilter);
+	}
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/IndicatorServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.IndicatorDao;
+import com.ims.eval.entity.Indicator;
+import com.ims.eval.service.IIndicatorService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 指标Service
+ * @author wang
+ * @version 2023-02-23
+ */
+@Service
+@Transactional(readOnly = true)
+public class IndicatorServiceImpl extends CrudServiceImpl<IndicatorDao, Indicator> implements IIndicatorService{
+
+ 	public Indicator get(Indicator indicator) {
+		return super.get(indicator);
+	}
+
+    public List<Indicator> findList(Indicator indicator) {
+        return super.findList(indicator);
+    }
+
+	public List<Indicator> findAllListM(Indicator indicator,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+	 	return super.findAllListM(indicator,dataFilter,baseFilter,key,baseQuery,specQuery);
+	}
+
+	public Page<Indicator> findPageM(Page<Indicator> page, Indicator indicator,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+		return super.findPageM(page, indicator,dataFilter,baseFilter,key,baseQuery,specQuery);
+	}
+
+	public Indicator initInsert(Indicator indicator)  {
+		return super.initInsert(indicator);
+	}
+
+	@Transactional(readOnly = false)
+	public void checkSave(Indicator indicator) {
+		super.checkSave(indicator);
+	}
+
+	@Transactional(readOnly = false)
+	public Indicator save(Indicator indicator, boolean isNewRecord){
+	    if(isNewRecord){
+	        indicator.setId(IdGen.uuid());
+	    }
+		return super.save(indicator,isNewRecord);
+	}
+
+    @Transactional(readOnly = false)
+    @Override
+    public void insertList(List<Indicator> list){
+        super.insertList(list);
+    }
+
+	@Transactional(readOnly = false)
+	public void checkRemove(Indicator indicator,String baseFilter){
+		super.checkRemove(indicator,baseFilter);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(Indicator indicator,String baseFilter) {
+		super.delete(indicator,baseFilter);
+	}
+}

+ 75 - 0
ims-service/sm-test/src/main/java/com/ims/eval/service/impl/ReportServiceImpl.java

@@ -0,0 +1,75 @@
+/**
+ *
+ */
+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.service.IReportService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+
+/**
+ * 公告发布Service
+ * @author wang
+ * @version 2023-02-23
+ */
+@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);
+	}
+
+	@Transactional(readOnly = false)
+	public void delete(Report report,String baseFilter) {
+		super.delete(report,baseFilter);
+	}
+}

+ 0 - 154
ims-service/sm-test/src/main/java/com/ims/ims/sm/controller/PubinfoController.java

@@ -1,154 +0,0 @@
-/**
- *
- */
-package com.ims.ims.sm.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alibaba.fastjson.JSONObject;
-import com.ims.system.auth.ImsPreAuth;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.http.MediaType;
-
-
-import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.ims.sm.entity.Pubinfo;
-import com.ims.ims.sm.service.IPubinfoService;
-
-/**
- * 电子公告Controller
- * @author niyili
- * @version 2022-12-27
- */
-@Controller
-@RequestMapping(value = "/pubinfo/pubinfo")
-public class PubinfoController extends WebController<IPubinfoService,Pubinfo> {
-
-	@RequestMapping(value = "doLogin")
-	public void doLogin(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		//获取code和iam-token
-		String iamCode = request.getParameter("code");
-		String iamAccessToken = request.getParameter("iamAccessToken");
-		String url = "http://localhost:9527/";
-		String auth_url = url + "?iamCode="+iamCode+"&iamAccessToken="+iamAccessToken;
-		System.out.println("auth_url:"+auth_url);
-		response.sendRedirect(auth_url);
-	}
-
- 	@ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "list")
-	public String list(Pubinfo pubinfo, Model model) {
-		return "你好";
-	}
-
-
-	@RequestMapping(value = "list2")
-	public JSONObject list2(Pubinfo pubinfo, Model model) {
-		JSONObject json = new JSONObject();
-		json.put("json","你好");
-		return json;
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "form")
-	public String form(Pubinfo pubinfo, Model model) {
-	    String formView = pubinfo.getFormView();
-	    if(StringUtils.isNotBlank(formView)){
-			return "sm/"+formView;
-		}
-		return "sm/sm-test${sm_test_suffix}/pubinfo/pubinfoForm";
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "lov")
-	public String lov(Pubinfo pubinfo, Model model) {
-		return "sm/sm-test${sm_test_suffix}/pubinfo/pubinfoList";
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "data")
-	@ResponseBody
-	public String getData(Pubinfo pubinfo, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getData(pubinfo,request,response,model);
-	}
-
-//    @ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "allData")
-	@ResponseBody
-	public String getAllData(Pubinfo pubinfo, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
-        return  super.getAllData(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "get")
-	@ResponseBody
-	public String get(Pubinfo pubinfo, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
-        return  super.get(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:edit")
-	@RequestMapping(value = "initInsert")
-	@ResponseBody
-	public String initInsert(Pubinfo pubinfo, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.initInsert(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:edit")
-	@RequestMapping(value = "checkSave")
-	@ResponseBody
-	public String checkSave(Pubinfo pubinfo, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkSave(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:edit")
-	@RequestMapping(value = "save")
-	@ResponseBody
-	public String save(Pubinfo pubinfo, Model model,  HttpServletRequest request, HttpServletResponse response) {
-		 return super.save(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:remove")
-	@RequestMapping(value = "checkRemove")
-	@ResponseBody
-	public String checkRemove(Pubinfo pubinfo, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.checkRemove(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:remove")
-	@RequestMapping(value = "remove")
-	@ResponseBody
-	public String remove(Pubinfo pubinfo, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		return super.remove(pubinfo,request,response,model);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:edit")
-	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
-	@ResponseBody
-	public String importFile(Pubinfo pubinfo,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
-         return super.importFile(pubinfo,excelFile,null,request,response);
-	}
-
-    @ImsPreAuth("pubinfo:pubinfo:view")
-	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(Pubinfo pubinfo, HttpServletRequest request, HttpServletResponse response) {
-         super.exportFile(pubinfo,request,response );
-	}
-}

+ 0 - 16
ims-service/sm-test/src/main/java/com/ims/ims/sm/dao/PubinfoDao.java

@@ -1,16 +0,0 @@
-/**
- *
- */
-package com.ims.ims.sm.dao;
-
-import com.ims.core.dao.CrudDao;
-import com.ims.ims.sm.entity.Pubinfo;
-
-/**
- * 电子公告DAO接口
- * @author niyili
- * @version 2022-12-27
- */
-public interface PubinfoDao extends CrudDao<Pubinfo> {
-
-}

+ 0 - 120
ims-service/sm-test/src/main/java/com/ims/ims/sm/entity/Pubinfo.java

@@ -1,120 +0,0 @@
-/**
- *
- */
-package com.ims.ims.sm.entity;
-
-import java.util.Date;
-import com.alibaba.fastjson.annotation.JSONField;
-
-import com.ims.core.entity.DataEntity;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-/**
- * 电子公告Entity
- * @author niyili
- * @version 2022-12-27
- */
-public class Pubinfo extends DataEntity<Pubinfo> {
-
-	private static final long serialVersionUID = 1L;
-	private String title;		// 标题
-	private String descr;		// 描述
-	private Date infoStartTime;		// 有效开始时间
-	private Date infoEndTime;		// 有效截止时间
-	private String infoType;		// 公告类型
-	private String notic;		// 公告内容
-	private String readPerson;		// 阅读人
-	private String readDep;		// 阅读部门
-	private String picName;		// 撰写人
-	private String isActive;		// 是否可用
-	private String remark;		// 备注说明
-
-
-	public Pubinfo() {
-		super();
-	}
-
-	public Pubinfo(String id){
-		super(id);
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public String getDescr() {
-		return descr;
-	}
-
-	public void setDescr(String descr) {
-		this.descr = descr;
-	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
-	public Date getInfoStartTime() {
-		return infoStartTime;
-	}
-
-	public void setInfoStartTime(Date infoStartTime) {
-		this.infoStartTime = infoStartTime;
-	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
-	public Date getInfoEndTime() {
-		return infoEndTime;
-	}
-
-	public void setInfoEndTime(Date infoEndTime) {
-		this.infoEndTime = infoEndTime;
-	}
-	public String getInfoType() {
-		return infoType;
-	}
-
-	public void setInfoType(String infoType) {
-		this.infoType = infoType;
-	}
-	public String getNotic() {
-		return notic;
-	}
-
-	public void setNotic(String notic) {
-		this.notic = notic;
-	}
-	public String getReadPerson() {
-		return readPerson;
-	}
-
-	public void setReadPerson(String readPerson) {
-		this.readPerson = readPerson;
-	}
-	public String getReadDep() {
-		return readDep;
-	}
-
-	public void setReadDep(String readDep) {
-		this.readDep = readDep;
-	}
-	public String getPicName() {
-		return picName;
-	}
-
-	public void setPicName(String picName) {
-		this.picName = picName;
-	}
-	public String getIsActive() {
-		return isActive;
-	}
-
-	public void setIsActive(String isActive) {
-		this.isActive = isActive;
-	}
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-}

+ 0 - 21
ims-service/sm-test/src/main/java/com/ims/ims/sm/service/IPubinfoService.java

@@ -1,21 +0,0 @@
-/**
- *
- */
-package com.ims.ims.sm.service;
-
-
-
-import com.ims.core.service.ICrudService;
-
-import com.ims.ims.sm.entity.Pubinfo;
-import com.ims.ims.sm.dao.PubinfoDao;
-
-/**
- * 电子公告Service
- * @author niyili
- * @version 2022-12-27
- */
-
-public interface IPubinfoService extends ICrudService<Pubinfo> {
-
-}

+ 0 - 77
ims-service/sm-test/src/main/java/com/ims/ims/sm/service/impl/PubinfoServiceImpl.java

@@ -1,77 +0,0 @@
-/**
- *
- */
-package com.ims.ims.sm.service.impl;
-
-import java.util.List;
-import com.ims.core.utils.IdGen;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.ims.core.persistence.Page;
-import com.ims.core.service.impl.CrudServiceImpl;
-
-import com.ims.ims.sm.service.IPubinfoService;
-
-import com.ims.ims.sm.entity.Pubinfo;
-import com.ims.ims.sm.dao.PubinfoDao;
-
-
-/**
- * 电子公告Service
- * @author niyili
- * @version 2022-12-27
- */
-@Service
-@Transactional(readOnly = true)
-public class PubinfoServiceImpl extends CrudServiceImpl<PubinfoDao, Pubinfo> implements IPubinfoService{
-
- 	public Pubinfo get(Pubinfo pubinfo) {
-		return super.get(pubinfo);
-	}
-
-    public List<Pubinfo> findList(Pubinfo pubinfo) {
-        return super.findList(pubinfo);
-    }
-
-	public List<Pubinfo> findAllListM(Pubinfo pubinfo,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-	 	return super.findAllListM(pubinfo,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Page<Pubinfo> findPageM(Page<Pubinfo> page, Pubinfo pubinfo,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
-		return super.findPageM(page, pubinfo,dataFilter,baseFilter,key,baseQuery,specQuery);
-	}
-
-	public Pubinfo initInsert(Pubinfo pubinfo)  {
-		return super.initInsert(pubinfo);
-	}
-
-	@Transactional(readOnly = false)
-	public void checkSave(Pubinfo pubinfo) {
-		super.checkSave(pubinfo);
-	}
-
-	@Transactional(readOnly = false)
-	public Pubinfo save(Pubinfo pubinfo, boolean isNewRecord){
-	    if(isNewRecord){
-	        pubinfo.setId(IdGen.uuid());
-	    }
-		return super.save(pubinfo,isNewRecord);
-	}
-
-    @Transactional(readOnly = false)
-    @Override
-    public void insertList(List<Pubinfo> list){
-        super.insertList(list);
-    }
-
-	@Transactional(readOnly = false)
-	public void checkRemove(Pubinfo pubinfo,String baseFilter){
-		super.checkRemove(pubinfo,baseFilter);
-	}
-
-	@Transactional(readOnly = false)
-	public void delete(Pubinfo pubinfo,String baseFilter) {
-		super.delete(pubinfo,baseFilter);
-	}
-}

+ 261 - 0
ims-service/sm-test/src/main/resources/mappings/sm/DdeptResponsibilityDao.xml

@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.DdeptResponsibilityDao">
+
+	<sql id="ddeptResponsibilityColumns">
+		a.id AS "id",
+		a.dept_id AS "deptId",
+		a.cycle_unit AS "cycleUnit",
+		a.check_cycle AS "checkCycle",
+		a.begin_date AS "beginDate",
+		a.end_date AS "endDate",
+		a.stage AS "stage",
+		a.des AS "des",
+		a.create_time AS "createTime",
+		a.create_by AS "createBy",
+		a.update_time AS "updateTime",
+		a.update_by AS "updateBy",
+		a.review_people AS "reviewPeople",
+		a.review_people_time AS "reviewPeopleTime",
+		a.review_opinion AS "reviewOpinion",
+		a.final_review_people AS "finalReviewPeople",
+		a.final_review_people_time AS "finalReviewPeopleTime",
+		a.final_review_opinion AS "finalReviewOpinion",
+		a.remark AS "remark"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="DdeptResponsibility">
+		SELECT
+			<include refid="ddeptResponsibilityColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="DdeptResponsibility">
+		SELECT
+			<include refid="ddeptResponsibilityColumns"/>
+		FROM public.dept_responsibility a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="DdeptResponsibility">
+		SELECT
+			<include refid="ddeptResponsibilityColumns"/>
+		FROM public.dept_responsibility a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        dept_id,
+	        cycle_unit,
+	        check_cycle,
+	        begin_date,
+	        end_date,
+	        stage,
+	        des,
+	        create_time,
+	        update_time,
+	        review_people,
+	        review_people_time,
+	        review_opinion,
+	        final_review_people,
+	        final_review_people_time,
+	        final_review_opinion,
+	        remark
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('dept_responsibility','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO dept_responsibility(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{deptId
+, jdbcType=VARCHAR
+
+},
+			#{cycleUnit
+, jdbcType=VARCHAR
+
+},
+			#{checkCycle
+, jdbcType=VARCHAR
+
+},
+			#{beginDate, jdbcType=TIMESTAMP
+
+
+},
+			#{endDate, jdbcType=TIMESTAMP
+
+
+},
+			#{stage
+, jdbcType=VARCHAR
+
+},
+			#{des
+, jdbcType=VARCHAR
+
+},
+			#{createTime, jdbcType=TIMESTAMP
+
+
+},
+			#{updateTime, jdbcType=TIMESTAMP
+
+
+},
+			#{reviewPeople
+, jdbcType=VARCHAR
+
+},
+			#{reviewPeopleTime, jdbcType=TIMESTAMP
+
+
+},
+			#{reviewOpinion
+, jdbcType=VARCHAR
+
+},
+			#{finalReviewPeople
+, jdbcType=VARCHAR
+
+},
+			#{finalReviewPeopleTime, jdbcType=TIMESTAMP
+
+
+},
+			#{finalReviewOpinion
+, jdbcType=VARCHAR
+
+},
+			#{remark
+, jdbcType=VARCHAR
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO dept_responsibility(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
+                    #{item.cycleUnit, jdbcType=VARCHAR} as "cycleUnit",
+                    #{item.checkCycle, jdbcType=VARCHAR} as "checkCycle",
+                    #{item.beginDate, jdbcType=TIMESTAMP} as "beginDate",
+                    #{item.endDate, jdbcType=TIMESTAMP} as "endDate",
+                    #{item.stage, jdbcType=VARCHAR} as "stage",
+                    #{item.des, jdbcType=VARCHAR} as "des",
+                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
+                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime",
+                    #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
+                    #{item.reviewPeopleTime, jdbcType=TIMESTAMP} as "reviewPeopleTime",
+                    #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion",
+                    #{item.finalReviewPeople, jdbcType=VARCHAR} as "finalReviewPeople",
+                    #{item.finalReviewPeopleTime, jdbcType=TIMESTAMP} as "finalReviewPeopleTime",
+                    #{item.finalReviewOpinion, jdbcType=VARCHAR} as "finalReviewOpinion",
+                    #{item.remark, jdbcType=VARCHAR} as "remark"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE dept_responsibility SET
+			id = #{id},
+			dept_id = #{deptId},
+			cycle_unit = #{cycleUnit},
+			check_cycle = #{checkCycle},
+			begin_date = #{beginDate},
+			end_date = #{endDate},
+			stage = #{stage},
+			des = #{des},
+			create_time = #{createTime},
+			update_time = #{updateTime},
+			update_by = #{updateBy},
+			review_people = #{reviewPeople},
+			review_people_time = #{reviewPeopleTime},
+			review_opinion = #{reviewOpinion},
+			final_review_people = #{finalReviewPeople},
+			final_review_people_time = #{finalReviewPeopleTime},
+			final_review_opinion = #{finalReviewOpinion},
+			remark = #{remark}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.dept_responsibility
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

+ 418 - 0
ims-service/sm-test/src/main/resources/mappings/sm/DeptResponsibilityTargetDao.xml

@@ -0,0 +1,418 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.DeptResponsibilityTargetDao">
+
+	<sql id="deptResponsibilityTargetColumns">
+		a.id AS "id",
+		a.responsibility_id AS "responsibilityId",
+		a.indicator_id AS "indicatorId",
+		a.quantization_target AS "quantizationTarget",
+		a.quantization_target_actual AS "quantizationTargetActual",
+		a.evaluation_target AS "evaluationTarget",
+		a.evaluation_target_actual AS "evaluationTargetActual",
+		a.month_threshold AS "monthThreshold",
+		a.season_threshold AS "seasonThreshold",
+		a.year_threshold AS "yearThreshold",
+		a.direction AS "direction",
+		a.order_num AS "orderNum",
+		a.remark AS "remark",
+		a.target_1 AS "target1",
+		a.actual_1 AS "actual1",
+		a.target_2 AS "target2",
+		a.actual_2 AS "actual2",
+		a.target_3 AS "target3",
+		a.actual_3 AS "actual3",
+		a.target_4 AS "target4",
+		a.actual_4 AS "actual4",
+		a.target_5 AS "target5",
+		a.actual_5 AS "actual5",
+		a.target_6 AS "target6",
+		a.actual_6 AS "actual6",
+		a.target_7 AS "target7",
+		a.actual_7 AS "actual7",
+		a.target_8 AS "target8",
+		a.actual_8 AS "actual8",
+		a.target_9 AS "target9",
+		a.actual_9 AS "actual9",
+		a.target_10 AS "target10",
+		a.actual_10 AS "actual10",
+		a.target_11 AS "target11",
+		a.actual_11 AS "actual11",
+		a.target_12 AS "target12",
+		a.actual_12 AS "actual12"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="DeptResponsibilityTarget">
+		SELECT
+			<include refid="deptResponsibilityTargetColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="DeptResponsibilityTarget">
+		SELECT
+			<include refid="deptResponsibilityTargetColumns"/>
+		FROM public.dept_responsibility_target a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="DeptResponsibilityTarget">
+		SELECT
+			<include refid="deptResponsibilityTargetColumns"/>
+		FROM public.dept_responsibility_target a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        responsibility_id,
+	        indicator_id,
+	        quantization_target,
+	        quantization_target_actual,
+	        evaluation_target,
+	        evaluation_target_actual,
+	        month_threshold,
+	        season_threshold,
+	        year_threshold,
+	        direction,
+	        order_num,
+	        remark,
+	        target_1,
+	        actual_1,
+	        target_2,
+	        actual_2,
+	        target_3,
+	        actual_3,
+	        target_4,
+	        actual_4,
+	        target_5,
+	        actual_5,
+	        target_6,
+	        actual_6,
+	        target_7,
+	        actual_7,
+	        target_8,
+	        actual_8,
+	        target_9,
+	        actual_9,
+	        target_10,
+	        actual_10,
+	        target_11,
+	        actual_11,
+	        target_12,
+	        actual_12
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('dept_responsibility_target','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO dept_responsibility_target(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{responsibilityId
+, jdbcType=VARCHAR
+
+},
+			#{indicatorId
+, jdbcType=VARCHAR
+
+},
+			#{quantizationTarget
+, jdbcType=VARCHAR
+
+},
+			#{quantizationTargetActual
+, jdbcType=VARCHAR
+
+},
+			#{evaluationTarget
+, jdbcType=VARCHAR
+
+},
+			#{evaluationTargetActual
+, jdbcType=VARCHAR
+
+},
+			#{monthThreshold
+, jdbcType=VARCHAR
+
+},
+			#{seasonThreshold
+, jdbcType=VARCHAR
+
+},
+			#{yearThreshold
+, jdbcType=VARCHAR
+
+},
+			#{direction
+, jdbcType=VARCHAR
+
+},
+			#{orderNum
+, jdbcType=VARCHAR
+
+},
+			#{remark
+, jdbcType=VARCHAR
+
+},
+			#{target1
+, jdbcType=VARCHAR
+
+},
+			#{actual1
+, jdbcType=VARCHAR
+
+},
+			#{target2
+, jdbcType=VARCHAR
+
+},
+			#{actual2
+, jdbcType=VARCHAR
+
+},
+			#{target3
+, jdbcType=VARCHAR
+
+},
+			#{actual3
+, jdbcType=VARCHAR
+
+},
+			#{target4
+, jdbcType=VARCHAR
+
+},
+			#{actual4
+, jdbcType=VARCHAR
+
+},
+			#{target5
+, jdbcType=VARCHAR
+
+},
+			#{actual5
+, jdbcType=VARCHAR
+
+},
+			#{target6
+, jdbcType=VARCHAR
+
+},
+			#{actual6
+, jdbcType=VARCHAR
+
+},
+			#{target7
+, jdbcType=VARCHAR
+
+},
+			#{actual7
+, jdbcType=VARCHAR
+
+},
+			#{target8
+, jdbcType=VARCHAR
+
+},
+			#{actual8
+, jdbcType=VARCHAR
+
+},
+			#{target9
+, jdbcType=VARCHAR
+
+},
+			#{actual9
+, jdbcType=VARCHAR
+
+},
+			#{target10
+, jdbcType=VARCHAR
+
+},
+			#{actual10
+, jdbcType=VARCHAR
+
+},
+			#{target11
+, jdbcType=VARCHAR
+
+},
+			#{actual11
+, jdbcType=VARCHAR
+
+},
+			#{target12
+, jdbcType=VARCHAR
+
+},
+			#{actual12
+, jdbcType=VARCHAR
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO dept_responsibility_target(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.responsibilityId, jdbcType=VARCHAR} as "responsibilityId",
+                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
+                    #{item.quantizationTarget, jdbcType=VARCHAR} as "quantizationTarget",
+                    #{item.quantizationTargetActual, jdbcType=VARCHAR} as "quantizationTargetActual",
+                    #{item.evaluationTarget, jdbcType=VARCHAR} as "evaluationTarget",
+                    #{item.evaluationTargetActual, jdbcType=VARCHAR} as "evaluationTargetActual",
+                    #{item.monthThreshold, jdbcType=VARCHAR} as "monthThreshold",
+                    #{item.seasonThreshold, jdbcType=VARCHAR} as "seasonThreshold",
+                    #{item.yearThreshold, jdbcType=VARCHAR} as "yearThreshold",
+                    #{item.direction, jdbcType=VARCHAR} as "direction",
+                    #{item.orderNum, jdbcType=VARCHAR} as "orderNum",
+                    #{item.remark, jdbcType=VARCHAR} as "remark",
+                    #{item.target1, jdbcType=VARCHAR} as "target1",
+                    #{item.actual1, jdbcType=VARCHAR} as "actual1",
+                    #{item.target2, jdbcType=VARCHAR} as "target2",
+                    #{item.actual2, jdbcType=VARCHAR} as "actual2",
+                    #{item.target3, jdbcType=VARCHAR} as "target3",
+                    #{item.actual3, jdbcType=VARCHAR} as "actual3",
+                    #{item.target4, jdbcType=VARCHAR} as "target4",
+                    #{item.actual4, jdbcType=VARCHAR} as "actual4",
+                    #{item.target5, jdbcType=VARCHAR} as "target5",
+                    #{item.actual5, jdbcType=VARCHAR} as "actual5",
+                    #{item.target6, jdbcType=VARCHAR} as "target6",
+                    #{item.actual6, jdbcType=VARCHAR} as "actual6",
+                    #{item.target7, jdbcType=VARCHAR} as "target7",
+                    #{item.actual7, jdbcType=VARCHAR} as "actual7",
+                    #{item.target8, jdbcType=VARCHAR} as "target8",
+                    #{item.actual8, jdbcType=VARCHAR} as "actual8",
+                    #{item.target9, jdbcType=VARCHAR} as "target9",
+                    #{item.actual9, jdbcType=VARCHAR} as "actual9",
+                    #{item.target10, jdbcType=VARCHAR} as "target10",
+                    #{item.actual10, jdbcType=VARCHAR} as "actual10",
+                    #{item.target11, jdbcType=VARCHAR} as "target11",
+                    #{item.actual11, jdbcType=VARCHAR} as "actual11",
+                    #{item.target12, jdbcType=VARCHAR} as "target12",
+                    #{item.actual12, jdbcType=VARCHAR} as "actual12"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE dept_responsibility_target SET
+			id = #{id},
+			responsibility_id = #{responsibilityId},
+			indicator_id = #{indicatorId},
+			quantization_target = #{quantizationTarget},
+			quantization_target_actual = #{quantizationTargetActual},
+			evaluation_target = #{evaluationTarget},
+			evaluation_target_actual = #{evaluationTargetActual},
+			month_threshold = #{monthThreshold},
+			season_threshold = #{seasonThreshold},
+			year_threshold = #{yearThreshold},
+			direction = #{direction},
+			order_num = #{orderNum},
+			remark = #{remark},
+			target_1 = #{target1},
+			actual_1 = #{actual1},
+			target_2 = #{target2},
+			actual_2 = #{actual2},
+			target_3 = #{target3},
+			actual_3 = #{actual3},
+			target_4 = #{target4},
+			actual_4 = #{actual4},
+			target_5 = #{target5},
+			actual_5 = #{actual5},
+			target_6 = #{target6},
+			actual_6 = #{actual6},
+			target_7 = #{target7},
+			actual_7 = #{actual7},
+			target_8 = #{target8},
+			actual_8 = #{actual8},
+			target_9 = #{target9},
+			actual_9 = #{actual9},
+			target_10 = #{target10},
+			actual_10 = #{actual10},
+			target_11 = #{target11},
+			actual_11 = #{actual11},
+			target_12 = #{target12},
+			actual_12 = #{actual12}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.dept_responsibility_target
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

+ 197 - 0
ims-service/sm-test/src/main/resources/mappings/sm/EvaluateRuleDao.xml

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluateRuleDao">
+
+	<sql id="evaluateRuleColumns">
+		a.id AS "id",
+		a.des AS "des",
+		a.indicator_id AS "indicatorId",
+		a.total_score AS "totalScore",
+		a.evaluate_method AS "evaluateMethod",
+		a.evaluate_formula AS "evaluateFormula",
+		a.mapping_function AS "mappingFunction",
+		a.create_time AS "createTime",
+		a.create_by AS "createBy",
+		a.update_time AS "updateTime",
+		a.update_by AS "updateBy"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="EvaluateRule">
+		SELECT
+			<include refid="evaluateRuleColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="EvaluateRule">
+		SELECT
+			<include refid="evaluateRuleColumns"/>
+		FROM public.evaluate_rule a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="EvaluateRule">
+		SELECT
+			<include refid="evaluateRuleColumns"/>
+		FROM public.evaluate_rule a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        des,
+	        indicator_id,
+	        total_score,
+	        evaluate_method,
+	        evaluate_formula,
+	        mapping_function,
+	        create_time,
+	        update_time
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('evaluate_rule','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO evaluate_rule(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{des
+, jdbcType=VARCHAR
+
+},
+			#{indicatorId
+, jdbcType=VARCHAR
+
+},
+			#{totalScore
+, jdbcType=VARCHAR
+
+},
+			#{evaluateMethod
+, jdbcType=VARCHAR
+
+},
+			#{evaluateFormula
+, jdbcType=VARCHAR
+
+},
+			#{mappingFunction
+, jdbcType=VARCHAR
+
+},
+			#{createTime, jdbcType=TIMESTAMP
+
+
+},
+			#{updateTime, jdbcType=TIMESTAMP
+
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO evaluate_rule(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.des, jdbcType=VARCHAR} as "des",
+                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
+                    #{item.totalScore, jdbcType=VARCHAR} as "totalScore",
+                    #{item.evaluateMethod, jdbcType=VARCHAR} as "evaluateMethod",
+                    #{item.evaluateFormula, jdbcType=VARCHAR} as "evaluateFormula",
+                    #{item.mappingFunction, jdbcType=VARCHAR} as "mappingFunction",
+                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
+                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE evaluate_rule SET
+			id = #{id},
+			des = #{des},
+			indicator_id = #{indicatorId},
+			total_score = #{totalScore},
+			evaluate_method = #{evaluateMethod},
+			evaluate_formula = #{evaluateFormula},
+			mapping_function = #{mappingFunction},
+			create_time = #{createTime},
+			update_time = #{updateTime},
+			update_by = #{updateBy}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.evaluate_rule
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

+ 229 - 0
ims-service/sm-test/src/main/resources/mappings/sm/EvaluateScoreDao.xml

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.EvaluateScoreDao">
+
+	<sql id="evaluateScoreColumns">
+		a.id AS "id",
+		a.des AS "des",
+		a.create_time AS "createTime",
+		a.create_by AS "createBy",
+		a.update_time AS "updateTime",
+		a.update_by AS "updateBy",
+		a.evaluate_cycle AS "evaluateCycle",
+		a.evaluate_type AS "evaluateType",
+		a.dept_id AS "deptId",
+		a.responsibility_id AS "responsibilityId",
+		a.sys_score AS "sysScore",
+		a.review_score AS "reviewScore",
+		a.review_people AS "reviewPeople",
+		a.review_people_time AS "reviewPeopleTime",
+		a.review_opinion AS "reviewOpinion"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="EvaluateScore">
+		SELECT
+			<include refid="evaluateScoreColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="EvaluateScore">
+		SELECT
+			<include refid="evaluateScoreColumns"/>
+		FROM public.evaluate_score a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="EvaluateScore">
+		SELECT
+			<include refid="evaluateScoreColumns"/>
+		FROM public.evaluate_score a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        des,
+	        create_time,
+	        update_time,
+	        evaluate_cycle,
+	        evaluate_type,
+	        dept_id,
+	        responsibility_id,
+	        sys_score,
+	        review_score,
+	        review_people,
+	        review_people_time,
+	        review_opinion
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('evaluate_score','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO evaluate_score(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{des
+, jdbcType=VARCHAR
+
+},
+			#{createTime, jdbcType=TIMESTAMP
+
+
+},
+			#{updateTime, jdbcType=TIMESTAMP
+
+
+},
+			#{evaluateCycle
+, jdbcType=VARCHAR
+
+},
+			#{evaluateType
+, jdbcType=VARCHAR
+
+},
+			#{deptId
+, jdbcType=VARCHAR
+
+},
+			#{responsibilityId
+, jdbcType=VARCHAR
+
+},
+			#{sysScore
+, jdbcType=VARCHAR
+
+},
+			#{reviewScore
+, jdbcType=VARCHAR
+
+},
+			#{reviewPeople
+, jdbcType=VARCHAR
+
+},
+			#{reviewPeopleTime, jdbcType=TIMESTAMP
+
+
+},
+			#{reviewOpinion
+, jdbcType=VARCHAR
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO evaluate_score(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.des, jdbcType=VARCHAR} as "des",
+                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
+                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime",
+                    #{item.evaluateCycle, jdbcType=VARCHAR} as "evaluateCycle",
+                    #{item.evaluateType, jdbcType=VARCHAR} as "evaluateType",
+                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
+                    #{item.responsibilityId, jdbcType=VARCHAR} as "responsibilityId",
+                    #{item.sysScore, jdbcType=VARCHAR} as "sysScore",
+                    #{item.reviewScore, jdbcType=VARCHAR} as "reviewScore",
+                    #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
+                    #{item.reviewPeopleTime, jdbcType=TIMESTAMP} as "reviewPeopleTime",
+                    #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE evaluate_score SET
+			id = #{id},
+			des = #{des},
+			create_time = #{createTime},
+			update_time = #{updateTime},
+			update_by = #{updateBy},
+			evaluate_cycle = #{evaluateCycle},
+			evaluate_type = #{evaluateType},
+			dept_id = #{deptId},
+			responsibility_id = #{responsibilityId},
+			sys_score = #{sysScore},
+			review_score = #{reviewScore},
+			review_people = #{reviewPeople},
+			review_people_time = #{reviewPeopleTime},
+			review_opinion = #{reviewOpinion}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.evaluate_score
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

+ 253 - 0
ims-service/sm-test/src/main/resources/mappings/sm/IndicatorDao.xml

@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.IndicatorDao">
+
+	<sql id="indicatorColumns">
+		a.id AS "id",
+		a.indicator_name AS "indicatorName",
+		a.indicator_cede AS "indicatorCede",
+		a.unit AS "unit",
+		a.is_quantified AS "isQuantified",
+		a.is_additional AS "isAdditional",
+		a.des AS "des",
+		a.bin_section AS "binSection",
+		a.bin_stage AS "binStage",
+		a.dept AS "dept",
+		a.company AS "company",
+		a.enable AS "enable",
+		a.create_time AS "createTime",
+		a.update_time AS "updateTime",
+		a.create_by AS "createBy",
+		a.update_by AS "updateBy",
+		a.remark AS "remark",
+		a.order_num AS "orderNum"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="Indicator">
+		SELECT
+			<include refid="indicatorColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="Indicator">
+		SELECT
+			<include refid="indicatorColumns"/>
+		FROM public.indicator a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="Indicator">
+		SELECT
+			<include refid="indicatorColumns"/>
+		FROM public.indicator a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        indicator_name,
+	        indicator_cede,
+	        unit,
+	        is_quantified,
+	        is_additional,
+	        des,
+	        bin_section,
+	        bin_stage,
+	        dept,
+	        company,
+	        enable,
+	        create_time,
+	        update_time,
+	        remark,
+	        order_num
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('indicator','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO indicator(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{indicatorName
+, jdbcType=VARCHAR
+
+},
+			#{indicatorCede
+, jdbcType=VARCHAR
+
+},
+			#{unit
+, jdbcType=VARCHAR
+
+},
+			#{isQuantified
+, jdbcType=VARCHAR
+
+},
+			#{isAdditional
+, jdbcType=VARCHAR
+
+},
+			#{des
+, jdbcType=VARCHAR
+
+},
+			#{binSection
+, jdbcType=VARCHAR
+
+},
+			#{binStage
+, jdbcType=VARCHAR
+
+},
+			#{dept
+, jdbcType=VARCHAR
+
+},
+			#{company
+, jdbcType=VARCHAR
+
+},
+			#{enable
+, jdbcType=VARCHAR
+
+},
+			#{createTime, jdbcType=TIMESTAMP
+
+
+},
+			#{updateTime, jdbcType=TIMESTAMP
+
+
+},
+			#{remark
+, jdbcType=VARCHAR
+
+},
+			#{orderNum
+, jdbcType=VARCHAR
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO indicator(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.indicatorName, jdbcType=VARCHAR} as "indicatorName",
+                    #{item.indicatorCede, jdbcType=VARCHAR} as "indicatorCede",
+                    #{item.unit, jdbcType=VARCHAR} as "unit",
+                    #{item.isQuantified, jdbcType=VARCHAR} as "isQuantified",
+                    #{item.isAdditional, jdbcType=VARCHAR} as "isAdditional",
+                    #{item.des, jdbcType=VARCHAR} as "des",
+                    #{item.binSection, jdbcType=VARCHAR} as "binSection",
+                    #{item.binStage, jdbcType=VARCHAR} as "binStage",
+                    #{item.dept, jdbcType=VARCHAR} as "dept",
+                    #{item.company, jdbcType=VARCHAR} as "company",
+                    #{item.enable, jdbcType=VARCHAR} as "enable",
+                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
+                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime",
+                    #{item.remark, jdbcType=VARCHAR} as "remark",
+                    #{item.orderNum, jdbcType=VARCHAR} as "orderNum"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE indicator SET
+			id = #{id},
+			indicator_name = #{indicatorName},
+			indicator_cede = #{indicatorCede},
+			unit = #{unit},
+			is_quantified = #{isQuantified},
+			is_additional = #{isAdditional},
+			des = #{des},
+			bin_section = #{binSection},
+			bin_stage = #{binStage},
+			dept = #{dept},
+			company = #{company},
+			enable = #{enable},
+			create_time = #{createTime},
+			update_time = #{updateTime},
+			update_by = #{updateBy},
+			remark = #{remark},
+			order_num = #{orderNum}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.indicator
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

+ 189 - 0
ims-service/sm-test/src/main/resources/mappings/sm/IndicatorDictionaryDao.xml

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.IndicatorDictionaryDao">
+
+	<sql id="indicatorDictionaryColumns">
+		a.id AS "id",
+		a.indicator_id AS "indicatorId",
+		a.option_code AS "optionCode",
+		a.option_name AS "optionName",
+		a.option_order AS "optionOrder",
+		a.des AS "des",
+		a.create_by AS "createBy",
+		a.create_time AS "createTime",
+		a.update_by AS "updateBy",
+		a.update_time AS "updateTime"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="IndicatorDictionary">
+		SELECT
+			<include refid="indicatorDictionaryColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="IndicatorDictionary">
+		SELECT
+			<include refid="indicatorDictionaryColumns"/>
+		FROM public.indicator_dictionary a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="IndicatorDictionary">
+		SELECT
+			<include refid="indicatorDictionaryColumns"/>
+		FROM public.indicator_dictionary a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        indicator_id,
+	        option_code,
+	        option_name,
+	        option_order,
+	        des,
+	        create_time,
+	        update_time
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('indicator_dictionary','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO indicator_dictionary(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{indicatorId
+, jdbcType=VARCHAR
+
+},
+			#{optionCode
+, jdbcType=VARCHAR
+
+},
+			#{optionName
+, jdbcType=VARCHAR
+
+},
+			#{optionOrder
+, jdbcType=VARCHAR
+
+},
+			#{des
+, jdbcType=VARCHAR
+
+},
+			#{createTime, jdbcType=TIMESTAMP
+
+
+},
+			#{updateTime, jdbcType=TIMESTAMP
+
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO indicator_dictionary(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
+                    #{item.optionCode, jdbcType=VARCHAR} as "optionCode",
+                    #{item.optionName, jdbcType=VARCHAR} as "optionName",
+                    #{item.optionOrder, jdbcType=VARCHAR} as "optionOrder",
+                    #{item.des, jdbcType=VARCHAR} as "des",
+                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
+                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE indicator_dictionary SET
+			id = #{id},
+			indicator_id = #{indicatorId},
+			option_code = #{optionCode},
+			option_name = #{optionName},
+			option_order = #{optionOrder},
+			des = #{des},
+			create_time = #{createTime},
+			update_by = #{updateBy},
+			update_time = #{updateTime}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.indicator_dictionary
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>

+ 189 - 0
ims-service/sm-test/src/main/resources/mappings/sm/ReportDao.xml

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.ReportDao">
+
+	<sql id="reportColumns">
+		a.id AS "id",
+		a.report_title AS "reportTitle",
+		a.des AS "des",
+		a.publish_time AS "publishTime",
+		a.report_path AS "reportPath",
+		a.dept_id AS "deptId",
+		a.create_time AS "createTime",
+		a.create_by AS "createBy",
+		a.update_time AS "updateTime",
+		a.update_by AS "updateBy"
+	</sql>
+
+
+    <sql id="whereStr">
+			1=1
+		    <!-- 快速定位 -->
+			<if test="sqlMap.key != null and  sqlMap.key  != ''">
+			  AND (
+			  )
+			</if>
+		    <!-- 高级查询dataFilter -->
+			<if test="sqlMap.df != null and  sqlMap.df  != ''">
+			   AND ( ${sqlMap.df} )
+			</if>
+		    <!-- 默认查询baseFilter -->
+			<if test="sqlMap.bf != null and  sqlMap.bf  != ''">
+			   AND ( ${sqlMap.bf} )
+			</if>
+		    <!-- 基本Query查询 -->
+			<if test="sqlMap.baseQuery != null and  sqlMap.baseQuery  != ''">
+			   AND ( ${sqlMap.baseQuery} )
+			</if>
+		    <!-- 特定Query查询 -->
+			<if test="sqlMap.specQuery != null and  sqlMap.specQuery  != ''">
+			   AND ( ${sqlMap.specQuery} )
+			</if>
+			<if test="sqlMap.dsf != null and  sqlMap.dsf  != ''">
+				AND (${sqlMap.dsf})
+			</if>
+    </sql>
+
+	<select id="get" resultType="Report">
+		SELECT
+			<include refid="reportColumns"/>
+		FROM public.{table.name} a
+
+		WHERE a.id = #{id}
+	</select>
+
+	<select id="findList" resultType="Report">
+		SELECT
+			<include refid="reportColumns"/>
+		FROM public.report a
+
+		<where>
+              <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+	<select id="findAllList" resultType="Report">
+		SELECT
+			<include refid="reportColumns"/>
+		FROM public.report a
+
+		<where>
+			 <include refid="whereStr"/>
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+
+    <sql id="insertColumns">
+	        report_title,
+	        des,
+	        publish_time,
+	        report_path,
+	        dept_id,
+	        create_time,
+	        update_time
+    </sql>
+
+	<insert id="insert">
+        <selectKey keyProperty="id" resultType="String" order="BEFORE">
+          <choose>
+			<when test="id == null or  id  == ''">
+              select get_next_id('report','') from dual
+			</when>
+			<otherwise>
+			  select #{id} from dual
+			</otherwise>
+	      </choose>
+        </selectKey>
+		INSERT INTO report(
+            <include refid="insertColumns"/>
+		) VALUES (
+			#{reportTitle
+, jdbcType=VARCHAR
+
+},
+			#{des
+, jdbcType=VARCHAR
+
+},
+			#{publishTime, jdbcType=TIMESTAMP
+
+
+},
+			#{reportPath
+, jdbcType=VARCHAR
+
+},
+			#{deptId
+, jdbcType=VARCHAR
+
+},
+			#{createTime, jdbcType=TIMESTAMP
+
+
+},
+			#{updateTime, jdbcType=TIMESTAMP
+
+
+}
+		)
+	</insert>
+
+	<insert id="insertList">
+		INSERT INTO report(
+		    <include refid="insertColumns"/>
+		) select FFF.* from (
+            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
+                select
+                    #{item.reportTitle, jdbcType=VARCHAR} as "reportTitle",
+                    #{item.des, jdbcType=VARCHAR} as "des",
+                    #{item.publishTime, jdbcType=TIMESTAMP} as "publishTime",
+                    #{item.reportPath, jdbcType=VARCHAR} as "reportPath",
+                    #{item.deptId, jdbcType=VARCHAR} as "deptId",
+                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
+                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime"
+                from dual
+            </foreach>
+		) FFF
+
+	</insert>
+
+	<update id="update">
+		UPDATE report SET
+			id = #{id},
+			report_title = #{reportTitle},
+			des = #{des},
+			publish_time = #{publishTime},
+			report_path = #{reportPath},
+			dept_id = #{deptId},
+			create_time = #{createTime},
+			update_time = #{updateTime},
+			update_by = #{updateBy}
+		WHERE id = #{id, jdbcType=VARCHAR}
+	</update>
+
+	<update id="delete">
+		DELETE FROM public.report
+	    WHERE
+		<choose>
+			<when test="id != null and  id  != ''">
+					 id = #{id, jdbcType=VARCHAR}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</update>
+
+</mapper>