a

youxiw2000
1 parent 346a8256
Showing 7 changed files with 117 additions and 23 deletions
trash-ui/src/api/business/credit.js
trash-ui/src/views/business/ConstructionCredit/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
trash-workFlow/src/main/java/com/trash/business/mapper/ConstructionCreditMapper.java
trash-workFlow/src/main/java/com/trash/business/service/IConstructionCreditService.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
trash-workFlow/src/main/resources/mapper/ConstructionCreditMapper.xml
@@ -17,6 +17,15 @@ export function getNames(query) {
   })
 }
  
+export function historyCredit(query) {
+  return request({
+    url: '/business/ConstructionCredit/historyCredit',
+    method: 'get',
+    params: query
+  })
+}
+
+
 // 查询【请填写功能名称】详细
 export function getCredit(id) {
   return request({
@@ -58,4 +67,4 @@ export function exportCredit(query) {
     method: 'get',
     params: query
   })
-}
 \ No newline at end of file
+}
@@ -5,13 +5,15 @@
         <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.status==0}"  size="mini" @click="getData(1);" >失信工地</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button  :class="{'el-button':true,'el-button--primary':this.queryParams.status==1}" size="mini" @click="getData(1);">历史失信工地</el-button>
+        <el-button  :class="{'el-button':true,'el-button--primary':this.queryParams.status==1}" size="mini" @click="getHistoryData(1);">历史失信工地</el-button>
       </el-col>
     </el-row>
  
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
        <el-row type="flex" justify="center">
-                    <el-form-item label="工地名称" prop="name">
+            <el-col>
+                    <el-form-item label="工地名称" prop="name"
+                          style="float:right;">
                       <el-select v-model="queryParams.name"
                           filterable
                           reserve-keyword
@@ -26,30 +28,39 @@
                         </el-option>
                       </el-select>
                     </el-form-item>
+                    </el-col>
+
+                         <el-col>
             <el-form-item label="所属场地" prop="place">
             <el-select v-model="queryParams.place" placeholder="所属场地" clearable size="small">
               <el-option label="请选择字典生成" value="" />
             </el-select>
             </el-form-item>
+            </el-col>
             </el-row>
             <el-row type="flex" justify="center">
-              <el-form-item label="垃圾类型" prop="type">
+               <el-col>
+              <el-form-item label="垃圾类型" prop="type"
+                          style="float:right;">
                 <el-select v-model="queryParams.type" placeholder="建筑垃圾类型" clearable size="small">
                   <el-option label="请选择字典生成" value="" />
                 </el-select>
               </el-form-item>
-      <el-form-item label="失信日期" prop="time">
-        <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
-          value-format="yyyy-MM-dd" placeholder="失信日期">
-        </el-date-picker>
-      </el-form-item>
+
+            </el-col><el-col>
+          <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
+            <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
+              value-format="yyyy-MM-dd" placeholder="失信日期">
+            </el-date-picker>
+          </el-form-item>
+            </el-col>
       </el-row>
  
     </el-form>
  
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']">新增</el-button>
+        <el-button type="primary"  size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']"  v-if="queryParams.status==0">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button  size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">导出</el-button>
@@ -68,7 +79,7 @@
       <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="工地名称" align="center" prop="name" />
       <el-table-column label="建筑垃圾类型" align="center" prop="type" />
-      <el-table-column label="失信时间" align="center" prop="time" width="180">
+      <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
@@ -77,8 +88,8 @@
       <el-table-column label="失信原因" align="center" prop="reason" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:ConstructionCredit:edit']" v-if="scope.row.lostCredit==1">撤销失信</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="scope.row.lostCredit==0">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:ConstructionCredit:edit']" v-if="queryParams.status==0">撤销失信</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -157,6 +168,21 @@
         <el-button @click="cancel">退出</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog  title="历史失信" :visible.sync="infoDialog"  width="800px" append-to-body center="true">
+        <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border>
+          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column label="工地名称" align="center" prop="name" />
+          <el-table-column label="建筑垃圾类型" align="center" prop="type" />
+          <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="所属区域" align="center" prop="place" />
+          <el-table-column label="失信原因" align="center" prop="reason" />
+        </el-table>
+    </el-dialog>
   </div>
 </template>
  
@@ -168,7 +194,8 @@
     addCredit,
     updateCredit,
     exportCredit,
-    getNames
+    getNames,
+    historyCredit
   } from "@/api/business/credit";
  
   export default {
@@ -185,11 +212,12 @@
         multiple: true,
         // 显示搜索条件
         showSearch: true,
-
+        infoDialog :false,
         // 总条数
         total: 0,
         // 工地表格数据
         creditList: [],
+        creditListInfo: [],
         dictNames:[],
         dictTypes:[],
         dictPlaces:[],
@@ -247,15 +275,31 @@
       this.getNamesData();
     },
     methods: {
+      getDataInfo(row){
+        console.log(row);
+
+        let param ={"objectId":row.objectId}
+
+        listCredit(param).then(response => {
+          this.creditListInfo = response.rows;
+          this.infoDialog = true;
+        });
+
+      },
       getNamesData(){
         getNames(this.queryParams).then(response => {
           this.dictNames = response;
         });
       },
       getData(stauts){
+        this.queryParams.status=0;
         this.queryParams.lostCredit=stauts;
         this.getList();
       },
+      getHistoryData(){
+        this.queryParams.status=1;
+        this.getList();
+      },
       colStyle(obj){
         if(obj.column.property == "id"){
           return {background:"#f8f8f9"}
@@ -266,11 +310,21 @@
       },
       getList() {
         this.loading = true;
-        listCredit(this.queryParams).then(response => {
-          this.creditList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
+        if(this.queryParams.status==0){
+          listCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+        if(this.queryParams.status==1){
+          historyCredit(this.queryParams).then(response => {
+            this.creditList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          });
+        }
+
       },
       // 取消按钮
       cancel() {
@@ -46,6 +46,16 @@ public class ConstructionCreditController extends BaseController
         List<ConstructionCredit> list = constructionCreditService.selectConstructionCreditList(constructionCredit);
         return getDataTable(list);
     }
+    
+    @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:list')")
+    @GetMapping("/historyCredit")
+    public TableDataInfo historyCredit(ConstructionCredit constructionCredit)
+    {
+        startPage();
+        List<ConstructionCredit> list = constructionCreditService.selectConstructionCreditHistory(constructionCredit);
+        return getDataTable(list);
+    }
+    
  
     /**
      * 导出工地失信列表
@@ -61,4 +61,6 @@ public interface ConstructionCreditMapper
     public int deleteConstructionCreditByIds(Long[] ids);
  
     public List<String> getNames(ConstructionCredit constructionCredit);
+
+	public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit);
 }
@@ -62,4 +62,6 @@ public interface IConstructionCreditService
     public int deleteConstructionCreditById(Long id);
  
 	public List<String> getNames(ConstructionCredit constructionCredit);
+
+	public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit);
 }
@@ -48,6 +48,13 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
         return constructionCreditMapper.selectConstructionCreditList(constructionCredit);
     }
  
+    @Override
+    public List<ConstructionCredit> selectConstructionCreditHistory(ConstructionCredit constructionCredit)
+    {
+        return constructionCreditMapper.selectConstructionCreditHistory(constructionCredit);
+    }
+    
+    
     /**
      * 新增【请填写功能名称】
      * 
@@ -19,7 +19,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     <sql id="selectConstructionCreditVo">
         select id, name, type, time, place, reason, status, lost_credit,object_id from construction_credit
     </sql>
-
+    
     <select id="selectConstructionCreditList" parameterType="ConstructionCredit" resultMap="ConstructionCreditResult">
         <include refid="selectConstructionCreditVo"/>
         <where>  
@@ -91,14 +91,24 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
  
         <select id="getNames" parameterType="ConstructionCredit" resultType="String">
  
-    	select name from construction_credit 
+    	select DISTINCT name from construction_credit 
         <where>  
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
         </where>
-        GROUP BY name
     </select>
  
  
+    <select id="selectConstructionCreditHistory" parameterType="ConstructionCredit" resultMap="ConstructionCreditResult">
+       
+        select c.* from (select a.* from construction_credit a where not exists (select b.* from construction_credit b where a.name = b.name and a.id &lt; id )) c
+        
+        <where>  
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="place != null  and place != ''"> and place = #{place}</if>
+        </where>
+    </select>
+    
 </mapper>
 \ No newline at end of file