数据操作

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -30,6 +30,8 @@ public interface LauncherConstant {
 
 	String APPLICATION_MANAGER_NAME = APPLICATION_NAME_PREFIX +  "manager";
 
+	String APPLICATION_VISUAL_NAME = APPLICATION_NAME_PREFIX +  "visual";
+
 	/**
 	 * xxljob
 	 */

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -287,7 +287,7 @@ public class TaskController extends BladeController {
 
 				taskApprovalVOS.add(approvalVO);
 			}
-			this.taskService.batchCompleteApprovalTask(taskApprovalVOS);
+			this.taskService.batchCompleteApprovalTask(taskApprovalVOS,AuthUtil.getUserId());
 
 			//通过WebSocket推送数量条数
 			if (ObjectUtil.isNotEmpty(AuthUtil.getUserId())) {
@@ -529,9 +529,9 @@ public class TaskController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "完成/审批任务")
 	public R<Boolean> completeApprovalTask(@RequestBody TaskApprovalVO taskApprovalVO) throws FileNotFoundException {
-
 		//检查当前用户是否存在等待批次
 		long batchCount = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, AuthUtil.getUserId()));
+
 		if(batchCount > 0){
 			this.taskParallelService.update(Wrappers.<TaskParallel>lambdaUpdate()
 					.set(TaskParallel::getEVisaContent, "当前等待电签的批次较多，请等待几分钟后刷新页面查看........")
@@ -552,7 +552,7 @@ public class TaskController extends BladeController {
 			//生成等待批次，任务完成后删除
 			List<TaskApprovalVO> taskApprovalVOS = new ArrayList<>();
 			taskApprovalVOS.add(taskApprovalVO);
-			this.taskService.batchCompleteApprovalTask(taskApprovalVOS);
+			this.taskService.batchCompleteApprovalTask(taskApprovalVOS,AuthUtil.getUserId());
 			return R.data(true, "提交成功");
 		}
 	}

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/TaskClientImpl.java

@@ -44,8 +44,9 @@ public class TaskClientImpl implements TaskClient {
         //找到任务
         Task task = this.queryTask(taskId);
         if(task != null){
-            //存在任务，根据formDataId查询
+            //存在任务，根据formDataId查询(获取 私有项目的 p_key_ids)
             List<String> privatePrimaryKeyIds = this.informationQueryService.queryBusinessTableData(task.getFormDataId());
+
             if(privatePrimaryKeyIds != null && privatePrimaryKeyIds.size() > 0){
                 //查询这些表格的电签配置
                 return this.eVisaConfigClient.queryEVisaConfigByTableIds(privatePrimaryKeyIds, task.getContractId(), isFinal);

blade-service/blade-business/src/main/java/org/springblade/business/service/ITaskService.java

@@ -50,7 +50,7 @@ public interface ITaskService extends BaseService<Task> {
     /**
      * 批量审批
      */
-    void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS) throws FileNotFoundException;
+    void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS,Long userId) throws FileNotFoundException;
 
     /**
      * 启动流程

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -68,7 +68,9 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
 
         //查询这个业务数据绑定的表格，需要区分监理和施工
         if (query != null) {
+            // 获取wbs
             WbsTreeContract tree = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(query.getWbsId());
+            // 获取 合同端信息表
             List<WbsTreeContract> tableList = this.wbsTreeContractClient.queryChildByParentId(tree, "queryTable", String.valueOf(query.getClassify()));
             if (tableList != null && tableList.size() > 0) {
                 //删除掉无法溯源的数据

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -21,6 +21,7 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.DateUtil;
@@ -330,10 +331,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 
     @Async
     @Override
-    public void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS) throws FileNotFoundException {
+    public void batchCompleteApprovalTask(List<TaskApprovalVO> taskApprovalVOS,Long userId) throws FileNotFoundException {
         List<String> taskIds = taskApprovalVOS.stream().map(TaskApprovalVO::getParallelProcessInstanceId).distinct().collect(Collectors.toList());
-
-        long batch = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, AuthUtil.getUserId()));
+        long batch = this.taskBatchService.count(Wrappers.<TaskBatch>lambdaQuery().eq(TaskBatch::getCreateUser, userId));
         if (batch > 0) {
             //修改电签状态
             this.taskParallelService.update(Wrappers.<TaskParallel>lambdaUpdate()

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -278,6 +278,12 @@ public class EVisaServiceImpl implements EVisaService {
         return finalPdfUrl;
     }
 
+
+    /**
+     * 电签信息
+     * @param task
+     * @return
+     */
     @Override
     public String eVisa(EVisaTaskApprovalVO task) {
         String resultMessage = E_VISA_ERROR;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TextdictInfoController.java

@@ -268,11 +268,12 @@ public class TextdictInfoController extends BladeController {
         }
 
         else if (textdictInfo.getTextId().equals("daterange")) { // 时间段
-            element.empty().append("<el-date-picker  v-model=" + vmode + " type='datetimerange' placeholder=" + placeholder + "  start-placeholder='开始日期'  end-placeholder='结束日期' format='yyyy年MM月DD日' trIndex=" + trindex + " keyname=" + keyname + " weighing=" + weighing + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + ">");
+            element.empty().append("<el-date-picker  v-model=" + vmode + " type='datetimerange' placeholder=" + placeholder + "  start-placeholder='开始日期'  end-placeholder='结束日期' format='YYYY年MM月DD日' trIndex=" + trindex + " keyname=" + keyname + " weighing=" + weighing + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + ">");
             element.children().get(0).attr("@change", "datePickerChange($event,'" + keyname + "')");
         } else if (textdictInfo.getTextId().equals("daterangeYMD")) { // 时间段 /
-            element.empty().append("<el-date-picker  v-model=" + vmode + " type='datetimerange' range-separator='/' placeholder=" + placeholder + "  start-placeholder='开始日期'  end-placeholder='结束日期' format='yyyy年MM月DD日' trIndex=" + trindex + " keyname=" + keyname + " weighing=" + weighing + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + ">");
+            element.empty().append("<el-date-picker  v-model=" + vmode + " type='datetimerange' range-separator='/' placeholder=" + placeholder + "  start-placeholder='开始日期'  end-placeholder='结束日期' format='YYYY年MM月DD日' trIndex=" + trindex + " keyname=" + keyname + " weighing=" + weighing + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" + y2 + ">");
             element.children().get(0).attr("@change", "datePickerChange($event,'" + keyname + "')");
+
         }else if (textdictInfo.getTextId().equals("img")) {
             element.empty().append("<hc-table-form-upload :src='" + vmode + "' placeholder=" + placeholder + " v-model=" + vmode + "  keyName=" + keyname + " weighing=" + weighing + "  @success='formUploadSuccess' @del='delTableFormFile' trIndex=" + trindex + " tdIndex=" + tdindex + "  x1=" + x1 + " x2=" + x2 + " y1=" + y1 + " y2=" +y2+"></hc-table-form-upload> ");
         }else if (textdictInfo.getTextId().equals("searchSelect")) { //搜索框
@@ -400,10 +401,10 @@ public class TextdictInfoController extends BladeController {
         String placeholder = "";
         String id = element.children().get(0).attr("keyname");
         if (element.html().indexOf("el-tooltip") >= 0) {
-            placeholder = element.children().get(0).children().get(0).attr("placeholder").replaceAll("[^(\u4E00-\u9FA5_)]", "");
+            placeholder = element.children().get(0).children().get(0).attr("placeholder");
             id = element.children().get(0).children().get(0).attr("keyname");
         } else {
-            placeholder = element.children().get(0).attr("placeholder").replaceAll("[^(\u4E00-\u9FA5_)]", "");
+            placeholder = element.children().get(0).attr("placeholder");
             id = element.children().get(0).attr("keyname");
         }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/SaveUserInfoByProjectClientImpl.java

@@ -54,6 +54,11 @@ public class SaveUserInfoByProjectClientImpl implements SaveUserInfoByProjectCli
         obj.setContractId(String.valueOf(contractId));
         obj.setRoleId(String.valueOf(roleId));
         obj.setStatus(1);
+
+        saveUserInfoByProjectService.remove(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
+                        .eq(SaveUserInfoByProjectDTO::getUserId, userId)
+                        .eq(SaveUserInfoByProjectDTO::getRoleId, roleId)
+                        .eq(SaveUserInfoByProjectDTO::getContractId, contractId));
         saveUserInfoByProjectService.save(obj);
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.java

@@ -59,4 +59,6 @@ public interface WbsFormElementMapper extends BaseMapper<WbsFormElement> {
 
     String selectFiledType(String initTableName, String eKey);
 
+    //查询 元素与实体表字段不匹配的字段
+    List<WbsFormElementDTO2> selColumnsByTabName(String parentId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.xml

@@ -161,4 +161,8 @@
         SELECT data_type FROM information_schema.columns WHERE table_name=#{initTableName} AND column_name = #{eKey}
     </select>
 
+    <select id="selColumnsByTabName" resultType="java.lang.String">
+        SELECT data_type FROM information_schema.columns WHERE table_name=#{initTableName} AND column_name = #{eKey}
+    </select>
+
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -69,6 +69,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -967,14 +968,18 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                 }
                                 String myData = DataInfo.get(val) + "";
                                 if (myData.indexOf("T") >= 0 && myData.indexOf("-") >= 0) {
+                                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                                    sdf.setTimeZone(TimeZone.getTimeZone("GTM+8"));
+                                    SimpleDateFormat formatStr = new SimpleDateFormat("yyyy年MM-dd");
                                     if (myData.indexOf(",") >= 0 && myData.indexOf("]") >= 0) {
+
                                         myData = myData.replace("[", "").replace("]", "").replaceAll("'", "");
                                         String[] dataVal = myData.split(",");
-                                        String Start_dataStr[] = dataVal[0].split("T")[0].split("-");
-                                        String StartDate = StringUtil.format("{}年{}月{}日", new Object[]{Start_dataStr[0], Start_dataStr[1], Integer.parseInt(Start_dataStr[2]) + 1}).trim();
 
-                                        String end_dataStr[] = dataVal[1].split("T")[0].split("-");
-                                        String endDate = StringUtil.format("{}年{}月{}日", new Object[]{end_dataStr[0], end_dataStr[1], Integer.parseInt(end_dataStr[2]) + 1}).trim();
+                                        Date Start_dataStr = sdf.parse(dataVal[0]);
+                                        Date end_dataStr = sdf.parse(dataVal[1]);
+                                        String StartDate = formatStr.format(Start_dataStr);
+                                        String endDate = formatStr.format(end_dataStr);
                                         if (StartDate.equals(endDate)) {
                                             myData = StartDate;
                                         } else {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -128,6 +128,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     @Override
     public WbsFormElement saveAndSyn(WbsFormElement wbsFormElement, String tableName) {
         try {
+
             //获取实体表主库信息
             TableInfo tableInfo = tableInfoMapper.selectById(wbsFormElement.getFId());
             if (tableInfo == null) {
@@ -136,6 +137,9 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
                 tableName = tableInfo.getTabEnName();
             }
 
+            // 删除 元素和实体表不匹配的字段
+            //baseMapper.deleteElementByfId2();
+
             //获取当前表单下所有元素
             List<WbsFormElement> wbsFormElements = baseMapper.selectList(Wrappers.<WbsFormElement>query().lambda().eq(WbsFormElement::getFId, wbsFormElement.getFId()));
             String substring = "";

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -540,7 +540,7 @@ public class UserController {
                             newUser.setAccount(account);
                             newUser.setRealName(name);
                             newUser.setName(name);
-                            newUser.setPassword(password);
+                            newUser.setPassword("10470c3b4b1fed12c3baac014be15fac67c6e815");
                             newUser.setName(name);
                             newUser.setStatus(Integer.parseInt(status));
                             newUser.setIdNumber(idCard);