提交

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 public enum StatusEnum {
 
     //合同状态
+    CONTRACT_WAIT("0", "待执行", "wait implementation"),
     CONTRACT_DO("1", "执行中", "Under implementation"),
     CONTRACT_COMPLETED("3", "已完成", "Completed"),
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ContractManagementInfoController.java

@@ -60,8 +60,8 @@ public class ContractManagementInfoController {
      * @param contractManagementInfo
      * @return
      */
-    @GetMapping("/selectinfo")
-    public Page<ContractManagementInfo> selectinfo(ContractManagementInfo contractManagementInfo) {
+    @GetMapping("/selectInfo")
+    public Page<ContractManagementInfo> selectInfo(ContractManagementInfo contractManagementInfo) {
         return contractManagementInfoService.selectInfo(contractManagementInfo);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -190,7 +190,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 模糊查询
      */
     @TableField(exist = false)
-    private Float searchKeyWord;
+    private String searchKeyWord;
     /**
      * 开始时间
      */
@@ -209,7 +209,7 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 查询类型
      */
     @TableField(exist = false)
-    private Float searchType;
+    private String searchType;
 
     @TableField(exist = false)
     private ContractGoodsInfo contractGoodsInfo;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 
+import com.alipay.sofa.runtime.api.annotation.SofaService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.google.common.collect.Lists;
@@ -15,13 +16,17 @@ import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.IContractProcessInfoService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import org.springframework.transaction.annotation.Transactional;
 
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -32,15 +37,14 @@ import java.util.List;
  * @author Gongdc
  * @since 2021-05-17
  */
-@Service
+@SofaService
+@Slf4j
 public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManagementInfoMapper, ContractManagementInfo> implements IContractManagementInfoService {
     @Autowired
     private IContractGoodsInfoService contractGoodsInfoService;
 
     @Autowired
     private IContractProcessInfoService contractProcessInfoService;
-//    @Autowired
-//    private ContractManagementInfoMapper contractManagementInfoMapper;
 
 
     /**
@@ -54,8 +58,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         // 主表信息新增
         // 新增主键id
         contractManagementInfo.setId(IdGenerator.generateUUID());
-        contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_DO.getFlag());
-        contractManagementInfo.setStatus(StatusEnum.CONTRACT_DO.getName());
+        contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_WAIT.getFlag());
+        contractManagementInfo.setStatus(StatusEnum.CONTRACT_WAIT.getName());
         // 货物信息新增
         ContractGoodsInfo contractGoodsInfo = contractManagementInfo.getContractGoodsInfo();
         contractGoodsInfo.setId(IdGenerator.generateUUID());
@@ -77,10 +81,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
      * @param contractManagementInfo
      * @return
      */
+    @Override
     public String editInfo(ContractManagementInfo contractManagementInfo){
         // 主表信息编辑
-        contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_DO.getFlag());
-        contractManagementInfo.setStatus(StatusEnum.CONTRACT_DO.getName());
         boolean one = this.updateById(contractManagementInfo);
         // 货物信息编辑
         boolean two =contractGoodsInfoService.updateById(contractManagementInfo.getContractGoodsInfo());
@@ -98,6 +101,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
      * @param id
      * @return
      */
+    @Override
     public ContractManagementInfo getInfo(String id) {
         // 主表信息
         ContractManagementInfo contractManagementInfo = this.selectById(id);
@@ -112,11 +116,11 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
 
     @Override
     public Page<ContractManagementInfo> selectInfo(ContractManagementInfo contractManagementInfo) {
-        PageView pageView = new PageView();
+        Map<String, Object> pageView = new HashMap<>();
         // 状态类型（1未完成2已完成3待回款）
         pageView.put("startRecord", (contractManagementInfo.getCurrentPage() - 1)
                 * contractManagementInfo.getPageSize());
-        // 公司ID
+        //  公司ID
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
         pageView.put("searchKeyWord",contractManagementInfo.getSearchKeyWord());
         pageView.put("startDate",contractManagementInfo.getStartDate());
@@ -128,8 +132,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         Page<ContractManagementInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(pageView.getCurrentPage());
-        page.setSize(pageView.getPageSize());
+        page.setCurrent(contractManagementInfo.getCurrentPage());
+        page.setSize(contractManagementInfo.getPageSize());
 
         return page;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -4,15 +4,15 @@
     <!-- 获得合同总数 -->
     <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
         SELECT
-        COUNT(1)
+        COUNT(m.id)
         FROM contract_management_info m
-        left join contract_goods_info g on m.contract_id=g.id
-        left join contract_process_info p on m.contract_id=p.id
+        left join contract_goods_info g on m.id=g.contract_id
+        left join contract_process_info p on m.id=p.contract_id
         WHERE
         m.comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND m.status_flag == '1'
+                AND m.status_flag == '1' or m.status_flag == '0'
             </if>
             <if test="searchType == 2">
                 AND m.status_flag == '3'
@@ -31,9 +31,9 @@
             DATE_FORMAT(#{endDate},"%Y%m%d")
         </if>
         <if test="searchType != null and searchType != ''">
-            AND m.contract_id LIKE #{contractId}
-            OR m.buyer LIKE #{buyer}
-            OR m.seller LIKE #{seller}
+            AND (lower(m.contract_id) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
     </select>
     <!-- 合同列表查询 -->
@@ -54,8 +54,8 @@
         p.mildew_grain as mildewGrain,
         m.address_url as addressUrl
         FROM contract_management_info m
-        left join contract_goods_info g on m.contract_id=g.id
-        left join contract_process_info p on m.contract_id=p.id
+        left join contract_goods_info g on m.id=g.contract_id
+        left join contract_process_info p on m.id=p.contract_id
         WHERE
         m.comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
@@ -79,9 +79,9 @@
             DATE_FORMAT(#{endDate},"%Y%m%d")
         </if>
         <if test="searchType != null and searchType != ''">
-            AND m.contract_id LIKE #{contractId}
-            OR m.buyer LIKE #{buyer}
-            OR m.seller LIKE #{seller}
+            AND (lower(m.contract_id) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower( m.buyer) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            OR lower( m.seller) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         ORDER BY m.signing_date DESC
         <if test="currentPage != null and currentPage != ''">