1

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

@@ -62,7 +62,7 @@ public class ContractFromVO {
     /**
      * 已分解量
      */
-    @ApiModelProperty(value = "已分解量 = 其他节点分解量+施工图数量")
+    @ApiModelProperty(value = "已分解量 = 其他节点分解量+变更后施工图数量")
     private BigDecimal poseNum;
 
     /**

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -2744,7 +2744,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		//先获取当前用户是否已经存在验收任务
 		Boolean aBoolean = this.getApplyStatus(dto.getProjectId());
 		if (aBoolean){
-			throw new ServiceException("当前专家已存在验收任务，请勿重复上报");
+			throw new ServiceException("当前用户已存在验收任务，请勿重复上报");
 		}
 		//设置任务表信息
 		Task task = new Task();

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

@@ -1553,12 +1553,12 @@ public class TaskController extends BladeController {
     @PostMapping("/reSigningEVisa")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "任务管理-一键重签", notes = "传入taskIds、下拉框的contractId、projectId")
-    public R<Object> reSigningEVisa(@RequestParam String taskIds, @RequestParam String contractId, @RequestParam String projectId, HttpServletRequest request) {
+    public R<Object> reSigningEVisa(@RequestParam String classifyType,@RequestParam String taskIds, @RequestParam String contractId, @RequestParam String projectId, HttpServletRequest request) {
         if (ObjectUtil.isEmpty(taskIds)) {
             return R.fail("请选择一条记录");
         }
         String header = request.getHeader("Blade-Auth");
-        taskService.reSigningEVisa(taskIds, contractId, projectId, header);
+        taskService.reSigningEVisa(classifyType,taskIds, contractId, projectId, header);
         return R.success("任务已经成功提交重签，请耐心等待！");
     }
 

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

@@ -154,7 +154,7 @@ public class TaskClientImpl implements TaskClient {
 
     @Override
     public R<Boolean> reSigningEVisa(String taskIds, String contractId, String projectId, String header) {
-        this.taskService.reSigningEVisa(taskIds, contractId, projectId, header);
+//        this.taskService.reSigningEVisa(taskIds, contractId, projectId, header);
         return null;
     }
 

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

@@ -22,6 +22,7 @@ import org.springblade.business.vo.TaskApprovalVO;
 import org.springblade.business.vo.TaskVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.FileNotFoundException;
@@ -97,5 +98,5 @@ public interface ITaskService extends BaseService<Task> {
     void delArchiveFileBusinessData(Long projectId, Long wbsId);
 
     @Async
-    void reSigningEVisa(String taskIds, String contractId, String projectId,String header);
+    void reSigningEVisa(String classify, String taskIds, String contractId, String projectId, String header);
 }

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

@@ -593,8 +593,8 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                     //说明属于待审批和已审批状态，查询待办信息
                     List<Task> tasks = finalTaskMaps.getOrDefault(vor.getId().toString(), null);
                     //获取创建时间最新的那条任务数据（存在多条任务指向同一个form_data_id，即一条资料多次上报，这里要获取最新的）
-                    Optional<Task> maxTask = tasks.stream().max(Comparator.comparing(Task::getCreateTime));
-                    if (maxTask.isPresent()) {
+                    if (tasks != null && tasks.size() > 0) {
+                        Optional<Task> maxTask = tasks.stream().max(Comparator.comparing(Task::getCreateTime));
                         Task maxTaskObject = maxTask.get();
                         //查询当前任务的所有待办人
                         List<TaskParallel> linkTasks = finalTaskParallelMaps.getOrDefault(maxTaskObject.getProcessInstanceId(), null);

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

@@ -61,6 +61,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -1391,7 +1392,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
 //    }
 
     @Override
-    public void reSigningEVisa(String taskIds, String contractId, String projectId, String header) {
+    public void reSigningEVisa(String classify, String taskIds, String contractId, String projectId, String header) {
         //查询任务信息
         List<Task> taskList = jdbcTemplate.query("select * from u_task where id in(" + taskIds + ")", new BeanPropertyRowMapper<>(Task.class));
         if (taskList.size() > 0) {
@@ -1412,7 +1413,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                 for (Task task : taskList) {
                     //重新保存
                     long startTime_1 = System.currentTimeMillis();
-                    R result = this.saveNodePdf(queryMap.get(task.getFormDataId()), contractId, projectId, header);
+                    R result = this.saveNodePdf(classify,queryMap.get(task.getFormDataId()), contractId, projectId, header);
                     long endTime_1 = System.currentTimeMillis();
                     long executionTime_1 = endTime_1 - startTime_1;
                     log.info("saveNodePdf执行时间：" + executionTime_1 + " 毫秒");
@@ -1458,8 +1459,8 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
         throw new ServiceException("未获取到任务信息，操作失败！");
     }
 
-    R saveNodePdf(String nodePKeyIds, String contractId, String projectId, String header) throws Exception {
-        return excelTabClient.synPDFInfo(contractId, nodePKeyIds, "1", projectId, header);
+    R saveNodePdf(String classify,String nodePKeyIds, String contractId, String projectId, String header) throws Exception {
+        return excelTabClient.synPDFInfo(contractId, nodePKeyIds, classify, projectId, header);
     }
 
 }

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

@@ -2340,7 +2340,8 @@ public class ExcelTabController extends BladeController {
                             taskIdsSeg.forEach(l -> {
                                 try {
                                     sqlIntA.addAll(l.stream().map(id -> "insert into m_cache (id) VALUES (" + id + ")").collect(Collectors.toList()));
-                                    this.taskClient.reSigningEVisa(String.join(",", l), contractId, projectId, AuthUtil.getHeader());
+                                    //要启用此方法，请多传入String classify,1施工2监理
+//                                    this.taskClient.reSigningEVisa(String.join(",", l), contractId, projectId, AuthUtil.getHeader());
                                     sum.addAndGet(l.size());
                                     double d = 100 * (double) sum.get() / (double) taskIds.size();
                                     String str = "已上报数据共计" + taskIdsSeg.size() + "条，已经执行" + sum.get() + "条(" + d + "%)";

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

@@ -617,9 +617,11 @@ public class TextdictInfoController extends BladeController {
         }
 
         if (textdictInfo.getType() == 4) { // 默认值
-            if (element.html().indexOf("el-input") >= 0) {
+            if (element.html().indexOf("el-input") >= 0 ) {
+                element.children().removeAttr("defText");
                 element.children().attr("defText", textdictInfo.getTextId());
             } else {
+                element.children().removeAttr("defText");
                 element.attr("defText", textdictInfo.getTextId());
             }
             File writeFile = new File(wbsTreePrivate.getHtmlUrl());

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

@@ -133,8 +133,8 @@
     </select>
     <select id="getNotResolveForm" resultType="org.springblade.meter.vo.ContractFromVO">
         select cif.id, cif.form_number,cif.form_name,cif.current_price,cif.contract_total,cif.change_total,cif.is_supplement,
-               IFNULL((SELECT SUM(build_picture_total) from s_inventory_form_meter
-                       WHERE contract_id = #{contractId} and contract_form_id = cif.id),0)  as poseNum
+               IFNULL((SELECT SUM(change_build_picture_total) from s_inventory_form_meter
+                       WHERE contract_id = #{contractId} and contract_form_id = cif.id and is_deleted = 0),0)  as poseNum
         from s_contract_inventory_form cif
         WHERE cif.contract_id = #{contractId} and cif.is_deleted = 0 and cif.is_form_node = 1
             <if test="formNum != null and formNum != ''">
@@ -152,9 +152,9 @@
                           where contract_id = #{contractId} and is_deleted = 0 and contract_form_id = ifm.contract_form_id and contract_meter_id = ifm.contract_meter_id)=0,0,1)
                    ,1),1) as citeStatus,
 
-            IFNULL((SELECT SUM(build_picture_total) from s_inventory_form_meter WHERE contract_id = #{contractId} and contract_form_id = cif.id
+            IFNULL((SELECT SUM(change_build_picture_total) from s_inventory_form_meter WHERE contract_id = #{contractId} and contract_form_id = cif.id
                      and is_deleted = 0 and contract_meter_id and contract_meter_id != #{meterId}),0)  as otherPoseNum,
-            IFNULL((SELECT SUM(build_picture_total) from s_inventory_form_meter
+            IFNULL((SELECT SUM(change_build_picture_total) from s_inventory_form_meter
                 WHERE contract_id = #{contractId} and is_deleted = 0 and contract_form_id = cif.id),0)  as poseNum
         from s_inventory_form_meter ifm left join s_contract_inventory_form cif on ifm.contract_form_id = cif.id
         WHERE ifm.contract_id = #{contractId} and ifm.is_deleted = 0