jihs %!s(int64=4) %!d(string=hai) anos
pai
achega
b4d9ea4107

+ 21 - 0
src/main/java/org/jeecg/common/dto/payment/SlipPriceReqDTO.java

@@ -0,0 +1,21 @@
+package org.jeecg.common.dto.payment;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("收付款单金额请求参数")
+@Data
+public class SlipPriceReqDTO {
+    @ApiModelProperty("项目档案id")
+    private String proId;
+    @ApiModelProperty("项目档案--里程碑id")
+    private String mileId;
+    @ApiModelProperty("项目档案--里程碑信息表子表id")
+    private String businessId;
+    @ApiModelProperty("1.收款单 2.付款单")
+    private String type;
+
+    public SlipPriceReqDTO() {
+    }
+}

+ 15 - 0
src/main/java/org/jeecg/common/dto/payment/SlipPriceRespDTO.java

@@ -0,0 +1,15 @@
+package org.jeecg.common.dto.payment;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import java.math.BigDecimal;
+
+
+@ApiModel("收付款单金额响应参数")
+@Data
+public class SlipPriceRespDTO {
+        private BigDecimal coPrvice;
+
+    public SlipPriceRespDTO() {
+    }
+}

+ 13 - 0
src/main/java/org/jeecg/modules/payment/controller/ManagerPaymentAndReceiptSlipController.java

@@ -11,6 +11,8 @@ import org.jeecg.common.dto.payment.ProjectArchiveReqDTO;
 import org.jeecg.common.dto.payment.ProjectArchiveRespDTO;
 import org.jeecg.common.dto.payment.SlieReqDTO;
 import org.jeecg.common.dto.payment.SlipAddReqDTO;
+import org.jeecg.common.dto.payment.SlipPriceReqDTO;
+import org.jeecg.common.dto.payment.SlipPriceRespDTO;
 import org.jeecg.common.dto.payment.SlipRespDTO;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -190,4 +192,15 @@ public class ManagerPaymentAndReceiptSlipController {
 			result.setSuccess(true);
 		return result;
 	}
+
+
+	@ApiOperation(value = "收付款单金额", notes = "收付款单金额")
+	@GetMapping(value = "/getSlipPrice")
+	public Result<List<SlipPriceRespDTO>> getSlipPrice(SlipPriceReqDTO reqDTO){
+		Result<List<SlipPriceRespDTO>> result = new Result<List<SlipPriceRespDTO>>();
+		List<SlipPriceRespDTO> list =  managerPaymentAndReceiptSlipService.getSlipPrice(reqDTO);
+		result.setResult(list);
+		result.setSuccess(true);
+		return result;
+	}
 }

+ 4 - 0
src/main/java/org/jeecg/modules/payment/mapper/ManagerPaymentAndReceiptSlipMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.dto.archives.ExpensePriceReqDTO;
 import org.jeecg.common.dto.payment.SlipAllListDTO;
+import org.jeecg.common.dto.payment.SlipPriceReqDTO;
+import org.jeecg.common.dto.payment.SlipPriceRespDTO;
 import org.jeecg.modules.payment.entity.ManagePaymentAndReceiptContent;
 import org.jeecg.modules.payment.entity.ManagerPaymentAndReceiptSlip;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -23,4 +25,6 @@ public interface ManagerPaymentAndReceiptSlipMapper extends BaseMapper<ManagerPa
      * @desc 主子表列表数据
      */
     List<SlipAllListDTO> getAll(@Param("ew") QueryWrapper<ManagerPaymentAndReceiptSlip> queryWrapper);
+
+    List<SlipPriceRespDTO> getSlipPrice(SlipPriceReqDTO reqDTO);
 }

+ 20 - 1
src/main/java/org/jeecg/modules/payment/mapper/xml/ManagerPaymentAndReceiptSlipMapper.xml

@@ -12,7 +12,7 @@
        SELECT * FROM (
            SELECT a.id,
                   a.billcode,
-                  'type',
+                  a.type,
                   a.pro_id,
                   a.pro_code,
                   a.pro_name ,
@@ -28,4 +28,23 @@
             ) T
             ${ew.customSqlSegment}
       </select>
+
+    <select id="getSlipPrice" resultType="org.jeecg.common.dto.payment.SlipPriceRespDTO">
+           SELECT a.id,
+                  a.billcode,
+                  'type',
+                  a.pro_id,
+                  a.pro_code,
+                  a.pro_name ,
+                  b.pro_archives_id,
+                  b.pro_archives_milestone,
+                  b.co_archives_id,
+                  b.co_archives_name,
+                  b.co_prvice
+            FROM manager_payment_and_receipt_slip a
+            JOIN manage_payment_and_receipt_content b
+            ON a.id = b.slip_id
+            WHERE a.del_flag = '0' AND b.del_flag = '0'
+            AND a.pro_id =#{proId} and b.pro_archives_id = #{mileId} AND b.co_archives_id = #{businessId} AND a.type = #{type}
+      </select>
 </mapper>

+ 4 - 0
src/main/java/org/jeecg/modules/payment/service/ManagerPaymentAndReceiptSlipService.java

@@ -6,6 +6,8 @@ import org.jeecg.common.dto.payment.ProjectArchiveReqDTO;
 import org.jeecg.common.dto.payment.ProjectArchiveRespDTO;
 import org.jeecg.common.dto.payment.SlipAddReqDTO;
 import org.jeecg.common.dto.payment.SlipAllListDTO;
+import org.jeecg.common.dto.payment.SlipPriceReqDTO;
+import org.jeecg.common.dto.payment.SlipPriceRespDTO;
 import org.jeecg.common.dto.payment.SlipRespDTO;
 import org.jeecg.modules.payment.entity.ManagerPaymentAndReceiptSlip;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -46,4 +48,6 @@ public interface ManagerPaymentAndReceiptSlipService extends IService<ManagerPay
      * @desc 主子表列表数据
      */
     List<SlipAllListDTO> getAll(ManagerPaymentAndReceiptSlip managerPaymentAndReceiptSlip);
+
+    List<SlipPriceRespDTO> getSlipPrice(SlipPriceReqDTO reqDTO);
 }

+ 7 - 0
src/main/java/org/jeecg/modules/payment/service/impl/ManagerPaymentAndReceiptSlipServiceImpl.java

@@ -13,6 +13,8 @@ import org.jeecg.common.dto.payment.SlipAddReqDTO;
 import org.jeecg.common.dto.payment.SlipAllListDTO;
 import org.jeecg.common.dto.payment.SlipContentAddReqDTO;
 import org.jeecg.common.dto.payment.SlipContentRespDTO;
+import org.jeecg.common.dto.payment.SlipPriceReqDTO;
+import org.jeecg.common.dto.payment.SlipPriceRespDTO;
 import org.jeecg.common.dto.payment.SlipRespDTO;
 import org.jeecg.modules.archives.entity.ProjectManageArchives;
 import org.jeecg.modules.archives.entity.ProjectManageArchivesAndBusiness;
@@ -161,6 +163,11 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
         return managerPaymentAndReceiptSlipMapper.getAll(queryWrapper);
     }
 
+    @Override
+    public List<SlipPriceRespDTO> getSlipPrice(SlipPriceReqDTO reqDTO) {
+        return managerPaymentAndReceiptSlipMapper.getSlipPrice(reqDTO);
+    }
+
 
 
     /**