Merge remote-tracking branch 'origin/main'

fuintAdmin_zt/src/views/Site/components/afterff.vue

@@ -47,6 +47,7 @@ export default {
       })
     },
     getList() {
+      
       getAfterListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
       })
@@ -155,9 +156,8 @@ export default {
         align="center"
         label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未开始</span>
+          <span v-if="scope.row.status == 1">未支付</span>
-          <span v-if="scope.row.status == 1">进行中</span>
+          <span v-if="scope.row.status == 0">已支付</span>
-          <span v-if="scope.row.status == 2">已完成</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -186,9 +186,11 @@ export default {
         <template slot-scope="scope">
           <el-button
             size="mini"
+            v-if="scope.row.status == 1"
             @click="handleEdit(scope.row)">修改</el-button>
           <el-button
             size="mini"
+            v-if="scope.row.status == 1"
             @click="handleEditshoukuan(scope.row)">收款</el-button>
         </template>
 

fuintAdmin_zt/src/views/Site/components/before.vue

@@ -7,10 +7,13 @@ import {
   updateBeforerApi
 } from "@/api/system/Site/compant";
 
+import { getDeptName} from '@/api/indexBanner/index'
+
 export default {
   name: "beforeff",
   data() {
     return {
+      deptName:'',
       dialogVisible:false,
       tableData: [ ],
       form: {
@@ -40,8 +43,14 @@ export default {
   created() {
     this.getList()
     this.getData()
+    this.getDeptName();
   },
   methods: {
+    getDeptName(){
+      getDeptName().then(res=>{
+        this.deptName = res.data.deptName
+      })
+    },
     getList() {
       getBeforeListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
@@ -155,9 +164,8 @@ export default {
         align="center"
         label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == 0">未开始</span>
+          <span v-if="scope.row.remainingTransactionVolume > 0">进行中</span>
-          <span v-if="scope.row.status == 1">进行中</span>
+          <span v-if="scope.row.remainingTransactionVolume == 0">已完成</span>
-          <span v-if="scope.row.status == 2">已完成</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -170,7 +178,8 @@ export default {
         align="center"
         label="创建人">
       </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
+        v-if = "this.deptName === '百业兴总部'"
         align="center">
         <template slot="header" slot-scope="scope">
           <el-button
@@ -183,7 +192,7 @@ export default {
             size="mini"
             @click="handleEdit( scope.row)">修改</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <el-dialog
       title="新增"

fuintAdmin_zt/src/views/Site/components/yearff.vue

@@ -1,6 +1,7 @@
 <script>
 import {addYearApi, getYearListApi, updateYearApi} from "@/api/system/Site/compant";
 import {parseTime} from "@/utils/fuint";
+import { getDeptName} from '@/api/indexBanner/index'
 
 export default {
   name: "yearff",
@@ -8,6 +9,7 @@ export default {
   data() {
 
     return {
+      deptName:'',
       dialogVisible:false,
       tableData: [ ],
       form: {
@@ -26,10 +28,16 @@ export default {
     deptId: Number
   },
   created() {
+    this.getDeptName();
     console.log("deptId",this.deptId)
     this.getList()
   },
   methods: {
+    getDeptName(){
+      getDeptName().then(res=>{
+        this.deptName = res.data.deptName
+      })
+    },
     getList() {
       getYearListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
@@ -116,9 +124,9 @@ export default {
       align="center"
       label="状态">
       <template slot-scope="scope">
-        <span v-if="scope.row.status == 0">未开始</span>
+        <span v-if="parseTime(scope.row.systemValidityPeriodStart) > parseTime(new Date())">未开始</span>
-        <span v-if="scope.row.status == 1">进行中</span>
+        <span v-if="parseTime(scope.row.systemValidityPeriodStart) < parseTime(new Date()) && parseTime(scope.row.systemValidityPeriodEnd) > parseTime(new Date())">进行中</span>
-        <span v-if="scope.row.status == 2">已完成</span>
+        <span v-if="parseTime(scope.row.systemValidityPeriodEnd) < parseTime(new Date())">已完成</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -131,7 +139,8 @@ export default {
       align="center"
       label="创建人">
     </el-table-column>
-    <!-- <el-table-column
+    <el-table-column
+      v-if = "this.deptName === '百业兴总部'"
       align="center">
       <template slot="header" slot-scope="scope">
         <el-button
@@ -141,12 +150,12 @@ export default {
       </template>
       <template slot-scope="scope">
         <el-button
-          v-if="scope.row.status == 0"
+          v-if="parseTime(scope.row.systemValidityPeriodEnd) > parseTime(new Date())"
           size="mini"
           @click="handleEdit(scope.row)">修改</el-button>
 
       </template>
-    </el-table-column> -->
+    </el-table-column>
 
   </el-table>
   <el-dialog

fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/mapper/xml/DeptServiceFeeInfoMapper.xml

@@ -32,6 +32,7 @@ service_fee_statistics,service_fee_limit,status,create_name,create_time
             dept_id = #{info.deptId}
 
         </where>
+        order by create_time desc
     </select>
 <!--    <if test="id != null">-->
 <!--        and id = #{id}-->
@@ -102,7 +103,7 @@ service_fee_statistics,service_fee_limit,status,create_name,create_time
         select
             id,deduction_rate,payment_amount,likely_transaction_volume,service_fee_statistics,service_fee_limit,status
         from dept_service_fee_info
-        where  dept_id = #{deptId}
+        where  dept_id = #{deptId} and status = 1
     </select>
 
     <!--新增所有列-->

fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java

@@ -92,7 +92,7 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
         }
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         deptPriceInfo.setCreateName(nowAccountInfo.getRealName());
-        deptPriceInfo.setDeptId(nowAccountInfo.getDeptId());
+        deptPriceInfo.setDeptId(deptPriceInfo.getDeptId());
 
         boolean isValid = isDateInRange(deptPriceInfo.getSystemValidityPeriodStart(),deptPriceInfo.getSystemValidityPeriodEnd());
 
@@ -113,14 +113,14 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
      */
     @Override
     public DeptPriceInfo update(DeptPriceInfo deptPriceInfo) {
-        int countByTime = getCountByTime(deptPriceInfo);
+        // int countByTime = getCountByTime(deptPriceInfo);
-        if (countByTime>0) {
+        // if (countByTime>0) {
-            throw new RuntimeException("该时间段已有数据");
+        //     throw new RuntimeException("该时间段已有数据");
-        }
+        // }
         boolean isValid = isDateInRange(deptPriceInfo.getSystemValidityPeriodStart(),deptPriceInfo.getSystemValidityPeriodEnd());
 
         if (isValid) {
-            deptPriceInfo.setStatus(1);
+            deptPriceInfo.setStatus(0);
             deptPriceInfoMapper.updateStatus(deptPriceInfo);
         }
         this.deptPriceInfoMapper.update(deptPriceInfo);

fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptServiceFeeInfoServiceImpl.java

@@ -132,6 +132,7 @@ public class DeptServiceFeeInfoServiceImpl implements DeptServiceFeeInfoService
      */
     @Override
     public DeptServiceFeeInfo update(DeptServiceFeeInfo deptServiceFeeInfo) {
+        deptServiceFeeInfo.setStatus(0);
         this.deptServiceFeeInfoMapper.update(deptServiceFeeInfo);
         return this.queryById(deptServiceFeeInfo.getId());
     }