|
|
@@ -2729,7 +2729,21 @@ public class TaskByTypeController extends BaseController{
|
|
|
Integer isTaskSon = ReqUtil.getInt(request,"isTaskSon",null);
|
|
|
|
|
|
List<Map> datas = TaskByTypeUtil.transSummaryDatas(ReqUtil.getString(request,"summaryData"));
|
|
|
+
|
|
|
if(CollectionUtil.isNotEmpty(datas)){
|
|
|
+ //特殊处理下字段
|
|
|
+ Object field_51 = datas.get(0).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;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// 查询事项类型绑定的默认角色
|
|
|
Map<TaskEnum.TaskMemberRelTypeEnum,List<CommonResourceRelationBean>> defaultTaskMember = Maps.newHashMap();
|
|
|
CommonResourceRelationBO commonResourceRelationBO = resourceManager.findRelationships(cid, ResourceTypeEnum.TaskType.getKey(),taskType,null, ResourceRelationTypeEnum.TaskTypeTaskRoleMember.getKey());
|
|
|
@@ -3070,6 +3084,12 @@ public class TaskByTypeController extends BaseController{
|
|
|
//快捷新建生成待办
|
|
|
taskManager.saveTaskWaiteDoBeans(Arrays.asList(taskBO.getSummaryBean()),null);
|
|
|
|
|
|
+ //保存事项关联指标类型
|
|
|
+ if (data.containsKey("type_setting")){
|
|
|
+ Object typeSetting = data.get("type_setting");
|
|
|
+ taskTypeSettingManager.saveListByTypeSettingStr(pid,id,typeSetting.toString());
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
if(isTaskSon != null){
|
|
|
for (TaskMemberBean bean:taskMemberBeans) {
|
zhaoq