解决已归档统计和列表对不上问题

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/controller/GwCirculationCard2Controller.java

@@ -126,15 +126,15 @@ public class GwCirculationCard2Controller {
 					queryWrapper.eq ("b.update_by_id", userDTO.getId() );
 				}
 				//查看归档的
-				if(state.equals("3")){
-					queryWrapper.eq ("b.update_by_id", userDTO.getId() );
-					queryWrapper.or();
-					queryWrapper.eq("b.create_by_id",userDTO.getId());
-				}
+//				if(state.equals("3")){
+//					queryWrapper.eq ("b.update_by_id", userDTO.getId() );
+//					queryWrapper.or();
+//					queryWrapper.eq("b.create_by_id",userDTO.getId());
+//				}
 			}
-			queryWrapper.groupBy("a.id");
+			//queryWrapper.groupBy("a.id");
 
-			result=gwCirculationCard2Service.findPage (page, queryWrapper);
+			result=gwCirculationCard2Service.findPage (page, queryWrapper,state,userDTO.getId());
 
 //		}
 

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/mapper/GwCirculationCard2Mapper.java

@@ -23,7 +23,7 @@ public interface GwCirculationCard2Mapper extends BaseMapper<GwCirculationCard2>
 
     int saveGetId(GwCirculationCard2DTO map);
 
-    IPage<GwCirculationCard2DTO> findList(Page<GwCirculationCard2> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+    IPage<GwCirculationCard2DTO> findList(Page<GwCirculationCard2> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String state,String userid);
 
     HashMap<String, Object> getStatistics(String userid);
     int getStatistics2(String userid);

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/mapper/xml/GwCirculationCard2Mapper.xml

@@ -45,6 +45,10 @@
         FROM gw_circulation_card2 a
         <include refid="circulation2DetailJoins"/>
         ${ew.customSqlSegment}
+        <if test="state ==3">
+            AND (b.update_by_id=#{userid} or b.create_by_id=#{userid})
+        </if>
+        group by a.id
 
     </select>
 

jp-console/jeeplus-modules/gw/src/main/java/com/jeeplus/circulation2/service/GwCirculationCard2Service.java

@@ -37,9 +37,9 @@ public class GwCirculationCard2Service extends ServiceImpl<GwCirculationCard2Map
      * @param queryWrapper
      * @return
      */
-    public IPage<GwCirculationCard2DTO> findPage(Page<GwCirculationCard2> page, QueryWrapper queryWrapper) {
+    public IPage<GwCirculationCard2DTO> findPage(Page<GwCirculationCard2> page, QueryWrapper queryWrapper,String state,String userid) {
 
-        return  baseMapper.findList (page, queryWrapper);
+        return  baseMapper.findList (page, queryWrapper,state,userid);
     }
 
     public HashMap<String, Object> getStatistics(String userid) {

jp-ui/src/api/circulation2/gwCirculationCard2Service.js

@@ -16,6 +16,13 @@ export default {
 			params: { ids: ids },
 		});
 	},
+	
+	getCardNum: function (id) {
+		return request({
+			url: "/circulation2/gwCirculationCard2/getCardNum",
+			method: "get",
+		});
+	},
 
 	queryById: function (id) {
 		return request({

jp-ui/src/views/circulation2/GwCirculationCard2Form.vue

@@ -9,14 +9,14 @@
             <el-form-item label="年度" prop="yearNum"
                 :rules="[
                  ]">
-              <el-input v-model="inputForm.yearNum" placeholder="请填写年度"     ></el-input>
+              <el-input v-model="inputForm.yearNum" placeholder="请填写年度"    readonly ></el-input>
            </el-form-item>
         </el-col>
         <el-col :span="12">
             <el-form-item label="卡号" prop="cardNum"
                 :rules="[
                  ]">
-              <el-input v-model="inputForm.cardNum" placeholder="请填写卡号"     ></el-input>
+              <el-input v-model="inputForm.cardNum" placeholder="请填写卡号"    readonly ></el-input>
            </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -121,6 +121,7 @@
         method: '',
         visible: false,
         loading: false,
+		cardNum: "",
         inputForm: {
           id: '',
           yearNum: '',
@@ -163,6 +164,19 @@
               this.loading = false
             })
           }
+
+
+		  if (method === 'add') { // 新增
+			  gwCirculationCard2Service.getCardNum().then(data => {
+				const currentYear = new Date().getFullYear();
+				this.inputForm.yearNum = currentYear
+				this.cardNum = data
+				this.inputForm.cardNum = "[" + currentYear + "]" + data + "号"
+				this.inputForm.writtenTime = this.moment().format('YYYY-MM-DD HH:mm:ss');
+				this.inputForm.receivingTime = this.moment().format('YYYY-MM-DD HH:mm:ss');
+			  })
+		  }
+
         })
       },
       // 表单提交
@@ -170,6 +184,9 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+			this.inputForm.writtenTime = this.inputForm.writtenTime + " 00:00:00";
+			this.inputForm.receivingTime = this.inputForm.receivingTime + " 00:00:00";
+			this.inputForm.cardNum = this.cardNum
             gwCirculationCard2Service.save(this.inputForm).then((data) => {
               this.visible = false
               this.$message.success(data)

jp-ui/src/views/circulation2/GwCirculationCard2List.vue

@@ -10,21 +10,21 @@
       @submit.prevent
     >
       <!-- 搜索框-->
-      <el-form-item prop="yearNum" label="年度：">
+      <!-- <el-form-item prop="yearNum" label="年度：">
         <el-input v-model="searchForm.yearNum" placeholder="请输入年度" clearable></el-input>
 		   </el-form-item>
       <el-form-item prop="cardNum" label="卡号：">
         <el-input v-model="searchForm.cardNum" placeholder="请输入卡号" clearable></el-input>
-		   </el-form-item>
+		   </el-form-item> -->
       <el-form-item prop="sendingAgency" label="来文机关：">
         <el-input v-model="searchForm.sendingAgency" placeholder="请输入来文机关" clearable></el-input>
 		   </el-form-item>
-      <el-form-item prop="docFontSize" label="来文字号：">
+      <!-- <el-form-item prop="docFontSize" label="来文字号：">
         <el-input v-model="searchForm.docFontSize" placeholder="请输入来文字号" clearable></el-input>
 		   </el-form-item>
       <el-form-item prop="fileSource" label="文件来源：">
         <el-input v-model="searchForm.fileSource" placeholder="请输入文件来源" clearable></el-input>
-		   </el-form-item>
+		   </el-form-item> -->
       <el-form-item prop="writtenTime" label="成文时间：">
         <el-date-picker
 						v-model="searchForm.writtenTime"
@@ -60,7 +60,7 @@
       </el-form-item>
     </el-form>
 
-		<div class="jp-table">
+		<div class="jp-table"  style="height: calc(100% - 120px);">
 		  <vxe-toolbar ref="gwCirculationCard2Toolbar" :refresh="{query: refreshList}" import export print custom>
 		    <template #buttons>
 				<el-button v-if="hasPermission('circulation2:gwCirculationCard2:add')" type="primary"  icon="plus" @click="add()">新建</el-button>
@@ -284,7 +284,7 @@
 		// 获取数据列表
 		refreshList () {
 		  this.loading = true
-		  
+
 
 		  gwCirculationCard2Service.list({
 		    'current': this.tablePage.currentPage,
@@ -295,14 +295,14 @@
 		    this.dataList = data.records
 		    this.tablePage.total = data.total
 		    this.loading = false
-			
+
 			//选择待办的时候
 			if(this.searchForm.state=='1'){
 						  this.daiban=true;
 			}else{
 						  this.daiban=false;
 			}
-			
+
 		  })
 		},
 		// 当前页