Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,28 @@
+package org.springblade.meter.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/12/7 16:35
+ **/
+@Data
+public class ChangeTokenAddFormDTO {
+
+    @ApiModelProperty(value = "合同id")
+    private Long contractId;
+
+    @ApiModelProperty(value = "显示类型")
+    private Integer showType;
+
+    @ApiModelProperty(value = "节点id")
+    private Long nodeId;
+
+    @ApiModelProperty(value = "搜索值")
+    private String searchValue;
+
+    @ApiModelProperty(value = "已经存在的变更申请清单id，逗号拼接")
+    private String ids;
+}

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

@@ -16,10 +16,14 @@
  */
 package org.springblade.meter.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import org.springblade.meter.entity.AttachmentForm;
 import org.springblade.meter.entity.ChangeTokenForm;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 变更令表数据传输对象实体类
  *
@@ -31,4 +35,12 @@ import lombok.EqualsAndHashCode;
 public class ChangeTokenFormDTO extends ChangeTokenForm {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "附件集合")
+	private List<AttachmentForm> nodeList;
+
+	@ApiModelProperty(value = "附件集合")
+	private List<AttachmentForm> formList;
+
+	@ApiModelProperty(value = "附件集合")
+	private List<AttachmentForm> fileList;
 }

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

@@ -0,0 +1,41 @@
+package org.springblade.meter.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Param   变更清单列表 -变更令使用
+ * @Author wangwl
+ * @Date 2023/12/7 15:52
+ **/
+@Data
+public class ChangeFormVO {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "清单编号")
+    private String formNumber;
+
+    @ApiModelProperty(value = "清单名称")
+    private String formName;
+
+    @ApiModelProperty(value = "当前单价")
+    private BigDecimal currentPrice;
+
+    @ApiModelProperty(value = "合同数量")
+    private Integer contractTotal;
+
+    @ApiModelProperty(value = "合同变更后数量")
+    private Integer changeTotal;
+
+    @ApiModelProperty(value = "施工图变更后数量")
+    private Integer buildChangeTotal;
+
+    @ApiModelProperty(value = "分解剩余量")
+    private Integer resolveResidueTotal;
+}

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

@@ -0,0 +1,46 @@
+package org.springblade.meter.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Param   变更申请清单列表 -变更令使用
+ * @Author wangwl
+ * @Date 2023/12/7 15:52
+ **/
+@Data
+public class ChangeFormVO2 {
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "清单编号")
+    private String formNumber;
+
+    @ApiModelProperty(value = "清单名称")
+    private String formName;
+
+    @ApiModelProperty(value = "当前单价")
+    private BigDecimal currentPrice;
+
+    @ApiModelProperty(value = "合同数量(变更前)")
+    private Integer contractTotal;
+
+    @ApiModelProperty(value = "数量变更增减")
+    private Integer currentChangeTotal;
+
+    @ApiModelProperty(value = "合同变更后数量（变更后）")
+    private Integer changeTotal;
+
+    @ApiModelProperty(value = "合同金额（变更前）")
+    private BigDecimal contractMoney;
+
+    @ApiModelProperty(value = "金额变更增减")
+    private BigDecimal currentChangeMoney;
+
+    @ApiModelProperty(value = "变更后金额（变更后）")
+    private BigDecimal changeMoney;
+}

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

@@ -43,4 +43,7 @@ public class MeterInventoryVO {
     @ApiModelProperty(value = "本期计量金额")
     private BigDecimal currentMeterMoney;
 
+    @ApiModelProperty(value = "累计计量数量")
+    private Integer allMeterTotal;
+
 }

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

@@ -17,10 +17,13 @@
 package org.springblade.meter.vo;
 
 import io.swagger.annotations.ApiModelProperty;
+import org.springblade.meter.entity.AttachmentForm;
 import org.springblade.meter.entity.MiddleMeterApply;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 中间计量申请表视图实体类
  *
@@ -38,4 +41,10 @@ public class MiddleMeterApplyVO extends MiddleMeterApply {
 	@ApiModelProperty(value = "计量期号")
 	private String periodNumber;
 
+	@ApiModelProperty(value = "计量清单列表")
+	private List<MeterInventoryVO> formList;
+
+	@ApiModelProperty(value = "附件集合")
+	private List<AttachmentForm> fileList;
+
 }

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

@@ -25,6 +25,10 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.vo.ChangeFormVO;
+import org.springblade.meter.vo.ChangeFormVO2;
 import org.springblade.meter.vo.ZeroChangeVO;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -67,7 +71,7 @@ public class ChangeTokenFormController extends BladeController {
 	 * 获取零号变更
 	 */
 	@GetMapping("/getZeroChange")
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "获取节点下的零号变更", notes = "传入合同段id,节点id")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "contractId", value = "合同id", required = true),
@@ -78,6 +82,49 @@ public class ChangeTokenFormController extends BladeController {
 		return R.data(vos);
 	}
 
+	/**
+	 * 新增-添加清单
+	 */
+	@GetMapping("/addForm")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增添加清单", notes = "传入合同id，显示类型1显示所有2显示已分解，节点id，搜索值,返回清单集合")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "contractId", value = "合同id", required = true),
+			@ApiImplicitParam(name = "showType", value = "显示类型1显示所有2显示已分解", required = true),
+			@ApiImplicitParam(name = "nodeId", value = "节点id", required = true),
+			@ApiImplicitParam(name = "searchValue", value = "搜索值", required = true),
+			@ApiImplicitParam(name = "ids", value = "已经存在的变更申请清单id，逗号拼接", required = true)
+	})
+	public R<List<ChangeFormVO>> addForm(ChangeTokenAddFormDTO dto) {
+		List<ChangeFormVO> vos = changeTokenFormService.addForm(dto);
+		return R.data(vos);
+	}
+
+	/**
+	 * 新增-确认选择清单
+	 */
+	@GetMapping("/selectForm")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增确认选择清单", notes = "传入选中的清单id,返回变更申请清单集合")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "ids", value = "选中的清单id，逗号拼接", required = true)
+	})
+	public R<List<ChangeFormVO2>> selectForm(String ids) {
+		List<ChangeFormVO2> vos = changeTokenFormService.selectForm(ids);
+		return R.data(vos);
+	}
+
+	/**
+	 * 新增 变更令表
+	 */
+	@PostMapping("/add")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "新增变更令", notes = "传入changeTokenFormDTO")
+	public R add(@Valid @RequestBody ChangeTokenFormDTO dto) {
+		changeTokenFormService.add(dto);
+		return R.success("新增成功");
+	}
+
 	/**
 	 * 详情
 	 */

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

@@ -116,11 +116,25 @@ public class MiddleMeterApplyController extends BladeController {
 		return R.success("新增成功");
 	}
 
+//	/**
+//	 * 获取详情
+//	 */
+//	@GetMapping("/detail")
+//	@ApiOperationSupport(order = 6)
+//	@ApiOperation(value = "获取详情", notes = "传入id，返回详情，修改时回显")
+//	@ApiImplicitParams(value = {
+//			@ApiImplicitParam(name = "id", value = "计量申请id", required = true),
+//	})
+//	public R<MeterInventoryDetailVO> detail(Long id) {
+//		MeterInventoryDetailVO  vo = middleMeterApplyService.detail(id);
+//		return R.data(vo);
+//	}
+
 	/**
 	 * 修改 中间计量申请表
 	 */
 	@PostMapping("/update")
-	@ApiOperationSupport(order = 6)
+	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "修改", notes = "传入middleMeterApplyDTO")
 	public R update(@Valid @RequestBody MiddleMeterApplyDTO dto) {
 		middleMeterApplyService.update2(dto);
@@ -131,7 +145,7 @@ public class MiddleMeterApplyController extends BladeController {
 	 * 分页 中间计量申请表
 	 */
 	@GetMapping("/page")
-	@ApiOperationSupport(order = 2)
+	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "分页", notes = "传合同id，节点id，计量期id和分页信息")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "contractId", value = "合同id", required = true),
@@ -147,7 +161,7 @@ public class MiddleMeterApplyController extends BladeController {
 	 * 删除 中间计量申请表
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
+	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		middleMeterApplyService.delete(Func.toLongList(ids));
@@ -158,7 +172,7 @@ public class MiddleMeterApplyController extends BladeController {
 	 * 清单明细
 	 */
 	@GetMapping("/formDetail")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "清单明细", notes = "传入合同id，合同计量期id,返回值包含展开明细")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "contractId", value = "合同id", required = true),

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

@@ -20,6 +20,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.meter.entity.ChangeTokenForm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springblade.meter.entity.ContractInventoryForm;
+import org.springblade.meter.vo.ChangeFormVO;
 import org.springblade.meter.vo.ZeroChangeVO;
 
 import java.util.List;
@@ -36,4 +37,10 @@ public interface ChangeTokenFormMapper extends BaseMapper<ChangeTokenForm> {
     List<ContractInventoryForm> getAllForm(@Param("contractId") Long contractId);
 
     List<ZeroChangeVO> getZeroChange(@Param("contractId") Long contractId,@Param("nodeId") Long nodeId);
+
+    List<ChangeFormVO> getChangeAllForm(@Param("contractId") Long contractId,@Param("searchValue") String searchValue,@Param("ids")  List<Long> ids);
+
+    List<ChangeFormVO> getChangeNodeForm(@Param("contractId") Long contractId,@Param("ids")  List<Long> ids,@Param("searchValue") String searchValue);
+
+    List<Long> getNodeForm(@Param("contractId") Long contractId,@Param("nodeId") Long nodeId);
 }

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

@@ -52,6 +52,45 @@
                         GROUP BY contract_form_id
               )
     </select>
+    <select id="getChangeAllForm" resultType="org.springblade.meter.vo.ChangeFormVO">
+        select id,form_number,form_name,current_price,contract_total,change_total,change_total as buildChangeTotal,
+               (cif.change_total - IFNULL((select sum(build_picture_total) from s_inventory_form_meter ifm
+                           where ifm.contract_id = #{contractId} and ifm.is_deleted = 0 and ifm.contract_form_id = cif.id),0)) as resolveResidueTotal
+        from s_contract_inventory_form cif
+        where contract_id = #{contractId} and is_deleted = 0 and is_form_node = 1
+        <if test="searchValue != null and searchValue != ''">
+            and form_number like concat('%',#{searchValue},'%')
+        </if>
+        <if test="ids.size != 0">
+            and id not in
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+            </foreach>
+        </if>
+    </select>
+    <select id="getChangeNodeForm" resultType="org.springblade.meter.vo.ChangeFormVO">
+        select id,form_number,form_name,current_price,contract_total,change_total,change_total as buildChangeTotal,
+               (cif.change_total - IFNULL((select sum(build_picture_total) from s_inventory_form_meter ifm
+                                           where ifm.contract_id = #{contractId} and ifm.is_deleted = 0 and ifm.contract_form_id = cif.id),0)) as resolveResidueTotal
+        from s_contract_inventory_form cif
+        where contract_id = #{contractId} and is_deleted = 0 and is_form_node = 1
+        <if test="searchValue != null and searchValue != ''">
+            and form_number like concat('%',#{searchValue},'%')
+        </if>
+            and id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+    <select id="getNodeForm" resultType="java.lang.Long">
+        SELECT contract_form_id
+        FROM s_inventory_form_meter
+        WHERE contract_id = #{contractId} and is_deleted = 0
+          and contract_meter_id in ( SELECT id
+                    FROM s_meter_tree_contract mtc WHERE contract_id = #{contractId} and is_deleted = 0
+                            and (mtc.id = #{nodeId} or FIND_IN_SET(#{nodeId}, ancestor) > 0))
+        GROUP BY contract_form_id
+    </select>
 
 
 </mapper>

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

@@ -39,7 +39,7 @@
     </select>
     <select id="getResolveFormInfo" resultType="org.springblade.meter.vo.MeterInventoryVO">
         select id,form_number,form_name,current_price,change_total,
-               IFNULL((select sum(build_picture_total) from s_inventory_form_meter where is_deleted = 0 and contract_form_id = cif.id),0) as resolveResidueTotal,
+               IFNULL((select sum(build_picture_total) from s_inventory_form_meter where is_deleted = 0 and contract_form_id = cif.id),0) as resolveTotal,
                0 as currentMeterTotal,0 as containChangeTotal,0 as currentMeterMoney,
                (IFNULL((select sum(current_meter_total) from s_inventory_form_apply where is_deleted = 0 and contract_form_id = cif.id),0)) as allMeterTotal
         from s_contract_inventory_form  cif where contract_id = #{contractId} and is_deleted = 0 and is_form_node = 1

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

@@ -16,8 +16,12 @@
  */
 package org.springblade.meter.service;
 
+import org.springblade.meter.dto.ChangeTokenAddFormDTO;
+import org.springblade.meter.dto.ChangeTokenFormDTO;
 import org.springblade.meter.entity.ChangeTokenForm;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.meter.vo.ChangeFormVO;
+import org.springblade.meter.vo.ChangeFormVO2;
 import org.springblade.meter.vo.ZeroChangeVO;
 
 import java.util.List;
@@ -40,4 +44,16 @@ public interface IChangeTokenFormService extends BaseService<ChangeTokenForm> {
      * 获取零号变更
      */
     List<ZeroChangeVO> getZeroChange(Long contractId, Long nodeId);
+
+    /**
+     * 新增 变更令表
+     */
+    void add(ChangeTokenFormDTO dto);
+
+    /**
+     * 新增-添加清单
+     */
+    List<ChangeFormVO> addForm(ChangeTokenAddFormDTO dto);
+
+    List<ChangeFormVO2> selectForm(String ids);
 }

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

@@ -54,4 +54,6 @@ public interface IMiddleMeterApplyService extends BaseService<MiddleMeterApply>
     void delete(List<Long> ids);
 
     List<MeterInventoryDetailVO> formDetail(MiddleMeterApply middleMeterApply);
+
+    MeterInventoryDetailVO detail(Long id);
 }

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

@@ -17,18 +17,26 @@
 package org.springblade.meter.service.impl;
 
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.meter.dto.ChangeTokenAddFormDTO;
+import org.springblade.meter.dto.ChangeTokenFormDTO;
 import org.springblade.meter.entity.ChangeTokenForm;
 import org.springblade.meter.entity.ContractInventoryForm;
 import org.springblade.meter.mapper.ChangeTokenFormMapper;
 import org.springblade.meter.service.IChangeTokenFormService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.meter.service.IContractInventoryFormService;
+import org.springblade.meter.vo.ChangeFormVO;
+import org.springblade.meter.vo.ChangeFormVO2;
 import org.springblade.meter.vo.ZeroChangeVO;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 变更令表 服务实现类
@@ -80,4 +88,49 @@ public class ChangeTokenFormServiceImpl extends BaseServiceImpl<ChangeTokenFormM
         }
         return vos;
     }
+
+    /**
+     * 新增 变更令表
+     */
+    @Override
+    public void add(ChangeTokenFormDTO dto) {
+
+    }
+
+    /**
+     * 新增-添加清单
+     */
+    @Override
+    public List<ChangeFormVO> addForm(ChangeTokenAddFormDTO dto) {
+        List<ChangeFormVO> vos = new ArrayList<>();
+        List<Long> ids = new ArrayList<>();
+        String dtoIds = dto.getIds();
+        if (StringUtils.isNotBlank(dtoIds)){
+            ids = Func.toLongList(dtoIds);
+        }
+        //1查询所有2查询节点下
+        if (dto.getShowType() == 1){
+            vos = baseMapper.getChangeAllForm(dto.getContractId(),dto.getSearchValue(),ids);
+        }else {
+            //先获取节点下的id
+            List<Long> formIds = baseMapper.getNodeForm(dto.getContractId(),dto.getNodeId());
+            //再去重
+            if (ids.size() != 0){
+                formIds = formIds.stream().filter(l -> !dtoIds.contains(l.toString())).collect(Collectors.toList());
+            }
+            if (formIds.size() != 0) {
+                //最后查询具体数据
+                vos = baseMapper.getChangeNodeForm(dto.getContractId(), formIds, dto.getSearchValue());
+            }
+        }
+        return vos;
+    }
+
+    /**
+     * 新增-确认选择清单
+     */
+    @Override
+    public List<ChangeFormVO2> selectForm(String ids) {
+        return null;
+    }
 }

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

@@ -147,6 +147,8 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         List<AttachmentForm> fileList = dto.getFileList();
         if (fileList != null && fileList.size() != 0) {
             for (AttachmentForm file : fileList) {
+                file.setProjectId(dto.getProjectId());
+                file.setContractId(dto.getContractId());
                 file.setMasterId(id);
             }
             attachmentFormService.saveBatch(fileList);
@@ -235,6 +237,8 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         List<AttachmentForm> fileList = dto.getFileList();
         if (fileList != null && fileList.size() != 0) {
             for (AttachmentForm file : fileList) {
+                file.setProjectId(dto.getProjectId());
+                file.setContractId(dto.getContractId());
                 file.setMasterId(dto.getId());
             }
             attachmentFormService.saveOrUpdateBatch(fileList);
@@ -302,4 +306,15 @@ public class MiddleMeterApplyServiceImpl extends BaseServiceImpl<MiddleMeterAppl
         }
         return vos;
     }
+
+    /**
+     * 获取详情
+     */
+    @Override
+    public MeterInventoryDetailVO detail(Long id) {
+        //获取中间计量申请
+        //获取计量清单列表
+        //获取附件列表
+        return null;
+    }
 }

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

@@ -62,6 +62,8 @@ public class StartPayMeterFormServiceImpl extends BaseServiceImpl<StartPayMeterF
         List<AttachmentForm> fileList = dto.getFileList();
         if (fileList != null && fileList.size() != 0) {
             for (AttachmentForm file : fileList) {
+                file.setProjectId(dto.getProjectId());
+                file.setContractId(dto.getContractId());
                 file.setMasterId(id);
             }
             attachmentFormService.saveBatch(fileList);
@@ -83,6 +85,8 @@ public class StartPayMeterFormServiceImpl extends BaseServiceImpl<StartPayMeterF
         List<AttachmentForm> fileList = dto.getFileList();
         if (fileList != null && fileList.size() != 0) {
             for (AttachmentForm file : fileList) {
+                file.setProjectId(dto.getProjectId());
+                file.setContractId(dto.getContractId());
                 file.setMasterId(form.getId());
             }
             attachmentFormService.saveBatch(fileList);