试验相关bug

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

@@ -50,7 +50,4 @@ public class EntrustInfoVO extends EntrustInfo {
 	@ApiModelProperty("测试单Id")
 	private String testId;
 
-    @ApiModelProperty("是否关联试验记录")
-    private Boolean isRecords;
-
 }

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

@@ -143,7 +143,7 @@ public class  EntrustInfoController extends BladeController {
 		return R.status(entrustInfoService.saveOrUpdate(entrustInfo));
 	}
 
-
+	
 	/**
 	 * 删除 委托单信息表
 	 */
@@ -154,13 +154,6 @@ public class  EntrustInfoController extends BladeController {
 		return  entrustInfoService.delEntrustInfo(ids);
 	}
 
-    @GetMapping("/annul")
-    @ApiOperationSupport(order = 7)
-    @ApiOperation(value = "废除委托单（撤回上报）")
-    public R annul(@RequestParam String id){
-        return entrustInfoService.annul(id);
-    }
-
 	@PostMapping("/get-report-detail")
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "获取报告详情", notes = "获取报告详情")

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

@@ -75,6 +75,4 @@ public interface IEntrustInfoService extends BaseService<EntrustInfo> {
 	R delEntrustInfo(String ids);
 	//检查材料是否关联委托单
 	R checkSample(Long sampleId);
-
-    R annul(String id);
 }

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

@@ -22,32 +22,25 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.business.entity.EntrustInfo;
-import org.springblade.business.entity.InformationQuery;
-import org.springblade.business.entity.Task;
-import org.springblade.business.entity.TaskParallel;
 import org.springblade.business.mapper.EntrustInfoMapper;
 import org.springblade.business.service.IEntrustInfoService;
-import org.springblade.business.service.IInformationQueryService;
 import org.springblade.business.vo.EntrustDataInfoVO;
 import org.springblade.business.vo.EntrustInfoVO;
 import org.springblade.business.vo.LoadDataInfoVO;
 import org.springblade.business.vo.TrialSampleDataInfoVO;
-import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.feign.ExcelTabClient;
 import org.springblade.manager.feign.WbsTreePrivateClient;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 委托单信息表 服务实现类
@@ -63,7 +56,6 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
 	private final JdbcTemplate jdbcTemplate;
 	private final WbsTreePrivateClient wbsTreePrivateClient;
 	private final EntrustInfoMapper entrustInfoMapper;
-    private final IInformationQueryService informationQueryService;
 
 	@Override
 	public IPage<EntrustInfoVO> selectEntrustInfoPage(IPage<EntrustInfoVO> page, EntrustInfoVO entrustInfo) {
@@ -156,6 +148,7 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
 					}
 				}
 			}
+
 			if ((wb.get("dynamic_dict") + "").equals("501")) { //委托单--委托单编号
 				for(String dataEkey : dataInfo.keySet()){
 					if(dataEkey.indexOf(ekey)>=0){
@@ -165,10 +158,7 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
 			}
 		}
 		entrustInfo.setEntrustName(wbsTreePrivate.getNodeName());
-        if(dataInfo.containsKey("id")){
-            entrustInfo.setId(Long.parseLong(dataInfo.get("id").toString()));
-        }
-        this.saveOrUpdate(entrustInfo);
+		this.saveOrUpdate(entrustInfo);
 		dataInfo.put("groupId",entrustInfo.getId());
 		dataInfo.put("pkeyId", dataInfo.getString("nodeErTreeId"));
 		excelTabClient.saveEntrustTabData(dataInfo);
@@ -214,49 +204,4 @@ public class EntrustInfoServiceImpl extends BaseServiceImpl<EntrustInfoMapper, E
 		}
 		return R.success("操作成功");
 	}
-
-    @Override
-    @Transactional
-    public R annul(String id) {
-        if (ObjectUtil.isEmpty(SecureUtil.getUserId()) || SecureUtil.getUserId() == -1L) {
-            throw new ServiceException("未获取到当前用户信息");
-        }
-        String[] ids = id.split(",");
-        List<String>formDataIds=new ArrayList<>();
-        if(ids.length>0){
-            for (String i : ids) {
-                EntrustInfo entrustInfo = entrustInfoMapper.selectById(Long.parseLong(i));
-                if(entrustInfo.getStatus()!=2&&entrustInfo.getStatus()!=3){
-                    throw new ServiceException("该委托单不能废除"+entrustInfo.getEntrustNo());
-                }
-                entrustInfo.setEntrustEPdf(null);
-                entrustInfo.setStatus(1);
-                entrustInfoMapper.updateById(entrustInfo);
-            }
-            List<InformationQuery> queryList = this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getId, Arrays.asList(ids)));
-            if (queryList.size() == 0) {
-                //试验填报数据
-                queryList = new ArrayList<>(this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getWbsId, Arrays.asList(ids))));
-                //重新绑定trialSelfInspectionRecordId使用map
-                //试验记录 和 委托单 ids重新赋值映射为数据源ids
-                formDataIds = queryList.stream().map(InformationQuery::getId).map(String::valueOf).collect(Collectors.toList());
-            }
-            if(formDataIds.size()>0){
-                for (String formDataId : formDataIds) {
-                    String sql="Select * from u_task where form_data_id="+formDataId +" and status!=3 and is_deleted=0";
-                    Task task = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(Task.class));
-                    if(task!=null){
-                        String updateTaskParallel="update u_task_parallel set status=3 where process_instance_id='" + task.getProcessInstanceId() + "'";
-                        String updateTask="update u_task set status=3 where id="+task.getId()+" and status!=3 and is_deleted=0";
-                        jdbcTemplate.update(updateTaskParallel);
-                        jdbcTemplate.update(updateTask);
-                    }
-                    String updateinformationQuery="update u_information_query set status=3,e_visa_pdf_url= null where id="+formDataId;
-                    jdbcTemplate.update(updateinformationQuery);
-                }
-            }
-
-        }
-        return R.success("操作成功");
-    }
 }

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

@@ -18,7 +18,7 @@ public class ScheduledTasks {
     //@Scheduled(fixedDelay = 5000) // 上一次任务执行完毕后等待5秒再执行下一次
     public void runTask() {
         //246 i=88,183 i=83
-        if(i==6){
+        if(i==88){
             return;
         }
         iWbsTreeContractService.diGuiWbs(i);

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

@@ -707,7 +707,7 @@ public class WbsTreePrivateController extends BladeController {
                 }
 
                 //表单数据
-                List<Map<String, Object>> bussDataInfoTrial = iExcelTabService.getBussDataInfoTrial(id, treePrivate.getPKeyId(), Long.parseLong(contractId),null,null,null,null);
+                List<Map<String, Object>> bussDataInfoTrial = iExcelTabService.getBussDataInfoTrial(id, treePrivate.getPKeyId(), Long.parseLong(contractId),null,null,null);
                 if (bussDataInfoTrial != null && bussDataInfoTrial.size() > 0) {
                     bussDataInfoTrial.get(0).remove("group_id");
                     treePrivate.setBussDataInfoTrial(bussDataInfoTrial.get(0));

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

@@ -218,7 +218,7 @@ public class WbsTreePrivateClientImpl implements WbsTreePrivateClient {
 
     @Override
     public List<Map<String, Object>> getTrialDataInfo(String pKeyId, Long id) {
-        return excelTabServiceImpl.getBussDataInfoTrial(id, Long.parseLong(pKeyId), null,null,null,null,null);
+        return excelTabServiceImpl.getBussDataInfoTrial(id, Long.parseLong(pKeyId), null,null,null,null);
     }
 
     @Override
@@ -307,7 +307,7 @@ public class WbsTreePrivateClientImpl implements WbsTreePrivateClient {
                 }
 
                 //表单数据
-                List<Map<String, Object>> bussDataInfoTrial = iExcelTabService.getBussDataInfoTrial(id, treePrivate.getPKeyId(), Long.parseLong(contractId),null,null,null,null);
+                List<Map<String, Object>> bussDataInfoTrial = iExcelTabService.getBussDataInfoTrial(id, treePrivate.getPKeyId(), Long.parseLong(contractId),null,null,null);
                 if (bussDataInfoTrial != null && bussDataInfoTrial.size() > 0) {
                     bussDataInfoTrial.get(0).remove("group_id");
                     treePrivate.setBussDataInfoTrial(bussDataInfoTrial.get(0));

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

@@ -2688,36 +2688,43 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         System.out.println("66666666666");
     }
     public void diGuiWbs(int i) {
+        List<Long>contractIds=new ArrayList<>();
+        contractIds.add(1750755552044064769L);
+        contractIds.add(1750756463776702465L);
+        contractIds.add(1750756833940807682L);
+        contractIds.add(1750757133997121538L);
+        contractIds.add(1750757280558686209L);
+        contractIds.add(1750757576810766337L);
         QueryWrapper<WbsTreeContract> wbsTreeContractQueryWrapper = new QueryWrapper<>();
         wbsTreeContractQueryWrapper.select("p_key_id","id","p_id","wbs_id","contract_id","parent_id","ancestors");
         wbsTreeContractQueryWrapper.eq("parent_id",0);
         wbsTreeContractQueryWrapper.eq("is_deleted",0);
-        wbsTreeContractQueryWrapper.isNotNull("contract_id");
+        wbsTreeContractQueryWrapper.in("contract_id",contractIds);
         wbsTreeContractQueryWrapper.isNotNull("wbs_id");
         List<WbsTreeContract> list = this.list(wbsTreeContractQueryWrapper);
         if(!list.isEmpty()){
             WbsTreeContract wbsTreeContract = list.get(i);
             //通过parentID,contractID,wbsId分组，映射map
-                    Map<CompositeKey, List<WbsTreeContract>> map = findAllContract(wbsTreeContract).stream()
-                        .collect(Collectors.groupingBy(
-                            item -> new CompositeKey(item.getParentId(),item.getContractId(),item.getWbsId())
-                        ));
-                    List<WbsTreeContract>updateList=new ArrayList<>();
-                    //递归设置pid和ancestors
-                    setPidAndAncestors(map,wbsTreeContract,updateList);
-                    System.out.println(Colour.RED.getCode()+updateList.size()+Colour.RESET.getCode());
-                    for (WbsTreeContract contract : updateList) {
-                        UpdateWrapper wrapper=new UpdateWrapper();
-                        wrapper.set("p_id",contract.getPId());
-                        wrapper.set("ancestors",contract.getAncestors());
-                        wrapper.eq("p_key_id",contract.getPKeyId());
-                        this.update(wrapper);
-                    }
+            Map<CompositeKey, List<WbsTreeContract>> map = findAllContract(wbsTreeContract).stream()
+                .collect(Collectors.groupingBy(
+                    item -> new CompositeKey(item.getParentId(),item.getContractId(),item.getWbsId())
+                ));
+            List<WbsTreeContract>updateList=new ArrayList<>();
+
+            //递归设置pid和ancestors
+            setPidAndAncestors(map,wbsTreeContract,updateList);
+            for (WbsTreeContract contract : updateList) {
+                UpdateWrapper wrapper=new UpdateWrapper();
+                wrapper.set("p_id",contract.getPId());
+                wrapper.set("ancestors",contract.getAncestors());
+                wrapper.eq("p_key_id",contract.getPKeyId());
+                this.update(wrapper);
+            }
         }
-    }
-
+        System.out.println(Colour.RED.getCode()+"第"+i+"次递归完成============================================================================================="+Colour.RESET.getCode());
 
 
+    }
     public  List<WbsTreeContract> findAllContract(WbsTreeContract wbsTreeContract){
         QueryWrapper<WbsTreeContract> wbsTreeContractQueryWrapper = new QueryWrapper<>();
         wbsTreeContractQueryWrapper.select("p_key_id","id","p_id","wbs_id","contract_id","parent_id","ancestors");
@@ -2732,14 +2739,14 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         if(ObjectUtil.isNotEmpty(childrens)){
             for (WbsTreeContract children : childrens) {
                 if(children.getParentId().equals(wbsTreeContract.getId())){
-                        //设置祖级节点和pid
-                        String ancestors=wbsTreeContract.getAncestors()+",";
-                        ancestors=ancestors+wbsTreeContract.getPKeyId();
-                        children.setAncestors(ancestors);
-                        children.setPId(wbsTreeContract.getPKeyId());
-                        updateList.add(children);
-                        //递归调用自己继续将一个合同段的子节点设置完
-                        setPidAndAncestors(map,children,updateList);
+                    //设置祖级节点和pid
+                    String ancestors=wbsTreeContract.getAncestors()+",";
+                    ancestors=ancestors+wbsTreeContract.getPKeyId();
+                    children.setAncestors(ancestors);
+                    children.setPId(wbsTreeContract.getPKeyId());
+                    updateList.add(children);
+                    //递归调用自己继续将一个合同段的子节点设置完
+                    setPidAndAncestors(map,children,updateList);
                 }
             }
         }