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

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractLazyVO.java

@@ -93,6 +93,9 @@ public class WbsTreeContractLazyVO implements Serializable {
     @ApiModelProperty(value = "全称")
     private String fullName;
 
+    @ApiModelProperty(value = "是否显示")
+    private String isBussShow;
+
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterTreeContract.java

@@ -1,5 +1,7 @@
 package org.springblade.meter.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -93,6 +95,7 @@ public class MeterTreeContract extends BaseEntity {
     private Integer isLock;
 
     @ApiModelProperty(value = "最高支付比例")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private BigDecimal upPayRatio;
 
     @ApiModelProperty(value = "是否自动计量1是0否")

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/TaskPageVO.java

@@ -51,4 +51,8 @@ public class TaskPageVO implements Serializable {
     @ApiModelProperty(value = "预设流程id")
     private Long fixedFlowId;
 
+    @ApiModelProperty(value = "驳回理由")
+    private String rejectDesc;
+
+
 }

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVisaController.java

@@ -175,10 +175,12 @@ public class EVisaController {
         }else{ //废除
             // 修改 主 任务 u_task 表 状态改为3
             String up_task_par = "update u_task_parallel set status=3 where parallel_process_instance_id='"+taskApprovalVO.getParallelProcessInstanceId()+"'";
+            String up_task_queryInfo = "update u_task_parallel set status=3 where parallel_process_instance_id='"+taskApprovalVO.getParallelProcessInstanceId()+"'";
             String up_task = "update u_task set status=3 where id='"+taskApprovalVO.getTaskId()+"'";
             this.jdbcTemplate.execute("delete from u_task_batch where id="+taskApprovalVO.getId());
             jdbcTemplate.execute(up_task_par);
             jdbcTemplate.execute(up_task);
+            jdbcTemplate.execute("update u_information_query set e_visa_pdf_url='',status=0 where id='"+taskApprovalVO.getFormDataId()+"'");
             RedisTemplate.delete("sign-" + taskApprovalVO.getFormDataId());
         }
     }

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

@@ -4042,4 +4042,17 @@ public class ExcelTabController extends BladeController {
     }
 
 
+    /**
+     * 获取项目表单的PDF
+     */
+    @GetMapping("/get-priwbs-pdf")
+    @ApiOperationSupport(order = 74)
+    @ApiOperation(value = "获取项目表单的PDF", notes = "获取项目表单的PDF")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
+    })
+    public R getPriWbsPdfByPId(Long pkeyId) throws Exception {
+
+        return R.data("http://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20230616/d1e4bed554cdb12e34928d15d53e33aa.pdf");
+    }
 }

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

@@ -73,7 +73,6 @@ public class WbsTreeContractController extends BladeController {
     @Autowired
     StringRedisTemplate redisTemplate;
     private final JdbcTemplate jdbcTemplate;
-    private final NewIOSSClient newIOSSClient;
     private final IWbsTreeContractService iWbsTreeContractService;
     private final WbsTreeContractServiceImpl wbsTreeContractServiceImpl;
     private final ContractClient contractClient;
@@ -713,4 +712,19 @@ public class WbsTreeContractController extends BladeController {
     }
 
 
+    /**
+     * 客户端  节点显示 和 隐藏
+     */
+    @PostMapping("/updateNodeStates")
+    @ApiOperationSupport(order = 41)
+    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "ids", value = "节点pkeyids", required = true),
+            @ApiImplicitParam(name = "status", value = "节点状态(1显示，2隐藏)", required = true)
+    })
+    public R updateNodeStates(@RequestParam String ids,@RequestParam String status) {
+        wbsTreeContractServiceImpl.UpdateNodeStatus(ids,status);
+         return R.success("成功");
+    }
+
 }

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

@@ -101,6 +101,9 @@
             is_deleted = 0 )
             )
         </if>
+        <if test="vo.certificateUserName != null">
+            and (spf.certificate_user_name like concat('%',#{vo.certificateUserName},'%') or spf.certificate_id like concat('%',#{vo.certificateUserName},'%') )
+        </if>
         order by spf.create_time DESC limit #{current},#{size}
     </select>
 

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

@@ -69,5 +69,4 @@ public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
 
     List<WbsTreeContractLazyVO> getConcealedWorksNodeTree(String contractId, String parentId);
 
-
 }

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

@@ -80,6 +80,7 @@ import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
+import java.awt.geom.Rectangle2D;
 import java.io.*;
 import java.net.URL;
 import java.text.ParseException;
@@ -1895,6 +1896,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             }
         }
 
+        if(pkeyId==1771097177339199489L){
+            System.out.println("1231");
+        }
         //数据不为空
         if (StringUtils.isNotEmpty(wbsTreeContract.getHtmlUrl())) {
             InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(wbsTreeContract.getHtmlUrl());
@@ -3681,4 +3685,5 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     }
 
 
+
 }

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

@@ -1052,6 +1052,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         return null;
     }
 
+
+
     /**
      * 递归获取隐蔽工程节点的所有父级节点
      *
@@ -2321,4 +2323,21 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         vo.setOuter(info2);
         return vo;
     }
+
+    public R UpdateNodeStatus(String ids, String status) {
+        if(ids==null && StringUtils.isEmpty(ids)){
+            return R.fail("ids不能为空");
+        }
+
+        if(status==null && StringUtils.isEmpty(status)){
+            return R.fail("status不能为空");
+        }
+
+        List<Long> longList = Func.toLongList(ids);
+        for(long pid:longList){
+            jdbcTemplate.execute("update m_wbs_tree_contract set is_buss_show = " + status + " where p_key_id = " + pid);
+        }
+
+        return R.success("操作成功");
+    }
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/FileUtils.java

@@ -16,6 +16,13 @@ import com.spire.xls.core.spreadsheet.HTMLOptions;
 import com.sun.image.codec.jpeg.JPEGCodec;
 import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import org.apache.commons.lang.StringUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.text.TextPosition;
 import org.apache.poi.hssf.usermodel.HSSFPrintSetup;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -41,6 +48,7 @@ import org.springblade.system.cache.ParamCache;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;

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

@@ -180,10 +180,10 @@ public class TaskController extends BladeController {
         /*加锁*/
         String redisValue = bladeRedis.get("meter:report:contractId-" + approvalDTO.getContractId());
         if (StringUtils.isNotEmpty(redisValue) && redisValue.equals("1")) {
-            return R.fail(400, "请勿重复提交，30秒后再尝试");
+            return R.fail(400, "请勿重复提交，2秒后再尝试");
         }
         bladeRedis.set("meter:report:contractId-" + approvalDTO.getContractId(), "1");
-        bladeRedis.expire("meter:report:contractId-" + approvalDTO.getContractId(), 30);
+        bladeRedis.expire("meter:report:contractId-" + approvalDTO.getContractId(), 1);
 
         if (ObjectUtil.isNotEmpty(approvalDTO.getType()) && (approvalDTO.getType().equals(1) || approvalDTO.getType().equals(2) || approvalDTO.getType().equals(3) || approvalDTO.getType().equals(4))) {
             if (approvalDTO.getType().equals(1)) {
@@ -1072,6 +1072,7 @@ public class TaskController extends BladeController {
         List<TaskPageVO> pageList = resultList.stream()
                 .map(task -> {
                     TaskPageVO vo = new TaskPageVO();
+                    vo.setRejectDesc(task.getMeterTaskRepealDesc());
                     vo.setId(task.getId());
                     vo.setTaskName(task.getTaskName());
                     vo.setTaskTypeName(task.getType().equals(1) ? "普通任务" : task.getType().equals(2) ? "验收任务" : "移交任务");

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MeterTreeContractServiceImpl.java

@@ -2201,7 +2201,6 @@ public class MeterTreeContractServiceImpl extends BaseServiceImpl<MeterTreeContr
         }
         //校验比例是否在范围之内
         if (dto.getUpPayRatio() == null){
-            dto.setUpPayRatio(new BigDecimal(80));
         }else if (dto.getUpPayRatio().compareTo(BigDecimal.ZERO) < 0 || dto.getUpPayRatio().compareTo(new BigDecimal("100")) > 0){
             throw new ServiceException("请检查支付比例是否在规定范围");
         }

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

@@ -719,7 +719,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                 if (new Integer(1).equals(contractInfo.getContractType())) {
                     String sql = "SELECT is_custom,p_key_id,contract_id," +
                             "(SELECT id FROM u_contract_tree_drawings WHERE process_id = p_key_id AND is_deleted = 0 limit 1) AS drawingsId," +
-                            "id,parent_id,node_type,type,wbs_type,is_concrete,major_data_type,partition_code,old_id,contract_id_relation,is_concealed_works_node," +
+                            "id,parent_id,node_type,type,wbs_type,is_buss_show as isBussShow,is_concrete,major_data_type,partition_code,old_id,contract_id_relation,is_concealed_works_node," +
                             "CASE (SELECT count(1) FROM u_tree_contract_first AS tcf WHERE tcf.is_deleted = 0 AND tcf.wbs_node_id = a.p_key_id) " +
                             "WHEN 0 THEN 'false' ELSE 'true' END AS isFirst,IFNULL(if(length(trim(full_name))>0,full_name,node_name),node_name) AS title," +
                             "(SELECT CASE WHEN count(1) > 0 THEN 1 ELSE 0 END FROM m_wbs_tree_contract b WHERE b.parent_id = a.id AND b.type = 1" +