资料查询显示电签信息

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/InformationQueryVO.java

@@ -76,6 +76,9 @@ public class InformationQueryVO extends InformationQuery {
     @ApiModelProperty("任务人")
     private List<WaitingUser> waitingUserList;
 
+    @ApiModelProperty(value = "电签失败原因")
+    private String eVisaFailedInfo;
+
     public void setWaitingUserList(String waitingUserName, Integer status) {
         if (this.waitingUserList == null) {
             this.waitingUserList = new ArrayList<>();

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

@@ -106,10 +106,13 @@ public class MiddleMeterApply extends BaseEntity {
     @ApiModelProperty(value = "变更令编号")
     private String changeTokenNumber;
     /**
-     * 图片地址
+     * 草图文件
      */
-    @ApiModelProperty(value = "图片地址")
+    @ApiModelProperty(value = "草图文件地址")
     private String pictureUrl;
+
+    @ApiModelProperty(value = "草图文件名称")
+    private String pictureName;
     /**
      * 计算式
      */

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

@@ -23,6 +23,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.BladeUser;
 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.utils.*;
 import org.springblade.manager.entity.ContractInfo;
@@ -545,7 +546,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
 
                 Set<String> processInstanceIds = query.stream().map(Task::getProcessInstanceId).map(id -> "'" + id + "'").collect(Collectors.toSet());
                 if (processInstanceIds.size() > 0) {
-                    List<TaskParallel> taskParallels = jdbcTemplate.query("select task_user, task_user_name, e_visa_status, status, process_instance_id, initiative from u_task_parallel where is_deleted = 0 and process_instance_id in(" + StringUtils.join(processInstanceIds, ",") + ")", new BeanPropertyRowMapper<>(TaskParallel.class));
+                    List<TaskParallel> taskParallels = jdbcTemplate.query("select task_user, task_user_name, e_visa_status, status, process_instance_id, initiative,e_visa_content from u_task_parallel where is_deleted = 0 and process_instance_id in(" + StringUtils.join(processInstanceIds, ",") + ")", new BeanPropertyRowMapper<>(TaskParallel.class));
                     taskParallelMaps = taskParallels.stream().collect(Collectors.groupingBy(TaskParallel::getProcessInstanceId));
                 }
             }
@@ -598,7 +599,7 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                         List<TaskParallel> linkTasks = finalTaskParallelMaps.getOrDefault(tasks.get(0).getProcessInstanceId(), null);
                         if (linkTasks != null && linkTasks.size() > 0) {
                             //处理审批状态
-                            this.integrationMethod(vor, linkTasks);
+                            this.integrationMethod(vor, linkTasks,vo.getTaskStatus());
                         }
                         //设置上报批次
                         vor.setReportNumber(String.valueOf(tasks.get(0).getBatch()));
@@ -816,7 +817,8 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
     /**
      * 统合方法
      */
-    private void integrationMethod(InformationQueryVO vo, List<TaskParallel> linkList) {
+    private void integrationMethod(InformationQueryVO vo, List<TaskParallel> linkList,String taskStatus) {
+
         for (TaskParallel link : linkList) {
             vo.setWaitingUserList
                     (link.getTaskUserName(),
@@ -824,6 +826,17 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                                     (new Integer(2).equals(link.getStatus()) ? 2 :
                                             (new Integer(3).equals(link.getStatus()) && new Integer(1).equals(link.getInitiative())) ? 3
                                                     : 1));
+            String eVisaFailedInfo = "";
+            if (link.getStatus() == 2 && ObjectUtil.isNotEmpty(link.getEVisaStatus()) && link.getEVisaStatus() == 2) {
+                if (link.getEVisaContent().contains("请等待") && ObjectUtil.isEmpty(eVisaFailedInfo)) {
+                    eVisaFailedInfo = link.getEVisaContent();
+                }
+            } else if (ObjectUtil.isNotEmpty(link.getEVisaStatus()) && link.getEVisaStatus() == 99) {
+                if (ObjectUtil.isEmpty(eVisaFailedInfo)) {
+                    eVisaFailedInfo = link.getEVisaContent();
+                }
+            }
+            vo.setEVisaFailedInfo(eVisaFailedInfo);
         }
     }
 

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.java

@@ -65,4 +65,6 @@ public interface MiddleMeterApplyMapper extends BaseMapper<MiddleMeterApply> {
     List<Long> getNodeOtherFormId(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId,@Param("nodeId") Long nodeId);
 
     BigDecimal getCurrentMeterMoney(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId);
+
+    Integer getAllAPPly(@Param("contractId") Long contractId,@Param("contractPeriodId") Long contractPeriodId);
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/MiddleMeterApplyMapper.xml

@@ -120,6 +120,11 @@
         from s_middle_meter_apply
         where contract_id = #{contractId} and is_deleted = 0 and contract_period_id = #{contractPeriodId} and approve_status != 3
     </select>
+    <select id="getAllAPPly" resultType="java.lang.Integer">
+        select count(1)
+        from s_middle_meter_apply
+        where contract_id = #{contractId} and contract_period_id = #{contractPeriodId}
+    </select>
 
 
 </mapper>

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

@@ -400,9 +400,7 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         }
         str.append(contractMeterPeriod.getPeriodNumber()+"-");
         //获取流水号:当前合同段存在的当前计量期的申请单总数+1
-        long count = this.count(new LambdaQueryWrapper<MiddleMeterApply>()
-                .eq(MiddleMeterApply::getContractId, apply.getContractId())
-                .eq(MiddleMeterApply::getContractPeriodId,apply.getContractPeriodId()));
+        Integer count = baseMapper.getAllAPPly(apply.getContractId(),apply.getContractPeriodId());
         str.append(count+1);
         return str.toString();
     }