Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/dto/GetChangeNodeDTO.java

@@ -0,0 +1,13 @@
+package org.springblade.meter.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetChangeNodeDTO {
+    private Long projectId;
+    private Long contractId;
+    private List<Long> ids;
+    private List<Long> changeIds;
+}

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

@@ -167,7 +167,7 @@ public class WeatherController {
     @PostMapping(value = "/downloadWeatherExcel")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "客户端-下载天气台账excel模板")
-    public ResponseEntity<Resource> downloadNeiYe(
+    public ResponseEntity<Resource> downloadWeatherExcel(
             @RequestParam String contractId,
             @RequestParam String startTime,
             @RequestParam String endTime,

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/ChangeTokenFormController.java

@@ -27,6 +27,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.meter.dto.ChangeTokenAddFormDTO;
 import org.springblade.meter.dto.ChangeTokenFormDTO;
+import org.springblade.meter.dto.GetChangeNodeDTO;
 import org.springblade.meter.vo.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -83,7 +84,7 @@ public class ChangeTokenFormController extends BladeController {
 	/**
 	 * 新增-获取变更申请部位
 	 */
-	@GetMapping("/getChangeNode")
+	@PostMapping("/getChangeNode")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "新增-获取变更申请部位", notes = "传入合同id和选中的节点id,返回变更申请部位集合")
 	@ApiImplicitParams(value = {
@@ -91,8 +92,8 @@ public class ChangeTokenFormController extends BladeController {
 			@ApiImplicitParam(name = "ids", value = "选中的节点id，逗号拼接", required = true),
 			@ApiImplicitParam(name = "changeIds", value = "已经存在的节点id，逗号拼接", required = true)
 	})
-	public R<List<ChangeNodeVO>> getChangeNode(Long contractId,String ids,String changeIds) {
-		List<ChangeNodeVO> vos = changeTokenFormService.getChangeNode(contractId,ids,changeIds);
+	public R<List<ChangeNodeVO>> getChangeNode(@RequestBody GetChangeNodeDTO dto) {
+		List<ChangeNodeVO> vos = changeTokenFormService.getChangeNode(dto);
 		return R.data(vos);
 	}
 

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

@@ -43,7 +43,7 @@ public interface ChangeTokenFormMapper extends BaseMapper<ChangeTokenForm> {
 
     List<Long> getNodeForm(@Param("contractId") Long contractId,@Param("nodeId") Long nodeId);
 
-    List<ChangeNodeVO> getChangeNode(@Param("contractId") Long contractId,@Param("ids") List<Long> longs,@Param("id2") String ids);
+    List<ChangeNodeVO> getChangeNode(@Param("contractId") Long contractId,@Param("ids") List<Long> longs);
 
     List<ChangeFormVO2> selectForm(@Param("contractId") Long contractId,@Param("ids") List<Long> longs,@Param("nodeId") Long nodeId);
 

blade-service/blade-meter/src/main/java/org/springblade/meter/service/IChangeTokenFormService.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.meter.dto.ChangeTokenAddFormDTO;
 import org.springblade.meter.dto.ChangeTokenFormDTO;
+import org.springblade.meter.dto.GetChangeNodeDTO;
 import org.springblade.meter.entity.ChangeTokenForm;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.meter.vo.*;
@@ -63,7 +64,7 @@ public interface IChangeTokenFormService extends BaseService<ChangeTokenForm> {
     /**
      * 新增 变更令
      */
-    List<ChangeNodeVO> getChangeNode(Long contractId,String ids,String changeIds);
+    List<ChangeNodeVO> getChangeNode(GetChangeNodeDTO dto);
 
     /**
      * 修改 变更令表

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

@@ -31,6 +31,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.meter.dto.ChangeTokenAddFormDTO;
 import org.springblade.meter.dto.ChangeTokenFormDTO;
+import org.springblade.meter.dto.GetChangeNodeDTO;
 import org.springblade.meter.entity.*;
 import org.springblade.meter.mapper.ChangeTokenFormMapper;
 import org.springblade.meter.service.*;
@@ -319,17 +320,16 @@ public class ChangeTokenFormServiceImpl extends BaseServiceImpl<ChangeTokenFormM
      * 新增-获取变更申请部位
      */
     @Override
-    public List<ChangeNodeVO> getChangeNode(Long contractId,String ids,String changeIds) {
+    public List<ChangeNodeVO> getChangeNode(GetChangeNodeDTO dto) {
         List<ChangeNodeVO> vos = new ArrayList<>();
-        if (StringUtils.isBlank(ids)){
+        if (dto.getIds().isEmpty()){
             return vos;
         }
-        List<Long> longs = Func.toLongList(ids);
         //获取所选节点下的最底层节点
-        vos = baseMapper.getChangeNode(contractId,longs,ids);
+        vos = baseMapper.getChangeNode(dto.getContractId(),dto.getIds());
         //排除当前已经存在的节点
-        if (StringUtils.isNotBlank(changeIds)) {
-            vos = vos.stream().filter(l ->!changeIds.contains(l.getId()+"")).collect(Collectors.toList());
+        if (!dto.getChangeIds().isEmpty()) {
+            vos = vos.stream().filter(l ->!dto.getChangeIds().contains(l.getId())).collect(Collectors.toList());
         }
         for (ChangeNodeVO vo : vos) {
             vo.setNodeUrl(middleMeterApplyService.getNodeDivide(vo.getId()));