附件管理

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/contract/ContractEnclosure.java

@@ -0,0 +1,70 @@
+package com.fjhx.entity.contract;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.StorageBaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 合同附件
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractEnclosure extends StorageBaseEntity {
+
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 文件类型（1发票，2合同付款，3合同）
+     */
+    private Integer type;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件大小
+     */
+    private String fileSize;
+
+    /**
+     * 发票金额
+     */
+    private BigDecimal amountMoney;
+
+    /**
+     * 合同付款id
+     */
+    private Long contractPayId;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+    private String oldId;
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/contract/ContractEnclosureEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.contract;
+
+import com.fjhx.entity.contract.ContractEnclosure;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 合同附件
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractEnclosureEx extends ContractEnclosure {
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/contract/ContractEnclosureVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.contract;
+
+import com.fjhx.entity.contract.ContractEnclosure;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 合同附件
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractEnclosureVo extends ContractEnclosure {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/controller/contract/ContractEnclosureController.java

@@ -0,0 +1,55 @@
+package com.fjhx.controller.contract;
+
+import com.fjhx.entity.contract.ContractEnclosure;
+import com.fjhx.params.contract.ContractEnclosureVo;
+import com.fjhx.service.contract.ContractEnclosureService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 合同附件 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+@RestController
+@RequestMapping("/contractEnclosure")
+public class ContractEnclosureController {
+
+    @Autowired
+    private ContractEnclosureService contractEnclosureService;
+
+    @PostMapping("/list")
+    public R page(@RequestBody ContractEnclosure contractEnclosure) {
+        List<ContractEnclosure> result = contractEnclosureService.getPage(contractEnclosure);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody ContractEnclosureVo contractEnclosureVo) {
+        contractEnclosureService.add(contractEnclosureVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody ContractEnclosureVo contractEnclosureVo) {
+        contractEnclosureService.edit(contractEnclosureVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody ContractEnclosureVo contractEnclosureVo) {
+        contractEnclosureService.delete(contractEnclosureVo);
+        return R.success();
+    }
+
+}
+

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/contract/ContractEnclosureMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.contract;
+
+import com.fjhx.entity.contract.ContractEnclosure;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 合同附件 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+public interface ContractEnclosureMapper extends BaseMapper<ContractEnclosure> {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/contract/ContractEnclosureMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mapper.contract.ContractEnclosureMapper">
+
+</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/contract/ContractPayMapper.xml

@@ -22,6 +22,7 @@
                m.spec                                                                  materialSpec,
                cd.quantity,
                cd.price,
+               cd.apply_purchase_id                                                    applyPurchaseId,
                c.amount_money                                                          amountMoney,
                c.adjust_amount                                                         adjustAmount,
                c.had_pay_amount                                                        hadPayAmount,

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/ContractEnclosureService.java

@@ -0,0 +1,30 @@
+package com.fjhx.service.contract;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
+import com.fjhx.entity.contract.ContractEnclosure;
+import com.fjhx.params.contract.ContractEnclosureVo;
+import com.fjhx.base.StorageBaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 合同附件 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+public interface ContractEnclosureService extends StorageBaseService<ContractEnclosure> {
+
+    List<ContractEnclosure> getPage(ContractEnclosure contractEnclosure);
+
+    void add(ContractEnclosureVo contractEnclosureVo);
+
+    void edit(ContractEnclosureVo contractEnclosureVo);
+
+    void delete(ContractEnclosureVo contractEnclosureVo);
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractEnclosureServiceImpl.java

@@ -0,0 +1,51 @@
+package com.fjhx.service.contract.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.StorageBaseEntity;
+import com.fjhx.entity.contract.ContractEnclosure;
+import com.fjhx.mapper.contract.ContractEnclosureMapper;
+import com.fjhx.params.contract.ContractEnclosureVo;
+import com.fjhx.service.contract.ContractEnclosureService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 合同附件 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-21
+ */
+@Service
+public class ContractEnclosureServiceImpl extends ServiceImpl<ContractEnclosureMapper, ContractEnclosure> implements ContractEnclosureService {
+
+    @Override
+    public List<ContractEnclosure> getPage(ContractEnclosure contractEnclosure) {
+        LambdaQueryWrapper<ContractEnclosure> wrapper = Wrappers.lambdaQuery();
+        wrapper.orderByDesc(StorageBaseEntity::getId)
+                .eq(ContractEnclosure::getContractId, contractEnclosure.getContractId())
+                .eq(ContractEnclosure::getType, contractEnclosure.getType());
+
+        return list(wrapper);
+    }
+
+    @Override
+    public void add(ContractEnclosureVo contractEnclosureVo) {
+        save(contractEnclosureVo);
+    }
+
+    @Override
+    public void edit(ContractEnclosureVo contractEnclosureVo) {
+        updateById(contractEnclosureVo);
+    }
+
+    @Override
+    public void delete(ContractEnclosureVo contractEnclosureVo) {
+        removeById(contractEnclosureVo.getId());
+    }
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractPayServiceImpl.java

@@ -263,6 +263,14 @@ public class ContractPayServiceImpl extends ServiceImpl<ContractPayMapper, Contr
         // 周期筛选
         cycleScreen(wrapper, condition, date);
 
+        // 关键字查询
+        String keyword = condition.getKeyword();
+        wrapper.and(ObjectUtil.isNotEmpty(keyword), q -> q
+                .like("c.code", keyword).or()
+                .like("s.name", keyword).or()
+                .like("m.name", keyword)
+        );
+
         Page<Map<String, Object>> page = baseMapper.getPage(condition.getPage(), wrapper);
 
         for (Map<String, Object> record : page.getRecords()) {