Merge remote-tracking branch 'origin/dev_2307' into dev_2307

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

@@ -5,15 +5,8 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="上级任务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperName">
-              <j-popup
+              <j-popup v-model="model.upperTaskName" field="upperTaskName" org-fields="id,task_name"
-                v-model="model.upperTaskName"
+                dest-fields="upperId,upperTaskName" code="taskname" :multi="true" @input="popupCallback" />
-                field="upperTaskName"
-                org-fields="id,task_name"
-                dest-fields="upperId,upperTaskName"
-                code="taskname"
-                :multi="true"
-                @input="popupCallback"
-              />
             </a-form-model-item>
           </a-col>
           <!--          <a-col :span="24">-->
@@ -31,7 +24,8 @@
           <a-col :span="24">
             <a-form-model-item label="任务等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workLevel">
               <!--              <a-input-number :min="1" :max="16" v-model="model.workLevel" placeholder="请输入任务等级" style="width: 100%" />-->
-              <j-dict-select-tag v-model="model.workLevel" type="radio" placeholder="请选择任务等级" dict-code="workLevel" style="width: 100%">
+              <j-dict-select-tag v-model="model.workLevel" type="radio" placeholder="请选择任务等级" dict-code="workLevel"
+                style="width: 100%">
               </j-dict-select-tag>
             </a-form-model-item>
 
@@ -62,13 +56,8 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
-              <j-dict-select-tag
+              <j-dict-select-tag v-model="model.projectId" placeholder="请选择项目" dict-code="projectx,project_name,id"
-                v-model="model.projectId"
+                style="width: 100%" :disabled="model.typeId == null" @change="fillTaskName">
-                placeholder="请选择项目"
-                dict-code="projectx,project_name,id"
-                style="width: 100%"
-                :disabled="model.typeId==null"
-                @change="fillTaskName" >
               </j-dict-select-tag>
             </a-form-model-item>
           </a-col>
@@ -78,32 +67,29 @@
               <!--                       autocomplete="on" -->
               <!--                       :disabled="model.typeId==null">-->
               <!--              </a-input>-->
-              <a-textarea v-model="model.taskName"
+              <a-textarea v-model="model.taskName" placeholder="请输入中文名称" autocomplete="on"
-                          placeholder="请输入中文名称"
+                :disabled="model.typeId == null" auto-size />
-                          autocomplete="on"
-                          :disabled="model.typeId==null"
-                          auto-size />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="责任人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="managerUsers">
-              <j-multi-select-tag type="list_multi" v-model="model.managerUsers" dictCode="sys_user,realname,id" placeholder="请选择责任人"/>
+              <j-multi-select-tag type="list_multi" v-model="model.managerUsers" dictCode="sys_user,realname,id"
+                placeholder="请选择责任人" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
               <!--              <a-input v-model="model.moduleId" placeholder="请输入模块"   modulex,module_name,id></a-input>-->
-              <j-dict-select-tag v-model="model.moduleId" placeholder="请选择模块" :dict-code="this.modulex"
+              <j-dict-select-tag v-model="model.moduleId" placeholder="请选择模块" :dict-code="this.modulex" style="width: 80%"
-                                 style="width: 80%" @change="fillModuleName()"></j-dict-select-tag>
+                @change="fillModuleName()"></j-dict-select-tag>
               <a-button @click="handleAdd3" type="primary" icon="plus" style="width: 20%;"></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"  functionx,function_name,id></a-input>-->
-              <j-dict-select-tag v-model="model.functionId" placeholder="请选择功能"
+              <j-dict-select-tag v-model="model.functionId" placeholder="请选择功能" :dict-code="functionx" style="width: 80%"
-                                 :dict-code="functionx"
+                @change="fillFunctionName()"></j-dict-select-tag>
-                                 style="width: 80%" @change="fillFunctionName()"></j-dict-select-tag>
               <a-button @click="handleAdd1(model.moduleId)" type="primary" icon="plus" style="width: 20%;"></a-button>
             </a-form-model-item>
           </a-col>
@@ -112,7 +98,8 @@
               <!--              <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"
                 style="width: 80%"></j-dict-select-tag>
-              <a-button @click="handleAdd2(model.functionId,model.moduleId)" type="primary" icon="plus" style="width: 20%;"></a-button>
+              <a-button @click="handleAdd2(model.functionId, model.moduleId)" type="primary" icon="plus"
+                style="width: 20%;"></a-button>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -143,13 +130,14 @@
           <a-col :span="24">
             <a-form-model-item label="预计结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expectedEndTime">
               <!--              <j-date placeholder="请选择预计结束时间" v-model="model.expectedEndTime" style="width: 100%"/>-->
-              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.expectedEndTime" style="width: 100%"/>
+              <a-date-picker showTime valueFormat="YYYY-MM-DD HH:mm:ss" v-model="model.expectedEndTime"
+                style="width: 100%"  />
 
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="预计时长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="expectedDuration">
-              <a-input-number v-model="model.expectedDuration" placeholder="请输入预计时长" style="width: 100%"/>
+              <a-input-number v-model="model.expectedDuration" placeholder="请输入预计时长" style="width: 100%"  @blur="expectedDuration()"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -326,7 +314,8 @@ export default {
         // queryTaskTypeById: "/taskType/taskType/queryById",
         fillTaskName: "/task/task/fillTaskName",
         list: "/task/task/list",
-        listtasktype: '/taskType/taskType/getTypeMap'
+        listtasktype: '/taskType/taskType/getTypeMap',
+        expectedDuration: '/task/task/estimateTime'
 
       }
     }
@@ -343,6 +332,16 @@ export default {
     this.tasktype()
   },
   methods: {
+    expectedDuration() {
+
+      let param = {
+        startTime: this.model.startTime,
+        expectedDuration: this.model.expectedDuration,
+      }
+      getAction(this.url. expectedDuration, param).then((res) => {
+        this.model.expectedEndTime=res.result
+      })
+    },
     tasktype() {
       getAction(this.url.listtasktype).then((res) => {
         const data = res.result;
@@ -505,11 +504,12 @@ export default {
   flex-wrap: wrap;
   align-items: baseline;
 }
+
 .B {
   width: 10%;
 }
+
 ::v-deep .ant-radio-group {
   width: 85%;
 }
-
 </style>

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/entity/FunctionxTest.java

@@ -24,8 +24,7 @@ public class FunctionxTest implements Serializable {
     /**
      * 对应上级模块
      */
-    @TableField("p_module_name")
+    private String project;
-    private String pModuleName;
 
     /**
      * 对应模块
@@ -45,7 +44,7 @@ public class FunctionxTest implements Serializable {
     /**
      * 功能编码
      */
-    private String functionCode;
+//    private String functionCode;
 
     /**
      * 功能类型

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/functionx/service/impl/FunctionXTestServiceImpl.java

@@ -23,13 +23,14 @@ import org.jeecg.modules.modulex.entity.Modulex;
 import org.jeecg.modules.modulex.service.IModulexService;
 import org.jeecg.modules.projectUserRole.entity.ProjectUserRole;
 import org.jeecg.modules.projectUserRole.service.IProjectUserRoleService;
+import org.jeecg.modules.projectx.entity.Projectx;
+import org.jeecg.modules.projectx.service.IProjectxService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
-import org.jeecg.modules.tablex.vo.TablexVo;
 import org.jeecg.modules.tablex.ws.WebSocketUtils;
-import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -49,8 +50,11 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
     private ISysUserService sysUserService;
     @Autowired
     private WebSocketUtils webSocketUtils;
+    @Autowired
+    private IProjectxService projectxService;
 
     @Override
+    @Transactional
     public Result<?> importExcel(MultipartFile file) {
 
         // 获取当前操作用户
@@ -137,46 +141,51 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
                     }
                     //------------接收-------------
                     FunctionxTest fun = new FunctionxTest();
-                    fun.setPModuleName(list.get(0));
+                    fun.setProject(list.get(0));   // 对应项目
                     fun.setModuleName(list.get(1));    // 对应模块
                     fun.setFunctionName(list.get(2));   // 中文名称
                     fun.setFunctionEnName(list.get(3));   // 英文名称
-                    fun.setFunctionCode(list.get(4));    // 功能编码
+//                    fun.setFunctionCode(list.get(4));    // 功能编码
-                    fun.setFunctionType(list.get(5));    // 功能类型
+                    fun.setFunctionType(list.get(4));    // 功能类型
-                    fun.setPmDescribe(list.get(6));      // 功能描述
+                    fun.setPmDescribe(list.get(5));      // 功能描述
-                    fun.setUserRole(list.get(7));        // 用户角色
+                    fun.setUserRole(list.get(6));        // 用户角色
-                    fun.setManagerUsers(list.get(8));    // 责任人
+                    fun.setManagerUsers(list.get(7));    // 责任人
-                    fun.setWorkLevel(list.get(9));       // 任务等级
+                    fun.setWorkLevel(list.get(8));       // 任务等级
-                    fun.setWorkStatus(list.get(10));      // 任务状态
+                    fun.setWorkStatus(list.get(9));      // 任务状态
-                    fun.setPublishTime(list.get(11));     // 发布时间
+                    fun.setPublishTime(list.get(10));     // 发布时间
-                    fun.setStartTime(list.get(12));       // 开始时间
+                    fun.setStartTime(list.get(11));       // 开始时间
-                    fun.setDuration(list.get(13));        // 任务时长
+                    fun.setDuration(list.get(12));        // 任务时长
-                    fun.setSubmitTime(list.get(14));      // 提交时间
+                    fun.setSubmitTime(list.get(13));      // 提交时间
-                    fun.setRealDuration(list.get(15));    // 实际时长
+                    fun.setRealDuration(list.get(14));    // 实际时长
-                    fun.setStatus(list.get(16));          // 功能状态
+                    fun.setStatus(list.get(15));          // 功能状态
-                    fun.setVerisonStatus(list.get(17));   // 版本状态
+                    fun.setVerisonStatus(list.get(16));   // 版本状态
-                    fun.setVerison(list.get(18));         // 版本号
+                    fun.setVerison(list.get(17));         // 版本号
                     fun.setCreatName(username);
 
                     listVo.add(fun);
                 }
             }
-            boolean isSuccessSave = this.saveBatch(listVo);
+
-            if (!isSuccessSave) {
+            LambdaQueryWrapper<FunctionxTest> queryWrapper = new LambdaQueryWrapper<>();
-                message.put("isError", "true");
+            queryWrapper.eq(username != null, FunctionxTest::getCreatName, username);
-                message.put("status", "文件读入失败");
+
-                message.put("closeable", "true");
+            int isSaveTestSuccess = saveTest(listVo);
-                webSocketUtils.sendMessage(loginUser.getId(), message);
+            List<FunctionxTest> list = this.list(queryWrapper);
-                return Result.error("文件读入失败");
+//            if (isSaveTestSuccess != -1){
-            }
+//                this.remove(queryWrapper);
+//                message.put("isError", "true");
+//                message.put("status", "第" + (isSaveTestSuccess+1) + "行中文名或英文名有重复");
+//                message.put("closeable", "true");
+//                webSocketUtils.sendMessage(loginUser.getId(), message);
+//                return Result.error("中文名或英文名有重复");
+//            }
+
 
             message.put("status", "数据校验");
             webSocketUtils.sendMessage(loginUser.getId(), message);
 
             //************************具体字段校验******************************
-            LambdaQueryWrapper<FunctionxTest> queryWrapper = new LambdaQueryWrapper<>();
+
-            queryWrapper.eq(username != null, FunctionxTest::getCreatName, username);
-            List<FunctionxTest> list = this.list(queryWrapper);
 
             boolean remove = this.remove(queryWrapper);
             if (!remove) {
@@ -193,11 +202,11 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
             for (int i = 0; i < list.size(); i++) {
                 FunctionxTest function = list.get(i);
                 Functionx functionx = new Functionx();
-                String pModuleId = function.getPModuleName();
+                String project = function.getProject();
                 String moduleId = function.getModuleName();
                 String functionName = function.getFunctionName();
                 String functionEnName = function.getFunctionEnName();
-                String functionCode = function.getFunctionCode();
+//                String functionCode = function.getFunctionCode();
                 String functionType = function.getFunctionType();
                 String pmDescribe = function.getPmDescribe();
                 String userRole = function.getUserRole();
@@ -214,41 +223,46 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
                 String verison = function.getVerison();
 
                 String moduleName = "";  // 模块编码
+                String moduleCode= "";  // 模块编码
                 functionx.setCreateBy(username);  // 创建人
                 functionx.setCreateTime(new Date());  //创建日期
-                if (StringUtils.isBlank(moduleId)) {
+
+                if (StringUtils.isBlank(project)) {
                     message.put("isError", "true");
-                    message.put("status", "第" + i + "行数据对应模块不能为空");
+                    message.put("status", "第" + (i+1) + "行数据项目名称不能为空");
                     message.put("closeable", "true");
                     webSocketUtils.sendMessage(loginUser.getId(), message);
-                    return Result.error("对应模块不能为空");
+                    return Result.error("项目名称不能为空");
                 } else {
-                    if (pModuleId != null && pModuleId.length()>0) {
+                    LambdaQueryWrapper<Projectx> projectxQueryWrapper =new LambdaQueryWrapper<>();
-                        String pid = "";
+                    projectxQueryWrapper.eq(Projectx::getProjectName,project);
-                        for (Modulex modulex : modulexList) {
+                    List<Projectx> list1 = projectxService.list(projectxQueryWrapper);
-                            if (modulex.getModuleName().equals(pModuleId)) {
+                    if (list1.size()==0){
-                                pid = modulex.getId();
+                        message.put("isError", "true");
-                                break;
+                        message.put("status", "第" + i + "行数据项目名称错误");
-                            }
+                        message.put("closeable", "true");
-                        }
+                        webSocketUtils.sendMessage(loginUser.getId(), message);
-                        for (Modulex modulex : modulexList) {
+                        return Result.error("项目名称错误");
-                            if (modulex.getModuleName().equals(moduleId) && modulex.getPid().equals(pid)) {
-                                functionx.setModuleId(modulex.getId());
-                                moduleId = modulex.getId();
-                                moduleName = modulex.getModuleName();
-                                break;
                     }
+                    project = list1.get(0).getId();   // 此时project为项目id
                 }
+
+                if (StringUtils.isBlank(moduleId)) {
+                    message.put("isError", "true");
+                    message.put("status", "第" + i + "行数据对应模块不能为空");
+                    message.put("closeable", "true");
+                    webSocketUtils.sendMessage(loginUser.getId(), message);
+                    return Result.error("对应模块不能为空");
                 } else {
                     for (Modulex modulex : modulexList) {
-                            if (modulex.getModuleName().equals(moduleId) && modulex.getPid() == null) {
+                        if (modulex.getModuleName().equals(moduleId) && modulex.getProjectId().equals(project)) {
                             functionx.setModuleId(modulex.getId());
                             moduleId = modulex.getId();
                             moduleName = modulex.getModuleName();
+                            moduleCode = modulex.getModuleCode();
                             break;
                         }
                     }
-                    }
                     if (functionx.getModuleId() == null) {
                         message.put("isError", "true");
                         message.put("status", "第" + (i+1) + "行数据数据对应模块有错误");
@@ -342,30 +356,32 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
                     }
                     functionx.setFunctionType(type);
                 }
-                // 模块编码+功能缩写；自动填充+手动修改
+                // 模块编码+功能缩写；自动填充+手动修改  // 改为自动生成
-                if (StringUtils.isBlank(functionCode)) {
+                String firstChar = toFirstChar(functionName);
-                    message.put("isError", "true");
+                String functionCode = moduleCode + firstChar;
-                    message.put("status", "第" + (i+1) + "行数据数据功能编码不能为空");
-                    message.put("closeable", "true");
-                    webSocketUtils.sendMessage(loginUser.getId(), message);
-                    return Result.error("功能编码不能为空");
-                } else {
-                    LambdaQueryWrapper<Modulex> queryWrapperModulex = new LambdaQueryWrapper<>();
-                    queryWrapperModulex.eq(Modulex::getModuleName, moduleName);
-                    Modulex modulex = modulexService.getOne(queryWrapperModulex);
-                    String moduleCode = modulex.getModuleCode();
-                    String firstChar = toFirstChar(functionType);
-                    String str = moduleCode + firstChar;
-                    if (!str.equals(functionCode)) {
-                        message.put("isError", "true");
-                        message.put("status", "第" + (i+1) + "行数据数据功能编码错误");
-                        message.put("closeable", "true");
-                        webSocketUtils.sendMessage(loginUser.getId(), message);
-                        return Result.error("功能编码错误");
-                    }
-
                 functionx.setFunctionCode(functionCode);
-                }
+//                if (StringUtils.isBlank(functionCode)) {
+//                    message.put("isError", "true");
+//                    message.put("status", "第" + (i+1) + "行数据数据功能编码不能为空");
+//                    message.put("closeable", "true");
+//                    webSocketUtils.sendMessage(loginUser.getId(), message);
+//                    return Result.error("功能编码不能为空");
+//                } else {
+//                    LambdaQueryWrapper<Modulex> queryWrapperModulex = new LambdaQueryWrapper<>();
+//                    queryWrapperModulex.eq(Modulex::getModuleName, moduleName);
+//                    Modulex modulex = modulexService.getOne(queryWrapperModulex);
+//                    String moduleCode = modulex.getModuleCode();
+//                    String firstChar = toFirstChar(functionName);
+//                    String str = moduleCode + firstChar;
+//                    if (!str.equals(functionCode)) {
+//                        message.put("isError", "true");
+//                        message.put("status", "第" + (i+1) + "行数据数据功能编码错误");
+//                        message.put("closeable", "true");
+//                        webSocketUtils.sendMessage(loginUser.getId(), message);
+//                        return Result.error("功能编码错误");
+//                    }
+//                    functionx.setFunctionCode(functionCode);
+//                }
 
                 if (StringUtils.isNotBlank(pmDescribe)) {    // 功能描述
                     functionx.setPmDescribe(pmDescribe);
@@ -514,6 +530,13 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
 
                 if (StringUtils.isNotBlank(duration)) {
                     Double aDouble = Double.valueOf(duration);
+                    if (aDouble <= 0){
+                        message.put("isError", "true");
+                        message.put("status", "第" + (i+1) + "行数据任务时长错误");
+                        message.put("closeable", "true");
+                        webSocketUtils.sendMessage(loginUser.getId(), message);
+                        return Result.error("任务时长错误");
+                    }
                     functionx.setDuration(aDouble);
                 }
 
@@ -609,6 +632,13 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
                     return Result.error("版本号不能为空");
                 } else {
                     Integer integer = Integer.valueOf(verison);
+                    if (integer<1){
+                        message.put("isError", "true");
+                        message.put("status", "第" + (i+1) + "行数据数据版本号不能小于1");
+                        message.put("closeable", "true");
+                        webSocketUtils.sendMessage(loginUser.getId(), message);
+                        return Result.error("版本号不能小于1");
+                    }
                     functionx.setStatus(integer);
                 }
 
@@ -639,6 +669,18 @@ public class FunctionXTestServiceImpl extends ServiceImpl<FunctionxTestMapper, F
         return Result.OK("导入成功");
     }
 
+
+    int saveTest(List<FunctionxTest> listVo) {
+        for (int i = 0; i < listVo.size(); i++) {
+            try {
+                this.save(listVo.get(i));
+            } catch (Exception e) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
     private boolean funCheck(List<String> list) {
         for (int i=0;i<list.size();i++){
             if(list.get(i)!=null && list.get(i).length()>0){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java

@@ -689,6 +689,7 @@ public class FieldxController extends JeecgController<Fieldx, IFieldxService> {
 			 message.put("isError", "true");
 			 message.put("status","单元格样式错误,请根据注意事项保证单元格样式正确");
 			 message.put("closeable","true");
+			 fieldxService.remove(null);
 			 webSocketUtils.sendMessage(loginUser.getId(), message);
 		 }
 		 return Result.OK("文件上传成功");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/service/impl/FieldxServiceImpl.java

@@ -9,10 +9,12 @@ import org.jeecg.modules.fieldx.service.IFieldxService;
 import org.jeecg.modules.tablex.entity.Tablex;
 import org.jeecg.modules.tablex.service.ITablexService;
 import org.jeecg.modules.tablex.ws.WebSocketUtils;
+import org.jsoup.helper.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +26,7 @@ import java.util.Map;
  * @Version: V1.0
  */
 
-
+@Transactional
 @Service
 public class FieldxServiceImpl extends ServiceImpl<FieldxMapper, Fieldx> implements IFieldxService {
     @Autowired
@@ -39,11 +41,21 @@ public class FieldxServiceImpl extends ServiceImpl<FieldxMapper, Fieldx> impleme
             try {
                 Thread.sleep(500L);
                 message.put("uploaded", String.valueOf(i + 1));
-                this.save(fieldxList.get(i));
+                Fieldx fieldx=fieldxList.get(i);
+                this.save(fieldx);
+                if(!StringUtil.isBlank(fieldx.getAssociateTable())||!StringUtil.isBlank(fieldx.getAssociateField())){
+                    webSocketUtils.sendMessage(loginUser.getId(), message);
+                    break;
+                }
+                    Tablex tablex = tablexService.getById(fieldx.getTableId());
+                    tablexService.updateVersion(fieldx.getTableId(), tablex.getVerison() + 1);
+                    tablexService.updateSql(fieldx.getTableId(), fieldxController.createSql(fieldx.getTableId()));
+
                 webSocketUtils.sendMessage(loginUser.getId(), message);
             } catch (InterruptedException e) {
                 log.error(e.getMessage(), e);
             }
         }
     }
+
 }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java

@@ -401,7 +401,7 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                         Cell cell = row.getCell(k);
                         if(cell==null){
                             propertyNames.add(null);
-                        }
+                        }else {
                             FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
                             DataFormatter formatter = new DataFormatter();
                             //单元格不设置数字格式
@@ -409,6 +409,7 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                             String name = formatter.formatCellValue(cell,evaluator);
                             propertyNames.add(name);
                         }
+                    }
                     if(propertyNames.size()!=18 || !propertyNames.get(0).equals("上级模块名称")
                             || !propertyNames.get(1).equals("项目名称")
                             || !propertyNames.get(2).equals("中文名称")
@@ -442,7 +443,11 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                         Cell cell = row.getCell(k);
                         String value="";
                         if(cell!=null){
-                            value = cell.getStringCellValue();
+                            FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
+                            DataFormatter formatter = new DataFormatter();
+                            //单元格不设置数字格式
+                            cell.setCellStyle(null);
+                            value = formatter.formatCellValue(cell,evaluator);
                         }
                         switch (k){
                             case 0:
@@ -663,14 +668,6 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                     webSocketUtils.sendMessage(loginUser.getId(), message);
                     return Result.error("导入失败,英文名称不能为空");
                 }modulex.setModuleEnName(moduleEnName);
-//                String moduleCode = modulexTemplate.getModuleCode();
-//                if(moduleCode==null||moduleCode.length()>30){
-//                    message.put("isError", "true");
-//                    message.put("status","导入失败,第" + (i+4) +"行" +"模块编码不能为空或者模块编码过长");
-//                    message.put("closeable","true");
-//                    webSocketUtils.sendMessage(loginUser.getId(), message);
-//                    return Result.error("导入失败,模块编码不能为空或者模块编码过长");
-//                }
                 String modulecode = null;
                 LambdaQueryWrapper<Projectx> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(Projectx::getProjectName,projectId);
@@ -685,13 +682,6 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                     return Result.error("导入失败,模块对应的项目编码不存在,请完善对应项目里的项目编码后,重新导入");
                 }
                 modulecode = projectCode + firstChar;
-//                if(!modulecode.equals(moduleCode)){
-//                    message.put("isError", "true");
-//                    message.put("status","导入失败,第" + (i+4) +"行" +"模块编码不规范，导入失败");
-//                    message.put("closeable","true");
-//                    webSocketUtils.sendMessage(loginUser.getId(), message);
-//                    return Result.error("模块编码不规范，导入失败");
-//                }
                 modulex.setModuleCode(modulecode);
                 String pmDescribe = modulexTemplate.getPmDescribe();
                 if(StringUtils.isBlank(pmDescribe)){
@@ -710,7 +700,7 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                     modulex.setManagerUsers(null);
                 }else {
                     LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                    String[] split = managerUsers.split(",");
+                    String[] split = managerUsers.split("\\s+|,|;|，|、");
                     List<String> managerUserName= Arrays.stream(split).map(String::valueOf).collect(Collectors.toList());
                     sysUserLambdaQueryWrapper.in(SysUser::getUsername,managerUserName);
                     List<SysUser> iSysUserServiceOne = iSysUserService.list(sysUserLambdaQueryWrapper);
@@ -729,7 +719,6 @@ public class ModulexServiceImpl extends ServiceImpl<ModulexMapper, Modulex> impl
                             webSocketUtils.sendMessage(loginUser.getId(), message);
                             return Result.error("导入失败,责任人信息查询不到");
                         }
-//                        String strip = org.apache.commons.lang.StringUtils.strip(list.toString(), "[]");
                         String s = "";
                         for (int j = 0; j < list.size(); j++) {
                             s = s + list.get(j);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

@@ -361,6 +361,7 @@ public class TaskController extends JeecgController<Task, ITaskService> {
     /**
      * 提交任务，更新状态，同时计算实际任务时长
      * 计算一整天，之后算头和尾时间
+     * 任务时长单位是小时，填写预计任务时长后自动计算结束时间，跨天每天按7小时计算，每天上午8点半开始到12点，下午2点半开始到6点。
      * @param task
      * @return
      */
@@ -453,7 +454,10 @@ public class TaskController extends JeecgController<Task, ITaskService> {
             workTime += endTime.getTime() - date3.getTime();
             return workTime;
         }else {
+
             //时间跨度没有超过两天
+            if (startTime.compareTo(date4) >= 0)
+                return workTime;    //任务是下午下班之后发布的，且是下班之后提交的，没有多余工作时间
             if (startTime.compareTo(date1) <= 0)
                 startTime = date1;  //发布任务在8点之前
             if (startTime.compareTo(date2) <= 0){
@@ -484,6 +488,7 @@ public class TaskController extends JeecgController<Task, ITaskService> {
 
     /**
      * 计算预计结束时间
+     * 任务时长单位是小时，填写预计任务时长后自动计算结束时间，跨天每天按7小时计算，每天上午8点半开始到12点，下午2点半开始到6点。
      * @param task
      * @return
      */
@@ -530,6 +535,11 @@ public class TaskController extends JeecgController<Task, ITaskService> {
         long tempTime = 0;
         if (startTime.compareTo(date1) <= 0)
             startTime = date1;  //任务发布在8点半之前，修正时间
+        if (startTime.compareTo(date4) >= 0){
+            startTime = date1;  //任务发布在晚上下班后，修正到第二天早上上班时间
+            offset ++;
+        }
+
         if (startTime.compareTo(date2) < 0){
             //上午发布任务
             tempTime = date2.getTime() - startTime.getTime();
@@ -547,6 +557,8 @@ public class TaskController extends JeecgController<Task, ITaskService> {
             tempTime = date4.getTime() - startTime.getTime();
             if (tempTime >= millisecond)
                 return new Date(startTime.getTime() + millisecond + DAYTIME*offset);
+            else
+                millisecond -= tempTime;
         }
         //时间修正，天数偏移量加1，到这里有两中情况，1、白天工作时间不足抵消 2、下午6点之后发布任务
         offset ++;
@@ -557,6 +569,7 @@ public class TaskController extends JeecgController<Task, ITaskService> {
             return new Date(startTime.getTime() + millisecond + DAYTIME*offset);
         //上午偏移不足，下午一定够，因为不会跨两天
         millisecond -= tempTime;
+        startTime = date3;
         return new Date(startTime.getTime() + millisecond + DAYTIME*offset);
     }