Merge branch 'master' of http://47.110.251.215:3000/java_org/bladex

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ContractLog.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -40,33 +41,45 @@ public class ContractLog extends BaseEntity {
     /**
      * 项目ID
      */
+    @ApiModelProperty("项目ID")
     private Long projectId;
     /**
      * 合同段ID
      */
+    @ApiModelProperty("合同段ID")
     private Long contractId;
     /**
      * 所填报的节点类型ID
      */
+    @ApiModelProperty("所填报的节点类型ID")
     private Long wbsNodeId;
     /**
      * 日志类型
      */
+    @ApiModelProperty("日志类型")
     private Integer wbsNodeType;
     /**
      * 填报时间、施工时间
      */
+    @ApiModelProperty("填报时间、施工时间")
     private String recordTime;
     /**
      * 编号
      */
+    @ApiModelProperty("编号")
     private String recordNumber;
+
+    @ApiModelProperty("工程桩号")
     private String projectPileno;
+
+    @ApiModelProperty("工程部位")
     private String projectPart;
     /**
      * 数据ID
      */
     private Long dataId;
+
+    @ApiModelProperty("填报人姓名")
     private String createUserName;
 
 

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

@@ -59,7 +59,7 @@ public class ContractLogController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "获取当前日志类型的填报人")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "wbsNodeId", value = "分类列表的primaryKeyId", required = true),
+			@ApiImplicitParam(name = "primaryKeyId", value = "分类列表的primaryKeyId", required = true),
 			@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
 	})
 	public R<List<FileUserVO>> queryFillUser(@RequestParam Long primaryKeyId, @RequestParam Long contractId){
@@ -74,7 +74,7 @@ public class ContractLogController extends BladeController {
 	 * @param logVo 查询条件
 	 * @return 结果
 	 */
-	@GetMapping("/constructionLogPage")
+	@PostMapping("/constructionLogPage")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "施工日志分页")
 	public R<IPage<ContractLogVO>> constructionLogPage(@RequestBody ContractLogVO logVo){

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

@@ -24,6 +24,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.business.entity.ContractTreeDrawings;
+import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -53,23 +54,32 @@ public class ContractTreeDrawingsController extends BladeController {
 	 * @return 保存结果
 	 */
 	@PostMapping("/saveContractTreeDrawings")
-	@ApiOperationSupport(order = 14)
+	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "保存或修改节点上传的图纸记录")
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "primaryKeyId", value = "节点primaryKeyId", required = true),
 			@ApiImplicitParam(name = "fileUrl", value = "文件url", required = true),
 			@ApiImplicitParam(name = "id", value = "节点的drawingsId")
 	})
-	public R<Boolean> saveOrUpdateContractTreeDrawings(@RequestParam String primaryKeyId, @RequestParam String fileUrl, @RequestParam String id){
+	public R<String> saveOrUpdateContractTreeDrawings(@RequestParam String primaryKeyId, @RequestParam String fileUrl, @RequestParam String id){
 		//当前提交用户
 		BladeUser user = AuthUtil.getUser();
-		return StringUtils.isNotEmpty(id) ?
-				R.data(this.contractTreeDrawingsService.update(Wrappers.<ContractTreeDrawings>lambdaUpdate()
-						.set(ContractTreeDrawings::getFileUrl, fileUrl).set(ContractTreeDrawings::getUpdateUser, user.getUserId())
-						.set(ContractTreeDrawings::getUpdateTime, new Date())
-						.eq(ContractTreeDrawings::getId, id)))
-				:
-				R.data(this.contractTreeDrawingsService.save(new ContractTreeDrawings(primaryKeyId, fileUrl, user.getUserId(), user.getDeptId())));
+		if(StringUtils.isNotEmpty(id) || !"-1".equals(id)){
+			//修改
+			this.contractTreeDrawingsService.update(Wrappers.<ContractTreeDrawings>lambdaUpdate()
+					.set(ContractTreeDrawings::getFileUrl, fileUrl).set(ContractTreeDrawings::getUpdateUser, user.getUserId())
+					.set(ContractTreeDrawings::getUpdateTime, new Date())
+					.eq(ContractTreeDrawings::getId, id));
+
+			return R.data(id);
+		} else {
+			//新增
+			ContractTreeDrawings drawings = new ContractTreeDrawings(primaryKeyId, fileUrl, user.getUserId(), user.getDeptId());
+			drawings.setId(SnowFlakeUtil.getId());
+			this.contractTreeDrawingsService.save(drawings);
+
+			return R.data(drawings.getId().toString());
+		}
 	}
 	
 }

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

@@ -81,6 +81,48 @@ public class InformationWriteQueryController extends BladeController {
 
 	private final ITreeContractFirstService treeContractFirstService;
 
+	/**
+	 * 导图结构树节点查询
+	 * @return 结果
+	 */
+	@GetMapping("/queryMappingStructureTree")
+	@ApiOperationSupport(order = 14)
+	@ApiOperation(value = "导图结构树节点查询")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "parentId", value = "父节点，首次进入传0、null、''", required = true),
+			@ApiImplicitParam(name = "wbsType", value = "模板类型， 1质检，2试验", required = true),
+			@ApiImplicitParam(name = "contractId", value = "合同段ID", required = true)
+	})
+	public R<List<WbsTreeContractTreeVOS>> queryMappingStructureTree(@RequestParam String parentId, @RequestParam Integer wbsType, @RequestParam String contractId){
+		if(StringUtils.isEmpty(parentId) || "0".equals(parentId)){
+			//直接返回
+			return R.data(this.clientTreePublicCodeClient.queryContractWbsTreeByContractIdAndType(contractId, wbsType, "0"));
+		}
+		//不是根节点，则获取子节点
+		List<WbsTreeContractTreeVOS> result = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(contractId, 1, parentId);
+		//判断当前节点下是不是只有一个子节点
+		if(result != null && result.size() == 1){
+			this.foreachQueryChildNode(result, contractId);
+		}
+
+		return R.data(result);
+	}
+
+	/**
+	 * 如果子节点只有一个，则进一步查询该子节点的下级节点
+	 * @param result 子节点集合
+	 */
+	private void foreachQueryChildNode(List<WbsTreeContractTreeVOS> result, String contractId){
+		result.forEach(vos -> {
+			List<WbsTreeContractTreeVOS> child = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(contractId, 1, vos.getId());
+			if(child != null && child.size() == 1){
+				//如果子节点还是只有一个，则进一步向下查询
+				this.foreachQueryChildNode(child, contractId);
+			}
+			vos.setChildren(child);
+		});
+	}
+
 	/**
 	 * 修改节点信息
 	 * @param node 节点信息

blade-service/blade-business/src/main/java/org/springblade/business/utils/FunctionMain.java

@@ -188,7 +188,6 @@ public class FunctionMain {
          dap.setRemark("导线点");
         System.out.println(JSON.toJSONString(dap));
     }
-*/
-
+**/
 
 }

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -2164,7 +2164,7 @@ public class CustomFunction {
 	public static Object tree(List<String>nodes,String param){
 		if(CollectionUtil.isNotEmpty(nodes)&& Func.isNotBlank(param)){
 			List<String> result = new ArrayList<>();
-			param=param.replaceAll("[cC]","");
+			param=param.replaceAll("(?i:c)","");
 			List<String> list = Arrays.asList(param.split("-"));
 			List<Integer> index =list.stream().map(Integer::parseInt).collect(Collectors.toList());
 			for(Integer i:index){

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

@@ -27,7 +27,9 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author yangyj
@@ -64,6 +66,35 @@ public class WbsParamController {
         }
     }
 
+    @PostMapping("/saveOrUpdateBatch")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "批量保存或修改参数", notes = "批量保存或修改参数")
+    public R saveOrUpdateBatch(@RequestBody List<WbsParamBean> wps) {
+       if(CollectionUtil.isNotEmpty(wps)){
+           List<Long> ids= wps.stream().map(WbsParamBean::getId).filter(Objects::nonNull).collect(Collectors.toList());
+           if(CollectionUtil.isNotEmpty(ids)){
+               this.service.update(Wrappers.<WbsParam>update().lambda().set(WbsParam::getIsDeleted,1).notIn(WbsParam::getId,ids));
+           }
+           Map<Boolean,List<WbsParamBean>> map = wps.stream().collect(Collectors.partitioningBy(e->e.getId()!=null));
+           List<WbsParamBean> saveList = map.get(false);
+           List<WbsParamBean> updateList = map.get(true);
+           if(CollectionUtil.isNotEmpty(saveList)){
+               this.service.saveBatch(BeanUtil.copy(saveList,WbsParam.class));
+           }
+           if(CollectionUtil.isNotEmpty(updateList)){
+               List<WbsParam> ul = new ArrayList<>();
+               for(WbsParamBean b:updateList){
+                   WbsParam old = this.service.getById(b.getId());
+                   BeanUtils.copyProperties(b,old);
+                   ul.add(old);
+               }
+               this.service.saveOrUpdateBatch(ul);
+           }
+           return  R.status(true);
+       }
+       return R.status(false);
+    }
+
     /**
      * 删除
      */

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

@@ -6,6 +6,7 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.manager.dto.FormData;
 import org.springblade.manager.entity.Formula;
 import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.mapper.FormulaMapper;
 import org.springblade.manager.service.IFormulaService;
 import org.springframework.stereotype.Service;
@@ -32,6 +33,11 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     public void execute(Map variables, List<FormData> list,List<Formula> formulas ){
              Map<Boolean,List<FormData>> map = list.stream().collect(Collectors.partitioningBy(e->e!=null&&e.getFormula().getFormula().contains("E[")));
             List<FormData>total = new ArrayList<>();
+            List<WbsTree> trees = new ArrayList<>();
+            for(int i=0;i<6;i++){
+                 WbsTree t= new WbsTree();
+                 t.setFullName("第"+i+"层");
+            }
              /*没有依赖的*/
              List<FormData> simple=map.get(false);
              if(CollectionUtil.isNotEmpty(simple)){