Merge branch 'dev_2307' of http://182.92.169.222:3000/zhc077/projectManagement into dev_2307

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -397,7 +397,8 @@ export default {
         deleteBatch: "/modulex/modulex/deleteBatch",
         exportXlsUrl: "/modulex/modulex/exportXls",
         importExcelUrl: "modulex/modulex/importExcel",
-
+        tablexImportExcelUrl: "tablex/tablex/importExcel",
+        ruleImportExcelUrl: "rulex/rulex/importExcel",
       },
       dictOptions: {},
       superFieldList: [],
@@ -422,7 +423,13 @@ export default {
     // 用计算属性取出columns的dataIndex，作为多选框的选项数据
     checkColumn: function () {
       return this.columns.map(item => item.title)
-    }
+    },
+  tablexImportExcelUrl: function(){
+    return `${window._CONFIG['domianURL']}/${this.url.tablexImportExcelUrl}`;
+  },
+    ruleImportExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.ruleImportExcelUrl}`
+    },
   },
   methods: {
     // 多选框的事件回调
@@ -626,6 +633,9 @@ export default {
       param.field = this.getQueryField()
       param.pageNo = this.ipagination.current
       param.pageSize = this.ipagination.pageSize
+      //模块管理 条件查询如果没有条件，则使用路由跳转值 ；直接点击模块管理则查询全部
+      if(param.projectId==null)
+        param.projectId = this.$route.query.project;
       //param.id=this.id;
       //!!!!!!!
       // param.projectId = this.$route.query.project;

ant-design-vue-jeecg/src/views/requiremententity/modules/RequirementEntityForm.vue

@@ -19,13 +19,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实体描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entityDescribe">
+            <a-form-model-item label="实体状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entityStatus">
-              <j-editor v-model="model.entityDescribe" />
+              <j-dict-select-tag type="radio" v-model="model.entityStatus" dictCode="entity_status" placeholder="请选择实体状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实体状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entityStatus">
+            <a-form-model-item label="实体描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entityDescribe">
-              <j-dict-select-tag type="radio" v-model="model.entityStatus" dictCode="entity_status" placeholder="请选择实体状态" />
+              <j-editor v-model="model.entityDescribe" />
             </a-form-model-item>
           </a-col>
         </a-row>

ant-design-vue-jeecg/src/views/task/modules/TaskForm.vue

@@ -16,13 +16,13 @@
               />
             </a-form-model-item>
           </a-col>
-          <!-- <a-col :span="24">
+<!--          <a-col :span="24">-->
-            <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">
+<!--            <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">-->
-              <j-dict-select-tag v-model="model.upperId" placeholder="请选择所属上级任务"
+<!--              <j-dict-select-tag v-model="model.upperId" placeholder="请选择所属上级任务"-->
-                                 dict-code="task,task_name,id" style="width: 100%">
+<!--                                 :dict-code="task" style="width: 100%">-->
-              </j-dict-select-tag>
+<!--              </j-dict-select-tag>-->
-            </a-form-model-item>
+<!--            </a-form-model-item>-->
-          </a-col> -->
+<!--          </a-col>-->
           <a-col :span="24" style="display: none;">
             <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperId">
               <a-input v-model="model.upperId" placeholder="请选择所属上级任务"></a-input>
@@ -76,23 +76,27 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
-              <!--              <a-input v-model="model.moduleId" placeholder="请输入模块"  ></a-input>-->
+              <!--              <a-input v-model="model.moduleId" placeholder="请输入模块"   modulex,module_name,id></a-input>-->
-              <j-dict-select-tag v-model="model.moduleId" placeholder="请选择模块" dict-code="modulex,module_name,id" style="width: 100%">
+              <j-dict-select-tag v-model="model.moduleId" placeholder="请选择模块" :dict-code="this.modulex"
-              </j-dict-select-tag>
+                                 style="width: 100%" @change="fillModuleName()"></j-dict-select-tag>
+              <a-button @click="handleAdd3" type="primary" icon="plus">新增模块</a-button>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="功能" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="functionId">
-              <!--              <a-input v-model="model.functionId" placeholder="请输入功能id"  ></a-input>-->
+              <!--              <a-input v-model="model.functionId" placeholder="请输入功能id"  functionx,function_name,id></a-input>-->
               <j-dict-select-tag v-model="model.functionId" placeholder="请选择功能"
-                                 dict-code="functionx,function_name,id"
+                                 :dict-code="functionx"
-                                 style="width: 100%"></j-dict-select-tag>
+                                 style="width: 100%" @change="fillFunctionName()"></j-dict-select-tag>
+              <a-button @click="handleAdd1" type="primary" icon="plus">新增功能</a-button>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="规则" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ruleId">
-              <!--              <a-input v-model="model.ruleId" placeholder="请输入规则id"  ></a-input>-->
+              <!--              <a-input v-model="model.ruleId" placeholder="请输入规则id"  rulex,rule_no,id></a-input>-->
-              <j-dict-select-tag v-model="model.ruleId" placeholder="请选择规则" dict-code="rulex,rule_no,id" style="width: 100%"></j-dict-select-tag>
+              <j-dict-select-tag v-model="model.ruleId" placeholder="请选择规则" :dict-code="rulex"
+                                 style="width: 100%"></j-dict-select-tag>
+              <a-button @click="handleAdd2" type="primary" icon="plus">新增规则</a-button>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -125,7 +129,7 @@
           <a-col :span="24">
             <a-form-model-item label="发布时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="publishTime">
               <!--              <j-date placeholder="请选择发布时间" v-model="model.publishTime" style="width: 100%"/>-->
-              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.publishTime" style="width: 100%"/>
+              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.startTime" style="width: 100%"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -166,6 +170,9 @@
         </a-row>
       </a-form-model>
     </j-form-container>
+    <modulex-modal ref="modalForm3" @ok="modalFormOk"></modulex-modal>
+    <functionx-modal ref="modalForm1" @ok="modalFormOk"></functionx-modal>
+    <rulex-modal ref="modalForm2" @ok="modalFormOk"></rulex-modal>
   </a-spin>
 </template>
 
@@ -176,12 +183,23 @@ import {httpAction, getAction} from '@api/manage'
 import {validateDuplicateValue} from '@/utils/util'
 import JVxeDateCell from "@comp/jeecg/JVxeTable/components/cells/JVxeDateCell";
 import JMultiSelectTag from "@/components/dict/JMultiSelectTag"
+import TaskModal from "@views/task/modules/TaskModal.vue";
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import {mixinDevice} from "@/utils/mixin";
+import modulexModal from "@views/modulex/modules/ModulexModal.vue";
+import FunctionxModal from "@views/functionx/modules/FunctionxModal__Style#Drawer.vue";
+import RulexModal from "@views/rulex/modules/RulexModal__Style#Drawer.vue";
 
 export default {
   name: 'TaskForm',
+  mixins: [JeecgListMixin, mixinDevice],
   components: {
+    RulexModal,
+    FunctionxModal,
+    modulexModal,
+    TaskModal,
     JVxeDateCell,
-    JMultiSelectTag
+    JMultiSelectTag,
   },
   props: {
     //表单禁用
@@ -193,6 +211,12 @@ export default {
   },
   data() {
     return {
+      modulex: "modulex,module_name,id",
+      functionx: "functionx,function_name,id",
+      rulex: "rulex,rule_no,id",
+      task: "task,task_name,id",
+      value: new Date(),
+
       model: {
         workLevel: 2,
         workStatus: 0,
@@ -318,6 +342,8 @@ export default {
     }
     ,
     fillTaskName() {
+      this.modulex = "modulex,module_name,id,project_id='"+this.model.projectId+"'";
+
       let that = this;
       let fillTaskName = "";
       let param = {
@@ -343,7 +369,31 @@ export default {
       }
     }
     ,
-
+    fillLevelName(){
+      this.task = "task,task_name,id,level='"+this.model.level+"'";
+    }
+    ,
+    handleAdd3: function () {
+      this.$refs.modalForm3.add();
+      this.$refs.modalForm3.title = "新增";
+      this.$refs.modalForm3.disableSubmit = false;
+    },
+    handleAdd1: function () {
+      this.$refs.modalForm1.add();
+      this.$refs.modalForm1.title = "新增";
+      this.$refs.modalForm1.disableSubmit = false;
+    },
+    handleAdd2: function () {
+      this.$refs.modalForm2.add();
+      this.$refs.modalForm2.title = "新增";
+      this.$refs.modalForm2.disableSubmit = false;
+    },
+    fillModuleName() {
+      this.functionx = "functionx,function_name,id,module_id='"+this.model.moduleId+"'";
+    },
+    fillFunctionName(){
+      this.rulex = "rulex,rule_no,id,function_id='"+this.model.functionId+"'";
+    },
 // 获取当前日期的方法
     getProjectNum() {
       const projectTime = new Date() // 当前中国标准时间

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/rulex/controller/RulexController.java

@@ -1,16 +1,23 @@
 package org.jeecg.modules.demo.rulex.controller;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.demo.functionx.entity.Functionx;
 import org.jeecg.modules.demo.functionx.mapper.FunctionxMapper;
+import org.jeecg.modules.demo.functionx.service.IFunctionxService;
 import org.jeecg.modules.demo.rulex.entity.RuleVo;
 import org.jeecg.modules.demo.rulex.entity.Rulex;
+import org.jeecg.modules.demo.rulex.mapper.RulexMapper;
 import org.jeecg.modules.demo.rulex.service.IRuleVoService;
 import org.jeecg.modules.demo.rulex.service.IRulexService;
 
@@ -19,16 +26,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.demo.rulex.util.DateValidator;
+import org.jeecg.modules.demo.rulex.util.DateValidatorUsingDateFormat;
 import org.jeecg.modules.fieldx.entity.Fieldx;
 import org.jeecg.modules.fieldx.service.IFieldxService;
 import org.jeecg.modules.modulex.entity.Modulex;
 import org.jeecg.modules.modulex.service.IModulexService;
+import org.jeecg.modules.system.entity.SysDict;
+import org.jeecg.modules.system.entity.SysDictItem;
+import org.jeecg.modules.system.mapper.SysDictItemMapper;
 import org.jeecg.modules.tablex.entity.Tablex;
 import org.jeecg.modules.tablex.service.ITablexService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -54,7 +69,10 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
 	 private IRuleVoService iRuleVoService;
 	 @Autowired
 	 FunctionxMapper functionxMapper;
-
+	 @Autowired
+	 IFunctionxService functionxService;
+	 @Autowired
+	 RulexMapper rulexMapper;
 	 @Autowired
 	 IFieldxService iFieldxService;
 	 @Autowired
@@ -62,6 +80,12 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
 	 @Autowired
 	 IModulexService iModulexService;
 
+	 @Autowired
+	 RulexController rulexController;
+
+	 @Autowired
+	 private SysDictItemMapper sysDictItemMapper;
+
 
 	 /**
 	 * 分页列表查询
@@ -205,13 +229,16 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, Rulex.class);
+
+		return rulexController.preImportAndExcel(request);
     }
+	 @Transactional
 	 public Result<?> preImportAndExcel(HttpServletRequest request)  {
 		 //return super.importExcel(request, response, ScTeams.class);
 		 MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		 Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-
+		 //校验时间
+		 final DateValidator validator = new DateValidatorUsingDateFormat("yyyy-MM-dd hh:mm:ss");
 		 for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
 			 System.err.println("----------------------------------------------");
 			 // 获取上传文件对象
@@ -233,37 +260,37 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
 				 System.out.println("List<ScTeams> list = ExcelImportUtil.importExcel: " + list);
 				 int num = 0;
 				 for (int i = 0; i < list.size(); i++) {
-					 if (list.size() > 0 &&
+					 if (
-							 list.get(i).getRuleNo() == null &&
+							 //excel出现必要值未填该行直接跳过
-							 list.get(i).getRuleCode() == null &&
+							 list.get(i).getRuleNo() == null ||
-							 list.get(i).getPmDescribe() == null &&
+							 list.get(i).getRuleCode() == null ||
-							 list.get(i).getModuleId() == null &&
+//							 list.get(i).getPmDescribe() == null &&
-							 list.get(i).getFunctionId() == null &&
+							 list.get(i).getModuleId() == null ||
-							 list.get(i).getDiagrams() == null &&
+							 list.get(i).getFunctionId() == null ||
-							 list.get(i).getTableId() == null &&
+//							 list.get(i).getDiagrams() == null &&
-							 list.get(i).getFieldId() == null &&
+							 list.get(i).getTableId() == null ||
-							 list.get(i).getManagerUsers() == null &&
+							 list.get(i).getFieldId() == null ||
-							 list.get(i).getWorkLevel() == null &&
+							 list.get(i).getManagerUsers() == null ||
-							 list.get(i).getWorkStatus() == null &&
+							 list.get(i).getWorkLevel() == null ||
-							 list.get(i).getStartTime() == null &&
+							 list.get(i).getWorkStatus() == null ||
-							 list.get(i).getManagerUsers() == null &&
+//							 list.get(i).getStartTime() == null &&
-							 list.get(i).getDuration() == null &&
+//							 list.get(i).getManagerUsers() == null &&
-							 list.get(i).getSubmitTime() == null &&
+//							 list.get(i).getDuration() == null &&
+//							 list.get(i).getSubmitTime() == null &&
 							 list.get(i).getRealDuration() == null&&
-							 list.get(i).getStatus() == null&&
+							 list.get(i).getStatus() == null||
-							 list.get(i).getVerisonStatus() == null&&
+							 list.get(i).getVerisonStatus() == null||
 							 list.get(i).getVerison() == null) {
 						 continue;
 					 }
-					 iRuleVoService.save(list.get(i));
+					 num++;
 					 if (num == 0) {
 						 return Result.error("文件导入失败:导入模板不匹配");
-					 } else {
+//					 } else if (num!=list.size()) {
-						 return Result.ok("文件导入成功！");
+//						 return Result.error("文件导入失败:请检查填写文字");
 					 }
+					 iRuleVoService.save(list.get(i));
 				 }
-
-
 			 }catch (Exception e) {
 				 //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
 				 String msg = e.getMessage();
@@ -285,69 +312,187 @@ public class RulexController extends JeecgController<Rulex, IRulexService> {
 		 }
 		 List<RuleVo> ruleVoList = iRuleVoService.list();
 		 if (ruleVoList.size()<=0||ruleVoList==null){
-			 return Result.error("文件导入失败");
+			 return Result.error("文件导入失败,模板不匹配");
 		 }
 		 for (int i = 0; i < ruleVoList.size(); i++) {
+			 Rulex rulex = new Rulex();
 			 RuleVo ruleVo = ruleVoList.get(i);
 			 //对应字段
 			 String fieldId = ruleVo.getFieldId();
-			 Fieldx byId = iFieldxService.getById(fieldId);
+			 LambdaQueryWrapper<Fieldx> rulexLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 rulexLambdaQueryWrapper.eq(Fieldx::getFieldName, fieldId);
+			 Fieldx byId = iFieldxService.getOne(rulexLambdaQueryWrapper);
 			 if (byId == null) {
+				 iRuleVoService.remove(null);
 				 return Result.error("字段输入错误,请核对");
 			 }
+			 rulex.setFieldId(byId.getId());
 			 //对应功能
-			 String functionId = ruleVo.getFunctionId();
+			 String functionName = ruleVo.getFunctionId();
-			 Fieldx byId1 = iFieldxService.getById(functionId);
+			 LambdaQueryWrapper<Functionx> functionxLambdaQueryWrapper = new LambdaQueryWrapper<Functionx>();
+			 functionxLambdaQueryWrapper.eq(Functionx::getFunctionName, functionName);
+			 Functionx byId1 = functionxService.getOne(functionxLambdaQueryWrapper);
 			 if (byId1 == null) {
+				 iRuleVoService.remove(null);
 				 return Result.error("功能输入错误,请核对");
 			 }
+			 rulex.setFunctionId(byId1.getId());
 			 //对应模块
-			 String moduleId = ruleVo.getModuleId();
+			 String moduleName = ruleVo.getModuleId();
-			 Modulex byId2 = iModulexService.getById(moduleId);
+			 LambdaQueryWrapper<Modulex> modulexLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 modulexLambdaQueryWrapper.eq(Modulex::getModuleName, moduleName);
+			 Modulex byId2 = iModulexService.getOne(modulexLambdaQueryWrapper);
 			 if (byId2 == null) {
+				 iRuleVoService.remove(null);
+
 				 return Result.error("模块输入错误,请核对");
 			 }
+			 rulex.setModuleId(byId2.getId());
 			 //对应实体
 			 String tableId = ruleVo.getTableId();
-			 Tablex byId3 = iTablexService.getById(tableId);
+			 LambdaQueryWrapper<Tablex> tableLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 tableLambdaQueryWrapper.eq(Tablex::getTableName, tableId);
+			 Tablex byId3 = iTablexService.getOne(tableLambdaQueryWrapper);
 			 if (byId3 == null) {
+				 iRuleVoService.remove(null);
+
 				 return Result.error("实体输入错误,请核对");
 			 }
+			 rulex.setTableId(byId3.getId());
+			 Double aDouble = null;
 			 try {
-				 Double.valueOf(ruleVo.getDuration());
+				 if (aDouble != null)
+					 aDouble = Double.valueOf(ruleVo.getDuration());
+				 rulex.setDuration(aDouble);
 			 } catch (Exception e) {
+				 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+
 				 return Result.error("任务时长输入错误,请核对");
 			 }
 
+			 Double d;
 			 try {
-				 Integer.valueOf(ruleVo.getRealDuration());
+				 d = Double.valueOf(ruleVo.getRealDuration());
 			 } catch (Exception e) {
+				 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+
 				 return Result.error("实际时长输入错误,请核对");
 			 }
-
+			 rulex.setRealDuration(d);
+			 Integer integer;
 			 try {
-				 Integer.valueOf(ruleVo.getWorkLevel());
+				 integer = Integer.valueOf(ruleVo.getWorkLevel());
 			 } catch (Exception e) {
+				 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+
 				 return Result.error("任务等级输入错误,请核对");
 			 }
-			 try {
+			 rulex.setWorkLevel(integer);
-				 Double.valueOf(ruleVo.getWorkStatus());
+			 String workStatus = ruleVo.getWorkStatus();
-			 }catch (Exception e){
+			 LambdaQueryWrapper<SysDictItem> sysDictItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+			 sysDictItemLambdaQueryWrapper.eq(SysDictItem::getItemText, workStatus).eq(SysDictItem::getDictId,"1645268542514421762");
+			 SysDictItem sysDictItem = sysDictItemMapper.selectOne(sysDictItemLambdaQueryWrapper);
+			 if (sysDictItem == null){
+				 iRuleVoService.remove(null);
 				 return Result.error("任务状态输入错误,请核对");
 			 }
+
+			 rulex.setWorkStatus(Integer.valueOf(sysDictItem.getItemValue()));
+
+			 String status = ruleVo.getStatus();
+			 LambdaQueryWrapper<SysDictItem> sysDictItemLambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+			 sysDictItemLambdaQueryWrapper2.eq(SysDictItem::getItemText, status).eq(SysDictItem::getDictId,"1645264493205491713");
+			 SysDictItem sysDictItem2 = sysDictItemMapper.selectOne(sysDictItemLambdaQueryWrapper2);
+			 if (sysDictItem2 == null){
+				 iRuleVoService.remove(null);
+				 return Result.error("规则状态输入错误,请核对");
+			 }
+
+
+			 rulex.setStatus(Integer.valueOf(sysDictItem2.getItemValue()));
+			 String verisonStatus = ruleVo.getVerisonStatus();
+			 LambdaQueryWrapper<SysDictItem> sysDictItemLambdaQueryWrapper3 = new LambdaQueryWrapper<>();
+			 sysDictItemLambdaQueryWrapper3.eq(SysDictItem::getItemText, verisonStatus);
+			 SysDictItem sysDictItem3 = sysDictItemMapper.selectOne(sysDictItemLambdaQueryWrapper3);
+			 if (sysDictItem3 == null) {
+				 iRuleVoService.remove(null);
+				 return Result.error("版本状态输入错误,请核对");
+			 }
+
+			 rulex.setVerisonStatus(Integer.valueOf(sysDictItem3.getItemValue()));
+
+			 //String转Date
+			 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
 			 try {
-				 Integer.valueOf(ruleVo.getStatus());
+				 String startTime = ruleVo.getStartTime();
-			 }catch (Exception e){
+				 if (startTime != null)
-				 return Result.error("规则输入错误,请核对");
+					 if (!validator.isValid(startTime)){
+						 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+						 return Result.error("开始时间输入错误");
 					 }
+
+					 else {
+						 Date date = simpleDateFormat.parse(startTime);
+						 rulex.setStartTime(date);
+					 }
+				 String submitTime = ruleVo.getSubmitTime();
+				 if (submitTime != null)
+					 if (!validator.isValid(submitTime)){
+						 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
+						 return Result.error("提交时间输入错误");
+					 }
+
+					 else {
+						 Date date1 = simpleDateFormat.parse(submitTime);
+						 rulex.setSubmitTime(date1);
+					 }
+			 } catch (ParseException e) {
+				 e.printStackTrace();
+			 }
+
+			 //规则序号
+			 String ruleNo = ruleVo.getRuleNo();
+			 List<String> list = rulexMapper.checkRuleNo(byId1.getId());
+			 if (list.contains(ruleNo)) {
+				 iRuleVoService.remove(null);
+				 return Result.error("规则序号已存在");
+			 }
+			 rulex.setRuleNo(ruleNo);
+			 //规则编码
+			 String ruleCode = ruleVo.getRuleCode();
+			 Functionx functionxServiceById = functionxService.getById(byId1.getId());
+			 String functionCode = functionxServiceById.getFunctionCode();
+//			 if (!ruleCode.matches(functionCode))
+//			 return Result.error("规则编码错误");
+			 rulex.setRuleCode(functionCode);
+			 //规则描述
+			 String pmDescribe = ruleVo.getPmDescribe();
+			 if (pmDescribe != null)
+				 rulex.setPmDescribe(pmDescribe);
+			 //分析图
+			 String diagrams = ruleVo.getDiagrams();
+			 if (diagrams != null)
+				 rulex.setDiagrams(diagrams);
+			 //版本号
+			 Integer integer1;
 			 try {
-				 Double.valueOf(ruleVo.getVerisonStatus());
+				 integer1 = Integer.valueOf(ruleVo.getVerison());
 			 } catch (Exception e) {
-				 return Result.error("版本状态输入错误,请核对");
+				 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); //手动回滚，这样上层就无需去处理异常了
-			 }
 
+				 return Result.error("版本号输入错误,请核对");
+			 }
+			 rulex.setVerison(String.valueOf(integer1));
+			 //责任人、
+			 String managerUsers = ruleVo.getManagerUsers();
+			 if (managerUsers != null)
+				 rulex.setManagerUsers(managerUsers);
+			 //存入真实表
+			 rulexService.save(rulex);
+             iRuleVoService.remove(null);
 		 }
-		 return Result.error("文件导入失败！");
+		 return Result.ok("文件导入成功！");
 
 	 }
 	 @GetMapping(value = "/sort")