bug修改数据

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

@@ -27,12 +27,10 @@ import static org.springblade.core.launch.constant.AppConstant.APPLICATION_NAME_
  */
 public interface LauncherConstant {
 
-
     String APPLICATION_MANAGER_NAME = APPLICATION_NAME_PREFIX + "manager";
 
     String APPLICATION_ARCHIVE_NAME = APPLICATION_NAME_PREFIX + "archive";
 
-
     String APPLICATION_VISUAL_NAME = APPLICATION_NAME_PREFIX + "visual";
 
     /**
@@ -48,7 +46,7 @@ public interface LauncherConstant {
     /**
      * nacos dev 地址 172.31.222.127   192.168.0.109     127.0.0.1
      */
-    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+    String NACOS_DEV_ADDR = "192.168.0.109:8848";
 
     /**
      * nacos prod 地址

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/DefaultConfig.java

@@ -68,5 +68,8 @@ public class DefaultConfig extends BaseEntity {
 	*/
 		private String fullScreen;
 
-
+	/**
+	 * 所属 客户端
+	 */
+	private String clientId;
 }

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

@@ -181,5 +181,5 @@ public interface WbsTreeContractClient {
 
     //获取 节点下表单
     @GetMapping(API_PREFIX + "/searchNodeAllTableInfo")
-    List<AppWbsTreeContractVO> searchNodeAllTableInfo(@RequestParam String primaryKeyId, @RequestParam String type, @RequestParam String contractId, @RequestParam String projectId);
+    List<AppWbsTreeContractVO> searchNodeAllTableInfo(@RequestParam String primaryKeyId, @RequestParam String type, @RequestParam String contractId, @RequestParam String projectId,@RequestParam Long userId);
 }

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

@@ -63,6 +63,7 @@ public class DefaultConfigController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入defaultConfig")
 	public R<DefaultConfig> detail(DefaultConfig defaultConfig, BladeUser user) {
 		defaultConfig.setCreateUser(user.getUserId());
+		defaultConfig.setClientId(user.getClientId());
 		DefaultConfig detail = defaultConfigService.getOne(Condition.getQueryWrapper(defaultConfig));
 		return R.data(detail);
 	}
@@ -138,9 +139,11 @@ public class DefaultConfigController extends BladeController {
     @PostMapping("/saveOrUpdate")
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "新增或修改")
-    public R<Boolean> saveOrUpdate(@Valid @RequestBody DefaultConfig newConfig) {
+    public R<Boolean> saveOrUpdate(@Valid @RequestBody DefaultConfig newConfig,BladeUser bladeUser) {
         //查询是否存在配置信息
-        DefaultConfig oldConfig = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery().eq(DefaultConfig::getCreateUser, AuthUtil.getUserId()));
+        DefaultConfig oldConfig = this.defaultConfigService.getOne(Wrappers.<DefaultConfig>lambdaQuery()
+				.eq(DefaultConfig::getCreateUser, bladeUser.getUserId())
+				.eq(DefaultConfig::getClientId, bladeUser.getClientId()));
         if (oldConfig != null) {
             //修改
             if (StringUtils.isNotEmpty(newConfig.getColor())) {

blade-service/blade-business/src/main/java/org/springblade/business/mapper/DefaultConfigMapper.xml

@@ -20,6 +20,7 @@
         <result column="sms_time_out" property="smsTimeOut"/>
         <result column="shot_web_rtc" property="shotWebRtc"/>
         <result column="full_screen" property="fullScreen"/>
+        <result column="client_id" property="clientId"/>
     </resultMap>
 
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -902,7 +902,7 @@
     </select>
 
     <select id="getTabussTimeInfo" resultMap="tabBusstimeInfoResultMap">
-        select * from m_tab_busstime_info where is_deleted = 0 and
+        select * from m_tab_busstime_info where is_deleted = 0
         <if test="tables != null">
             and tab_en_name in
             <foreach collection="tables" item="wbsIdc" open="(" separator="," close=")">

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

@@ -360,7 +360,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         //修改主流程状态为3
         this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 3).eq(Task::getId, task.getId()));
         //修改业务数据状态为未上报
-        this.updateBusinessDataByFormDataId(task, 0, null);
+       // this.updateBusinessDataByFormDataId(task, 0, null);
+        this.updateBusinessDataByFormDataId(task, 0, null,-1L);
 
         return true;
     }
@@ -615,14 +616,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         //修改主流程状态为已完成
                         this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 2).set(Task::getUpdateTime, new Date()).eq(Task::getId, masterTask.getId()));
                         //修改对应的业务数据状态为已审批
-                        this.updateBusinessDataByFormDataId(masterTask, 2, finalPdfUrl);
+                        this.updateBusinessDataByFormDataId(masterTask, 2, finalPdfUrl,taskApprovalVO.getUserId());
 
                         //返回电签成功的pdf路径，给试验用
                         return finalPdfUrl;
                     }
                 } else {
                     //只更新PDF路径
-                    this.updateBusinessDataByFormDataId(masterTask, 1, eVisaStatus.contains("@@@@") ? eVisaStatus.split("@@@@")[1] : null);
+                    this.updateBusinessDataByFormDataId(masterTask, 1, eVisaStatus.contains("@@@@") ? eVisaStatus.split("@@@@")[1] : null,taskApprovalVO.getUserId());
                     return eVisaStatus.contains("@@@@") ? eVisaStatus.split("@@@@")[1] : null;
                 }
             } else if ("eVisaError".equals(eVisaStatus) || eVisaStatus.contains("eVisaError")) {
@@ -693,7 +694,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             }
             this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 3).set(Task::getUpdateTime, new Date()).eq(Task::getProcessInstanceId, masterProcessInstanceId));
             //修改对应的业务数据状态为已废除
-            this.updateBusinessDataByFormDataId(this.getOne(Wrappers.<Task>lambdaQuery().eq(Task::getProcessInstanceId, masterProcessInstanceId)), 3, null);
+            this.updateBusinessDataByFormDataId(this.getOne(Wrappers.<Task>lambdaQuery().eq(Task::getProcessInstanceId, masterProcessInstanceId)), 3, null,taskApprovalVO.getUserId());
 
             //任务废除通知
             this.abolishMessage(masterTask, currentLink, comment);
@@ -935,11 +936,11 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     /**
      * 修改业务数据状态
      */
-    private void updateBusinessDataByFormDataId(Task task, Integer status, String newFileUrl) {
+    private void updateBusinessDataByFormDataId(Task task, Integer status, String newFileUrl,Long UserId) {
         switch (task.getApprovalType()) {
             case 1:
                 //资料填报
-                this.updateWriteBusinessDataStatus(task.getFormDataId(), status, newFileUrl);
+                this.updateWriteBusinessDataStatus(task.getFormDataId(), status, newFileUrl,UserId);
                 break;
             case 2:
                 //工程文件
@@ -970,17 +971,22 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
      * 资料填报
      */
     @Transactional
-    public void updateWriteBusinessDataStatus(String formDataId, Integer status, String newFileUrl) {
-
+    public void updateWriteBusinessDataStatus(String formDataId, Integer status, String newFileUrl,Long userId) {
+        String pdfPage ="";
+        Long pdfSize =0L;
+        String dateInfo = "";
         try {
-            String pdfPage = commonFileClient.getPdfNum(newFileUrl);
-            Long pdfSize = CommonUtil.getResourceLength(newFileUrl);
+            System.out.println("----- 电签成功--------");
+            pdfPage = commonFileClient.getPdfNum(newFileUrl);
+            pdfSize = CommonUtil.getResourceLength(newFileUrl);
+            System.out.println("----- 电签成功--------==pdfPage"+pdfPage);
+            System.out.println("----- 电签成功--------==pdfSize"+pdfSize);
             List<String> list = Arrays.asList(formDataId.split(","));
             for(String iId : list){
                 //获取
-                String dateInfo = "";
                 InformationQuery queryinfo = informationQueryService.getById(iId);
-                List<AppWbsTreeContractVO> WbsTreeContract = wbsTreeContractClient.searchNodeAllTableInfo(queryinfo.getWbsId() + "", queryinfo.getClassify() + "", queryinfo.getContractId() + "", queryinfo.getProjectId() + "");
+
+                List<AppWbsTreeContractVO> WbsTreeContract = wbsTreeContractClient.searchNodeAllTableInfo(queryinfo.getWbsId() + "", queryinfo.getClassify() + "", queryinfo.getContractId() + "", queryinfo.getProjectId() + "",userId);
                 List<String> collect = new ArrayList<>();
                 Map<String,String> idMap = new HashMap<>();
                 for(AppWbsTreeContractVO appWbsTreeContractVO : WbsTreeContract){
@@ -996,7 +1002,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         dateInfo = maps.get(tabBusstimeInfo.getColKey())+"";
                     }
                 }
-
+                System.out.println("----- 电签成功--------==修改---="+dateInfo);
                 this.informationQueryService.update(Wrappers.<InformationQuery>lambdaUpdate().set(InformationQuery::getStatus, status)
                         .set(InformationQuery::getEVisaPdfUrl, newFileUrl)
                         .set(InformationQuery::getReportNumber, null)
@@ -1011,6 +1017,9 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                     .set(InformationQuery::getEVisaPdfUrl, newFileUrl)
                     .set(InformationQuery::getReportNumber, null)
                     .set(InformationQuery::getAuditUserIdAndName, null)
+                    .set(InformationQuery::getEVisaPdfPage, pdfPage)
+                    .set(InformationQuery::getEVisaPdfSize, pdfSize)
+                    .set(InformationQuery::getBusinessTime, dateInfo)
                     .in(InformationQuery::getId, Arrays.asList(formDataId.split(","))));
         }
 

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -1051,12 +1051,7 @@ public class CustomFunction {
               .toEpochMilli();
     }
 
-/*    public static void main(String[] args) {
-             List<Object> l1 = Arrays.asList("16:00","2023年6月29日 16:10:31","2023年6月29日 16:09");
-             List<Object> l2 = Arrays.asList("2023年6月29日16:50");
-        System.out.println(minutesPassed(l1,l2));
 
-    }*/
 
     public static Object k2d(Object k) {
         Matcher mt = RegexUtils.matcher("[A-Z]*(\\d*)\\+([\\d|\\.]*)", k.toString());
@@ -2582,11 +2577,13 @@ public class CustomFunction {
         return dXd(design, data, xN, scale, mode);
     }
 
-/*    public static void main(String[] args) {
+/*
+    public static void main(String[] args) {
         String a="100/200";
         List<Object>list  = new ArrayList<>(Arrays.asList(101,102,201,198));
         list.forEach(d-> System.out.println(dXd(a,d)));
-    }*/
+    }
+*/
 
     /**
      * @return java.lang.Object

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

@@ -489,6 +489,8 @@ public class ExcelTabController extends BladeController {
         Elements trs = table.select("tr");
         if(StringUtils.isNotEmpty(excelTab.getTabId())){
             updateWrapper.set("init_table_id", excelTab.getTabId());
+            org.springblade.manager.entity.TableInfo tableInfo = tableInfoService.getById(excelTab.getTabId());
+            updateWrapper.set("init_table_name", tableInfo.getTabEnName());
         }else {
             if (aPrivate.getInitTableId() == null) {
                 org.springblade.manager.entity.TableInfo tableInfo = tableInfoService.getOne(new LambdaQueryWrapper<org.springblade.manager.entity.TableInfo>()

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

@@ -272,7 +272,7 @@ public class FormulaController {
     @GetMapping("/range")
     @ApiOperationSupport(order = 10)
     @ApiOperation(value = "自动填充数据", notes = "根据设计值、偏差范围、频率自动填充数据")
-    public R<Map<String, Object>> rangeList(RangeInfo info) throws FileNotFoundException {
+    public R<Map<String, Object>> rangeList(RangeInfo info) throws FileNotFoundException, InterruptedException {
         if (info.verify()) {
             String bak = info.getKey().replaceAll("key_\\d+__", "");
             info.setKey(info.getKey().replaceAll("__[\\d_]+", ""));

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

@@ -420,8 +420,8 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     }
 
     @Override
-    public List<AppWbsTreeContractVO> searchNodeAllTableInfo(String primaryKeyId, String type, String contractId, String projectId) {
-        List<AppWbsTreeContractVO> list = wbsTreeContractService.searchNodeAllTable(primaryKeyId, type, contractId, projectId);
+    public List<AppWbsTreeContractVO> searchNodeAllTableInfo(String primaryKeyId, String type, String contractId, String projectId,Long userId) {
+        List<AppWbsTreeContractVO> list = wbsTreeContractService.searchNodeAllTable(primaryKeyId+":"+userId, type, contractId, projectId);
         return list;
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -55,7 +55,7 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
     List<WbsContractNodeVo> appSearchConcealedNodes(long primaryKeyId, Long contractId);
 
     // 频率设计值  添加表单
-    boolean addTabInfoByRan(RangeInfo info, List<Object> moreData, String[] excLenght) throws FileNotFoundException;
+    boolean addTabInfoByRan(RangeInfo info, List<Object> moreData, String[] excLenght) throws FileNotFoundException, InterruptedException;
 
     boolean syncTabData(String pKeyId) throws Exception;
 

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

@@ -1,5 +1,6 @@
 package org.springblade.manager.service.impl;
 
+import cn.hutool.core.swing.ScreenUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -25,6 +26,7 @@ import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.dto.RangeInfo;
@@ -411,6 +413,19 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
     @Override
     public List<AppWbsTreeContractVO> searchNodeAllTable(String primaryKeyId, String tableOwner, String contractId, String projectId) {
+
+        //由于fegin 调用时，获取不到UserId
+        Long userId =-1L;
+        if(primaryKeyId.indexOf(":")>=0){
+            String ds[] = primaryKeyId.split(":");
+            primaryKeyId = ds[0];
+            userId = Long.parseLong(ds[1]);
+            if(userId == -1L){
+                userId =  AuthUtil.getUserId();
+            }
+        }else{
+            userId = AuthUtil.getUserId();
+        }
         WbsTreeContract wbsTreeContract = baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, primaryKeyId));
         if (wbsTreeContract == null) {
@@ -418,9 +433,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         }
 
         //当前项目合同段只会存在一个角色roleId
-        SaveUserInfoByProject userInfo = baseMapper.selectRoleInfo(AuthUtil.getUserId(), contractId, projectId);
+        SaveUserInfoByProject userInfo = baseMapper.selectRoleInfo(userId, contractId, projectId);
         if (userInfo == null) {
-            throw new ServiceException("请先分配当前用户对该合同段的角色信息");
+            throw new ServiceException("请先分配当前用户对该合同段的角色信息="+ SecureUtil.getUserId());
         }
         String roleId = userInfo.getRoleId();
 
@@ -462,7 +477,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
 
     // 频率添加表单
     @Override
-    public boolean addTabInfoByRan(RangeInfo info, List<Object> moreData, String[] excLenght) {
+    public boolean addTabInfoByRan(RangeInfo info, List<Object> moreData, String[] excLenght) throws InterruptedException {
         WbsTreeContract wbsInfo = this.baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, info.getPkId()));
 
@@ -535,8 +550,10 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 WbsTreeContract wbsTreeContract = new WbsTreeContract();
                 BeanUtil.copy(wbsInfo, wbsTreeContract);
                 wbsTreeContract.setPKeyId(newPkId);
+                Thread.sleep(200);
                 wbsTreeContract.setCreateTime(new Date());
                 wbsTreeContract.setTabGroupId(tabGroupId);
+                wbsTreeContract.setSort(wbsInfo.getSort());
                 String nodeName = wbsTreeContractList2.get(wbsTreeContractList2.size() - 1).getNodeName();
 
                 if (nodeName.indexOf("_PL_") >= 0) {

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

@@ -209,5 +209,21 @@ public class DeptController extends BladeController {
     }
 
 
+    /**
+     * 获取所有部门
+     */
+    @GetMapping("/listAllByType")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "deptName", value = "部门名称", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "fullName", value = "部门全称", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "deptType", value = "部门类型", paramType = "query", dataType = "string")
+    })
+    @ApiOperationSupport(order = 11)
+    @ApiOperation(value = "列表", notes = "传入dept")
+    public R<List<Dept>> listAllByType(@ApiIgnore @RequestParam Map<String, Object> dept, BladeUser bladeUser) {
+        QueryWrapper<Dept> queryWrapper = Condition.getQueryWrapper(dept, Dept.class);
+        List<Dept> list = deptService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()) : queryWrapper);
+        return R.data(list);
+    }
 
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -180,7 +180,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
     @Override
     public List<DeptVO> getUserDeptTreeInfo(String tenantId,String deptType) {
-        return ForestNodeMerger.merge(baseMapper.getUserDeptTreeInfo(tenantId,deptType));
+        if(deptType.equals("-1")){
+            deptType="";
+            return ForestNodeMerger.merge(baseMapper.getUserDeptTreeInfo(tenantId,deptType));
+        }else{
+            return baseMapper.getUserDeptTreeInfo(tenantId,deptType);
+        }
     }
 
 }