白板

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProjectInfo.java

@@ -144,4 +144,11 @@ public class ProjectInfo extends BaseEntity {
     @ApiModelProperty(value = "是否开启随机数 '0'否 '1'是")
     private Integer isOpenRandomNumber;
 
+    /**
+     * 是否开启随机数 '0'否 '1'是
+     */
+    @ApiModelProperty(value = "电签类型 '1'安签 '2'东方中讯")
+    private Integer remarkType;
+
+
 }

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

@@ -313,7 +313,6 @@ public class EVisaServiceImpl implements EVisaService {
         //上锁
         if(DistributedRedisLock.acquire(AuthUtil.getUserId().toString(), batch)){
             try{
-
                 //获取需要签章的数据
                 List<TaskApprovalVO.ApprovalFile> files = taskFile.getApprovalFileList();
                 //这里的文件只会是一张拼接好的PDF

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

@@ -282,7 +282,7 @@ public class ExcelTabController extends BladeController {
     })
     public R putFileAttach(@RequestParam("file") MultipartFile file, Long nodeId) {
 
-        String file_path = "/Users/hongchuangyanfa/Desktop//privateUrl/";//ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
 
         ExcelTab detail = excelTabService.getById(nodeId);
         // 上传excel文件

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

@@ -200,7 +200,9 @@ public class TextdictInfoController extends BladeController {
         Element table = doc.select("table").first();
         Elements trs = table.select("tr");
         Element element = trs.get(textdictInfo.getTrIndex()).select("td").get(textdictInfo.getTdIndex());
-
+        if (element.html().indexOf("el-tooltip") >= 0) {
+            element = element.children().get(0);
+        }
         String trindex = element.children().get(0).attr("trindex");
         String tdindex = element.children().get(0).attr("tdindex");
         String x1 = element.children().get(0).attr("x1");
@@ -210,7 +212,6 @@ public class TextdictInfoController extends BladeController {
         String placeholder = element.children().get(0).attr("placeholder").replaceAll("[^(\u4E00-\u9FA5_)]", "");
         String keyname = element.children().get(0).attr("keyname");
         String weighing = element.children().get(0).attr("weighing");
-        System.out.println(y2);
         String parm = trindex + "," + tdindex + "," + x1 + "," + x2 + "," + y1 + "," + y2 + ",$event";
         String oncklickText = "'" + placeholder + "'," + trindex + "," + tdindex;
 
@@ -292,7 +293,6 @@ public class TextdictInfoController extends BladeController {
         }
 
         //
-
         return R.success("操作成功");
     }
 
@@ -308,10 +308,8 @@ public class TextdictInfoController extends BladeController {
         Long tableId = dataInfo.getLong("tabId");
         // 删除
         textdictInfoService.getBaseMapper().delete(Wrappers.<TextdictInfo>query().lambda()
-                .eq(TextdictInfo::getTabId, tableId));
-        if(jsonArray==null || jsonArray.size()==0 ){
-            return R.fail("保存列表无任何数据");
-        }
+                .eq(TextdictInfo::getTabId, tableId).in(TextdictInfo::getType,2,6));
+
 
         WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.getByPKeyId(tableId);
         // 读取html页面信息
@@ -325,10 +323,10 @@ public class TextdictInfoController extends BladeController {
         Element table = doc.select("table").first();
         Elements trs = table.select("tr");
 
-        Elements onlyInfo = doc.select("el-input[readonly]");
+        Elements onlyInfo = doc.select("[:readonly]");
         if(onlyInfo!=null && onlyInfo.size()>=1){
             for(Element element :onlyInfo ){
-                 element.removeAttr("readonly");
+                 element.removeAttr(":readonly");
              }
         }
 
@@ -339,6 +337,9 @@ public class TextdictInfoController extends BladeController {
             }
         }
 
+        if(jsonArray==null || jsonArray.size()==0 ){
+            return R.success("操作成功");
+        }
         List<TextdictInfo> textdictInfos = new ArrayList<>();
 
         for (int i = 0; i < jsonArray.size(); i++) {
@@ -361,10 +362,13 @@ public class TextdictInfoController extends BladeController {
             textdictInfoService.saveOrUpdate(textdictInfo);
             element.removeAttr("dqId");
             element.attr("dqId", textdictInfo.getId() + "");
-            if(!jsonObject.getInteger("type").equals("6")){
-                element.children().get(0).attr(":readonly","true");
+            if(jsonObject.getInteger("type")==2){ //个人签字 不能用户输入
+                if (element.html().indexOf("el-tooltip") >= 0) {
+                    element.children().get(0).children().get(0).attr(":readonly","true");
+                }else{
+                    element.children().get(0).attr(":readonly","true");
+                }
             }
-
         }
 
         // 写入 excel

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

@@ -35,6 +35,7 @@
         <result column="reference_wbs_template_type_trial" property="referenceWbsTemplateTypeTrial"/>
         <result column="reference_log_wbs_template_id" property="referenceLogWbsTemplateId"/>
         <result column="is_open_random_number" property="isOpenRandomNumber"/>
+        <result column="remark_type" property="remarkType"/>
     </resultMap>
 
     <resultMap id="singPfxManagementResultMap" type="org.springblade.manager.vo.SingPfxManagementVO">

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

@@ -869,7 +869,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     @Override
     public R getBussPdfInfo(Long pkeyId) throws Exception {
 
-        String file_path = "/Users/hongchuangyanfa/Desktop/" ;ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+        String file_path ="/Users/hongchuangyanfa/Desktop/" ;//ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
 
         WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, pkeyId));
@@ -1031,7 +1031,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
                 // 组装电签设置
                 QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("type", 2);
+                queryWrapper.in("type", 2,6);
                 queryWrapper.eq("tab_id", wbsTreeContract.getIsTypePrivatePid());
 
                 List<TextdictInfo> textdictInfos = textdictInfoService.getBaseMapper().selectList(queryWrapper);
@@ -1134,8 +1134,8 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         BladeFile bladeFile = this.newIOSSClient.uploadFile(nodeId + ".pdf", listPdf);
 
         // 合并pdf集合
-        String sql = "update u_information_query set pdf_url ='" + bladeFile.getLink() + "' where classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "' ";
-        jdbcTemplate.execute(sql);
+       // String sql = "update u_information_query set pdf_url ='" + bladeFile.getLink() + "' where classify='" + classify + "' and  wbs_id='" + nodeId + "' and contract_id ='" + contractId + "' ";
+      //  jdbcTemplate.execute(sql);
     }