代码修改

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

@@ -28,9 +28,9 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author Chill
  */
-@Configuration
-@EnableFeignClients({"com.ims"})
-@MapperScan({"com.ims.ims.sm.dao.**","com.ims.**.dao.**"})
-@EnableConfigurationProperties(DemoProperties.class)
+//@Configuration
+//@EnableFeignClients({"com.ims"})
+//@MapperScan({"com.ims.ims.sm.dao.**","com.ims.**.dao.**"})
+//@EnableConfigurationProperties(DemoProperties.class)
 public class ImsDemoConfiguration {
 }

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

@@ -6,8 +6,8 @@ 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 com.ims.eval.entity.DeptResponsibility;
+import com.ims.eval.service.IDeptResponsibilityService;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -27,17 +27,17 @@ import java.io.IOException;
  */
 @Controller
 @RequestMapping(value = "/eval/ddeptResponsibility")
-public class DdeptResponsibilityController extends WebController<IDdeptResponsibilityService, DdeptResponsibility> {
+public class DeptResponsibilityController extends WebController<IDeptResponsibilityService, DeptResponsibility> {
 
  	//@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "list")
-	public String list(DdeptResponsibility ddeptResponsibility, Model model) {
+	public String list(DeptResponsibility ddeptResponsibility, Model model) {
 		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "form")
-	public String form(DdeptResponsibility ddeptResponsibility, Model model) {
+	public String form(DeptResponsibility ddeptResponsibility, Model model) {
 	    String formView = ddeptResponsibility.getFormView();
 	    if(StringUtils.isNotBlank(formView)){
 			return "ims/"+formView;
@@ -47,76 +47,76 @@ public class DdeptResponsibilityController extends WebController<IDdeptResponsib
 
     //@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "lov")
-	public String lov(DdeptResponsibility ddeptResponsibility, Model model) {
+	public String lov(DeptResponsibility ddeptResponsibility, Model model) {
 		return "ims/ims-eval${ims_eval_suffix}/eval/ddeptResponsibilityList";
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "data")
 	@ResponseBody
-	public String getData(DdeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
+	public String getData(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
         return  super.getData(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "allData")
 	@ResponseBody
-	public String getAllData(DdeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
+	public String getAllData(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException  {
         return  super.getAllData(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "get")
 	@ResponseBody
-	public String get(DdeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
+	public String get(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response, Model model) throws IOException {
         return  super.get(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:edit")
 	@RequestMapping(value = "initInsert")
 	@ResponseBody
-	public String initInsert(DdeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	public String initInsert(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return super.initInsert(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:edit")
 	@RequestMapping(value = "checkSave")
 	@ResponseBody
-	public String checkSave(DdeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	public String checkSave(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return super.checkSave(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:edit")
 	@RequestMapping(value = "save")
 	@ResponseBody
-	public String save(DdeptResponsibility ddeptResponsibility, Model model,  HttpServletRequest request, HttpServletResponse response) {
+	public String save(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) {
 		 return super.save(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:remove")
 	@RequestMapping(value = "checkRemove")
 	@ResponseBody
-	public String checkRemove(DdeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	public String checkRemove(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return super.checkRemove(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:remove")
 	@RequestMapping(value = "remove")
 	@ResponseBody
-	public String remove(DdeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+	public String remove(DeptResponsibility ddeptResponsibility, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return super.remove(ddeptResponsibility,request,response,model);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:edit")
 	@RequestMapping(value = "import",produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@ResponseBody
-	public String importFile(DdeptResponsibility ddeptResponsibility,MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
+	public String importFile(DeptResponsibility ddeptResponsibility, MultipartFile excelFile, HttpServletRequest request, HttpServletResponse response) {
          return super.importFile(ddeptResponsibility,excelFile,null,request,response);
 	}
 
     //@ImsPreAuth("eval:ddeptResponsibility:view")
 	@RequestMapping(value = "export", method= RequestMethod.POST)
-	public void exportFile(DdeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response) {
+	public void exportFile(DeptResponsibility ddeptResponsibility, HttpServletRequest request, HttpServletResponse response) {
          super.exportFile(ddeptResponsibility,request,response );
 	}
 

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

@@ -3,32 +3,42 @@
  */
 package com.ims.eval.controller;
 
-import com.ims.core.controller.WebController;
-import com.ims.core.utils.StringUtils;
-
-import com.ims.eval.entity.Report;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import com.ims.eval.service.IReportService;
-import org.springframework.http.MediaType;
+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.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.http.MediaType;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+
+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.eval.entity.Report;
+import com.ims.eval.service.IReportService;
 
 /**
- * 公告发布Controller
+ * 发布公告表Controller
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 @Controller
 @RequestMapping(value = "/eval/report")
-public class ReportController extends WebController<IReportService, Report> {
+public class ReportController extends WebController<IReportService,Report> {
 
  	//@ImsPreAuth("eval:report:view")
 	@RequestMapping(value = "list")
@@ -121,4 +131,4 @@ public class ReportController extends WebController<IReportService, Report> {
          super.exportFile(report,request,response );
 	}
 
-}
+}

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

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

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

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

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

@@ -3,17 +3,18 @@
  */
 package com.ims.eval.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ims.core.entity.DataEntity;
-
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 
+import com.ims.core.entity.DataEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
- * 部门目标责任Entity
+ * 部门目标责任表Entity
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
-public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
+public class DeptResponsibility extends DataEntity<DeptResponsibility> {
 
 	private static final long serialVersionUID = 1L;
 	private String deptId;		// 部门ID
@@ -34,11 +35,11 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	private String remark;		// 备注
 
 
-	public DdeptResponsibility() {
+	public DeptResponsibility() {
 		super();
 	}
 
-	public DdeptResponsibility(String id){
+	public DeptResponsibility(String id){
 		super(id);
 	}
 
@@ -63,7 +64,6 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	public void setCheckCycle(String checkCycle) {
 		this.checkCycle = checkCycle;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getBeginDate() {
 		return beginDate;
 	}
@@ -71,7 +71,6 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	public void setBeginDate(Date beginDate) {
 		this.beginDate = beginDate;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getEndDate() {
 		return endDate;
 	}
@@ -93,7 +92,6 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	public void setDes(String des) {
 		this.des = des;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -101,7 +99,6 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getUpdateTime() {
 		return updateTime;
 	}
@@ -116,7 +113,6 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	public void setReviewPeople(String reviewPeople) {
 		this.reviewPeople = reviewPeople;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getReviewPeopleTime() {
 		return reviewPeopleTime;
 	}
@@ -138,7 +134,6 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 	public void setFinalReviewPeople(String finalReviewPeople) {
 		this.finalReviewPeople = finalReviewPeople;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getFinalReviewPeopleTime() {
 		return finalReviewPeopleTime;
 	}
@@ -161,4 +156,4 @@ public class DdeptResponsibility extends DataEntity<DdeptResponsibility> {
 		this.remark = remark;
 	}
 
-}
+}

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

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

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

@@ -3,22 +3,23 @@
  */
 package com.ims.eval.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ims.core.entity.DataEntity;
-
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 
+import com.ims.core.entity.DataEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
  * 考评规则Entity
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 public class EvaluateRule extends DataEntity<EvaluateRule> {
 
 	private static final long serialVersionUID = 1L;
 	private String des;		// 描述
 	private String indicatorId;		// 指标ID
-	private String totalScore;		// 指标总分
+	private BigDecimal totalScore;		// 指标总分
 	private String evaluateMethod;		// 评分方式
 	private String evaluateFormula;		// 评分公式
 	private String mappingFunction;		// 隐射函数
@@ -48,11 +49,11 @@ public class EvaluateRule extends DataEntity<EvaluateRule> {
 	public void setIndicatorId(String indicatorId) {
 		this.indicatorId = indicatorId;
 	}
-	public String getTotalScore() {
+	public BigDecimal getTotalScore() {
 		return totalScore;
 	}
 
-	public void setTotalScore(String totalScore) {
+	public void setTotalScore(BigDecimal totalScore) {
 		this.totalScore = totalScore;
 	}
 	public String getEvaluateMethod() {
@@ -76,7 +77,6 @@ public class EvaluateRule extends DataEntity<EvaluateRule> {
 	public void setMappingFunction(String mappingFunction) {
 		this.mappingFunction = mappingFunction;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -84,7 +84,6 @@ public class EvaluateRule extends DataEntity<EvaluateRule> {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getUpdateTime() {
 		return updateTime;
 	}
@@ -93,4 +92,4 @@ public class EvaluateRule extends DataEntity<EvaluateRule> {
 		this.updateTime = updateTime;
 	}
 
-}
+}

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

@@ -3,15 +3,16 @@
  */
 package com.ims.eval.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ims.core.entity.DataEntity;
-
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 
+import com.ims.core.entity.DataEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
  * 考评得分Entity
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 public class EvaluateScore extends DataEntity<EvaluateScore> {
 
@@ -23,8 +24,8 @@ public class EvaluateScore extends DataEntity<EvaluateScore> {
 	private String evaluateType;		// 考评性质（0:预考评；1正式考评）
 	private String deptId;		// 部门ID
 	private String responsibilityId;		// 责任书ID
-	private String sysScore;		// 系统评分
-	private String reviewScore;		// 复审评分
+	private BigDecimal sysScore;		// 系统评分
+	private BigDecimal reviewScore;		// 复审评分
 	private String reviewPeople;		// 复审人
 	private Date reviewPeopleTime;		// 复审时间
 	private String reviewOpinion;		// 复审意见
@@ -45,7 +46,6 @@ public class EvaluateScore extends DataEntity<EvaluateScore> {
 	public void setDes(String des) {
 		this.des = des;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -53,7 +53,6 @@ public class EvaluateScore extends DataEntity<EvaluateScore> {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getUpdateTime() {
 		return updateTime;
 	}
@@ -89,18 +88,18 @@ public class EvaluateScore extends DataEntity<EvaluateScore> {
 	public void setResponsibilityId(String responsibilityId) {
 		this.responsibilityId = responsibilityId;
 	}
-	public String getSysScore() {
+	public BigDecimal getSysScore() {
 		return sysScore;
 	}
 
-	public void setSysScore(String sysScore) {
+	public void setSysScore(BigDecimal sysScore) {
 		this.sysScore = sysScore;
 	}
-	public String getReviewScore() {
+	public BigDecimal getReviewScore() {
 		return reviewScore;
 	}
 
-	public void setReviewScore(String reviewScore) {
+	public void setReviewScore(BigDecimal reviewScore) {
 		this.reviewScore = reviewScore;
 	}
 	public String getReviewPeople() {
@@ -110,7 +109,6 @@ public class EvaluateScore extends DataEntity<EvaluateScore> {
 	public void setReviewPeople(String reviewPeople) {
 		this.reviewPeople = reviewPeople;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getReviewPeopleTime() {
 		return reviewPeopleTime;
 	}
@@ -126,4 +124,4 @@ public class EvaluateScore extends DataEntity<EvaluateScore> {
 		this.reviewOpinion = reviewOpinion;
 	}
 
-}
+}

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

@@ -3,15 +3,16 @@
  */
 package com.ims.eval.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ims.core.entity.DataEntity;
-
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 
+import com.ims.core.entity.DataEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
  * 指标Entity
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 public class Indicator extends DataEntity<Indicator> {
 
@@ -26,11 +27,11 @@ public class Indicator extends DataEntity<Indicator> {
 	private String binStage;		// 业务阶段
 	private String dept;		// 部门
 	private String company;		// 公司
-	private String enable;		// 是否启用
+	private Boolean enable;		// 是否启用
 	private Date createTime;		// 创建时间
 	private Date updateTime;		// 修改时间
 	private String remark;		// 备注
-	private String orderNum;		// 排序
+	private BigDecimal orderNum;		// 排序
 
 
 	public Indicator() {
@@ -111,14 +112,13 @@ public class Indicator extends DataEntity<Indicator> {
 	public void setCompany(String company) {
 		this.company = company;
 	}
-	public String getEnable() {
+	public Boolean getEnable() {
 		return enable;
 	}
 
-	public void setEnable(String enable) {
+	public void setEnable(Boolean enable) {
 		this.enable = enable;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -126,7 +126,6 @@ public class Indicator extends DataEntity<Indicator> {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getUpdateTime() {
 		return updateTime;
 	}
@@ -141,12 +140,12 @@ public class Indicator extends DataEntity<Indicator> {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	public String getOrderNum() {
+	public BigDecimal getOrderNum() {
 		return orderNum;
 	}
 
-	public void setOrderNum(String orderNum) {
+	public void setOrderNum(BigDecimal orderNum) {
 		this.orderNum = orderNum;
 	}
 
-}
+}

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

@@ -3,15 +3,18 @@
  */
 package com.ims.eval.entity;
 
+import java.util.Date;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.ims.core.entity.DataEntity;
-
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 
+import com.ims.core.entity.DataEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
- * 指标字典Entity
- * @author song
- * @version 2023-02-22
+ * 指标字典表Entity
+ * @author wang
+ * @version 2023-02-25
  */
 public class IndicatorDictionary extends DataEntity<IndicatorDictionary> {
 
@@ -19,7 +22,7 @@ public class IndicatorDictionary extends DataEntity<IndicatorDictionary> {
 	private String indicatorId;		// 指标ID
 	private String optionCode;		// 选项编码
 	private String optionName;		// 选项名称
-	private String optionOrder;		// 选项顺序
+	private Integer optionOrder;		// 选项顺序
 	private String des;		// 描述
 	private Date createTime;		// 创建时间
 	private Date updateTime;		// 更新时间
@@ -54,11 +57,11 @@ public class IndicatorDictionary extends DataEntity<IndicatorDictionary> {
 	public void setOptionName(String optionName) {
 		this.optionName = optionName;
 	}
-	public String getOptionOrder() {
+	public Integer getOptionOrder() {
 		return optionOrder;
 	}
 
-	public void setOptionOrder(String optionOrder) {
+	public void setOptionOrder(Integer optionOrder) {
 		this.optionOrder = optionOrder;
 	}
 	public String getDes() {

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

@@ -3,15 +3,16 @@
  */
 package com.ims.eval.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.ims.core.entity.DataEntity;
-
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.util.Date;
 
+import com.ims.core.entity.DataEntity;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 /**
- * 公告发布Entity
+ * 发布公告表Entity
  * @author wang
- * @version 2023-02-23
+ * @version 2023-02-25
  */
 public class Report extends DataEntity<Report> {
 
@@ -47,7 +48,6 @@ public class Report extends DataEntity<Report> {
 	public void setDes(String des) {
 		this.des = des;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getPublishTime() {
 		return publishTime;
 	}
@@ -69,7 +69,6 @@ public class Report extends DataEntity<Report> {
 	public void setDeptId(String deptId) {
 		this.deptId = deptId;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -77,7 +76,6 @@ public class Report extends DataEntity<Report> {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	@JSONField(format = "yyyy-MM-dd HH:mm:ss")
 	public Date getUpdateTime() {
 		return updateTime;
 	}
@@ -86,4 +84,4 @@ public class Report extends DataEntity<Report> {
 		this.updateTime = updateTime;
 	}
 
-}
+}

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

@@ -5,7 +5,7 @@ package com.ims.eval.service;
 
 
 import com.ims.core.service.ICrudService;
-import com.ims.eval.entity.DdeptResponsibility;
+import com.ims.eval.entity.DeptResponsibility;
 
 /**
  * 部门目标责任Service
@@ -13,6 +13,6 @@ import com.ims.eval.entity.DdeptResponsibility;
  * @version 2023-02-23
  */
 
-public interface IDdeptResponsibilityService extends ICrudService<DdeptResponsibility> {
+public interface IDeptResponsibilityService extends ICrudService<DeptResponsibility> {
 
 }

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

@@ -7,8 +7,8 @@ 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 com.ims.eval.entity.DeptResponsibility;
+import com.ims.eval.service.IDeptResponsibilityService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,35 +22,35 @@ import java.util.List;
  */
 @Service
 @Transactional(readOnly = true)
-public class DdeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptResponsibilityDao, DdeptResponsibility> implements IDdeptResponsibilityService{
+public class DeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptResponsibilityDao, DeptResponsibility> implements IDeptResponsibilityService {
 
- 	public DdeptResponsibility get(DdeptResponsibility ddeptResponsibility) {
+ 	public DeptResponsibility get(DeptResponsibility ddeptResponsibility) {
 		return super.get(ddeptResponsibility);
 	}
 
-    public List<DdeptResponsibility> findList(DdeptResponsibility ddeptResponsibility) {
+    public List<DeptResponsibility> findList(DeptResponsibility ddeptResponsibility) {
         return super.findList(ddeptResponsibility);
     }
 
-	public List<DdeptResponsibility> findAllListM(DdeptResponsibility ddeptResponsibility,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+	public List<DeptResponsibility> findAllListM(DeptResponsibility ddeptResponsibility, String dataFilter, String baseFilter, String key, String baseQuery, String specQuery) {
 	 	return super.findAllListM(ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
 	}
 
-	public Page<DdeptResponsibility> findPageM(Page<DdeptResponsibility> page, DdeptResponsibility ddeptResponsibility,String dataFilter,String baseFilter,String key,String baseQuery,String specQuery) {
+	public Page<DeptResponsibility> findPageM(Page<DeptResponsibility> page, DeptResponsibility ddeptResponsibility, String dataFilter, String baseFilter, String key, String baseQuery, String specQuery) {
 		return super.findPageM(page, ddeptResponsibility,dataFilter,baseFilter,key,baseQuery,specQuery);
 	}
 
-	public DdeptResponsibility initInsert(DdeptResponsibility ddeptResponsibility)  {
+	public DeptResponsibility initInsert(DeptResponsibility ddeptResponsibility)  {
 		return super.initInsert(ddeptResponsibility);
 	}
 
 	@Transactional(readOnly = false)
-	public void checkSave(DdeptResponsibility ddeptResponsibility) {
+	public void checkSave(DeptResponsibility ddeptResponsibility) {
 		super.checkSave(ddeptResponsibility);
 	}
 
 	@Transactional(readOnly = false)
-	public DdeptResponsibility save(DdeptResponsibility ddeptResponsibility, boolean isNewRecord){
+	public DeptResponsibility save(DeptResponsibility ddeptResponsibility, boolean isNewRecord){
 	    if(isNewRecord){
 	        ddeptResponsibility.setId(IdGen.uuid());
 	    }
@@ -59,17 +59,17 @@ public class DdeptResponsibilityServiceImpl extends CrudServiceImpl<DdeptRespons
 
     @Transactional(readOnly = false)
     @Override
-    public void insertList(List<DdeptResponsibility> list){
+    public void insertList(List<DeptResponsibility> list){
         super.insertList(list);
     }
 
 	@Transactional(readOnly = false)
-	public void checkRemove(DdeptResponsibility ddeptResponsibility,String baseFilter){
+	public void checkRemove(DeptResponsibility ddeptResponsibility, String baseFilter){
 		super.checkRemove(ddeptResponsibility,baseFilter);
 	}
 
 	@Transactional(readOnly = false)
-	public void delete(DdeptResponsibility ddeptResponsibility,String baseFilter) {
+	public void delete(DeptResponsibility ddeptResponsibility, String baseFilter) {
 		super.delete(ddeptResponsibility,baseFilter);
 	}
 }

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

@@ -1,8 +1,8 @@
 <?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">
+<mapper namespace="com.ims.eval.dao.DeptResponsibilityDao">
 
-	<sql id="ddeptResponsibilityColumns">
+	<sql id="deptResponsibilityColumns">
 		a.id AS "id",
 		a.dept_id AS "deptId",
 		a.cycle_unit AS "cycleUnit",
@@ -53,17 +53,17 @@
 			</if>
     </sql>
 
-	<select id="get" resultType="DdeptResponsibility">
+	<select id="get" resultType="DeptResponsibility">
 		SELECT
-			<include refid="ddeptResponsibilityColumns"/>
+			<include refid="deptResponsibilityColumns"/>
 		FROM public.{table.name} a
 
 		WHERE a.id = #{id}
 	</select>
 
-	<select id="findList" resultType="DdeptResponsibility">
+	<select id="findList" resultType="DeptResponsibility">
 		SELECT
-			<include refid="ddeptResponsibilityColumns"/>
+			<include refid="deptResponsibilityColumns"/>
 		FROM public.dept_responsibility a
 
 		<where>
@@ -78,9 +78,9 @@
 		</choose>
 	</select>
 
-	<select id="findAllList" resultType="DdeptResponsibility">
+	<select id="findAllList" resultType="DeptResponsibility">
 		SELECT
-			<include refid="ddeptResponsibilityColumns"/>
+			<include refid="deptResponsibilityColumns"/>
 		FROM public.dept_responsibility a
 
 		<where>
@@ -96,6 +96,7 @@
 	</select>
 
     <sql id="insertColumns">
+	        id,
 	        dept_id,
 	        cycle_unit,
 	        check_cycle,
@@ -128,6 +129,10 @@
 		INSERT INTO dept_responsibility(
             <include refid="insertColumns"/>
 		) VALUES (
+			#{id
+, jdbcType=VARCHAR
+
+},
 			#{deptId
 , jdbcType=VARCHAR
 
@@ -140,11 +145,11 @@
 , jdbcType=VARCHAR
 
 },
-			#{beginDate, jdbcType=TIMESTAMP
+			#{beginDate
 
 
 },
-			#{endDate, jdbcType=TIMESTAMP
+			#{endDate
 
 
 },
@@ -156,11 +161,11 @@
 , jdbcType=VARCHAR
 
 },
-			#{createTime, jdbcType=TIMESTAMP
+			#{createTime
 
 
 },
-			#{updateTime, jdbcType=TIMESTAMP
+			#{updateTime
 
 
 },
@@ -168,7 +173,7 @@
 , jdbcType=VARCHAR
 
 },
-			#{reviewPeopleTime, jdbcType=TIMESTAMP
+			#{reviewPeopleTime
 
 
 },
@@ -180,7 +185,7 @@
 , jdbcType=VARCHAR
 
 },
-			#{finalReviewPeopleTime, jdbcType=TIMESTAMP
+			#{finalReviewPeopleTime
 
 
 },
@@ -201,20 +206,21 @@
 		) select FFF.* from (
             <foreach collection="list" item="item" index="index" separator="UNION ALL" >
                 select
+                    #{item.id, jdbcType=VARCHAR} as "id",
                     #{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.beginDate} as "beginDate",
+                    #{item.endDate} 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.createTime} as "createTime",
+                    #{item.updateTime} as "updateTime",
                     #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
-                    #{item.reviewPeopleTime, jdbcType=TIMESTAMP} as "reviewPeopleTime",
+                    #{item.reviewPeopleTime} as "reviewPeopleTime",
                     #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion",
                     #{item.finalReviewPeople, jdbcType=VARCHAR} as "finalReviewPeople",
-                    #{item.finalReviewPeopleTime, jdbcType=TIMESTAMP} as "finalReviewPeopleTime",
+                    #{item.finalReviewPeopleTime} as "finalReviewPeopleTime",
                     #{item.finalReviewOpinion, jdbcType=VARCHAR} as "finalReviewOpinion",
                     #{item.remark, jdbcType=VARCHAR} as "remark"
                 from dual

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

@@ -114,6 +114,7 @@
 	</select>
 
     <sql id="insertColumns">
+	        id,
 	        responsibility_id,
 	        indicator_id,
 	        quantization_target,
@@ -166,6 +167,10 @@
 		INSERT INTO dept_responsibility_target(
             <include refid="insertColumns"/>
 		) VALUES (
+			#{id
+, jdbcType=VARCHAR
+
+},
 			#{responsibilityId
 , jdbcType=VARCHAR
 
@@ -175,11 +180,11 @@
 
 },
 			#{quantizationTarget
-, jdbcType=VARCHAR
+
 
 },
 			#{quantizationTargetActual
-, jdbcType=VARCHAR
+
 
 },
 			#{evaluationTarget
@@ -187,27 +192,27 @@
 
 },
 			#{evaluationTargetActual
-, jdbcType=VARCHAR
+
 
 },
 			#{monthThreshold
-, jdbcType=VARCHAR
+
 
 },
 			#{seasonThreshold
-, jdbcType=VARCHAR
+
 
 },
 			#{yearThreshold
-, jdbcType=VARCHAR
+
 
 },
 			#{direction
-, jdbcType=VARCHAR
+
 
 },
 			#{orderNum
-, jdbcType=VARCHAR
+
 
 },
 			#{remark
@@ -215,99 +220,99 @@
 
 },
 			#{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
+
 
 }
 		)
@@ -319,42 +324,43 @@
 		) select FFF.* from (
             <foreach collection="list" item="item" index="index" separator="UNION ALL" >
                 select
+                    #{item.id, jdbcType=VARCHAR} as "id",
                     #{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.quantizationTarget} as "quantizationTarget",
+                    #{item.quantizationTargetActual} 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.evaluationTargetActual} as "evaluationTargetActual",
+                    #{item.monthThreshold} as "monthThreshold",
+                    #{item.seasonThreshold} as "seasonThreshold",
+                    #{item.yearThreshold} as "yearThreshold",
+                    #{item.direction} as "direction",
+                    #{item.orderNum} 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"
+                    #{item.target1} as "target1",
+                    #{item.actual1} as "actual1",
+                    #{item.target2} as "target2",
+                    #{item.actual2} as "actual2",
+                    #{item.target3} as "target3",
+                    #{item.actual3} as "actual3",
+                    #{item.target4} as "target4",
+                    #{item.actual4} as "actual4",
+                    #{item.target5} as "target5",
+                    #{item.actual5} as "actual5",
+                    #{item.target6} as "target6",
+                    #{item.actual6} as "actual6",
+                    #{item.target7} as "target7",
+                    #{item.actual7} as "actual7",
+                    #{item.target8} as "target8",
+                    #{item.actual8} as "actual8",
+                    #{item.target9} as "target9",
+                    #{item.actual9} as "actual9",
+                    #{item.target10} as "target10",
+                    #{item.actual10} as "actual10",
+                    #{item.target11} as "target11",
+                    #{item.actual11} as "actual11",
+                    #{item.target12} as "target12",
+                    #{item.actual12} as "actual12"
                 from dual
             </foreach>
 		) FFF

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

@@ -88,6 +88,7 @@
 	</select>
 
     <sql id="insertColumns">
+	        id,
 	        des,
 	        indicator_id,
 	        total_score,
@@ -112,6 +113,10 @@
 		INSERT INTO evaluate_rule(
             <include refid="insertColumns"/>
 		) VALUES (
+			#{id
+, jdbcType=VARCHAR
+
+},
 			#{des
 , jdbcType=VARCHAR
 
@@ -121,7 +126,7 @@
 
 },
 			#{totalScore
-, jdbcType=VARCHAR
+
 
 },
 			#{evaluateMethod
@@ -136,11 +141,11 @@
 , jdbcType=VARCHAR
 
 },
-			#{createTime, jdbcType=TIMESTAMP
+			#{createTime
 
 
 },
-			#{updateTime, jdbcType=TIMESTAMP
+			#{updateTime
 
 
 }
@@ -153,14 +158,15 @@
 		) select FFF.* from (
             <foreach collection="list" item="item" index="index" separator="UNION ALL" >
                 select
+                    #{item.id, jdbcType=VARCHAR} as "id",
                     #{item.des, jdbcType=VARCHAR} as "des",
                     #{item.indicatorId, jdbcType=VARCHAR} as "indicatorId",
-                    #{item.totalScore, jdbcType=VARCHAR} as "totalScore",
+                    #{item.totalScore} 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"
+                    #{item.createTime} as "createTime",
+                    #{item.updateTime} as "updateTime"
                 from dual
             </foreach>
 		) FFF

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

@@ -92,6 +92,7 @@
 	</select>
 
     <sql id="insertColumns">
+	        id,
 	        des,
 	        create_time,
 	        update_time,
@@ -120,15 +121,19 @@
 		INSERT INTO evaluate_score(
             <include refid="insertColumns"/>
 		) VALUES (
+			#{id
+, jdbcType=VARCHAR
+
+},
 			#{des
 , jdbcType=VARCHAR
 
 },
-			#{createTime, jdbcType=TIMESTAMP
+			#{createTime
 
 
 },
-			#{updateTime, jdbcType=TIMESTAMP
+			#{updateTime
 
 
 },
@@ -149,18 +154,18 @@
 
 },
 			#{sysScore
-, jdbcType=VARCHAR
+
 
 },
 			#{reviewScore
-, jdbcType=VARCHAR
+
 
 },
 			#{reviewPeople
 , jdbcType=VARCHAR
 
 },
-			#{reviewPeopleTime, jdbcType=TIMESTAMP
+			#{reviewPeopleTime
 
 
 },
@@ -177,17 +182,18 @@
 		) select FFF.* from (
             <foreach collection="list" item="item" index="index" separator="UNION ALL" >
                 select
+                    #{item.id, jdbcType=VARCHAR} as "id",
                     #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
-                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime",
+                    #{item.createTime} as "createTime",
+                    #{item.updateTime} 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.sysScore} as "sysScore",
+                    #{item.reviewScore} as "reviewScore",
                     #{item.reviewPeople, jdbcType=VARCHAR} as "reviewPeople",
-                    #{item.reviewPeopleTime, jdbcType=TIMESTAMP} as "reviewPeopleTime",
+                    #{item.reviewPeopleTime} as "reviewPeopleTime",
                     #{item.reviewOpinion, jdbcType=VARCHAR} as "reviewOpinion"
                 from dual
             </foreach>

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

@@ -87,6 +87,7 @@
 	</select>
 
     <sql id="insertColumns">
+	        id,
 	        indicator_id,
 	        option_code,
 	        option_name,
@@ -110,6 +111,10 @@
 		INSERT INTO indicator_dictionary(
             <include refid="insertColumns"/>
 		) VALUES (
+			#{id
+, jdbcType=VARCHAR
+
+},
 			#{indicatorId
 , jdbcType=VARCHAR
 
@@ -123,18 +128,18 @@
 
 },
 			#{optionOrder
-, jdbcType=VARCHAR
+
 
 },
 			#{des
 , jdbcType=VARCHAR
 
 },
-			#{createTime, jdbcType=TIMESTAMP
+			#{createTime
 
 
 },
-			#{updateTime, jdbcType=TIMESTAMP
+			#{updateTime
 
 
 }
@@ -147,13 +152,14 @@
 		) select FFF.* from (
             <foreach collection="list" item="item" index="index" separator="UNION ALL" >
                 select
+                    #{item.id, jdbcType=VARCHAR} as "id",
                     #{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.optionOrder} as "optionOrder",
                     #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.createTime, jdbcType=TIMESTAMP} as "createTime",
-                    #{item.updateTime, jdbcType=TIMESTAMP} as "updateTime"
+                    #{item.createTime} as "createTime",
+                    #{item.updateTime} as "updateTime"
                 from dual
             </foreach>
 		) FFF

ims-service/sm-test/src/main/resources/mappings/sm/PubinfoDao.xml

@@ -1,326 +0,0 @@
-<?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.ims.sm.dao.PubinfoDao">
-
-	<sql id="pubinfoColumns">
-		a.id AS "id",
-		a.title AS "title",
-		a.descr AS "descr",
-		a.info_start_time AS "infoStartTime",
-		a.info_end_time AS "infoEndTime",
-		a.info_type AS "infoType",
-		a.notic AS "notic",
-		a.read_person AS "readPerson",
-		a.read_dep AS "readDep",
-		a.pic_name AS "picName",
-		a.is_active AS "isActive",
-		a.remark AS "remark",
-		a.create_by AS "createBy",
-		a.create_date AS "createDate",
-		a.update_by AS "updateBy",
-		a.update_date AS "updateDate"
-	</sql>
-
-	<sql id="pubinfoJoins">
-		LEFT JOIN ims_sys_user u8 ON u8.id = a.create_by
-	</sql>
-    <sql id="whereStr">
-			1=1
-		    <!-- 快速定位 -->
-			<if test="sqlMap.key != null and  sqlMap.key  != ''">
-			  AND (
-						( a.title LIKE treps_concat('%',#{sqlMap.key},'%')
-							)
-						OR( a.descr LIKE treps_concat('%',#{sqlMap.key},'%')
-							)
-			  )
-			</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="Pubinfo">
-		SELECT
-			<include refid="pubinfoColumns"/>
-		FROM pubinfo a
-		<include refid="pubinfoJoins"/>
-		WHERE a.id = #{id}
-	</select>
-
-	<select id="findList" resultType="Pubinfo">
-		SELECT
-			<include refid="pubinfoColumns"/>
-		FROM pubinfo a
-		<include refid="pubinfoJoins"/>
-		<where>
-              <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.update_date DESC
-			</otherwise>
-		</choose>
-	</select>
-
-	<select id="findAllList" resultType="Pubinfo">
-		SELECT
-			<include refid="pubinfoColumns"/>
-		FROM pubinfo a
-		<include refid="pubinfoJoins"/>
-		<where>
-			 <include refid="whereStr"/>
-		</where>
-		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY a.update_date DESC
-			</otherwise>
-		</choose>
-	</select>
-
-    <sql id="insertColumns">
-	        id,
-	        title,
-	        descr,
-	        info_start_time,
-	        info_end_time,
-	        info_type,
-	        notic,
-	        read_person,
-	        read_dep,
-	        pic_name,
-	        is_active,
-	        remark,
-	        create_by,
-	        create_date,
-	        update_by,
-	        update_date
-    </sql>
-
-	<insert id="insert">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('pubinfo','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO pubinfo(
-            <include refid="insertColumns"/>
-		) VALUES (
-			#{id
-, jdbcType=VARCHAR
-
-},
-			#{title
-, jdbcType=VARCHAR
-
-},
-			#{descr
-, jdbcType=VARCHAR
-
-},
-			#{infoStartTime, jdbcType=TIMESTAMP
-
-
-},
-			#{infoEndTime, jdbcType=TIMESTAMP
-
-
-},
-			#{infoType
-, jdbcType=VARCHAR
-
-},
-			#{notic
-, jdbcType=VARCHAR
-
-},
-			#{readPerson
-, jdbcType=VARCHAR
-
-},
-			#{readDep
-, jdbcType=VARCHAR
-
-},
-			#{picName
-, jdbcType=VARCHAR
-
-},
-			#{isActive
-, jdbcType=VARCHAR
-
-},
-			#{remark
-, jdbcType=VARCHAR
-
-},
-			#{createBy
-, jdbcType=VARCHAR
-
-},
-			#{createDate, jdbcType=TIMESTAMP
-
-
-},
-			#{updateBy
-, jdbcType=VARCHAR
-
-},
-			#{updateDate, jdbcType=TIMESTAMP
-
-
-}
-		)
-	</insert>
-
-	<insert id="insertList">
-        <selectKey keyProperty="id" resultType="String" order="BEFORE">
-          <choose>
-			<when test="id == null or  id  == ''">
-              select get_next_id('pubinfo','') from dual
-			</when>
-			<otherwise>
-			  select #{id} from dual
-			</otherwise>
-	      </choose>
-        </selectKey>
-		INSERT INTO pubinfo(
-		    <include refid="insertColumns"/>
-		) select FFF.* from (
-            <foreach collection="list" item="item" index="index" separator="UNION ALL" >
-                select
-                    #{item.id
-, jdbcType=VARCHAR
-
-} as "id",
-                    #{item.title
-, jdbcType=VARCHAR
-
-} as "title",
-                    #{item.descr
-, jdbcType=VARCHAR
-
-} as "descr",
-                    #{item.infoStartTime, jdbcType=TIMESTAMP
-
-
-} as "infoStartTime",
-                    #{item.infoEndTime, jdbcType=TIMESTAMP
-
-
-} as "infoEndTime",
-                    #{item.infoType
-, jdbcType=VARCHAR
-
-} as "infoType",
-                    #{item.notic
-, jdbcType=VARCHAR
-
-} as "notic",
-                    #{item.readPerson
-, jdbcType=VARCHAR
-
-} as "readPerson",
-                    #{item.readDep
-, jdbcType=VARCHAR
-
-} as "readDep",
-                    #{item.picName
-, jdbcType=VARCHAR
-
-} as "picName",
-                    #{item.isActive
-, jdbcType=VARCHAR
-
-} as "isActive",
-                    #{item.remark
-, jdbcType=VARCHAR
-
-} as "remark",
-                    #{item.createBy
-, jdbcType=VARCHAR
-
-} as "createBy",
-                    #{item.createDate, jdbcType=TIMESTAMP
-
-
-} as "createDate",
-                    #{item.updateBy
-, jdbcType=VARCHAR
-
-} as "updateBy",
-                    #{item.updateDate, jdbcType=TIMESTAMP
-
-
-} as "updateDate"
-                from dual
-            </foreach>
-		) FFF
-
-	</insert>
-
-	<update id="update">
-		UPDATE pubinfo SET
-			id = #{id},
-			title = #{title},
-			descr = #{descr},
-			info_start_time = #{infoStartTime},
-			info_end_time = #{infoEndTime},
-			info_type = #{infoType},
-			notic = #{notic},
-			read_person = #{readPerson},
-			read_dep = #{readDep},
-			pic_name = #{picName},
-			is_active = #{isActive},
-			remark = #{remark},
-			update_by = #{updateBy},
-			update_date = #{updateDate}
-		WHERE id = #{id
-, jdbcType=VARCHAR
-
-}
-	</update>
-
-	<update id="delete">
-		DELETE FROM pubinfo
-	    WHERE
-		<choose>
-			<when test="id != null and  id  != ''">
-					 id = #{id
-, jdbcType=VARCHAR
-
-}
-			</when>
-			<otherwise>
-			</otherwise>
-		</choose>
-	</update>
-
-</mapper>

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

@@ -87,6 +87,7 @@
 	</select>
 
     <sql id="insertColumns">
+	        id,
 	        report_title,
 	        des,
 	        publish_time,
@@ -110,6 +111,10 @@
 		INSERT INTO report(
             <include refid="insertColumns"/>
 		) VALUES (
+			#{id
+, jdbcType=VARCHAR
+
+},
 			#{reportTitle
 , jdbcType=VARCHAR
 
@@ -118,7 +123,7 @@
 , jdbcType=VARCHAR
 
 },
-			#{publishTime, jdbcType=TIMESTAMP
+			#{publishTime
 
 
 },
@@ -130,11 +135,11 @@
 , jdbcType=VARCHAR
 
 },
-			#{createTime, jdbcType=TIMESTAMP
+			#{createTime
 
 
 },
-			#{updateTime, jdbcType=TIMESTAMP
+			#{updateTime
 
 
 }
@@ -147,13 +152,14 @@
 		) select FFF.* from (
             <foreach collection="list" item="item" index="index" separator="UNION ALL" >
                 select
+                    #{item.id, jdbcType=VARCHAR} as "id",
                     #{item.reportTitle, jdbcType=VARCHAR} as "reportTitle",
                     #{item.des, jdbcType=VARCHAR} as "des",
-                    #{item.publishTime, jdbcType=TIMESTAMP} as "publishTime",
+                    #{item.publishTime} 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"
+                    #{item.createTime} as "createTime",
+                    #{item.updateTime} as "updateTime"
                 from dual
             </foreach>
 		) FFF