更新档案

src/main/java/org/jeecg/common/dto/archives/ExpensePriceReqDTO.java

@@ -0,0 +1,28 @@
+package org.jeecg.common.dto.archives;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.validation.constraints.NotEmpty;
+
+/**
+   * @Author jihaosen
+   * @date 2021/3/5
+   */
+
+@ApiModel("统计收付款金额请求参数")
+@Data
+public class ExpensePriceReqDTO {
+    @ApiModelProperty("项目id")
+    @NotEmpty(message = "参数proId不能为空")
+    private String proId;
+    @ApiModelProperty("1.收款单 2.付款单")
+    @NotEmpty(message = "参数type不能为空")
+    private String type;
+    @ApiModelProperty("项目档案里程碑id")
+    @NotEmpty(message = "参数proArchivesId不能为空")
+    private String proArchivesId;
+
+    public ExpensePriceReqDTO() {
+    }
+}

src/main/java/org/jeecg/common/dto/archives/ExpensePriceRespDTO.java

@@ -0,0 +1,24 @@
+package org.jeecg.common.dto.archives;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.math.BigDecimal;
+
+ /**
+   * @Author jihaosen
+   * @date 2021/3/5
+   */
+@ApiModel("统计收付款金额响应参数")
+@Data
+public class ExpensePriceRespDTO {
+    @ApiModelProperty("金额")
+    private BigDecimal totalCoPrivce;
+
+     public ExpensePriceRespDTO() {
+     }
+
+     public ExpensePriceRespDTO(BigDecimal totalCoPrivce) {
+         this.totalCoPrivce = totalCoPrivce;
+     }
+ }

src/main/java/org/jeecg/modules/archives/controller/ProjectManageArchivesController.java

@@ -1,12 +1,16 @@
 package org.jeecg.modules.archives.controller;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.NotDuplicate;
+import org.jeecg.common.dto.archives.ExpensePriceReqDTO;
+import org.jeecg.common.dto.archives.ExpensePriceRespDTO;
 import org.jeecg.common.dto.archives.ProArchivesAddReqDTO;
 import org.jeecg.common.dto.archives.ProArchivesAddRespDTO;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -18,6 +22,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.archives.service.ProjectManageArchivesAndBusinessService;
 import org.jeecg.modules.archives.service.ProjectManageArchivesService;
 import org.jeecg.modules.archives.service.ProjectManageBusinessOtherService;
+import org.jeecg.modules.expense.entity.ReExpenseSlip;
+import org.jeecg.modules.expense.service.IReExpenseSlipService;
+import org.jeecg.modules.payment.service.ManagerPaymentAndReceiptSlipService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +45,11 @@ import org.springframework.web.bind.annotation.RestController;
 public class ProjectManageArchivesController {
 	@Autowired
 	private ProjectManageArchivesService projectManageArchivesService;
+	@Autowired
+	private IReExpenseSlipService reExpenseSlipService;
+	@Autowired
+	private ManagerPaymentAndReceiptSlipService managerPaymentAndReceiptSlipService;
+
 
 	@ApiOperation(value = "项目档案分页查询接口", notes = "项目档案分页查询")
 	@ApiImplicitParams({
@@ -251,4 +263,34 @@ public class ProjectManageArchivesController {
 		}
 		return result;
 	}
+
+	@ApiOperation(value = "统计汇款单金额", notes = "统计汇款单金额")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name="proId", value="项目id",required=true, dataType="String"),
+			@ApiImplicitParam(name="type", value="1.收款单 2.付款单",required=true, dataType="String"),
+			@ApiImplicitParam(name="proArchivesId", value="项目档案里程碑id",required=true, dataType="String")
+	})
+	@GetMapping(value = "/getExpensePrice")
+	public Result<ExpensePriceRespDTO> getExpensePrice(@Valid ExpensePriceReqDTO reqDTO, BindingResult bindingResult) {
+		Result<ExpensePriceRespDTO> result = new Result<ExpensePriceRespDTO>();
+		try {
+			StringBuilder sb = new StringBuilder();
+			if (bindingResult.hasErrors()){
+				//记录错误信息
+				bindingResult.getAllErrors().stream().forEach(error -> sb.append(error.getDefaultMessage() + "<br/>"));
+				result.error500(sb.toString());
+				return result;
+			}
+		ExpensePriceRespDTO respDTO = managerPaymentAndReceiptSlipService.getExpensePrice(reqDTO);
+		result.setResult(respDTO);
+		result.setSuccess(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	//TODO 过滤项目档案接口
 }

src/main/java/org/jeecg/modules/basedata/controller/BaseArchivesMilestoneController.java

@@ -14,7 +14,9 @@ import org.jeecg.common.aspect.annotation.NotDuplicate;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.dto.basedata.ArchivesMilestoneListRespDTO;
 import org.jeecg.common.dto.basedata.ArchivesPostReqDTO;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.basedata.entity.BaseArchivesMilestone;
+import org.jeecg.modules.basedata.entity.FdContractClass;
 import org.jeecg.modules.basedata.service.IBaseArchivesMilestoneService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -28,7 +30,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+
+/**
    * @Author jihaosen
    * @date 2021/2/24
    */
@@ -164,6 +168,26 @@ public class BaseArchivesMilestoneController {
 
 
 
+	 @ApiOperation(value = "查询里程碑档案父级数据接口", notes = "只查询父级的数据")
+	 @ApiImplicitParams({
+			 @ApiImplicitParam(name="pkOrg", value="组织",required=false, dataType="String"),
+			 @ApiImplicitParam(name="typeId", value="类型id",required=false, dataType="String"),
+
+	 })
+	 @GetMapping(value = "/getAll")
+	 public Result<List<BaseArchivesMilestone>> getList(BaseArchivesMilestone baseArchivesMilestone, HttpServletRequest req) {
+		 Result<List<BaseArchivesMilestone>> result = new Result<List<BaseArchivesMilestone>>();
+		 baseArchivesMilestone.setDelFlag("0");
+		 baseArchivesMilestone.setParentId("0");
+		 QueryWrapper<BaseArchivesMilestone> queryWrapper = QueryGenerator.initQueryWrapper(baseArchivesMilestone, req.getParameterMap());
+		 queryWrapper.orderByAsc("create_time");
+		 List<BaseArchivesMilestone> list = baseArchivesMilestoneService.list(queryWrapper);
+		 result.setSuccess(true);
+		 result.setResult(list);
+		 return result;
+	 }
+
+
 
 	  /**
 	   * @desc 将里程碑档案列表转成树状结构

src/main/java/org/jeecg/modules/payment/entity/ManagePaymentAndReceiptContent.java

@@ -28,7 +28,7 @@ public class ManagePaymentAndReceiptContent implements Serializable {
     private String id;
     @ApiModelProperty("收款单id")
     private String slipId;
-    @ApiModelProperty("项目档案id")
+    @ApiModelProperty("项目档案--里程碑id")
     private String proArchivesId;
     @ApiModelProperty("项目档案--里程碑")
     private String proArchivesMilestone;

src/main/java/org/jeecg/modules/payment/mapper/ManagerPaymentAndReceiptSlipMapper.java

@@ -1,8 +1,8 @@
 package org.jeecg.modules.payment.mapper;
 
 import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
+import org.jeecg.common.dto.archives.ExpensePriceReqDTO;
+import org.jeecg.modules.payment.entity.ManagePaymentAndReceiptContent;
 import org.jeecg.modules.payment.entity.ManagerPaymentAndReceiptSlip;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ManagerPaymentAndReceiptSlipMapper extends BaseMapper<ManagerPaymentAndReceiptSlip> {
 
+    List<ManagePaymentAndReceiptContent> getExpensePrice(ExpensePriceReqDTO reqDTO);
 }

src/main/java/org/jeecg/modules/payment/mapper/xml/ManagerPaymentAndReceiptSlipMapper.xml

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.payment.mapper.ManagerPaymentAndReceiptSlipMapper">
 
+      <select id="getExpensePrice" resultType="org.jeecg.modules.payment.entity.ManagePaymentAndReceiptContent">
+         SELECT  b.co_prvice from manager_payment_and_receipt_slip t
+            JOIN manage_payment_and_receipt_content b
+			ON t.id = b.slip_id
+			where t.del_flag = '0'  AND b.del_flag = '0' AND t.pro_id = #{proId} AND t.type =#{type} and b.pro_archives_id = #{proArchivesId}
+      </select>
 </mapper>

src/main/java/org/jeecg/modules/payment/service/ManagerPaymentAndReceiptSlipService.java

@@ -1,10 +1,14 @@
 package org.jeecg.modules.payment.service;
 
+import org.jeecg.common.dto.archives.ExpensePriceReqDTO;
+import org.jeecg.common.dto.archives.ExpensePriceRespDTO;
 import org.jeecg.common.dto.payment.SlipAddReqDTO;
 import org.jeecg.common.dto.payment.SlipRespDTO;
 import org.jeecg.modules.payment.entity.ManagerPaymentAndReceiptSlip;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 收付款管理--收款单
  * @author： jeecg-boot
@@ -28,4 +32,9 @@ public interface ManagerPaymentAndReceiptSlipService extends IService<ManagerPay
      * @desc 通过id删除
      */
     Boolean dropById(ManagerPaymentAndReceiptSlip managerPaymentAndReceiptSlip);
+
+    /**
+     * @desc 统计收付款单金额
+     */
+    ExpensePriceRespDTO getExpensePrice(ExpensePriceReqDTO reqDTO);
 }

src/main/java/org/jeecg/modules/payment/service/impl/ManagerPaymentAndReceiptSlipServiceImpl.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.payment.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
+import org.jeecg.common.dto.archives.ExpensePriceReqDTO;
+import org.jeecg.common.dto.archives.ExpensePriceRespDTO;
 import org.jeecg.common.dto.payment.SlipAddReqDTO;
 import org.jeecg.common.dto.payment.SlipContentAddReqDTO;
 import org.jeecg.common.dto.payment.SlipContentRespDTO;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -34,6 +37,8 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
     private ISysSerialPatternService sysSerialPatternService;
     @Autowired
     private ManagePaymentAndReceiptContentService managePaymentAndReceiptContentService;
+    @Autowired
+    private ManagerPaymentAndReceiptSlipMapper managerPaymentAndReceiptSlipMapper;
 
     /**
      * @desc 新增
@@ -89,6 +94,16 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
         return true;
     }
 
+    @Override
+    public ExpensePriceRespDTO getExpensePrice(ExpensePriceReqDTO reqDTO) {
+       List<ManagePaymentAndReceiptContent> contents = managerPaymentAndReceiptSlipMapper.getExpensePrice(reqDTO);
+        BigDecimal price = BigDecimal.ZERO;
+        for(ManagePaymentAndReceiptContent content : contents){
+            price = price.add(content.getCoPrvice());
+        }
+        return new ExpensePriceRespDTO(price);
+    }
+
 
 
     /**