交易项目导出查询-驳回

precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TTradeProjectController.java

@@ -11,9 +11,12 @@ import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.StringUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
 import com.zehong.system.domain.TTradeProject;
+import com.zehong.system.domain.vo.TTradeProjectExportVo;
 import com.zehong.system.service.ITTradeProjectService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -24,8 +27,10 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -69,9 +74,15 @@ public class TTradeProjectController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(TTradeProject tTradeProject)
     {
-        List<TTradeProject> list = tTradeProjectService.selectTTradeProjectList(tTradeProject);
-        ExcelUtil<TTradeProject> util = new ExcelUtil<TTradeProject>(TTradeProject.class);
-        return util.exportExcel(list, "交易项目数据");
+        startPage();
+        List<TTradeProject> list = tTradeProjectService.selectTTradeProjectListByRoles(tTradeProject);
+        List<TTradeProjectExportVo> listVo = list.stream().map(item ->{
+            TTradeProjectExportVo vo = new TTradeProjectExportVo();
+            BeanUtils.copyProperties(item,vo);
+            return vo;
+        }).collect(Collectors.toList());
+        ExcelUtil<TTradeProjectExportVo> util = new ExcelUtil<>(TTradeProjectExportVo.class);
+        return util.exportExcel(listVo, "交易项目数据");
     }
 
     /**

precision-effect-system/src/main/java/com/zehong/system/domain/TTradeProject.java

@@ -118,6 +118,12 @@ public class TTradeProject extends BaseEntity
 
     private String transactionDetailName;
 
+    private String relationTransactionProjectName;
+
+    private Date createBeginTime;
+
+    private Date createEndTime;
+
     public String getDealRemark() {
         return dealRemark;
     }
@@ -402,6 +408,30 @@ public class TTradeProject extends BaseEntity
         this.transactionDetailName = transactionDetailName;
     }
 
+    public String getRelationTransactionProjectName() {
+        return relationTransactionProjectName;
+    }
+
+    public void setRelationTransactionProjectName(String relationTransactionProjectName) {
+        this.relationTransactionProjectName = relationTransactionProjectName;
+    }
+
+    public Date getCreateBeginTime() {
+        return createBeginTime;
+    }
+
+    public void setCreateBeginTime(Date createBeginTime) {
+        this.createBeginTime = createBeginTime;
+    }
+
+    public Date getCreateEndTime() {
+        return createEndTime;
+    }
+
+    public void setCreateEndTime(Date createEndTime) {
+        this.createEndTime = createEndTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

precision-effect-system/src/main/java/com/zehong/system/domain/vo/TTradeProjectExportVo.java

+package com.zehong.system.domain.vo;
+
+import com.zehong.common.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TTradeProjectExportVo {
+
+    @Excel(name = "交易项目")
+    private String relationTransactionProjectName;
+
+    @Excel(name = "交易细项名称")
+    private String transactionDetailName;
+
+    @Excel(name ="交易状态")
+    private String tradeStatus;
+
+    @Excel(name = "卖方")
+    private String applyDeptName;
+
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /** 创建时间 */
+
+    @Excel(name = "申请时间",dateFormat="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Excel(name = "申报总价")
+    private BigDecimal tradeTotal;
+
+    @Excel(name = "买方")
+    private String tradeDeptName;
+
+    @Excel(name = "买方经办人")
+    private String tradeTransactorName;
+
+    @Excel(name = "评分")
+    private Integer tradeScore;
+
+    @Excel(name = "交易成交价")
+    private BigDecimal dealPrice;
+
+    @Excel(name = "尾款")
+    private BigDecimal pendingPayment;
+
+    public String getRelationTransactionProjectName() {
+        return relationTransactionProjectName;
+    }
+
+    public void setRelationTransactionProjectName(String relationTransactionProjectName) {
+        this.relationTransactionProjectName = relationTransactionProjectName;
+    }
+
+    public String getTransactionDetailName() {
+        return transactionDetailName;
+    }
+
+    public void setTransactionDetailName(String transactionDetailName) {
+        this.transactionDetailName = transactionDetailName;
+    }
+
+    public String getTradeStatus() {
+        return tradeStatus;
+    }
+
+    public void setTradeStatus(String tradeStatus) {
+        this.tradeStatus = getTradeStatusName(tradeStatus);
+    }
+
+    public String getApplyDeptName() {
+        return applyDeptName;
+    }
+
+    public void setApplyDeptName(String applyDeptName) {
+        this.applyDeptName = applyDeptName;
+    }
+
+    public String getApplyName() {
+        return applyName;
+    }
+
+    public void setApplyName(String applyName) {
+        this.applyName = applyName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
+    public String getTradeDeptName() {
+        return tradeDeptName;
+    }
+
+    public void setTradeDeptName(String tradeDeptName) {
+        this.tradeDeptName = tradeDeptName;
+    }
+
+    public String getTradeTransactorName() {
+        return tradeTransactorName;
+    }
+
+    public void setTradeTransactorName(String tradeTransactorName) {
+        this.tradeTransactorName = tradeTransactorName;
+    }
+
+    public Integer getTradeScore() {
+        return tradeScore;
+    }
+
+    public void setTradeScore(Integer tradeScore) {
+        this.tradeScore = tradeScore;
+    }
+
+    public BigDecimal getDealPrice() {
+        return dealPrice;
+    }
+
+    public void setDealPrice(BigDecimal dealPrice) {
+        this.dealPrice = dealPrice != null ? dealPrice.setScale(2,BigDecimal.ROUND_HALF_UP) : dealPrice;
+    }
+
+    public BigDecimal getPendingPayment() {
+        return pendingPayment;
+    }
+
+    public void setPendingPayment(BigDecimal pendingPayment) {
+        this.pendingPayment = pendingPayment != null ? pendingPayment.setScale(2,BigDecimal.ROUND_HALF_UP) : pendingPayment;
+    }
+
+    private String getTradeStatusName(String tradeStatus){
+        switch (tradeStatus){
+            case "0":
+                return "待买方经办人评价";
+            case "1":
+                return "待买方部门长确认";
+            case "2":
+                return "待卖方部门长确认";
+            case "3":
+                return "完成";
+            case "4":
+                return "驳回";
+            case "5":
+                return "待支付";
+            default:
+                return  "";
+        }
+    }
+}

precision-effect-web/src/views/trade/components/OperatorButton.vue

@@ -5,6 +5,7 @@
         <component :is="currentTabComponent" :tradeData="tradeData" ref="currentCom" v-if="open"></component>
         <div slot="footer" class="dialog-footer" style="text-align: center" v-if="operatorName != 'tradeDetail'">
           <el-button style="width: 150px;border-color: #1890ff;color: #1890ff;" @click="resetSuggestion">重置意见</el-button>
+          <el-button type="primary" style="width: 150px" v-if="operatorName == 'evaluate'" @click="reject">驳回</el-button>
           <el-button type="primary" style="width: 150px" @click="submitSuggestion">提交</el-button>
         </div>
       </el-dialog>
@@ -107,7 +108,6 @@
           }
         )
           .then(() => {
-            console.log("7778444-------------------")
             settlePendingPayment({tradeId:this.tradeInfo.tradeId}).then(res =>{
               if(res.code == 200){
                 this.$emit("getList");
@@ -172,6 +172,19 @@
             that.$message.error("提交失败！");
           }
         })
+      },
+      //驳回
+      reject(){
+        updateProject({tradeId:this.tradeInfo.tradeId,tradeStatus:"4"}).then(res =>{
+          if(res.code == 200){
+            this.open = false;
+            this.$emit("getList");
+            this.$message.success("驳回成功！");
+            sendNotice({noticeTitle:"您有新交易项目被驳回",noticeType:"1",noticeContent:"您有新交易项目被驳回",userId:this.tradeInfo.applyId,relationType:"1",relationId:this.tradeInfo.tradeId})
+          }else{
+            this.$message.error("驳回失败！");
+          }
+        })
       }
     }
   }

precision-effect-web/src/views/trade/components/TableList.vue

@@ -13,6 +13,7 @@
         align="center"
         prop="transactionDetailName"
         :show-overflow-tooltip="true"
+        width="100px"
       >
         <template slot-scope="scope">
           <span v-if="scope.row.transactionDetailName">{{scope.row.transactionDetailName}}</span>

precision-effect-web/src/views/trade/index.vue

@@ -8,6 +8,17 @@
       v-show="showSearch"
       label-width="100px"
     >
+      <el-form-item label="交易项目" prop="relationTransactionProjectName">
+        <el-input
+          v-model="queryParams.relationTransactionProjectName"
+          placeholder="请输入交易项目"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
       <el-form-item label="交易细项名称" prop="transactionDetailName">
         <!--<el-select
           v-model="queryParams.relationTransactionProjectId"
@@ -67,15 +78,22 @@
           />
         </div>
       </el-form-item>
-<!--
-      <el-form-item label="发起时间" prop="createTime">
+
+
+      <el-form-item label="申请时间">
         <el-date-picker
-          v-model="queryParams.createTime"
-          type="datetime"
-          placeholder="选择日期"
+          v-model="applyTime"
+          size="small"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="timeChange"
+          style="width: 340px"
         >
         </el-date-picker>
-      </el-form-item>-->
+      </el-form-item>
 
       <el-form-item>
         <el-button
@@ -91,8 +109,8 @@
       </el-form-item>
     </el-form>
 
-    <!--<el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+    <el-row :gutter="10" class="mb8">
+      <!--<el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -123,7 +141,7 @@
           @click="handleDelete"
           v-hasPermi="['system:project:remove']"
         >删除</el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -132,11 +150,11 @@
           size="mini"
 		     :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['system:project:export']"
+          v-hasPermi="['trade:project:export']"
         >导出</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>-->
+      <!--<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+    </el-row>
 
     <el-card class="box-card">
       <div class="outer-div">
@@ -400,7 +418,10 @@ export default {
         tradeStatus: null,
         createTime: null,
         queryApplyDeptId: null,
-        queryTradeDeptId: null
+        queryTradeDeptId: null,
+        relationTransactionProjectName: null,
+        createBeginTime: null,
+        createEndTime: null
       },
       // 表单参数
       form: {},
@@ -438,7 +459,8 @@ export default {
       tab: "0",
       transactionOptions: [],
       transactorList: [],
-      count: 0
+      count: 0,
+      applyTime: []
     };
   },
   created() {
@@ -515,6 +537,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.createBeginTime = null;
+      this.queryParams.createEndTime = null;
+      this.applyTime = [];
       this.handleQuery();
     },
     // 多选框选中数据
@@ -611,7 +636,8 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      const queryParams = {...this.queryParams};
+      queryParams.pageSize = 1000;
       this.$confirm("是否确认导出所有交易项目数据项?", "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -773,6 +799,13 @@ export default {
         );
       }
     },
+    //时间切换
+    timeChange(value){
+      if(value){
+        this.queryParams.createBeginTime = value[0];
+        this.queryParams.createEndTime = value[1];
+      }
+    },
   },
 };
 </script>

precision-effect-web/src/views/trade/tradeQuery/index.vue

@@ -8,6 +8,17 @@
         v-show="showSearch"
         label-width="100px"
       >
+
+        <el-form-item label="交易项目" prop="relationTransactionProjectName">
+          <el-input
+            v-model="queryParams.relationTransactionProjectName"
+            placeholder="请输入交易项目"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
         <el-form-item label="交易细项名称" prop="transactionDetailName">
 
           <el-input
@@ -52,6 +63,21 @@
           </div>
         </el-form-item>
 
+        <el-form-item label="申请时间">
+          <el-date-picker
+            v-model="applyTime"
+            size="small"
+            type="datetimerange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="timeChange"
+            style="width: 340px"
+          >
+          </el-date-picker>
+        </el-form-item>
+
         <el-form-item>
           <el-button
             type="primary"
@@ -169,13 +195,17 @@
           tradeStatus: null,
           createTime: null,
           queryApplyDeptId: null,
-          queryTradeDeptId: null
+          queryTradeDeptId: null,
+          relationTransactionProjectName: null,
+          createBeginTime: null,
+          createEndTime: null
         },
         // 总条数
         total: 0,
         deptOptions: [],
         // 显示搜索条件
         showSearch: true,
+        applyTime: []
       }
     },
     created(){
@@ -195,6 +225,9 @@
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
+        this.queryParams.createBeginTime = null;
+        this.queryParams.createEndTime = null;
+        this.applyTime = [];
         this.handleQuery();
       },
       /** 查询交易项目列表 */
@@ -237,6 +270,13 @@
           this.deptOptions = response.data;
         });
       },
+      //时间切换
+      timeChange(value){
+        if(value){
+          this.queryParams.createBeginTime = value[0];
+          this.queryParams.createEndTime = value[1];
+        }
+      },
     }
   }
 </script>