评价基础分值增加校验

td-service/td-apps/src/main/java/com/minto/web/td/TdByTypeController.java

@@ -3979,6 +3979,20 @@ public class TdByTypeController extends TdBaseController {
             ///上面去查詢一遍，不懂
             Long curUserId=token.getUser().getId();
             JSONObject data = JSONObject.parseObject(ReqUtil.getString(request, "summaryData"));
+
+            //特殊处理下字段
+            Object field_51 = data.get("field_51");
+            if (null != field_51){
+                String regex = "^[+]{0,1}([0-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\\.\\d+)$|^[+]{0,1}([0]\\.(?!0+$)\\d{1,})$";
+                boolean matches = field_51.toString().matches(regex);
+                if (!matches){
+                    result.put("state","error");
+                    result.put("message", "评价基础分值仅限为非负数字，允许小数");
+                    RespUtil.rendJson(response,result);
+                    return null;
+                }
+            }
+
             //创建TaskBO 使用原任务保存方式，直接通过TaskBO进行保存
             TaskBO taskBO = new TaskBO();
             Boolean isEdit = ReqUtil.getBoolean(request, "isEdit", false);
@@ -5653,6 +5667,20 @@ public class TdByTypeController extends TdBaseController {
             Integer status = ReqUtil.getInt(request, "status", 1);
             // Integer reportSatus = ReqUtil.getInt(request,"reportSatus",0);
             Map data = TaskByTypeUtil.transSummaryData(ReqUtil.getString(request, "summaryData"));
+
+            //特殊处理下字段
+            Object field_51 = data.get("field_51");
+            if (null != field_51){
+                String regex = "^[+]{0,1}([0-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\\.\\d+)$|^[+]{0,1}([0]\\.(?!0+$)\\d{1,})$";
+                boolean matches = field_51.toString().matches(regex);
+                if (!matches){
+                    result.put("state","error");
+                    result.put("message", "评价基础分值仅限为非负数字，允许小数");
+                    RespUtil.rendJson(response,result);
+                    return null;
+                }
+            }
+
             //创建TaskBO 使用原任务保存方式，直接通过TaskBO进行保存
             TaskBO taskBO = new TaskBO();
             Boolean isEdit = ReqUtil.getBoolean(request, "isEdit", false);
@@ -5964,6 +5992,20 @@ public class TdByTypeController extends TdBaseController {
             Integer status = ReqUtil.getInt(request, "status", 1);
             // Integer reportSatus = ReqUtil.getInt(request,"reportSatus",0);
             Map data = TaskByTypeUtil.transSummaryData(ReqUtil.getString(request, "summaryData"));
+
+            //特殊处理下字段
+            Object field_51 = data.get("field_51");
+            if (null != field_51){
+                String regex = "^[+]{0,1}([0-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\\.\\d+)$|^[+]{0,1}([0]\\.(?!0+$)\\d{1,})$";
+                boolean matches = field_51.toString().matches(regex);
+                if (!matches){
+                    result.put("state","error");
+                    result.put("message", "评价基础分值仅限为非负数字，允许小数");
+                    RespUtil.rendJson(response,result);
+                    return null;
+                }
+            }
+
             //创建TaskBO 使用原任务保存方式，直接通过TaskBO进行保存
             TaskBO taskBO = new TaskBO();
             Boolean isEdit = ReqUtil.getBoolean(request, "isEdit", false);

tip-front/src/main/java/com/minto/app/task/controller/TaskByTypeController.java

@@ -3249,6 +3249,20 @@ public class TaskByTypeController extends BaseController{
             param.setStatus(status);
             // Integer reportSatus = ReqUtil.getInt(request,"reportSatus",0);
             Map data = TaskByTypeUtil.transSummaryData(ReqUtil.getString(request,"summaryData"));
+
+            //特殊处理下字段
+            Object field_51 = data.get("field_51");
+            if (null != field_51){
+                String regex = "^[+]{0,1}([0-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\\.\\d+)$|^[+]{0,1}([0]\\.(?!0+$)\\d{1,})$";
+                boolean matches = field_51.toString().matches(regex);
+                if (!matches){
+                    result.put("state","error");
+                    result.put("message", "评价基础分值仅限为非负数字，允许小数");
+                    RespUtil.rendJson(response,result);
+                    return;
+                }
+            }
+
             String tempData = ReqUtil.getString(request,"tempData");
             if (!Objects.equals(tempData,"")&&tempData!=null){
                 data.put("tempData", JsonUtil.parseObject(tempData));
@@ -7744,7 +7758,7 @@ public class TaskByTypeController extends BaseController{
             Integer pageSize = PageUtil.setRangSize(request, 15);
             Integer start = PageUtil.getStartPageIndex(request);
             Map<String,Object> map = getLogWhereMap(request,result);
-            
+
             var taskId = ParameterUtil.getLong(map, "resId");
             if(taskId != null){
                 //查询子任务
@@ -18461,7 +18475,7 @@ public class TaskByTypeController extends BaseController{
         }
         return flag;
     }
-    
+
     private Double dealCountEconomic(Object total_economic) {
         Double economic=0d;
         try{

tip-front/src/main/java/com/minto/app/task/controller/TaskByTypeProcessController.java

@@ -1018,7 +1018,7 @@ public class TaskByTypeProcessController extends BaseController {
 
                 }
             });
-            
+
             //暂存的进展情况不发事件
             if (!String.valueOf(TaskEnum.TaskReportStatus.save.getKey()).equals(reportStatus)){
                 Map<String, Object> returnMap = new HashMap<>();
@@ -1657,7 +1657,7 @@ public class TaskByTypeProcessController extends BaseController {
         Long pid=AppContext.currentUserId();
         Long cid=AppContext.currentLoginCorporation();
         String extendFields="";
-        
+
         Long taskType = ReqUtil.getLong(request,"taskType");
         TaskSummaryBean taskSummaryBean = taskManager.findTaskSummaryBeanById(taskId);
         TaskTypeBean taskTypeBean = taskManager.findTaskTypeBeanByTaskId(taskId);
@@ -1841,8 +1841,8 @@ public class TaskByTypeProcessController extends BaseController {
                                 notShow = true;
                             }
                         }
-                        
-                        
+
+
                         map.put("notShow",notShow);
                         if(/*resourceId.contains(memberBean.getResourceId()) && */taskReportBean.getMemberId().equals(memberBean.getId())){
 
@@ -2793,8 +2793,8 @@ public class TaskByTypeProcessController extends BaseController {
                         }
                     }
                 }
-                
-                
+
+
                 List<TaskMemberBean> taskMember = taskManager.findTaskmemberByTaskIdsAndResourceId(taskIdArray,deptId);
                 if (CollectionUtil.isNotEmpty(taskMember)){
                     //如果是催办汇报
@@ -3156,6 +3156,20 @@ public class TaskByTypeProcessController extends BaseController {
             Long curUserId = AppContext.currentUserId();
             Long taskType = ReqUtil.getLong(request,"category");//任务类型
             Map data = TaskByTypeUtil.transSummaryData(ReqUtil.getString(request,"summaryData"));
+
+            //特殊处理下字段
+            Object field_51 = data.get("field_51");
+            if (null != field_51){
+                String regex = "^[+]{0,1}([0-9][0-9]{0,})$|^[+]{0,1}([1-9][0-9]{0,}\\.\\d+)$|^[+]{0,1}([0]\\.(?!0+$)\\d{1,})$";
+                boolean matches = field_51.toString().matches(regex);
+                if (!matches){
+                    result.put("state","error");
+                    result.put("message", "评价基础分值仅限为非负数字，允许小数");
+                    RespUtil.rendJson(response,result);
+                    return;
+                }
+            }
+
             String departData = ReqUtil.getString(request,"summaryDepartData",null);
             //1.根据事项id获取原始数据，并且将事项状态修改为“未签收”
                 TaskSummaryBean summary = taskManager.findTaskSummaryBeanById(id);
@@ -3381,7 +3395,7 @@ public class TaskByTypeProcessController extends BaseController {
             //检查是否新增了督办人
             dealNewMembers(taskMemberBeans, TaskEnum.TaskMemberRelTypeEnum.Supervise, relationMap);
             newMembers.addAll(taskMemberBeans);
-            
+
             //4.评价人，默认值为督办人
             taskMemberBeans = TaskBO.taskAddMember(id, ReqUtil.getString(request, "commentPersonId",
                     ReqUtil.getString(request, "supervise")),
@@ -3741,7 +3755,7 @@ public class TaskByTypeProcessController extends BaseController {
             }
         }
     }
-    
+
     /**
      * 汇报模版字段获取
      * @param request