From cc699e231f8796e51a0fd4f70ba364273c417323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Tue, 6 Aug 2024 10:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E9=A2=98/=E5=8F=91=E7=A5=A8/=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E4=BD=9C=E5=93=81=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChaoseTopicPersionController.java | 15 +++++++ .../mapper/ChaoseTopicPersionMapper.java | 3 ++ .../service/IChaoseTopicPersionService.java | 1 + .../impl/ChaoseTopicPersionServiceImpl.java | 8 ++++ .../modules/demo/receipt/entity/Receipt.java | 5 +++ .../controller/UpfilePersionController.java | 5 ++- .../upfile_persion/entity/UpfilePersion.java | 6 ++- .../impl/UpfilePersionServiceImpl.java | 4 +- .../views/UpfilePersion/UpfilePersionList.vue | 41 +++++++++++++++---- .../ChaoseTopicPersion.api.ts | 5 +++ .../components/ChaoseTopicPersionForm.vue | 10 ++++- .../src/views/receipt/Receipt.data.ts | 10 ++++- .../views/receipt/components/ReceiptForm.vue | 41 +++++++++++-------- 13 files changed, 122 insertions(+), 32 deletions(-) diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java index 16260830..c35a70a7 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/controller/ChaoseTopicPersionController.java @@ -342,6 +342,21 @@ public class ChaoseTopicPersionController extends JeecgController edit2(@RequestBody ChaoseTopicPersion chaoseTopicPersion) { + chaoseTopicPersionService.updatestaticandblack(chaoseTopicPersion.getId()); + return Result.OK("提交成功!"); + } + @RequestMapping(value = "/edit1", method = {RequestMethod.PUT, RequestMethod.POST}) public Result edit1(@RequestBody ChooseEdit chooseEdit) { String enrollCode = chooseEdit.getEnrollCode(); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/mapper/ChaoseTopicPersionMapper.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/mapper/ChaoseTopicPersionMapper.java index d7435b9b..522c7d55 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/mapper/ChaoseTopicPersionMapper.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/mapper/ChaoseTopicPersionMapper.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.chooseTopicPersion.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; import org.jeecg.modules.demo.chooseTopicPersion.entity.ChaoseTopicPersion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ChaoseTopicPersionMapper extends BaseMapper { + @Update("UPDATE chaose_topic_persion SET status='1' ,black='' WHERE id=#{id}") + void updatestaticandblack(String id); } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/IChaoseTopicPersionService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/IChaoseTopicPersionService.java index 7e1a385c..ed3a24c0 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/IChaoseTopicPersionService.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/IChaoseTopicPersionService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IChaoseTopicPersionService extends IService { + void updatestaticandblack(String id); } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/impl/ChaoseTopicPersionServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/impl/ChaoseTopicPersionServiceImpl.java index 5c07f77e..86e48033 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/impl/ChaoseTopicPersionServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/chooseTopicPersion/service/impl/ChaoseTopicPersionServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.demo.chooseTopicPersion.service.impl; import org.jeecg.modules.demo.chooseTopicPersion.entity.ChaoseTopicPersion; import org.jeecg.modules.demo.chooseTopicPersion.mapper.ChaoseTopicPersionMapper; import org.jeecg.modules.demo.chooseTopicPersion.service.IChaoseTopicPersionService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +17,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ChaoseTopicPersionServiceImpl extends ServiceImpl implements IChaoseTopicPersionService { + @Autowired + private ChaoseTopicPersionMapper chaoseTopicPersionMapper; + + @Override + public void updatestaticandblack(String id) { + chaoseTopicPersionMapper.updatestaticandblack(id); + } } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/receipt/entity/Receipt.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/receipt/entity/Receipt.java index 3fbca1c7..18cb677c 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/receipt/entity/Receipt.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/receipt/entity/Receipt.java @@ -87,6 +87,11 @@ public class Receipt implements Serializable { @Excel(name = "税号", width = 15) @ApiModelProperty(value = "税号") private java.lang.String duty; + + /**税号*/ + @Excel(name = "税号", width = 15) + @ApiModelProperty(value = "发票号") + private java.lang.String fph; /**地址*/ @Excel(name = "地址", width = 15) @ApiModelProperty(value = "地址") diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java index 9a9abb31..b4aa48ad 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/controller/UpfilePersionController.java @@ -165,13 +165,14 @@ public class UpfilePersionController extends JeecgController upfilePersions = upfilePersionService.list(queryWrapper); diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/entity/UpfilePersion.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/entity/UpfilePersion.java index bb2de8bb..0db3a822 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/entity/UpfilePersion.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/entity/UpfilePersion.java @@ -30,7 +30,7 @@ public class UpfilePersion implements Serializable { private static final long serialVersionUID = 1L; /** - * 待评分 + * 带评分 */ public static final Integer WORK_STATUS_READY_SCORE = 0; /** @@ -49,6 +49,10 @@ public class UpfilePersion implements Serializable { * 待提交 */ public static final Integer WORK_STATUS_READY_SUBMIT = 4; + /** + * 待审核 + */ + public static final Integer WORK_STATUS_ALREADY_SH = 5; /** * 主键 diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/service/impl/UpfilePersionServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/service/impl/UpfilePersionServiceImpl.java index 39c1eb50..573db4e3 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/service/impl/UpfilePersionServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/upfile_persion/service/impl/UpfilePersionServiceImpl.java @@ -340,7 +340,7 @@ public class UpfilePersionServiceImpl annualCompPointMap.get(dto.getAnnualCompPointId()).getObjName()); // 设置状态 if (UpfilePersion.WORK_STATUS_READY_SCORE.equals(dto.getStatus())) { - dto.setStatusText("待评分"); + dto.setStatusText("待评分/已审核"); } else if (UpfilePersion.WORK_STATUS_ALREADY_SCORE.equals(dto.getStatus())) { dto.setStatusText("已评分"); } else if (UpfilePersion.WORK_STATUS_READY_OVERRULE.equals(dto.getStatus())) { @@ -349,6 +349,8 @@ public class UpfilePersionServiceImpl dto.setStatusText("已驳回"); } else if (UpfilePersion.WORK_STATUS_READY_SUBMIT.equals(dto.getStatus())) { dto.setStatusText("待提交"); + }else if (UpfilePersion.WORK_STATUS_ALREADY_SH.equals(dto.getStatus())) { + dto.setStatusText("已提交"); } dtoList.add(dto); }); diff --git a/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue b/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue index 3f571b16..9c1256dc 100644 --- a/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue +++ b/jeecgboot-vue3-master/src/views/UpfilePersion/UpfilePersionList.vue @@ -27,13 +27,14 @@ - - - 待评分 - 已评分 + + + 待评分/已审核 + 待驳回 - 已驳回 - 待提交 + + 已提交 @@ -300,7 +301,24 @@ } async function handleWorkSubmit(record) { - if (record.status !== 4 && record.status !== 3) { + if (record.status !== 4 && record.status !== 3 && record.status !== 5) { + return message.error('作品禁止重复提交'); + } else { + record.status = 5; + record.backInfo = ''; + const resp = await saveOrUpdate(record, true); + if (resp.success) { + await reload(); + message.success('提交成功'); + } else { + message.error('提交失败'); + } + } + } + + + async function handleup(record) { + if (record.status !== 4 && record.status !== 3 && record.status !== 5) { return message.error('作品禁止重复提交'); } else { record.status = 0; @@ -422,7 +440,14 @@ title: '是否驳回当前作品？', confirm: handleBack.bind(null, record), }, - } + }, + { + label: '通过', + popConfirm: { + title: '是否通过审核当前作品', + confirm: handleup.bind(null, record), + }, + }, ); } else if (isSuperAdmin.value) { tableAction.unshift( diff --git a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersion.api.ts b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersion.api.ts index fba0a063..274fd35c 100644 --- a/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersion.api.ts +++ b/jeecgboot-vue3-master/src/views/chooseTopicPersion/ChaoseTopicPersion.api.ts @@ -10,6 +10,7 @@ enum Api { save='/chooseTopicPersion/chaoseTopicPersion/add', edit='/chooseTopicPersion/chaoseTopicPersion/edit', edit1='/chooseTopicPersion/chaoseTopicPersion/edit1', + edit2='/chooseTopicPersion/chaoseTopicPersion/edit2', deleteOne = '/chooseTopicPersion/chaoseTopicPersion/delete', deleteBatch = '/chooseTopicPersion/chaoseTopicPersion/deleteBatch', importExcel = '/chooseTopicPersion/chaoseTopicPersion/importExcel', @@ -68,6 +69,10 @@ export const batchDelete = (params, handleSuccess) => { export const update = (params) => { return defHttp.post({ url: Api.save, params }); } + +export const update2 = (params) => { + return defHttp.post({ url: Api.edit2, params }); +} export const update1 = (params) => { return defHttp.post({ url: Api.edit1, params }, { isTransformResponse: false }); } diff --git a/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue b/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue index 2bca5426..066f31f6 100644 --- a/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue +++ b/jeecgboot-vue3-master/src/views/chooseTopicPersion/components/ChaoseTopicPersionForm.vue @@ -38,7 +38,7 @@ dictCode="choose_topic_persion_status" disabled="true"/> 提交选题 - 申请驳回 + 提交选题 @@ -72,6 +72,7 @@ import {getValueType} from '/@/utils'; import {update,saveOrUpdate, list4, watch} from '../ChaoseTopicPersion.api'; import {Form} from 'ant-design-vue'; import JDictSelectTag from "/@/components/Form/src/jeecg/components/JDictSelectTag.vue"; +import {update2} from "/@/views/chooseTopicPersion/ChaoseTopicPersion.api"; const props = defineProps({ formDisabled: {type: Boolean, default: false}, @@ -128,6 +129,13 @@ function click1(status1) { update({enrollCode: formData.bmcode,status:status1,topicid : formData.timul}) emit('up'); } + + +function click2(status1) { + console.log(formData) + update2({enrollCode: formData.bmcode,status:status1,topicid : formData.timul}) + emit('up'); +} /** * 编辑 */ diff --git a/jeecgboot-vue3-master/src/views/receipt/Receipt.data.ts b/jeecgboot-vue3-master/src/views/receipt/Receipt.data.ts index 82416cb9..d1be8ca8 100644 --- a/jeecgboot-vue3-master/src/views/receipt/Receipt.data.ts +++ b/jeecgboot-vue3-master/src/views/receipt/Receipt.data.ts @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '学校', + title: '院系', align: "center", dataIndex: 'schoolid' }, @@ -44,6 +44,12 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'duty' }, + { + title: '发票号', + align: "center", + dataIndex: 'fph' + }, + { title: '地址', align: "center", @@ -78,7 +84,7 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '学校', + label: '院系', field: 'schoolid', component: 'Input', }, diff --git a/jeecgboot-vue3-master/src/views/receipt/components/ReceiptForm.vue b/jeecgboot-vue3-master/src/views/receipt/components/ReceiptForm.vue index f94bc58b..2757afca 100644 --- a/jeecgboot-vue3-master/src/views/receipt/components/ReceiptForm.vue +++ b/jeecgboot-vue3-master/src/views/receipt/components/ReceiptForm.vue @@ -3,8 +3,8 @@ - - + + @@ -42,6 +42,12 @@ + + + + + + @@ -80,7 +86,7 @@ import { getValueType } from '/@/utils'; import { saveOrUpdate } from '../Receipt.api'; import { Form } from 'ant-design-vue'; - + const props = defineProps({ formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: ()=>{} }, @@ -91,19 +97,20 @@ const emit = defineEmits(['register', 'ok']); const formData = reactive>({ id: '', - schoolid: '', - teamsnumber: '', - price: '', - kpPrice: '', - contacts: '', - telephone: '', - mailbox: '', - duty: '', - address: '', - phone: '', - bank: '', - bankCode: '', - iskp: '', + schoolid: '', + teamsnumber: '', + fph: '', + price: '', + kpPrice: '', + contacts: '', + telephone: '', + mailbox: '', + duty: '', + address: '', + phone: '', + bank: '', + bankCode: '', + iskp: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); @@ -126,7 +133,7 @@ return props.formDisabled; }); - + /** * 新增 */