外销跟单

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -272,6 +272,15 @@ public class ContractController {
     }
 
     /**
+     * 外销跟单备注
+     */
+    @PostMapping("/editContractRemark")
+    public void editContractRemark(@RequestBody ContractVo contractVo) {
+        contractService.editContractRemark(contractVo);
+    }
+
+
+    /**
      * 根据合同id获取合同的资金流水信息
      */
     @PostMapping("/111")

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractDocumentaryController.java → hx-sale/src/main/java/com/fjhx/sale/controller/contract/EhsdPurchaseDocumentaryController.java

@@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 @RestController
 @RequestMapping("/contractDocumentary")
-public class ContractDocumentaryController {
+public class EhsdPurchaseDocumentaryController {
 
     @Autowired
     private ContractDocumentaryService contractDocumentaryService;

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -54,4 +54,8 @@ public class ContractSelectDto extends BaseSelectDto {
      */
     private Integer orderStatus;
 
+    /**
+     * 跟单类型
+     */
+    private Integer documentaryType;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -314,6 +314,11 @@ public class Contract extends BasePo {
     private Long oldContractId;
 
     /**
+     * 外销跟单备注
+     */
+    private String documentaryRemark;
+
+    /**
      * 版本号
      */
     @TableField(fill = FieldFill.INSERT)
@@ -343,6 +348,12 @@ public class Contract extends BasePo {
     private List<ObsFile> packageFileList;
 
     /**
+     * 备注文件列表
+     */
+    @TableField(exist = false)
+    private List<ObsFile> remarkFileList;
+
+    /**
      * 合同产品列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/ContractDocumentary.java

@@ -20,13 +20,13 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("contract_documentary")
+@TableName("ehsd_purchase_documentary")
 public class ContractDocumentary extends BasePo {
 
     /**
      * 合同ID
      */
-    private Long contractId;
+    private Long purchaseId;
 
     /**
      * 跟单类型 字典 documentary_type

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -196,5 +196,10 @@ public class ContractVo extends Contract {
      * 采购条数
      */
     private Integer purchaseCount;
+
+    /**
+     * 跟单条数
+     */
+    private Integer documentaryCount;
 }
 

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java

@@ -113,6 +113,6 @@ public interface ContractMapper extends BaseMapper<Contract> {
      * @param wrapper
      * @return
      */
-    Page<ContractVo> getExportCopyList(@Param("page") Page<Object> page, @Param("ew") IWrapper<Contract> wrapper);
+    Page<ContractVo> getExportCopyList(@Param("page") Page<Object> page, @Param("ew") IWrapper<Contract> wrapper,@Param("documentaryType") Integer documentaryType );
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -195,4 +195,9 @@ public interface ContractService extends BaseService<Contract> {
      * 外销跟单分页
      */
     Page<ContractVo> getExportCopyList(ContractSelectDto dto);
+
+    /**
+     * 添加备注
+     */
+    void editContractRemark(ContractVo contractVo);
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -1869,7 +1869,8 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         wrapper.ne("t1",Contract::getIsShow,1);
         wrapper.eq("t1", Contract::getStatus, FlowStatusEnum1.PASS.getKey());
         wrapper.eq("t1.orderStatus", dto.getOrderStatus());
-        Page<ContractVo> page = baseMapper.getExportCopyList(dto.getPage(), wrapper);
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getDocumentaryType()),"t1.documentaryCount",0);
+        Page<ContractVo> page = baseMapper.getExportCopyList(dto.getPage(), wrapper,dto.getDocumentaryType());
         List<ContractVo> list = page.getRecords();
         if(CollectionUtils.isNotEmpty(list)){
             List<Long> customerIds = list.stream().map(Contract::getBuyCorporationId).collect(Collectors.toList());
@@ -1931,6 +1932,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         return page;
     }
 
+    /**
+     * 外销跟单添加备注
+     * @param contractVo
+     */
+    @DSTransactional
+    @Override
+    public void editContractRemark(ContractVo contractVo) {
+        this.updateById(contractVo);
+        ObsFileUtil.editFile(contractVo.getFileList(), contractVo.getId(), 1);
+    }
+
     public static void main(String[] args) {
         BigDecimal a = null;
         double d1 = a.doubleValue() * 0.13;

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -416,6 +416,9 @@
                 SELECT
                     t1.*,
                     IFNULL( t1.amount * t1.rate, 0 ) AS amountCNY,
+                    <if test="documentaryType neq null ">
+                        (SELECT count(1) FROM ehsd_purchase p LEFT JOIN ehsd_purchase_documentary pd ON p.id = pd.purchase_id WHERE p.data_resource_id = t1.id AND pd.documentary_type = #{documentaryType}) AS documentaryCount,
+                    </if>
                     IFNULL(t1.advance_ratio,0)*IFNULL(t1.amount,0)/100 AS earnest,
                     ( SELECT create_time FROM claim_contract WHERE contract_id = t1.id ORDER BY create_time ASC LIMIT 1) AS claimTime,
                     ( SELECT count( 1 ) FROM ehsd_purchase WHERE `status` = 30 AND data_resource_id = t1.id ) AS purchaseCount,