Commit 9d2cc6bc083ca689bd232d74b865ebfd46a3ee5b

Authored by boyang
1 parent d76063bf

fix: 修改预警参数

src/pages/Client/FollowRecord/Components/CommunicationHistoryModal.tsx
... ... @@ -34,7 +34,6 @@ export default ({ data, reloadTable }) => {
34 34 const [assignPeople, setAssignPeople] = useState(''); // 附件名称
35 35 useEffect(() => {
36 36 const request = async () => {
37   - console.log(data, '5656datatatatata');
38 37 const res = await postAdminClientQueryClientComunicationInfo({
39 38 data: {
40 39 id: data.id,
... ...
src/pages/Client/FollowRecord/index.tsx
... ... @@ -23,7 +23,6 @@ export default () => {
23 23  
24 24 // 更新 refreshKey,强制刷新 CommunicationHistoryModal
25 25 setRefreshKey((prevKey) => prevKey + 1);
26   - console.log('5656refresh');
27 26 };
28 27 //biaoji
29 28 const columns = [
... ...
src/pages/Order/FeedBack/FeedbackRegistrationModal.tsx
... ... @@ -7,9 +7,9 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) => {
7 7 const [isModalOpen] = useState(true);
8 8 const { TextArea } = Input;
9 9 const [textValue, setTextValue] = useState('');
  10 + console.log(mainOrder);
10 11  
11 12 const handleOk = async () => {
12   - console.log(subOrders, '5656subOrders', mainOrder);
13 13 await postServiceOrderFeedbackRegistration({
14 14 data: {
15 15 id: subOrders[0].id,
... ...
src/pages/Order/FeedBack/OrderList.tsx
... ... @@ -4599,9 +4599,9 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) => {
4599 4599 useEffect(() => {
4600 4600 if (paramsNew) {
4601 4601 setNewParams(paramsNew);
  4602 + console.log(newParams);
4602 4603 }
4603 4604 refreshTable();
4604   - console.log(paramsNew, '5656paramsNewc', newParams);
4605 4605 }, [paramsNew]);
4606 4606 return (
4607 4607 <div className="order-page-container">
... ...
src/pages/Order/Order/components/FeedbackRegistrationModal.tsx
... ... @@ -7,9 +7,8 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
7 7 const [isModalOpen] = useState(true);
8 8 const { TextArea } = Input;
9 9 const [textValue, setTextValue] = useState('');
10   -
  10 + console.log(mainOrder);
11 11 const handleOk = async () => {
12   - console.log(subOrders, '5656subOrders', mainOrder);
13 12 await postServiceOrderFeedbackRegistration({
14 13 data: {
15 14 id: subOrders[0].id,
... ...
src/pages/Order/Order/index.tsx
... ... @@ -42,9 +42,9 @@ const OrderPage = () =&gt; {
42 42 data: {
43 43 salesCode: userInfo.username,
44 44 waitConfirmReiceptStatusDateTimeLe: setOriginTime(7),
45   - waitConfirmPaymentOrderCreatedDateTimeGe: setOriginTime(21),
  45 + waitConfirmInvoiceStatusDateTimeLe: setOriginTime(5),
46 46 waitFeedbackStatusDateTimeLe: setOriginTime(20),
47   - waitInvoicingStatusDateTimeLe: setOriginTime(5),
  47 + waitInvoicingStatusDateTimeLe: setOriginTime(21),
48 48 waitConfirmPaymentStatusDateTimeLe: setOriginTime(30),
49 49 },
50 50 });
... ... @@ -56,12 +56,9 @@ const OrderPage = () =&gt; {
56 56 res.data.waitInvoicing !== 0) &&
57 57 openCount !== 'true'
58 58 ) {
59   - console.log(open, '5656re222s', res);
60   -
61 59 setOpenCount('true');
62 60 setOpen(true);
63 61 }
64   - console.log(open, '5656res', res);
65 62 setInvoiceWarningNum(res.data.waitConfirmInvoice);
66 63 setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
67 64 setWaitConfirmPayment(res.data.waitConfirmPayment);
... ...
src/pages/Order/OrderList/FeedbackRegistrationModal.tsx
... ... @@ -7,9 +7,8 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
7 7 const [isModalOpen] = useState(true);
8 8 const { TextArea } = Input;
9 9 const [textValue, setTextValue] = useState('');
10   -
  10 + console.log(mainOrder);
11 11 const handleOk = async () => {
12   - console.log(subOrders, '5656subOrders', mainOrder);
13 12 await postServiceOrderFeedbackRegistration({
14 13 data: {
15 14 id: subOrders[0].id,
... ...
src/pages/Order/OrderList/OrderList.tsx
... ... @@ -4587,9 +4587,9 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
4587 4587 useEffect(() => {
4588 4588 if (paramsNew) {
4589 4589 setNewParams(paramsNew);
  4590 + console.log(newParams);
4590 4591 }
4591 4592 refreshTable();
4592   - console.log(paramsNew, '5656paramsNewc', newParams);
4593 4593 }, [paramsNew]);
4594 4594 return (
4595 4595 <div className="order-page-container">
... ... @@ -4684,7 +4684,6 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
4684 4684 }
4685 4685 //保存这个搜索条件
4686 4686 setSearchParam(params);
4687   - console.log(paramsNew, '5656paramsNew');
4688 4687 const { data } = await postServiceOrderQueryServiceOrder({
4689 4688 // ...params,
4690 4689 // FIXME: remove @ts-ignore
... ...
src/pages/Order/OrderWarning/components/FeedbackRegistrationModal.tsx
... ... @@ -9,7 +9,7 @@ export default ({ setVisible, subOrders, mainOrder, onClose }) =&gt; {
9 9 const [textValue, setTextValue] = useState('');
10 10  
11 11 const handleOk = async () => {
12   - console.log(subOrders, '5656subOrders', mainOrder);
  12 + console.log(subOrders, '', mainOrder);
13 13 await postServiceOrderFeedbackRegistration({
14 14 data: {
15 15 id: subOrders[0].id,
... ...
src/pages/Order/OrderWarning/index.tsx
... ... @@ -139,15 +139,12 @@ const OrderPage = () =&gt; {
139 139 data: {
140 140 salesCode: staticSalesCode,
141 141 waitConfirmReiceptStatusDateTimeLe: setOriginTime(options1[0].value),
142   - waitConfirmPaymentOrderCreatedDateTimeGe: setOriginTime(
143   - options2[0].value,
144   - ),
  142 + waitInvoicingStatusDateTimeLe: setOriginTime(options2[0].value),
145 143 waitFeedbackStatusDateTimeLe: setOriginTime(options3[0].value),
146   - waitInvoicingStatusDateTimeLe: setOriginTime(options4[0].value),
  144 + waitConfirmInvoiceStatusDateTimeLe: setOriginTime(options4[0].value),
147 145 waitConfirmPaymentStatusDateTimeLe: setOriginTime(options5[0].value),
148 146 },
149 147 });
150   - console.log(res, '5656565656');
151 148 setInvoiceWarningNum(res.data.waitConfirmInvoice);
152 149 setInvoiceCreateWarningNum(res.data.waitInvoicing);
153 150 setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
... ... @@ -306,7 +303,9 @@ const OrderPage = () =&gt; {
306 303 ? options2
307 304 : activeTabKey === 3
308 305 ? options3
309   - : options4
  306 + : activeTabKey === 4
  307 + ? options4
  308 + : options5
310 309 ).map((option) => (
311 310 <Radio
312 311 key={option.value}
... ... @@ -502,7 +501,6 @@ const OrderPage = () =&gt; {
502 501 applyTimeLe: calDate,
503 502 };
504 503 }
505   - console.log(initialParams, '5656initialParams');
506 504 // 返回完整的参数对象
507 505 return initialParams;
508 506 })()}
... ...
src/pages/Order/WarningWhitelist/index.tsx
... ... @@ -87,7 +87,6 @@ const WarningWhitelist = () =&gt; {
87 87 title={'确认删除此项吗?'}
88 88 text="删除"
89 89 onConfirm={async () => {
90   - console.log(record, '5656record');
91 90 await postServiceOrderDeleteWarningUserWhiteList({
92 91 query: {
93 92 orderId: record.orderId,
... ... @@ -113,7 +112,6 @@ const WarningWhitelist = () =&gt; {
113 112 search: {
114 113 transform: (value) => {
115 114 if (value) {
116   - console.log(value, '5656valueid');
117 115 return {
118 116 orderId: Number(value),
119 117 };
... ... @@ -165,7 +163,6 @@ const WarningWhitelist = () =&gt; {
165 163 title={'确认删除此项吗?'}
166 164 text="删除"
167 165 onConfirm={async () => {
168   - console.log(record.orderId, '5656idoreder');
169 166 await postServiceOrderDeleteWarningOrderWhiteList({
170 167 query: {
171 168 orderId: record.orderId,
... ... @@ -192,7 +189,6 @@ const WarningWhitelist = () =&gt; {
192 189 const res = await postServiceOrderWarningUserWhiteLists({
193 190 data: { ...params },
194 191 });
195   - console.log(res.data, '5656res.data');
196 192 return res.data;
197 193 }}
198 194 rowKey="id"
... ... @@ -228,7 +224,6 @@ const WarningWhitelist = () =&gt; {
228 224 }}
229 225 submitTimeout={2000}
230 226 onFinish={async (values) => {
231   - console.log(values, '5656values');
232 227 const res = await postServiceOrderAddWarningUserWhiteList({
233 228 data: {
234 229 userName: values.orderIdsText,
... ... @@ -239,7 +234,6 @@ const WarningWhitelist = () =&gt; {
239 234 setTimeout(() => {
240 235 actionRef.current?.reload();
241 236 }, 50);
242   - console.log('res5656 :>> ', res);
243 237 message.success('添加成功');
244 238 return true;
245 239 }
... ... @@ -310,7 +304,6 @@ const WarningWhitelist = () =&gt; {
310 304 }}
311 305 submitTimeout={2000}
312 306 onFinish={async (values) => {
313   - console.log(values, '5656values');
314 307 const res = await postServiceOrderAddWarningOrderWhiteList({
315 308 data: {
316 309 orderId: values.orderIdsText,
... ... @@ -345,13 +338,7 @@ const WarningWhitelist = () =&gt; {
345 338 ];
346 339 return (
347 340 <div>
348   - <Tabs
349   - defaultActiveKey="1"
350   - items={tabsItems}
351   - onChange={(value) => {
352   - console.log(value, '5656tabsvalue');
353   - }}
354   - />
  341 + <Tabs defaultActiveKey="1" items={tabsItems} onChange={() => {}} />
355 342 </div>
356 343 );
357 344 };
... ...
src/services/definition.ts
... ... @@ -99,6 +99,11 @@ export interface AdminClientDto {
99 99 address?: string;
100 100 /**
101 101 * @description
  102 + * 关联销售
  103 + */
  104 + affiliateSales?: Array<any>;
  105 + /**
  106 + * @description
102 107 * 市
103 108 */
104 109 city?: string;
... ... @@ -561,6 +566,16 @@ export interface ApiCreateOrderRequest {
561 566 institutionContactName?: string;
562 567 /**
563 568 * @description
  569 + * 发票备注
  570 + */
  571 + invoiceIdentificationNumber?: string;
  572 + /**
  573 + * @description
  574 + * 发票状态
  575 + */
  576 + invoicingStatus?: string;
  577 + /**
  578 + * @description
564 579 * 商品列表
565 580 */
566 581 list?: Array<ApiCreateProductRequest>;
... ... @@ -584,6 +599,8 @@ export interface ApiCreateOrderRequest {
584 599 * 支付方式
585 600 */
586 601 paymentMethod?: string;
  602 + /** @format int64 */
  603 + researchGroupId?: number;
587 604 /**
588 605 * @description
589 606 * 销售代表
... ... @@ -1079,6 +1096,13 @@ export interface CaptchaMessageVO {
1079 1096 type?: string;
1080 1097 }
1081 1098  
  1099 +export interface ClaimPointsDto {
  1100 + orderIds?: Array<number>;
  1101 + /** @format int32 */
  1102 + uid?: number;
  1103 + userPhone?: string;
  1104 +}
  1105 +
1082 1106 export interface CommonAuditRequest {
1083 1107 extend?: any;
1084 1108 /**
... ... @@ -2172,6 +2196,21 @@ export interface MeasureUnitListResRow {
2172 2196 precision?: string;
2173 2197 }
2174 2198  
  2199 +export interface MergeIntegralDto {
  2200 + createByName?: string;
  2201 + /** @format date-time */
  2202 + createTime?: string;
  2203 + /** @format int64 */
  2204 + groupId?: number;
  2205 + logicDelete?: boolean;
  2206 + paths?: Array<string>;
  2207 + /** @format int32 */
  2208 + uid?: number;
  2209 + updateByName?: string;
  2210 + /** @format date-time */
  2211 + updateTime?: string;
  2212 +}
  2213 +
2175 2214 export interface MessageQueryDTO {
2176 2215 createByName?: string;
2177 2216 /** @format int32 */
... ... @@ -2553,23 +2592,16 @@ export interface OrderStagesFromDo {
2553 2592 }
2554 2593  
2555 2594 export interface OrderStagesPayWay {
2556   - createByName?: string;
2557   - /** @format date-time */
2558   - createTime?: string;
2559 2595 /** @format date-time */
2560 2596 dateRange?: string;
2561 2597 fileName?: string;
2562 2598 fileUrl?: string;
2563 2599 /** @format int32 */
2564 2600 id?: number;
2565   - logicDelete?: boolean;
2566 2601 /** @format int32 */
2567 2602 number?: number;
2568 2603 /** @format int32 */
2569 2604 ossId?: number;
2570   - updateByName?: string;
2571   - /** @format date-time */
2572   - updateTime?: string;
2573 2605 }
2574 2606  
2575 2607 export interface OrderStagesPayWayDo {
... ... @@ -2983,6 +3015,28 @@ export interface QueryCustomerInformationDto {
2983 3015 name?: string;
2984 3016 }
2985 3017  
  3018 +export interface QueryGroupIntegralRecordDto {
  3019 + createByName?: string;
  3020 + /** @format date-time */
  3021 + createTimeGe?: string;
  3022 + /** @format date-time */
  3023 + createTimeLe?: string;
  3024 + /** @format int32 */
  3025 + current?: number;
  3026 + detalGe?: number;
  3027 + /** @format int32 */
  3028 + end?: number;
  3029 + /** @format int64 */
  3030 + groupId?: number;
  3031 + /** @format int32 */
  3032 + pageSize?: number;
  3033 + /** @format int32 */
  3034 + start?: number;
  3035 + /** @format int32 */
  3036 + total?: number;
  3037 + type?: string;
  3038 +}
  3039 +
2986 3040 export interface QueryHistoryRecordDto {
2987 3041 /**
2988 3042 * @description
... ... @@ -3247,6 +3301,16 @@ export interface QueryProcureReturnBillDto {
3247 3301 total?: number;
3248 3302 }
3249 3303  
  3304 +export interface QueryRelatedProducts {
  3305 + productName?: string;
  3306 + userPhone?: string;
  3307 +}
  3308 +
  3309 +export interface QueryRelatedSchools {
  3310 + productNames?: Array<string>;
  3311 + userPhone?: string;
  3312 +}
  3313 +
3250 3314 export interface QueryReportFormsDto {
3251 3315 /**
3252 3316 * @description
... ... @@ -3297,8 +3361,24 @@ export interface QueryUseOldInvoicingDto {
3297 3361 total?: number;
3298 3362 }
3299 3363  
  3364 +export interface QueryUserIntegralRecordDto {
  3365 + createByName?: string;
  3366 + /** @format int32 */
  3367 + current?: number;
  3368 + /** @format int32 */
  3369 + end?: number;
  3370 + /** @format int32 */
  3371 + pageSize?: number;
  3372 + /** @format int32 */
  3373 + start?: number;
  3374 + /** @format int32 */
  3375 + total?: number;
  3376 + uid?: string;
  3377 +}
  3378 +
3300 3379 export interface QueryWarningOrderStatistics {
3301 3380 excludeWhiteList?: boolean;
  3381 + querySelf?: boolean;
3302 3382 salesCode?: string;
3303 3383 /** @format date-time */
3304 3384 waitConfirmInvoiceStatusDateTimeLe?: string;
... ... @@ -3310,6 +3390,8 @@ export interface QueryWarningOrderStatistics {
3310 3390 waitConfirmReiceptStatusDateTimeLe?: string;
3311 3391 /** @format date-time */
3312 3392 waitFeedbackStatusDateTimeLe?: string;
  3393 + /** @format date-time */
  3394 + waitInvoicingStatusDateTimeLe?: string;
3313 3395 }
3314 3396  
3315 3397 export interface QueryWarningOrderWhiteListDto {
... ... @@ -3366,55 +3448,6 @@ export interface ReissueInvoiceDto {
3366 3448 purchaser?: string;
3367 3449 }
3368 3450  
3369   -export interface ResearchGroupAddRequest {
3370   - accounts?: Array<ResearchGroupAccounts>;
3371   - /**
3372   - * @description
3373   - * 单位名称
3374   - */
3375   - companyName?: string;
3376   - createByName?: string;
3377   - /** @format date-time */
3378   - createTime?: string;
3379   - /**
3380   - * @description
3381   - * 课题组名称
3382   - */
3383   - groupName?: string;
3384   - /**
3385   - * @description
3386   - * 主键id
3387   - * @format int64
3388   - */
3389   - id?: number;
3390   - /**
3391   - * @description
3392   - * 负责人
3393   - */
3394   - leaderName?: string;
3395   - logicDelete?: boolean;
3396   - members?: Array<ResearchGroupMembers>;
3397   - paths?: Array<string>;
3398   - /**
3399   - * @description
3400   - * 状态
3401   - */
3402   - status?: string;
3403   - /**
3404   - * @description
3405   - * 冗余字段,当前状态备注
3406   - */
3407   - statusNotes?: string;
3408   - /**
3409   - * @description
3410   - * 状态文本
3411   - */
3412   - statusText?: string;
3413   - updateByName?: string;
3414   - /** @format date-time */
3415   - updateTime?: string;
3416   -}
3417   -
3418 3451 export interface ResearchGroupDeleteRequest {
3419 3452 /**
3420 3453 * @description
... ... @@ -3461,6 +3494,7 @@ export interface ResearchGroupEditRequest {
3461 3494 logicDelete?: boolean;
3462 3495 members?: Array<ResearchGroupMembers>;
3463 3496 paths?: Array<string>;
  3497 + requestStatus?: string;
3464 3498 /**
3465 3499 * @description
3466 3500 * 状态
... ... @@ -3487,6 +3521,7 @@ export interface ResearchGroupListRequest {
3487 3521 * 预存账号手机号
3488 3522 */
3489 3523 accountPhone?: string;
  3524 + addAuditPass?: boolean;
3490 3525 /**
3491 3526 * @description
3492 3527 * 公司名称
... ... @@ -3509,6 +3544,11 @@ export interface ResearchGroupListRequest {
3509 3544 idIn?: Array<number>;
3510 3545 /**
3511 3546 * @description
  3547 + * 是否包含正在申请的课题组
  3548 + */
  3549 + includeApplying?: boolean;
  3550 + /**
  3551 + * @description
3512 3552 * 课题组负责人
3513 3553 */
3514 3554 leaderName?: string;
... ... @@ -3523,6 +3563,8 @@ export interface ResearchGroupListRequest {
3523 3563 */
3524 3564 memberPhone?: string;
3525 3565 /** @format int32 */
  3566 + page?: number;
  3567 + /** @format int32 */
3526 3568 pageSize?: number;
3527 3569 /** @format int32 */
3528 3570 start?: number;
... ... @@ -3621,7 +3663,62 @@ export interface ResearchGroupMemberRequestDetailRequest {
3621 3663 id?: number;
3622 3664 }
3623 3665  
3624   -export interface ResearchGroupMemberRequestEditRequest {
  3666 +export interface ResearchGroupMemberRequestsRequest {
  3667 + /**
  3668 + * @description
  3669 + * 审核备注
  3670 + */
  3671 + auditNotes?: string;
  3672 + /**
  3673 + * @description
  3674 + * 审核状态
  3675 + */
  3676 + auditStatus?: string;
  3677 + /**
  3678 + * @description
  3679 + * 创建人
  3680 + */
  3681 + createByName?: string;
  3682 + /** @format int32 */
  3683 + current?: number;
  3684 + /** @format int32 */
  3685 + end?: number;
  3686 + /**
  3687 + * @description
  3688 + * 课题组id
  3689 + * @format int64
  3690 + */
  3691 + groupId?: number;
  3692 + /**
  3693 + * @description
  3694 + * 课题组名称
  3695 + */
  3696 + groupName?: string;
  3697 + idIn?: Array<number>;
  3698 + /**
  3699 + * @description
  3700 + * 成员名称
  3701 + */
  3702 + memberName?: string;
  3703 + /**
  3704 + * @description
  3705 + * 成员手机号
  3706 + */
  3707 + memberPhone?: string;
  3708 + /** @format int32 */
  3709 + pageSize?: number;
  3710 + /**
  3711 + * @description
  3712 + * 申请备注
  3713 + */
  3714 + requestNotes?: string;
  3715 + /** @format int32 */
  3716 + start?: number;
  3717 + /** @format int32 */
  3718 + total?: number;
  3719 +}
  3720 +
  3721 +export interface ResearchGroupRequestsDto {
3625 3722 /**
3626 3723 * @description
3627 3724 * 审核备注
... ... @@ -3689,52 +3786,54 @@ export interface ResearchGroupMemberRequestEditRequest {
3689 3786 updateTime?: string;
3690 3787 }
3691 3788  
3692   -export interface ResearchGroupMemberRequestsRequest {
  3789 +export interface ResearchGroupsDTO {
  3790 + accounts?: Array<ResearchGroupAccounts>;
3693 3791 /**
3694 3792 * @description
3695   - * 审核备注
  3793 + * 单位名称
3696 3794 */
3697   - auditNotes?: string;
  3795 + companyName?: string;
  3796 + createByName?: string;
  3797 + /** @format date-time */
  3798 + createTime?: string;
3698 3799 /**
3699 3800 * @description
3700   - * 审核状态
  3801 + * 课题组名称
3701 3802 */
3702   - auditStatus?: string;
  3803 + groupName?: string;
3703 3804 /**
3704 3805 * @description
3705   - * 创建人
  3806 + * 主键id
  3807 + * @format int64
3706 3808 */
3707   - createByName?: string;
3708   - /** @format int32 */
3709   - current?: number;
3710   - /** @format int32 */
3711   - end?: number;
  3809 + id?: number;
3712 3810 /**
3713 3811 * @description
3714   - * 课题组名称
  3812 + * 负责人
3715 3813 */
3716   - groupName?: string;
  3814 + leaderName?: string;
  3815 + logicDelete?: boolean;
  3816 + members?: Array<ResearchGroupMembers>;
  3817 + paths?: Array<string>;
  3818 + requestStatus?: string;
3717 3819 /**
3718 3820 * @description
3719   - * 成员名称
  3821 + * 状态
3720 3822 */
3721   - memberName?: string;
  3823 + status?: string;
3722 3824 /**
3723 3825 * @description
3724   - * 成员手机号
  3826 + * 冗余字段,当前状态备注
3725 3827 */
3726   - memberPhone?: string;
3727   - /** @format int32 */
3728   - pageSize?: number;
  3828 + statusNotes?: string;
3729 3829 /**
3730 3830 * @description
3731   - * 申请备注
  3831 + * 状态文本
3732 3832 */
3733   - requestNotes?: string;
3734   - /** @format int32 */
3735   - start?: number;
3736   - /** @format int32 */
3737   - total?: number;
  3833 + statusText?: string;
  3834 + updateByName?: string;
  3835 + /** @format date-time */
  3836 + updateTime?: string;
3738 3837 }
3739 3838  
3740 3839 export interface ResetPwdVO {
... ... @@ -3815,6 +3914,9 @@ export interface SubOrder {
3815 3914 /** @format int64 */
3816 3915 id?: number;
3817 3916 image?: string;
  3917 + integral?: number;
  3918 + /** @format date-time */
  3919 + integralCollectionTime?: string;
3818 3920 invoiceApplyUsername?: string;
3819 3921 invoiceConfirmStatus?: string;
3820 3922 /** @format date-time */
... ... @@ -3885,6 +3987,8 @@ export interface SubOrder {
3885 3987 quantity?: number;
3886 3988 receivingCompany?: string;
3887 3989 reissueNotes?: string;
  3990 + /** @format int64 */
  3991 + researchGroupId?: number;
3888 3992 serialNumber?: string;
3889 3993 shippingWarehouse?: string;
3890 3994 /** @format date-time */
... ... @@ -3940,15 +4044,16 @@ export interface SystemCustomFieldReq {
3940 4044 entityNumber?: string;
3941 4045 }
3942 4046  
  4047 +export interface TicketsDeteleVo {
  4048 + ids?: Array<number>;
  4049 +}
  4050 +
3943 4051 export interface TicketsSearchVo {
3944 4052 annexName?: string;
3945 4053 annexUrl?: string;
3946 4054 assignPeople?: string;
3947 4055 createByName?: string;
3948   - /** @format date-time */
3949   - createTimeBegin?: string;
3950   - /** @format date-time */
3951   - createTimeEnd?: string;
  4056 + createTime?: Array<LocalDateTime>;
3952 4057 /** @format int32 */
3953 4058 current?: number;
3954 4059 detailText?: string;
... ... @@ -3959,10 +4064,7 @@ export interface TicketsSearchVo {
3959 4064 origin?: string;
3960 4065 /** @format int32 */
3961 4066 pageSize?: number;
3962   - /** @format date-time */
3963   - resolveTimeBegin?: string;
3964   - /** @format date-time */
3965   - resolveTimeEnd?: string;
  4067 + resolveTime?: Array<LocalDateTime>;
3966 4068 /** @format int32 */
3967 4069 start?: number;
3968 4070 status?: string;
... ... @@ -3981,6 +4083,9 @@ export interface TicketsVo {
3981 4083 /** @format int64 */
3982 4084 id?: number;
3983 4085 origin?: string;
  4086 + result?: string;
  4087 + resultAnnexName?: string;
  4088 + resultAnnexUrl?: string;
3984 4089 status?: string;
3985 4090 type?: string;
3986 4091 }
... ... @@ -4366,7 +4471,9 @@ export interface ClientCommunicationInfo {
4366 4471 logicDelete?: boolean;
4367 4472 ticketsAttachments?: string;
4368 4473 ticketsDetail?: string;
  4474 + ticketsStatus?: string;
4369 4475 ticketsType?: string;
  4476 + ticketsTypeText?: string;
4370 4477 /**
4371 4478 * @description
4372 4479 * 客户状态
... ... @@ -4526,6 +4633,7 @@ export interface ResearchGroupAccounts {
4526 4633 */
4527 4634 id?: number;
4528 4635 logicDelete?: boolean;
  4636 + paths?: Array<string>;
4529 4637 updateByName?: string;
4530 4638 /** @format date-time */
4531 4639 updateTime?: string;
... ... @@ -4547,6 +4655,12 @@ export interface ResearchGroupMembers {
4547 4655 * @format int64
4548 4656 */
4549 4657 id?: number;
  4658 + /**
  4659 + * @description
  4660 + * 成员等级
  4661 + * @format int64
  4662 + */
  4663 + levelStatus?: number;
4550 4664 logicDelete?: boolean;
4551 4665 /**
4552 4666 * @description
... ... @@ -4992,3 +5106,5 @@ export interface Dto {
4992 5106 */
4993 5107 subOrderIds?: Array<string>;
4994 5108 }
  5109 +
  5110 +export type LocalDateTime = any;
... ...
src/services/request.ts
... ... @@ -38,6 +38,7 @@ import type {
38 38 CancelInvoiceRecordDto,
39 39 CancelSendOrderDto,
40 40 CaptchaMessageVO,
  41 + ClaimPointsDto,
41 42 ClientCommunicationInfo,
42 43 CommonAuditRequest,
43 44 CompanyInfo,
... ... @@ -66,6 +67,7 @@ import type {
66 67 MaterialStockRes,
67 68 MaterialUnitListRes,
68 69 MeasureUnitListRes,
  70 + MergeIntegralDto,
69 71 MessageQueryDTO,
70 72 ModelAndView,
71 73 OrderAddVO,
... ... @@ -97,20 +99,23 @@ import type {
97 99 QueryClientDto,
98 100 QueryCommunicationInfoDto,
99 101 QueryCustomerInformationDto,
  102 + QueryGroupIntegralRecordDto,
100 103 QueryHistoryRecordDto,
101 104 QueryInvoiceDetailDto,
102 105 QueryInvoiceProjectDto,
103 106 QueryInvoiceRecordDto,
104 107 QueryMainOrderDto,
105 108 QueryProcureReturnBillDto,
  109 + QueryRelatedProducts,
  110 + QueryRelatedSchools,
106 111 QueryReportFormsDto,
107 112 QueryUseOldInvoicingDto,
  113 + QueryUserIntegralRecordDto,
108 114 QueryWarningOrderStatistics,
109 115 QueryWarningOrderWhiteListDto,
110 116 QueryWarningUserWhiteListDto,
111 117 QueryWriteOffRecordDto,
112 118 ReissueInvoiceDto,
113   - ResearchGroupAddRequest,
114 119 ResearchGroupDeleteRequest,
115 120 ResearchGroupDetailRequest,
116 121 ResearchGroupEditRequest,
... ... @@ -118,8 +123,9 @@ import type {
118 123 ResearchGroupMemberRequestAddRequest,
119 124 ResearchGroupMemberRequestDeleteRequest,
120 125 ResearchGroupMemberRequestDetailRequest,
121   - ResearchGroupMemberRequestEditRequest,
122 126 ResearchGroupMemberRequestsRequest,
  127 + ResearchGroupRequestsDto,
  128 + ResearchGroupsDTO,
123 129 ResetPwdVO,
124 130 SalOrderSaveDto,
125 131 SalesRechargePrepaymentAuditRequest,
... ... @@ -133,6 +139,7 @@ import type {
133 139 StoreOrderInvoiceRequest,
134 140 SysLogQueryVO,
135 141 SystemCustomFieldReq,
  142 + TicketsDeteleVo,
136 143 TicketsSearchVo,
137 144 TicketsVo,
138 145 ToProcureAuditDto,
... ... @@ -1362,6 +1369,77 @@ export const postApiOrderApplyAfterSales = /* #__PURE__ */ (() =&gt; {
1362 1369 return request;
1363 1370 })();
1364 1371  
  1372 +/** @description request parameter type for postApiOrderClaimPoints */
  1373 +export interface PostApiOrderClaimPointsOption {
  1374 + /**
  1375 + * @description
  1376 + * claimPointsDto
  1377 + */
  1378 + body: {
  1379 + /**
  1380 + @description
  1381 + claimPointsDto */
  1382 + claimPointsDto: ClaimPointsDto;
  1383 + };
  1384 +}
  1385 +
  1386 +/** @description response type for postApiOrderClaimPoints */
  1387 +export interface PostApiOrderClaimPointsResponse {
  1388 + /**
  1389 + * @description
  1390 + * OK
  1391 + */
  1392 + 200: ServerResult;
  1393 + /**
  1394 + * @description
  1395 + * Created
  1396 + */
  1397 + 201: any;
  1398 + /**
  1399 + * @description
  1400 + * Unauthorized
  1401 + */
  1402 + 401: any;
  1403 + /**
  1404 + * @description
  1405 + * Forbidden
  1406 + */
  1407 + 403: any;
  1408 + /**
  1409 + * @description
  1410 + * Not Found
  1411 + */
  1412 + 404: any;
  1413 +}
  1414 +
  1415 +export type PostApiOrderClaimPointsResponseSuccess =
  1416 + PostApiOrderClaimPointsResponse[200];
  1417 +/**
  1418 + * @description
  1419 + * 领取积分
  1420 + * @tags 内部订单
  1421 + * @produces *
  1422 + * @consumes application/json
  1423 + */
  1424 +export const postApiOrderClaimPoints = /* #__PURE__ */ (() => {
  1425 + const method = 'post';
  1426 + const url = '/api/order/claimPoints';
  1427 + function request(
  1428 + option: PostApiOrderClaimPointsOption,
  1429 + ): Promise<PostApiOrderClaimPointsResponseSuccess> {
  1430 + return requester(request.url, {
  1431 + method: request.method,
  1432 + ...option,
  1433 + }) as unknown as Promise<PostApiOrderClaimPointsResponseSuccess>;
  1434 + }
  1435 +
  1436 + /** http method */
  1437 + request.method = method;
  1438 + /** request url */
  1439 + request.url = url;
  1440 + return request;
  1441 +})();
  1442 +
1365 1443 /** @description request parameter type for postApiOrderConfirmReceive */
1366 1444 export interface PostApiOrderConfirmReceiveOption {
1367 1445 /**
... ... @@ -2055,6 +2133,148 @@ export const postApiOrderQueryServiceOrder = /* #__PURE__ */ (() =&gt; {
2055 2133 return request;
2056 2134 })();
2057 2135  
  2136 +/** @description request parameter type for postApiOrderRelatedProducts */
  2137 +export interface PostApiOrderRelatedProductsOption {
  2138 + /**
  2139 + * @description
  2140 + * queryRelatedProducts
  2141 + */
  2142 + body: {
  2143 + /**
  2144 + @description
  2145 + queryRelatedProducts */
  2146 + queryRelatedProducts: QueryRelatedProducts;
  2147 + };
  2148 +}
  2149 +
  2150 +/** @description response type for postApiOrderRelatedProducts */
  2151 +export interface PostApiOrderRelatedProductsResponse {
  2152 + /**
  2153 + * @description
  2154 + * OK
  2155 + */
  2156 + 200: ServerResult;
  2157 + /**
  2158 + * @description
  2159 + * Created
  2160 + */
  2161 + 201: any;
  2162 + /**
  2163 + * @description
  2164 + * Unauthorized
  2165 + */
  2166 + 401: any;
  2167 + /**
  2168 + * @description
  2169 + * Forbidden
  2170 + */
  2171 + 403: any;
  2172 + /**
  2173 + * @description
  2174 + * Not Found
  2175 + */
  2176 + 404: any;
  2177 +}
  2178 +
  2179 +export type PostApiOrderRelatedProductsResponseSuccess =
  2180 + PostApiOrderRelatedProductsResponse[200];
  2181 +/**
  2182 + * @description
  2183 + * 获取用户购买某个商品关联的其他商品
  2184 + * @tags 内部订单
  2185 + * @produces *
  2186 + * @consumes application/json
  2187 + */
  2188 +export const postApiOrderRelatedProducts = /* #__PURE__ */ (() => {
  2189 + const method = 'post';
  2190 + const url = '/api/order/relatedProducts';
  2191 + function request(
  2192 + option: PostApiOrderRelatedProductsOption,
  2193 + ): Promise<PostApiOrderRelatedProductsResponseSuccess> {
  2194 + return requester(request.url, {
  2195 + method: request.method,
  2196 + ...option,
  2197 + }) as unknown as Promise<PostApiOrderRelatedProductsResponseSuccess>;
  2198 + }
  2199 +
  2200 + /** http method */
  2201 + request.method = method;
  2202 + /** request url */
  2203 + request.url = url;
  2204 + return request;
  2205 +})();
  2206 +
  2207 +/** @description request parameter type for postApiOrderRelatedSchools */
  2208 +export interface PostApiOrderRelatedSchoolsOption {
  2209 + /**
  2210 + * @description
  2211 + * queryRelatedSchools
  2212 + */
  2213 + body: {
  2214 + /**
  2215 + @description
  2216 + queryRelatedSchools */
  2217 + queryRelatedSchools: QueryRelatedSchools;
  2218 + };
  2219 +}
  2220 +
  2221 +/** @description response type for postApiOrderRelatedSchools */
  2222 +export interface PostApiOrderRelatedSchoolsResponse {
  2223 + /**
  2224 + * @description
  2225 + * OK
  2226 + */
  2227 + 200: ServerResult;
  2228 + /**
  2229 + * @description
  2230 + * Created
  2231 + */
  2232 + 201: any;
  2233 + /**
  2234 + * @description
  2235 + * Unauthorized
  2236 + */
  2237 + 401: any;
  2238 + /**
  2239 + * @description
  2240 + * Forbidden
  2241 + */
  2242 + 403: any;
  2243 + /**
  2244 + * @description
  2245 + * Not Found
  2246 + */
  2247 + 404: any;
  2248 +}
  2249 +
  2250 +export type PostApiOrderRelatedSchoolsResponseSuccess =
  2251 + PostApiOrderRelatedSchoolsResponse[200];
  2252 +/**
  2253 + * @description
  2254 + * 获取购买某个商品的学校
  2255 + * @tags 内部订单
  2256 + * @produces *
  2257 + * @consumes application/json
  2258 + */
  2259 +export const postApiOrderRelatedSchools = /* #__PURE__ */ (() => {
  2260 + const method = 'post';
  2261 + const url = '/api/order/relatedSchools';
  2262 + function request(
  2263 + option: PostApiOrderRelatedSchoolsOption,
  2264 + ): Promise<PostApiOrderRelatedSchoolsResponseSuccess> {
  2265 + return requester(request.url, {
  2266 + method: request.method,
  2267 + ...option,
  2268 + }) as unknown as Promise<PostApiOrderRelatedSchoolsResponseSuccess>;
  2269 + }
  2270 +
  2271 + /** http method */
  2272 + request.method = method;
  2273 + /** request url */
  2274 + request.url = url;
  2275 + return request;
  2276 +})();
  2277 +
2058 2278 /** @description request parameter type for postApiOrderStoreApplyInvoice */
2059 2279 export interface PostApiOrderStoreApplyInvoiceOption {
2060 2280 /**
... ... @@ -3568,9 +3788,385 @@ export interface HeadErrorResponse {
3568 3788 200: ModelAndView;
3569 3789 /**
3570 3790 * @description
3571   - * No Content
  3791 + * No Content
  3792 + */
  3793 + 204: any;
  3794 + /**
  3795 + * @description
  3796 + * Unauthorized
  3797 + */
  3798 + 401: any;
  3799 + /**
  3800 + * @description
  3801 + * Forbidden
  3802 + */
  3803 + 403: any;
  3804 +}
  3805 +
  3806 +export type HeadErrorResponseSuccess = HeadErrorResponse[200];
  3807 +/**
  3808 + * @description
  3809 + * errorHtml
  3810 + * @tags basic-error-controller
  3811 + * @produces text/html
  3812 + * @consumes application/json
  3813 + */
  3814 +export const headError = /* #__PURE__ */ (() => {
  3815 + const method = 'head';
  3816 + const url = '/error';
  3817 + function request(): Promise<HeadErrorResponseSuccess> {
  3818 + return requester(request.url, {
  3819 + method: request.method,
  3820 + }) as unknown as Promise<HeadErrorResponseSuccess>;
  3821 + }
  3822 +
  3823 + /** http method */
  3824 + request.method = method;
  3825 + /** request url */
  3826 + request.url = url;
  3827 + return request;
  3828 +})();
  3829 +
  3830 +/** @description response type for patchError */
  3831 +export interface PatchErrorResponse {
  3832 + /**
  3833 + * @description
  3834 + * OK
  3835 + */
  3836 + 200: ModelAndView;
  3837 + /**
  3838 + * @description
  3839 + * No Content
  3840 + */
  3841 + 204: any;
  3842 + /**
  3843 + * @description
  3844 + * Unauthorized
  3845 + */
  3846 + 401: any;
  3847 + /**
  3848 + * @description
  3849 + * Forbidden
  3850 + */
  3851 + 403: any;
  3852 +}
  3853 +
  3854 +export type PatchErrorResponseSuccess = PatchErrorResponse[200];
  3855 +/**
  3856 + * @description
  3857 + * errorHtml
  3858 + * @tags basic-error-controller
  3859 + * @produces text/html
  3860 + * @consumes application/json
  3861 + */
  3862 +export const patchError = /* #__PURE__ */ (() => {
  3863 + const method = 'patch';
  3864 + const url = '/error';
  3865 + function request(): Promise<PatchErrorResponseSuccess> {
  3866 + return requester(request.url, {
  3867 + method: request.method,
  3868 + }) as unknown as Promise<PatchErrorResponseSuccess>;
  3869 + }
  3870 +
  3871 + /** http method */
  3872 + request.method = method;
  3873 + /** request url */
  3874 + request.url = url;
  3875 + return request;
  3876 +})();
  3877 +
  3878 +/** @description request parameter type for postFileDirectDown */
  3879 +export interface PostFileDirectDownOption {
  3880 + /**
  3881 + * @description
  3882 + * urls
  3883 + */
  3884 + body: {
  3885 + /**
  3886 + @description
  3887 + urls */
  3888 + urls: Array<string>;
  3889 + };
  3890 +}
  3891 +
  3892 +/** @description response type for postFileDirectDown */
  3893 +export interface PostFileDirectDownResponse {
  3894 + /**
  3895 + * @description
  3896 + * OK
  3897 + */
  3898 + 200: any;
  3899 + /**
  3900 + * @description
  3901 + * Created
  3902 + */
  3903 + 201: any;
  3904 + /**
  3905 + * @description
  3906 + * Unauthorized
  3907 + */
  3908 + 401: any;
  3909 + /**
  3910 + * @description
  3911 + * Forbidden
  3912 + */
  3913 + 403: any;
  3914 + /**
  3915 + * @description
  3916 + * Not Found
  3917 + */
  3918 + 404: any;
  3919 +}
  3920 +
  3921 +export type PostFileDirectDownResponseSuccess = PostFileDirectDownResponse[200];
  3922 +/**
  3923 + * @description
  3924 + * directDownFile
  3925 + * @tags file-controller
  3926 + * @produces *
  3927 + * @consumes application/json
  3928 + */
  3929 +export const postFileDirectDown = /* #__PURE__ */ (() => {
  3930 + const method = 'post';
  3931 + const url = '/file/directDown';
  3932 + function request(
  3933 + option: PostFileDirectDownOption,
  3934 + ): Promise<PostFileDirectDownResponseSuccess> {
  3935 + return requester(request.url, {
  3936 + method: request.method,
  3937 + ...option,
  3938 + }) as unknown as Promise<PostFileDirectDownResponseSuccess>;
  3939 + }
  3940 +
  3941 + /** http method */
  3942 + request.method = method;
  3943 + /** request url */
  3944 + request.url = url;
  3945 + return request;
  3946 +})();
  3947 +
  3948 +/** @description response type for postIntegralGetIntegralRecordTypes */
  3949 +export interface PostIntegralGetIntegralRecordTypesResponse {
  3950 + /**
  3951 + * @description
  3952 + * OK
  3953 + */
  3954 + 200: ServerResult;
  3955 + /**
  3956 + * @description
  3957 + * Created
  3958 + */
  3959 + 201: any;
  3960 + /**
  3961 + * @description
  3962 + * Unauthorized
  3963 + */
  3964 + 401: any;
  3965 + /**
  3966 + * @description
  3967 + * Forbidden
  3968 + */
  3969 + 403: any;
  3970 + /**
  3971 + * @description
  3972 + * Not Found
  3973 + */
  3974 + 404: any;
  3975 +}
  3976 +
  3977 +export type PostIntegralGetIntegralRecordTypesResponseSuccess =
  3978 + PostIntegralGetIntegralRecordTypesResponse[200];
  3979 +/**
  3980 + * @description
  3981 + * 获取积分记录类型
  3982 + * @tags 积分接口
  3983 + * @produces *
  3984 + * @consumes application/json
  3985 + */
  3986 +export const postIntegralGetIntegralRecordTypes = /* #__PURE__ */ (() => {
  3987 + const method = 'post';
  3988 + const url = '/integral/getIntegralRecordTypes';
  3989 + function request(): Promise<PostIntegralGetIntegralRecordTypesResponseSuccess> {
  3990 + return requester(request.url, {
  3991 + method: request.method,
  3992 + }) as unknown as Promise<PostIntegralGetIntegralRecordTypesResponseSuccess>;
  3993 + }
  3994 +
  3995 + /** http method */
  3996 + request.method = method;
  3997 + /** request url */
  3998 + request.url = url;
  3999 + return request;
  4000 +})();
  4001 +
  4002 +/** @description request parameter type for postIntegralMergeUserIntegralToGroup */
  4003 +export interface PostIntegralMergeUserIntegralToGroupOption {
  4004 + /**
  4005 + * @description
  4006 + * dto
  4007 + */
  4008 + body: {
  4009 + /**
  4010 + @description
  4011 + dto */
  4012 + dto: MergeIntegralDto;
  4013 + };
  4014 +}
  4015 +
  4016 +/** @description response type for postIntegralMergeUserIntegralToGroup */
  4017 +export interface PostIntegralMergeUserIntegralToGroupResponse {
  4018 + /**
  4019 + * @description
  4020 + * OK
  4021 + */
  4022 + 200: ServerResult;
  4023 + /**
  4024 + * @description
  4025 + * Created
  4026 + */
  4027 + 201: any;
  4028 + /**
  4029 + * @description
  4030 + * Unauthorized
  4031 + */
  4032 + 401: any;
  4033 + /**
  4034 + * @description
  4035 + * Forbidden
  4036 + */
  4037 + 403: any;
  4038 + /**
  4039 + * @description
  4040 + * Not Found
  4041 + */
  4042 + 404: any;
  4043 +}
  4044 +
  4045 +export type PostIntegralMergeUserIntegralToGroupResponseSuccess =
  4046 + PostIntegralMergeUserIntegralToGroupResponse[200];
  4047 +/**
  4048 + * @description
  4049 + * 并入积分到课题组
  4050 + * @tags 积分接口
  4051 + * @produces *
  4052 + * @consumes application/json
  4053 + */
  4054 +export const postIntegralMergeUserIntegralToGroup = /* #__PURE__ */ (() => {
  4055 + const method = 'post';
  4056 + const url = '/integral/mergeUserIntegralToGroup';
  4057 + function request(
  4058 + option: PostIntegralMergeUserIntegralToGroupOption,
  4059 + ): Promise<PostIntegralMergeUserIntegralToGroupResponseSuccess> {
  4060 + return requester(request.url, {
  4061 + method: request.method,
  4062 + ...option,
  4063 + }) as unknown as Promise<PostIntegralMergeUserIntegralToGroupResponseSuccess>;
  4064 + }
  4065 +
  4066 + /** http method */
  4067 + request.method = method;
  4068 + /** request url */
  4069 + request.url = url;
  4070 + return request;
  4071 +})();
  4072 +
  4073 +/** @description request parameter type for postIntegralQueryByGroup */
  4074 +export interface PostIntegralQueryByGroupOption {
  4075 + /**
  4076 + * @description
  4077 + * query
  4078 + */
  4079 + body: {
  4080 + /**
  4081 + @description
  4082 + query */
  4083 + query: QueryGroupIntegralRecordDto;
  4084 + };
  4085 +}
  4086 +
  4087 +/** @description response type for postIntegralQueryByGroup */
  4088 +export interface PostIntegralQueryByGroupResponse {
  4089 + /**
  4090 + * @description
  4091 + * OK
  4092 + */
  4093 + 200: ServerResult;
  4094 + /**
  4095 + * @description
  4096 + * Created
  4097 + */
  4098 + 201: any;
  4099 + /**
  4100 + * @description
  4101 + * Unauthorized
  4102 + */
  4103 + 401: any;
  4104 + /**
  4105 + * @description
  4106 + * Forbidden
  4107 + */
  4108 + 403: any;
  4109 + /**
  4110 + * @description
  4111 + * Not Found
  4112 + */
  4113 + 404: any;
  4114 +}
  4115 +
  4116 +export type PostIntegralQueryByGroupResponseSuccess =
  4117 + PostIntegralQueryByGroupResponse[200];
  4118 +/**
  4119 + * @description
  4120 + * 查询课题组积分记录
  4121 + * @tags 积分接口
  4122 + * @produces *
  4123 + * @consumes application/json
  4124 + */
  4125 +export const postIntegralQueryByGroup = /* #__PURE__ */ (() => {
  4126 + const method = 'post';
  4127 + const url = '/integral/queryByGroup';
  4128 + function request(
  4129 + option: PostIntegralQueryByGroupOption,
  4130 + ): Promise<PostIntegralQueryByGroupResponseSuccess> {
  4131 + return requester(request.url, {
  4132 + method: request.method,
  4133 + ...option,
  4134 + }) as unknown as Promise<PostIntegralQueryByGroupResponseSuccess>;
  4135 + }
  4136 +
  4137 + /** http method */
  4138 + request.method = method;
  4139 + /** request url */
  4140 + request.url = url;
  4141 + return request;
  4142 +})();
  4143 +
  4144 +/** @description request parameter type for postIntegralQueryByUser */
  4145 +export interface PostIntegralQueryByUserOption {
  4146 + /**
  4147 + * @description
  4148 + * query
  4149 + */
  4150 + body: {
  4151 + /**
  4152 + @description
  4153 + query */
  4154 + query: QueryUserIntegralRecordDto;
  4155 + };
  4156 +}
  4157 +
  4158 +/** @description response type for postIntegralQueryByUser */
  4159 +export interface PostIntegralQueryByUserResponse {
  4160 + /**
  4161 + * @description
  4162 + * OK
  4163 + */
  4164 + 200: ServerResult;
  4165 + /**
  4166 + * @description
  4167 + * Created
3572 4168 */
3573   - 204: any;
  4169 + 201: any;
3574 4170 /**
3575 4171 * @description
3576 4172 * Unauthorized
... ... @@ -3581,23 +4177,32 @@ export interface HeadErrorResponse {
3581 4177 * Forbidden
3582 4178 */
3583 4179 403: any;
  4180 + /**
  4181 + * @description
  4182 + * Not Found
  4183 + */
  4184 + 404: any;
3584 4185 }
3585 4186  
3586   -export type HeadErrorResponseSuccess = HeadErrorResponse[200];
  4187 +export type PostIntegralQueryByUserResponseSuccess =
  4188 + PostIntegralQueryByUserResponse[200];
3587 4189 /**
3588 4190 * @description
3589   - * errorHtml
3590   - * @tags basic-error-controller
3591   - * @produces text/html
  4191 + * 查询用户积分记录
  4192 + * @tags 积分接口
  4193 + * @produces *
3592 4194 * @consumes application/json
3593 4195 */
3594   -export const headError = /* #__PURE__ */ (() => {
3595   - const method = 'head';
3596   - const url = '/error';
3597   - function request(): Promise<HeadErrorResponseSuccess> {
  4196 +export const postIntegralQueryByUser = /* #__PURE__ */ (() => {
  4197 + const method = 'post';
  4198 + const url = '/integral/queryByUser';
  4199 + function request(
  4200 + option: PostIntegralQueryByUserOption,
  4201 + ): Promise<PostIntegralQueryByUserResponseSuccess> {
3598 4202 return requester(request.url, {
3599 4203 method: request.method,
3600   - }) as unknown as Promise<HeadErrorResponseSuccess>;
  4204 + ...option,
  4205 + }) as unknown as Promise<PostIntegralQueryByUserResponseSuccess>;
3601 4206 }
3602 4207  
3603 4208 /** http method */
... ... @@ -3607,18 +4212,32 @@ export const headError = /* #__PURE__ */ (() =&gt; {
3607 4212 return request;
3608 4213 })();
3609 4214  
3610   -/** @description response type for patchError */
3611   -export interface PatchErrorResponse {
  4215 +/** @description request parameter type for postIntegralQuerySumByGroup */
  4216 +export interface PostIntegralQuerySumByGroupOption {
  4217 + /**
  4218 + * @description
  4219 + * query
  4220 + */
  4221 + body: {
  4222 + /**
  4223 + @description
  4224 + query */
  4225 + query: QueryGroupIntegralRecordDto;
  4226 + };
  4227 +}
  4228 +
  4229 +/** @description response type for postIntegralQuerySumByGroup */
  4230 +export interface PostIntegralQuerySumByGroupResponse {
3612 4231 /**
3613 4232 * @description
3614 4233 * OK
3615 4234 */
3616   - 200: ModelAndView;
  4235 + 200: ServerResult;
3617 4236 /**
3618 4237 * @description
3619   - * No Content
  4238 + * Created
3620 4239 */
3621   - 204: any;
  4240 + 201: any;
3622 4241 /**
3623 4242 * @description
3624 4243 * Unauthorized
... ... @@ -3629,23 +4248,32 @@ export interface PatchErrorResponse {
3629 4248 * Forbidden
3630 4249 */
3631 4250 403: any;
  4251 + /**
  4252 + * @description
  4253 + * Not Found
  4254 + */
  4255 + 404: any;
3632 4256 }
3633 4257  
3634   -export type PatchErrorResponseSuccess = PatchErrorResponse[200];
  4258 +export type PostIntegralQuerySumByGroupResponseSuccess =
  4259 + PostIntegralQuerySumByGroupResponse[200];
3635 4260 /**
3636 4261 * @description
3637   - * errorHtml
3638   - * @tags basic-error-controller
3639   - * @produces text/html
  4262 + * 查询课题组积分总额
  4263 + * @tags 积分接口
  4264 + * @produces *
3640 4265 * @consumes application/json
3641 4266 */
3642   -export const patchError = /* #__PURE__ */ (() => {
3643   - const method = 'patch';
3644   - const url = '/error';
3645   - function request(): Promise<PatchErrorResponseSuccess> {
  4267 +export const postIntegralQuerySumByGroup = /* #__PURE__ */ (() => {
  4268 + const method = 'post';
  4269 + const url = '/integral/querySumByGroup';
  4270 + function request(
  4271 + option: PostIntegralQuerySumByGroupOption,
  4272 + ): Promise<PostIntegralQuerySumByGroupResponseSuccess> {
3646 4273 return requester(request.url, {
3647 4274 method: request.method,
3648   - }) as unknown as Promise<PatchErrorResponseSuccess>;
  4275 + ...option,
  4276 + }) as unknown as Promise<PostIntegralQuerySumByGroupResponseSuccess>;
3649 4277 }
3650 4278  
3651 4279 /** http method */
... ... @@ -3655,27 +4283,27 @@ export const patchError = /* #__PURE__ */ (() =&gt; {
3655 4283 return request;
3656 4284 })();
3657 4285  
3658   -/** @description request parameter type for postFileDirectDown */
3659   -export interface PostFileDirectDownOption {
  4286 +/** @description request parameter type for postIntegralQuerySumByUser */
  4287 +export interface PostIntegralQuerySumByUserOption {
3660 4288 /**
3661 4289 * @description
3662   - * urls
  4290 + * query
3663 4291 */
3664 4292 body: {
3665 4293 /**
3666 4294 @description
3667   - urls */
3668   - urls: Array<string>;
  4295 + query */
  4296 + query: QueryUserIntegralRecordDto;
3669 4297 };
3670 4298 }
3671 4299  
3672   -/** @description response type for postFileDirectDown */
3673   -export interface PostFileDirectDownResponse {
  4300 +/** @description response type for postIntegralQuerySumByUser */
  4301 +export interface PostIntegralQuerySumByUserResponse {
3674 4302 /**
3675 4303 * @description
3676 4304 * OK
3677 4305 */
3678   - 200: any;
  4306 + 200: ServerResult;
3679 4307 /**
3680 4308 * @description
3681 4309 * Created
... ... @@ -3698,24 +4326,25 @@ export interface PostFileDirectDownResponse {
3698 4326 404: any;
3699 4327 }
3700 4328  
3701   -export type PostFileDirectDownResponseSuccess = PostFileDirectDownResponse[200];
  4329 +export type PostIntegralQuerySumByUserResponseSuccess =
  4330 + PostIntegralQuerySumByUserResponse[200];
3702 4331 /**
3703 4332 * @description
3704   - * directDownFile
3705   - * @tags file-controller
  4333 + * 查询用户积分总额
  4334 + * @tags 积分接口
3706 4335 * @produces *
3707 4336 * @consumes application/json
3708 4337 */
3709   -export const postFileDirectDown = /* #__PURE__ */ (() => {
  4338 +export const postIntegralQuerySumByUser = /* #__PURE__ */ (() => {
3710 4339 const method = 'post';
3711   - const url = '/file/directDown';
  4340 + const url = '/integral/querySumByUser';
3712 4341 function request(
3713   - option: PostFileDirectDownOption,
3714   - ): Promise<PostFileDirectDownResponseSuccess> {
  4342 + option: PostIntegralQuerySumByUserOption,
  4343 + ): Promise<PostIntegralQuerySumByUserResponseSuccess> {
3715 4344 return requester(request.url, {
3716 4345 method: request.method,
3717 4346 ...option,
3718   - }) as unknown as Promise<PostFileDirectDownResponseSuccess>;
  4347 + }) as unknown as Promise<PostIntegralQuerySumByUserResponseSuccess>;
3719 4348 }
3720 4349  
3721 4350 /** http method */
... ... @@ -5218,6 +5847,77 @@ export const postOrderErpAuditWaitAuditList = /* #__PURE__ */ (() =&gt; {
5218 5847 return request;
5219 5848 })();
5220 5849  
  5850 +/** @description request parameter type for postOrderErpAuthGenerateToken */
  5851 +export interface PostOrderErpAuthGenerateTokenOption {
  5852 + /**
  5853 + * @description
  5854 + * tokenApiDto
  5855 + */
  5856 + body: {
  5857 + /**
  5858 + @description
  5859 + tokenApiDto */
  5860 + tokenApiDto: TokenApiDto;
  5861 + };
  5862 +}
  5863 +
  5864 +/** @description response type for postOrderErpAuthGenerateToken */
  5865 +export interface PostOrderErpAuthGenerateTokenResponse {
  5866 + /**
  5867 + * @description
  5868 + * OK
  5869 + */
  5870 + 200: ServerResult;
  5871 + /**
  5872 + * @description
  5873 + * Created
  5874 + */
  5875 + 201: any;
  5876 + /**
  5877 + * @description
  5878 + * Unauthorized
  5879 + */
  5880 + 401: any;
  5881 + /**
  5882 + * @description
  5883 + * Forbidden
  5884 + */
  5885 + 403: any;
  5886 + /**
  5887 + * @description
  5888 + * Not Found
  5889 + */
  5890 + 404: any;
  5891 +}
  5892 +
  5893 +export type PostOrderErpAuthGenerateTokenResponseSuccess =
  5894 + PostOrderErpAuthGenerateTokenResponse[200];
  5895 +/**
  5896 + * @description
  5897 + * 生成token
  5898 + * @tags login-controller
  5899 + * @produces *
  5900 + * @consumes application/json
  5901 + */
  5902 +export const postOrderErpAuthGenerateToken = /* #__PURE__ */ (() => {
  5903 + const method = 'post';
  5904 + const url = '/order/erp/auth/generateToken';
  5905 + function request(
  5906 + option: PostOrderErpAuthGenerateTokenOption,
  5907 + ): Promise<PostOrderErpAuthGenerateTokenResponseSuccess> {
  5908 + return requester(request.url, {
  5909 + method: request.method,
  5910 + ...option,
  5911 + }) as unknown as Promise<PostOrderErpAuthGenerateTokenResponseSuccess>;
  5912 + }
  5913 +
  5914 + /** http method */
  5915 + request.method = method;
  5916 + /** request url */
  5917 + request.url = url;
  5918 + return request;
  5919 +})();
  5920 +
5221 5921 /** @description request parameter type for postOrderErpAuthLoginByPhone */
5222 5922 export interface PostOrderErpAuthLoginByPhoneOption {
5223 5923 /**
... ... @@ -9985,13 +10685,13 @@ export const postOrderErpTicketsCreate = /* #__PURE__ */ (() =&gt; {
9985 10685 export interface PostOrderErpTicketsDeleteOption {
9986 10686 /**
9987 10687 * @description
9988   - * ids
  10688 + * ticketsDeteleVo
9989 10689 */
9990   - query: {
  10690 + body: {
9991 10691 /**
9992 10692 @description
9993   - ids */
9994   - ids: Array<number>;
  10693 + ticketsDeteleVo */
  10694 + ticketsDeteleVo: TicketsDeteleVo;
9995 10695 };
9996 10696 }
9997 10697  
... ... @@ -12479,7 +13179,7 @@ export interface PostResearchGroupMemberRequestsEditOption {
12479 13179 /**
12480 13180 @description
12481 13181 request */
12482   - request: ResearchGroupMemberRequestEditRequest;
  13182 + request: ResearchGroupRequestsDto;
12483 13183 };
12484 13184 }
12485 13185  
... ... @@ -12621,7 +13321,7 @@ export interface PostResearchGroupsAddOption {
12621 13321 /**
12622 13322 @description
12623 13323 request */
12624   - request: ResearchGroupAddRequest;
  13324 + request: ResearchGroupsDTO;
12625 13325 };
12626 13326 }
12627 13327  
... ... @@ -12682,6 +13382,77 @@ export const postResearchGroupsAdd = /* #__PURE__ */ (() =&gt; {
12682 13382 return request;
12683 13383 })();
12684 13384  
  13385 +/** @description request parameter type for postResearchGroupsAudit */
  13386 +export interface PostResearchGroupsAuditOption {
  13387 + query?: {
  13388 + extend?: any;
  13389 + /**
  13390 + @description
  13391 + id集合 */
  13392 + ids?: Array<string>;
  13393 + notes?: string;
  13394 + pass?: boolean;
  13395 + type?: string;
  13396 + };
  13397 +}
  13398 +
  13399 +/** @description response type for postResearchGroupsAudit */
  13400 +export interface PostResearchGroupsAuditResponse {
  13401 + /**
  13402 + * @description
  13403 + * OK
  13404 + */
  13405 + 200: any;
  13406 + /**
  13407 + * @description
  13408 + * Created
  13409 + */
  13410 + 201: any;
  13411 + /**
  13412 + * @description
  13413 + * Unauthorized
  13414 + */
  13415 + 401: any;
  13416 + /**
  13417 + * @description
  13418 + * Forbidden
  13419 + */
  13420 + 403: any;
  13421 + /**
  13422 + * @description
  13423 + * Not Found
  13424 + */
  13425 + 404: any;
  13426 +}
  13427 +
  13428 +export type PostResearchGroupsAuditResponseSuccess =
  13429 + PostResearchGroupsAuditResponse[200];
  13430 +/**
  13431 + * @description
  13432 + * 审核
  13433 + * @tags research-groups-controller
  13434 + * @produces *
  13435 + * @consumes application/json
  13436 + */
  13437 +export const postResearchGroupsAudit = /* #__PURE__ */ (() => {
  13438 + const method = 'post';
  13439 + const url = '/research/groups/audit';
  13440 + function request(
  13441 + option?: PostResearchGroupsAuditOption,
  13442 + ): Promise<PostResearchGroupsAuditResponseSuccess> {
  13443 + return requester(request.url, {
  13444 + method: request.method,
  13445 + ...option,
  13446 + }) as unknown as Promise<PostResearchGroupsAuditResponseSuccess>;
  13447 + }
  13448 +
  13449 + /** http method */
  13450 + request.method = method;
  13451 + /** request url */
  13452 + request.url = url;
  13453 + return request;
  13454 +})();
  13455 +
12685 13456 /** @description request parameter type for postResearchGroupsDelete */
12686 13457 export interface PostResearchGroupsDeleteOption {
12687 13458 /**
... ... @@ -17062,6 +17833,77 @@ export const postServiceInvoiceReissueOld = /* #__PURE__ */ (() =&gt; {
17062 17833 return request;
17063 17834 })();
17064 17835  
  17836 +/** @description request parameter type for postServiceInvoiceSucessInvoices */
  17837 +export interface PostServiceInvoiceSucessInvoicesOption {
  17838 + /**
  17839 + * @description
  17840 + * ids
  17841 + */
  17842 + body: {
  17843 + /**
  17844 + @description
  17845 + ids */
  17846 + ids: Array<number>;
  17847 + };
  17848 +}
  17849 +
  17850 +/** @description response type for postServiceInvoiceSucessInvoices */
  17851 +export interface PostServiceInvoiceSucessInvoicesResponse {
  17852 + /**
  17853 + * @description
  17854 + * OK
  17855 + */
  17856 + 200: ServerResult;
  17857 + /**
  17858 + * @description
  17859 + * Created
  17860 + */
  17861 + 201: any;
  17862 + /**
  17863 + * @description
  17864 + * Unauthorized
  17865 + */
  17866 + 401: any;
  17867 + /**
  17868 + * @description
  17869 + * Forbidden
  17870 + */
  17871 + 403: any;
  17872 + /**
  17873 + * @description
  17874 + * Not Found
  17875 + */
  17876 + 404: any;
  17877 +}
  17878 +
  17879 +export type PostServiceInvoiceSucessInvoicesResponseSuccess =
  17880 + PostServiceInvoiceSucessInvoicesResponse[200];
  17881 +/**
  17882 + * @description
  17883 + * 获取待重新开票的开票记录
  17884 + * @tags 发票
  17885 + * @produces *
  17886 + * @consumes application/json
  17887 + */
  17888 +export const postServiceInvoiceSucessInvoices = /* #__PURE__ */ (() => {
  17889 + const method = 'post';
  17890 + const url = '/service/invoice/sucessInvoices';
  17891 + function request(
  17892 + option: PostServiceInvoiceSucessInvoicesOption,
  17893 + ): Promise<PostServiceInvoiceSucessInvoicesResponseSuccess> {
  17894 + return requester(request.url, {
  17895 + method: request.method,
  17896 + ...option,
  17897 + }) as unknown as Promise<PostServiceInvoiceSucessInvoicesResponseSuccess>;
  17898 + }
  17899 +
  17900 + /** http method */
  17901 + request.method = method;
  17902 + /** request url */
  17903 + request.url = url;
  17904 + return request;
  17905 +})();
  17906 +
17065 17907 /** @description request parameter type for postServiceInvoiceUrgentInvoicing */
17066 17908 export interface PostServiceInvoiceUrgentInvoicingOption {
17067 17909 /**
... ...