修正sugsql导航更新加配置的bug

移动系统liao

2025-05-01 a247547df86f0fad8f03aebb91de68d3f2bc7918

修正sugsql导航更新加配置的bug

 AdminwebPages/adminpageView/src/App.vue

@@ -3,7 +3,7 @@
 * @Author: 小飞侠
 * @Date: 2025-03-17 09:36:48
 * @LastEditors: Please set LastEditors
 * @LastEditTime: 2025-03-18 10:33:24
 * @LastEditTime: 2025-03-27 13:20:03
 * Copyright: 2025  MinTinge CO.,LTD. All Rights Reserved.
 * @Descripttion: 写入你的描述
-->
@@ -13,7 +13,7 @@

<template>

<div  style="width: 100%; background-color: burlywood; height: 100%;">
<div  style=" background-color: gainsboro;">
  <RouterView />
</div>


 AdminwebPages/adminpageView/src/assets/main.css

@@ -4,11 +4,8 @@
  padding: 0;
}
#app {
  width: 100vw;
  height: 100vh;
  margin: 10px 0px 0px 0px ;

  padding: 2px;

  font-weight: normal;
}


 AdminwebPages/adminpageView/src/views/AboutView.vue

@@ -7,7 +7,7 @@
<style>
@media (min-width: 1024px) {
  .about {
    min-height: 100vh;

    display: flex;
    align-items: center;
  }

 AdminwebPages/adminpageView/src/views/cylsgPayrollReport.vue

@@ -3,23 +3,30 @@
 * @Author: 小飞侠
 * @Date: 2025-03-17 09:45:10
 * @LastEditors: Please set LastEditors
 * @LastEditTime: 2025-03-27 13:24:58
 * Copyright: 2025  MinTinge CO.,LTD. All Rights Reserved.
 * @Descripttion: 写入你的描述
-->
<!--
 * @FilePath: cylsgPayrollReport.vue
 * @Author: 小飞侠
 * @Date: 2025-03-17 09:45:10
 * @LastEditors: Please set LastEditors
 * @LastEditTime: 2025-03-19 11:33:32
 * Copyright: 2025  MinTinge CO.,LTD. All Rights Reserved.
 * @Descripttion: 写入你的描述
-->
<!-- -->
<template>
  <div>
  <div style="max-width: 1440px; margin: 0 auto">

    <el-card>
      <PlusForm v-model="formdata" :columns="FromColumns" :row-props="{ gutter: 100 }" :col-props="{
        span: 4
        span: 5
      }" @submit="mysubmit">
        <template #footer="{ handleSubmit }">
          <div style="margin: 0 auto">
            <el-button type="primary" @click="handleSubmit">搜索</el-button>


          </div>
        </template>
      </PlusForm>
@@ -32,7 +39,6 @@
<script setup lang='tsx'>
import { GetTransferOrder, OrderByType, type WeChatTransferOrder } from '@/Api/apis';
import moment from 'moment';
import { valueEquals } from 'element-plus';
import type { PlusColumn, PlusTableInstance, PageInfo } from 'plus-pro-components'
import { useTable } from 'plus-pro-components'
import { h, onMounted, ref, type VNode } from 'vue'
@@ -48,32 +54,30 @@
  {
    label: '姓名',
    prop: 'userName',
    tooltip: '名称最多显示6个字符'
    labelWidth: 60,

  },
  {
    label: '身份证号码',
    labelWidth: 110,
    width: 200,
    prop: 'userIDCode',
    tooltip: '名称最多显示6个字符'
    labelWidth: 100,

    prop: 'userIDCode'
  }
  ,
  {
    label: '电话号码',
    labelWidth: 110,
    width: 200,
    prop: 'itCode',
    tooltip: '名称最多显示6个字符'
    labelWidth: 100,

    prop: 'itCode'
  },
  {
    label: '支付时间',
    labelWidth: 110,
    labelWidth: 100,
    width: 400,
    colProps: {
      span: 8
    },
    prop: 'DataTime',
    tooltip: '支付时间',
    valueType: 'date-picker',
    fieldProps: {
      type: 'datetimerange',

 cylsg/ECTESTOA/OAServices.cs

@@ -68,7 +68,7 @@
                    throw Oops.Oh("登录信息错误,不是有效用户");
                }
                //重新获取权限
                ret = await _OAsqlSugarClient.Queryable<OaStaff>().Includes(x => x.Department).Where(x => x.MobieNum == user.ItCode && x.FirmId == firmId).Select(x => new ECTESTOAPermissions
                ret = await _OAsqlSugarClient.Queryable<OaStaff>().Includes(x => x.Department).Where(x => x.MobieNum == user.ItCode && x.FirmId == firmId&&x.Status=="在职").Select(x => new ECTESTOAPermissions
                {
                    DepartmentName = x.Department.Name,
                     DepartId=x.DepartmentId

 cylsg/cylsg.Application/CyOS/CyOSSDriver.cs

@@ -121,10 +121,18 @@
        public async Task<int > StartDeliverPlan(Guid KeyId)
        {

          
            if (!await CheckRols())
            {
                throw Oops.Oh("没有权限");
            }
      DateTime specificDateTime = new DateTime(2025, 4, 9, 23, 59, 59);//2025年4月10 日之后的，必须一单一单点击完成后才能送货
            var count = await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid != KeyId && x.ShifouDelivery != 2 && x.Deliveredstatus == DeliveredType.Deliver&&x.DeliverTime> specificDateTime).CountAsync();
            if(count > 0)
            {
                throw Oops.Oh($"你还有{count}送货任务没有确认完成，不能开始新的任务");
            }
       
             var a= await _client.Queryable<OA_DeliverPlanPaiche>().Where(x => x.DriverId == Permissions.KeyId && x.Keyid == KeyId && x.ShifouDelivery != 2).FirstAsync();
            if(a==null)
                throw Oops.Oh("没有权限");

 cylsg/cylsg.Application/CyOS/CyOSSettingController.cs

@@ -49,7 +49,7 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]

        [AllowAnonymous]
        public async Task<List<OaSubjectSet>> getKeMuList()
        {
            return await _client.Queryable<OaSubjectSet>().Where(x => x.Status == true && x.FirmId == _oAServices.firmId && x.SubjectType == "贷").Select(x => new OaSubjectSet
@@ -74,7 +74,7 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [AllowAnonymous]
        //[AllowAnonymous]
        public async Task<object> GeCorporateClients()
        {
             return  await _client.Queryable<OA_CorporateClients>()
@@ -95,15 +95,17 @@
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [AllowAnonymous]
        public async Task<List<OaStaff>> Getdrivers()
        {
            return await _client.Queryable<OaStaff>().Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            {
                Name = x.Name,
                MemberId = x.MemberId,
                Keyid = x.Keyid,
                Car=x.Car

            }).WithCache(60).ToListAsync();
            }).ToListAsync();
        }


@@ -117,13 +119,14 @@
        {
           
            var list = await _client.Queryable<OA_DeliverPlanPaiche>().Where(x =>( x.DeliverTime.Value.Date < DateTime.Now.AddDays(8).Date) && (x.DeliverTime.Value.Date >= DateTime.Now.Date)).Select(x => x.DriverId).ToListAsync();
            return await _client.Queryable<OaStaff>().Where(x=>list.Contains(x.Keyid)).Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            return await _client.Queryable<OaStaff>().Includes(x=>x.Car).Where(x=>list.Contains(x.Keyid)).Where(x => x.Status == "在职" && x.FirmId == _oAServices.firmId && x.BF_IsDriver).Select(x => new OaStaff
            {
                Name = x.Name,
                MemberId = x.MemberId,
                Keyid = x.Keyid,
                Car=x.Car

            }).WithCache(60).ToListAsync();
            })/*.WithCache(30)*/.ToListAsync(); //Includes(x => x.Car)加缓存会报错
            ////      return await _client.Queryable<OA_DeliverPlan>()
            ////.LeftJoin<OaStaff>((dp, os) => dp.DriverId == os.Keyid)
            ////.Where((dp, os) => SqlFunc.ToDate(dp.DeliverTime) < DateTime.Now.AddDays(8).Date

 cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs

@@ -13,6 +13,7 @@
using System.Text;
using System.Threading.Tasks;
using TencentCloud.Iecp.V20210914.Models;
using TencentCloud.Monitor.V20180724.Models;

namespace cylsg.Application.CyOS
{
@@ -34,32 +35,92 @@
            _oAServices = oAServices;
            _eZCoreNetRedisService = netRedisService;
        }
        [HttpGet]
        [AllowAnonymous]
        public async Task<OA_DriverRecord> testc()
        {
            OA_DriverRecord data = null;
        //[HttpGet]
        //[AllowAnonymous]
        //public async Task<bool > TestCreat()
        //{
        //    OaWorkPlan pram = new OaWorkPlan()
        //    {

            data = await _client.Queryable<OA_DriverRecord>().Where(x =>
             x.Id == new Guid("BE15D584-DFE3-438D-863B-705DB1AB14ED")
           ).Includes(x=>x.Attachments).FirstAsync();
        //        EvaluationContent = "",
        //        PlanDataType = 17,
        //        PlanType = 3,
        //        MemberId = _oAServices.firmId,
        //        SentStaffId = Guid.Empty,
        //        ReciveStaffId = Guid.Empty,
        //        DepartId = 0,
        //        PlanStartTime = DateTime.Now,
        //        RewardContent = "",
        //        LastUpdateTime = DateTime.Now,
        //        Operator = "",
        //        PlanTitle = "",
        //        PlanRunTime = DateTime.Now,
        //        PlanRemark = "",
        //        PlanPeople = "测试测试",
        //        PlanComplany = "",
        //        PlanStatus = PlanStatusType.unApproval,
        //        ApprovalStaffId = Guid.Empty,
        //        ApprovalStatus = PlanStatusType.unApproval,
        //        EvaluationStatus = BaoxiaoStausType.Unknown,
        //        FirmAccountId = 0,
        //        HoubufapiaoStatus = HoubufapiaoStatusType.Unknown,
        //        PlanMoney = 200,
        //        PlanContent = "测试批量",
        //        RewardResult = "10",
          
            data.Attachments?.Add(new OA_attachment
            {
                PlanAttachment = "1111",
                AttachmentType = 4,
                Operator= "sdasd"
            });
            data.CarConditionAttachments = null;
            await _client.UpdateNav(data).Include(x => x.CarConditionAttachments,new UpdateNavOptions
            {
                OneToManyInsertOrUpdate=true,
        //        ApprovalTime = DateTime.Now,
        //        ApprovalContent = "",
        //        EvaluationStaffId = Guid.Empty,
        //        EvaluationTime = DateTime.Now,
        //        RewardMoney = 0,
        //        RewardType = 1,
        //        Keyid = null,
        //        WorkPlanAttachments = new List<OaWorkPlanAttachment>()
        //        {
        //             new OaWorkPlanAttachment
        //             {
        //                  AttachmentType=1,
        //                   CreateTime=DateTime.Now,
        //                    Operator="123213",
        //                     PlanAttachment="hhttp://1.jpg"
        //             },
        //              new OaWorkPlanAttachment
        //             {
        //                  AttachmentType=1,
        //                   CreateTime=DateTime.Now,
        //                    Operator="123213",
        //                     PlanAttachment="hhttp://2.jpg"
        //             }
        //              ,
        //              new OaWorkPlanAttachment
        //             {
        //                  AttachmentType=4,
        //                   CreateTime=DateTime.Now,
        //                    Operator="123213",
        //                     PlanAttachment="hhttp://2.jpg"
        //             }
        //        }
                 
            }).ExecuteCommandAsync();

            return await _client.Queryable<OA_DriverRecord>().Where(x => x.Id == new Guid("BE15D584-DFE3-438D-863B-705DB1AB14ED")).Includes(x => x.Attachments).Includes(x => x.CarConditionAttachments).FirstAsync();
        //    };
        //    return await _client.InsertNav(pram).Include(x => x.WorkPlanAttachments).ExecuteCommandAsync();

        }


        //}

        ///// <summary>
        ///// 
        ///// </summary>
        ///// <returns></returns>
        //[HttpGet]
        //[AllowAnonymous]
        //public async Task<OA_DriverRecord> TestUpdata()
        //{



        //}

        /// <summary>
        /// 获取预约配送信息

 cylsg/cylsg.Model/ECTEModel/OaStaff.cs

@@ -1,4 +1,5 @@
using SqlSugar;
using Models;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -377,6 +378,12 @@
            [SugarColumn(ColumnName = "BF_Isbaoxiaojingli")]
            public bool BF_Isbaoxiaojingli { get; set; }

        /// <summary>
        /// 车辆
        /// </summary>
        [Navigate(NavigateType.OneToOne, nameof(Keyid), nameof(OA_CarManage.StaffID))]
        public OA_CarManage? Car { get; set; }

            
    }