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

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

@@ -55,4 +55,7 @@ public class WbsTreeContractTreeVOS {
     @ApiModelProperty("图标")
     private String iconValue;
 
+    @ApiModelProperty("划分编号")
+    private String partitionCode;
+
 }

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

@@ -64,7 +64,7 @@ public class ContractTreeDrawingsController extends BladeController {
 	public R<String> saveOrUpdateContractTreeDrawings(@RequestParam String primaryKeyId, @RequestParam String fileUrl, @RequestParam String id){
 		//当前提交用户
 		BladeUser user = AuthUtil.getUser();
-		if(StringUtils.isNotEmpty(id) || !"-1".equals(id)){
+		if(!"-1".equals(id) && StringUtils.isNotEmpty(id)){
 			//修改
 			this.contractTreeDrawingsService.update(Wrappers.<ContractTreeDrawings>lambdaUpdate()
 					.set(ContractTreeDrawings::getFileUrl, fileUrl).set(ContractTreeDrawings::getUpdateUser, user.getUserId())

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

@@ -125,16 +125,24 @@ public class InformationWriteQueryController extends BladeController {
 
 	/**
 	 * 修改节点信息
-	 * @param node 节点信息
 	 * @return 修改结果
 	 */
 	@PostMapping("/updateContractNodeParameter")
 	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "修改节点信息")
-	@ApiImplicitParam(name = "node", value = "节点信息（目前只允许修改名称），需要将pKeyId传入")
-	public R<Boolean> updateContractNodeParameter(@Valid @RequestBody WbsTreeContract node){
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pKeyId", value = "节点的primaryKeyId", required = true),
+			@ApiImplicitParam(name = "deptName", value = "节点的title", required = true),
+			@ApiImplicitParam(name = "partitionCode", value = "划分编号")
+	})
+	public R<Boolean> updateContractNodeParameter(@RequestParam Long pKeyId, @RequestParam String deptName, @RequestParam String partitionCode){
+		WbsTreeContract node = new WbsTreeContract();
+		node.setPKeyId(pKeyId);
+		node.setDeptName(deptName);
+		node.setPartitionCode(partitionCode);
+
 		//只允许修改节点名称
-		if(StringUtils.isEmpty(node.getDeptName()) || "null".equals(String.valueOf(node.getPKeyId())) || StringUtils.isNotEmpty(String.valueOf(node.getPKeyId()))){
+		if(StringUtils.isEmpty(node.getDeptName()) || "null".equals(String.valueOf(node.getPKeyId())) || StringUtils.isEmpty(String.valueOf(node.getPKeyId()))){
 			return R.data(-1, false , "缺少参数");
 		}
 		return R.data(this.wbsTreeContractClient.updateContractNodeParameter(node));

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

@@ -29,7 +29,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
 
     @Override
     public Boolean updateContractNodeParameter(WbsTreeContract node) {
-        return this.wbsTreeContractService.update(Wrappers.<WbsTreeContract>lambdaUpdate().set(WbsTreeContract::getFullName, node.getDeptName()).set(WbsTreeContract::getPartitionCode, node.getPartitionCode()).eq(WbsTreeContract::getPKeyId, node.getPKeyId()));
+        return this.wbsTreeContractService.update(Wrappers.<WbsTreeContract>lambdaUpdate().set(WbsTreeContract::getDeptName, node.getDeptName()).set(WbsTreeContract::getFullName, node.getDeptName()).set(WbsTreeContract::getPartitionCode, node.getPartitionCode()).eq(WbsTreeContract::getPKeyId, node.getPKeyId()));
     }
 
     @Override

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

@@ -157,11 +157,12 @@
         wbs_type AS wbsType,
         id,
         parent_id,
-        dept_name AS title,
+        IFNULL(full_name,dept_name) AS title,
         type AS "type",
         dept_category AS deptCategory,
         id AS "value",
-        id AS "key"
+        id AS "key",
+        partition_code AS partitionCode
         FROM
         m_wbs_tree_contract
         WHERE