diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java index 909ffda..ee2c50d 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java @@ -215,8 +215,8 @@ public class InstrumentController extends JeecgController edit2(@RequestBody Instrument instrument) { - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(sysDepartService.getById(loginUser.getOrgId()).getOrgCategory().equals("3")){ + //LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(sysDepartService.getById(instrument.getDeclarationUnit()).getOrgCategory().equals("3")){ instrument.setFlag("1"); }else{ instrument.setFlag("0"); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java index e51b057..4d24e39 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java @@ -1,8 +1,10 @@ package org.jeecg.modules.demo.mock.vxe.controller; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,6 +18,9 @@ import org.jeecg.common.system.query.QueryCondition; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.demo.mock.vxe.entity.MockEntity; import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket; +import org.jeecg.modules.demo.projectFeeBudget.entity.ProjectFeeBudget; +import org.jeecg.modules.demo.projectFeeBudget.service.IProjectFeeBudgetService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -33,6 +38,9 @@ import java.util.*; @Slf4j public class VxeMockController { + @Autowired + private IProjectFeeBudgetService projectFeeBudgetService; + /** * 模拟更改状态 * @@ -65,7 +73,7 @@ public class VxeMockController { */ @Deprecated @GetMapping("/change2") - public Result mockChange2(@RequestParam("id") String id,@RequestParam("tug_status") String tugStatus) { + public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tugStatus) { /* id 为 行的id（rowId），只要获取到rowId，那么只需要调用 VXESocket.sendMessageToAll() 即可 */ // 封装行数据 @@ -200,6 +208,37 @@ public class VxeMockController { return Result.ok(page); } + + /** + * @description: 获取项目经费预算填报项 + * @param: [pageNo, pageSize, parentId] + * @return: org.jeecg.common.api.vo.Result + * @author: z.h.c + * @date: 24/10/29 15:47 + */ + @GetMapping("/getProjectFeeBudgetList/{projectId}") + public Result getProjectFeeBudgetList(@PathVariable("projectId") String projectId, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + // 父级id，根据父级id查询子级，如果为空则查询顶级 + @RequestParam(name = "parentId", required = false) String parentId) { + + JSONArray dataList; + List feeBudgetList = projectFeeBudgetService.list(new LambdaQueryWrapper().eq(ProjectFeeBudget::getProjectId,projectId)); + if (ObjectUtil.isNotEmpty(feeBudgetList)) { + dataList = JSONArray.parseArray(JSON.toJSONString(feeBudgetList)); + } else { + String path = "classpath:org/jeecg/modules/demo/mock/vxe/json/projectFeeBudget.json"; + dataList = readJsonData(path); + /*// 读取JSON数据 + if (dataList == null) { + return Result.error("读取数据失败！"); + }*/ + } + IPage page = this.queryDataPage(dataList, parentId, pageNo, pageSize); + return Result.ok(page); + } + /** * 获取模拟“调度计划”页面的数据 * diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/projectFeeBudget.json b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/projectFeeBudget.json new file mode 100644 index 0000000..b1d2e61 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/projectFeeBudget.json @@ -0,0 +1,15 @@ +[ +{"budgetSubject":"设备费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""}, +{"budgetSubject":"材料费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"测试化验加工费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"燃料动力费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"差旅费/会议费/国际合作与交流费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"出版/文献/信息传播/知识产权事务费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"劳务费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"专家咨询费","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"其他支出","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"本次申请省财政经费支持","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"其他财政拨款","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"单位自有货币资金","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +{"budgetSubject":"其他资金","totalFee":0.00,"specialFee":0.00,"selfFee":0.00,"specialFeeMark":""} +] diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java new file mode 100644 index 0000000..edfbd16 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java @@ -0,0 +1,188 @@ +package org.jeecg.modules.demo.projectAnnualBudget.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.demo.project.entity.Project; +import org.jeecg.modules.demo.project.service.IProjectService; +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import org.jeecg.modules.demo.projectAnnualBudget.service.IProjectAnnualBudgetService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +@Api(tags = "财政拨款分单位年度预算") +@RestController +@RequestMapping("/projectAnnualBudget/projectAnnualBudget") +@Slf4j +public class ProjectAnnualBudgetController extends JeecgController { + @Autowired + private IProjectAnnualBudgetService projectAnnualBudgetService; + + @Autowired + private IProjectService iProjectService; + + + /** + * 分页列表查询 + * + * @param projectAnnualBudget + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "财政拨款分单位年度预算-分页列表查询") + @ApiOperation(value = "财政拨款分单位年度预算-分页列表查询", notes = "财政拨款分单位年度预算-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ProjectAnnualBudget projectAnnualBudget, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectAnnualBudget, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectAnnualBudgetService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-添加") + @ApiOperation(value = "财政拨款分单位年度预算-添加", notes = "财政拨款分单位年度预算-添加") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:add") + @PostMapping(value = "/add/{projectId}") + public Result add(@PathVariable("projectId") String projectId, @RequestBody ProjectAnnualBudget projectAnnualBudget) { + Project project = iProjectService.getById(projectId); + Optional.ofNullable(project).orElseThrow(() -> new JeecgBootException("项目不存在")); + projectAnnualBudgetService.remove(new LambdaQueryWrapper().eq(ProjectAnnualBudget::getProjectId, projectId)); + projectAnnualBudgetService.save(projectAnnualBudget); + return Result.OK("添加成功！"); + } + + + /** + * 编辑 + * + * @param projectAnnualBudget + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-编辑") + @ApiOperation(value = "财政拨款分单位年度预算-编辑", notes = "财政拨款分单位年度预算-编辑") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ProjectAnnualBudget projectAnnualBudget) { + projectAnnualBudgetService.updateById(projectAnnualBudget); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-通过id删除") + @ApiOperation(value = "财政拨款分单位年度预算-通过id删除", notes = "财政拨款分单位年度预算-通过id删除") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + projectAnnualBudgetService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "财政拨款分单位年度预算-批量删除") + @ApiOperation(value = "财政拨款分单位年度预算-批量删除", notes = "财政拨款分单位年度预算-批量删除") +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.projectAnnualBudgetService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "财政拨款分单位年度预算-通过id查询") + @ApiOperation(value = "财政拨款分单位年度预算-通过id查询", notes = "财政拨款分单位年度预算-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getById(id); + if (projectAnnualBudget == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectAnnualBudget); + } + + @ApiOperation(value = "财政拨款分单位年度预算-通过id查询", notes = "财政拨款分单位年度预算-通过id查询") + @GetMapping(value = "/queryByProjectId/{projectId}") + public Result queryByProjectId(@PathVariable("projectId") String projectId) { + ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getOne(new LambdaQueryWrapper().eq(ProjectAnnualBudget::getProjectId,projectId)); + if (projectAnnualBudget == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectAnnualBudget); + } + + /** + * 导出excel + * + * @param request + * @param projectAnnualBudget + */ +// @RequiresPermissions("projectAnnualBudget:project_annual_budget:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectAnnualBudget projectAnnualBudget) { + return super.exportXls(request, projectAnnualBudget, ProjectAnnualBudget.class, "财政拨款分单位年度预算"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("projectAnnualBudget:project_annual_budget:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectAnnualBudget.class); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java new file mode 100644 index 0000000..ed66020 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java @@ -0,0 +1,120 @@ +package org.jeecg.modules.demo.projectAnnualBudget.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +@Data +@TableName("project_annual_budget") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "project_annual_budget对象", description = "财政拨款分单位年度预算") +public class ProjectAnnualBudget implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /** + * 项目id + */ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private String projectId; + + @Excel(name = "年度1", width = 15) + @ApiModelProperty(value = "年度1") + private String year1; + /** + * 年度2 + */ + @Excel(name = "年度2", width = 15) + @ApiModelProperty(value = "年度2") + private String year2; + /** + * 年度3 + */ + @Excel(name = "年度3", width = 15) + @ApiModelProperty(value = "年度3") + private String year3; + + @Excel(name = "年度1", width = 15) + @ApiModelProperty(value = "年度1") + private String year1Value; + /** + * 年度2 + */ + @Excel(name = "年度2", width = 15) + @ApiModelProperty(value = "年度2") + private String year2Value; + /** + * 年度3 + */ + @Excel(name = "年度3", width = 15) + @ApiModelProperty(value = "年度3") + private String year3Value; + + + /** + * 部门名称 + */ + @Excel(name = "部门名称", width = 15) + @ApiModelProperty(value = "部门名称") + private String departName; + /** + * 总金额 + */ + @Excel(name = "总金额", width = 15) + @ApiModelProperty(value = "总金额") + private BigDecimal totalAmount; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java new file mode 100644 index 0000000..557b83d --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/ProjectAnnualBudgetMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.projectAnnualBudget.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +public interface ProjectAnnualBudgetMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml new file mode 100644 index 0000000..edee973 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/mapper/xml/ProjectAnnualBudgetMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java new file mode 100644 index 0000000..1a8ecf6 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/IProjectAnnualBudgetService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.projectAnnualBudget.service; + +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +public interface IProjectAnnualBudgetService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java new file mode 100644 index 0000000..0a91108 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/service/impl/ProjectAnnualBudgetServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.projectAnnualBudget.service.impl; + +import org.jeecg.modules.demo.projectAnnualBudget.entity.ProjectAnnualBudget; +import org.jeecg.modules.demo.projectAnnualBudget.mapper.ProjectAnnualBudgetMapper; +import org.jeecg.modules.demo.projectAnnualBudget.service.IProjectAnnualBudgetService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 财政拨款分单位年度预算 + * @Author: jeecg-boot + * @Date: 2024-10-31 + * @Version: V1.0 + */ +@Service +public class ProjectAnnualBudgetServiceImpl extends ServiceImpl implements IProjectAnnualBudgetService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java new file mode 100644 index 0000000..e1bbcb3 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/controller/ProjectFeeBudgetController.java @@ -0,0 +1,202 @@ +package org.jeecg.modules.demo.projectFeeBudget.controller; + +import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.UUIDGenerator; +import org.jeecg.modules.demo.project.entity.Project; +import org.jeecg.modules.demo.project.service.IProjectService; +import org.jeecg.modules.demo.projectFeeBudget.entity.ProjectFeeBudget; +import org.jeecg.modules.demo.projectFeeBudget.service.IProjectFeeBudgetService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; + +/** + * @Description: 项目经费预算 + * @Author: jeecg-boot + * @Date: 2024-10-29 + * @Version: V1.0 + */ +@Api(tags = "项目经费预算") +@RestController +@RequestMapping("/projectFeeBudget/projectFeeBudget") +@Slf4j +public class ProjectFeeBudgetController extends JeecgController { + @Autowired + private IProjectFeeBudgetService projectFeeBudgetService; + + @Autowired + private IProjectService iProjectService; + + /** + * @description: 保存项目经费预算 + * @param: [projectId, tableData] + * @return: org.jeecg.common.api.vo.Result + * @author: z.h.c + * @date: 24/10/29 16:10 + */ + @PostMapping("/saveAll/{projectId}") + public Result saveAll(@PathVariable("projectId") String projectId, @RequestBody JSONArray tableData) { + Project project = iProjectService.getById(projectId); + Optional.ofNullable(project).orElseThrow(() -> new JeecgBootException("项目不存在")); + + List list = JSONArray.parseArray(tableData.toJSONString(), ProjectFeeBudget.class); + list.forEach(obj -> { + obj.setProjectId(projectId); + obj.setId(UUIDGenerator.generate()); + }); + BigDecimal sumFee = Optional.ofNullable(list).orElse(new LinkedList<>()).stream().map(ProjectFeeBudget::getTotalFee).reduce(BigDecimal.ZERO, BigDecimal::add); + //申请财政拨款与经费明细总各比较，不相等 异常退出 + if(project.getApplyFund().compareTo(sumFee) != 0){ + throw new JeecgBootException("申请财政拨款("+project.getApplyFund()+"万元),与项目经费预算表合计金额不等,请核对!"); + } + projectFeeBudgetService.remove(new LambdaQueryWrapper().eq(ProjectFeeBudget::getProjectId, projectId)); + projectFeeBudgetService.saveBatch(list); + return Result.ok(); + } + + /** + * 分页列表查询 + * + * @param projectFeeBudget + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "项目经费预算-分页列表查询") + @ApiOperation(value = "项目经费预算-分页列表查询", notes = "项目经费预算-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ProjectFeeBudget projectFeeBudget, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectFeeBudget, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectFeeBudgetService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param projectFeeBudget + * @return + */ + @AutoLog(value = "项目经费预算-添加") + @ApiOperation(value = "项目经费预算-添加", notes = "项目经费预算-添加") +// @RequiresPermissions("projectFeeBudget:project_fee_budget:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ProjectFeeBudget projectFeeBudget) { + projectFeeBudgetService.save(projectFeeBudget); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectFeeBudget + * @return + */ + @AutoLog(value = "项目经费预算-编辑") + @ApiOperation(value = "项目经费预算-编辑", notes = "项目经费预算-编辑") +// @RequiresPermissions("projectFeeBudget:project_fee_budget:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ProjectFeeBudget projectFeeBudget) { + projectFeeBudgetService.updateById(projectFeeBudget); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "项目经费预算-通过id删除") + @ApiOperation(value = "项目经费预算-通过id删除", notes = "项目经费预算-通过id删除") +// @RequiresPermissions("projectFeeBudget:project_fee_budget:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + projectFeeBudgetService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "项目经费预算-批量删除") + @ApiOperation(value = "项目经费预算-批量删除", notes = "项目经费预算-批量删除") +// @RequiresPermissions("projectFeeBudget:project_fee_budget:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.projectFeeBudgetService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "项目经费预算-通过id查询") + @ApiOperation(value = "项目经费预算-通过id查询", notes = "项目经费预算-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ProjectFeeBudget projectFeeBudget = projectFeeBudgetService.getById(id); + if (projectFeeBudget == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectFeeBudget); + } + + /** + * 导出excel + * + * @param request + * @param projectFeeBudget + */ +// @RequiresPermissions("projectFeeBudget:project_fee_budget:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectFeeBudget projectFeeBudget) { + return super.exportXls(request, projectFeeBudget, ProjectFeeBudget.class, "项目经费预算"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("projectFeeBudget:project_fee_budget:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectFeeBudget.class); + } + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/entity/ProjectFeeBudget.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/entity/ProjectFeeBudget.java new file mode 100644 index 0000000..b03433b --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/entity/ProjectFeeBudget.java @@ -0,0 +1,104 @@ +package org.jeecg.modules.demo.projectFeeBudget.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 项目经费预算 + * @Author: jeecg-boot + * @Date: 2024-10-29 + * @Version: V1.0 + */ +@Data +@TableName("project_fee_budget") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "project_fee_budget对象", description = "项目经费预算") +public class ProjectFeeBudget implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /** + * 创建人 + */ + @ApiModelProperty(value = "创建人") + private String createBy; + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /** + * 更新人 + */ + @ApiModelProperty(value = "更新人") + private String updateBy; + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /** + * 所属部门 + */ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + /** + * 项目id + */ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private String projectId; + /** + * 预算科目 + */ + @Excel(name = "预算科目", width = 15) + @ApiModelProperty(value = "预算科目") + private String budgetSubject; + /** + * 合计 + */ + @Excel(name = "合计", width = 15) + @ApiModelProperty(value = "合计") + private BigDecimal totalFee; + /** + * 专项经费 + */ + @Excel(name = "专项经费", width = 15) + @ApiModelProperty(value = "专项经费") + private BigDecimal specialFee; + /** + * 自筹经费 + */ + @Excel(name = "自筹经费", width = 15) + @ApiModelProperty(value = "自筹经费") + private BigDecimal selfFee; + /** + * 专项经费说明 + */ + @Excel(name = "专项经费说明", width = 15) + @ApiModelProperty(value = "专项经费说明") + private String specialFeeMark; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/mapper/ProjectFeeBudgetMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/mapper/ProjectFeeBudgetMapper.java new file mode 100644 index 0000000..95db8a8 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/mapper/ProjectFeeBudgetMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.demo.projectFeeBudget.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.demo.projectFeeBudget.entity.ProjectFeeBudget; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 项目经费预算 + * @Author: jeecg-boot + * @Date: 2024-10-29 + * @Version: V1.0 + */ +public interface ProjectFeeBudgetMapper extends BaseMapper { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/mapper/xml/ProjectFeeBudgetMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/mapper/xml/ProjectFeeBudgetMapper.xml new file mode 100644 index 0000000..a26d9e2 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/mapper/xml/ProjectFeeBudgetMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/service/IProjectFeeBudgetService.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/service/IProjectFeeBudgetService.java new file mode 100644 index 0000000..374af4d --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/service/IProjectFeeBudgetService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.demo.projectFeeBudget.service; + +import org.jeecg.modules.demo.projectFeeBudget.entity.ProjectFeeBudget; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 项目经费预算 + * @Author: jeecg-boot + * @Date: 2024-10-29 + * @Version: V1.0 + */ +public interface IProjectFeeBudgetService extends IService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/service/impl/ProjectFeeBudgetServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/service/impl/ProjectFeeBudgetServiceImpl.java new file mode 100644 index 0000000..0516b20 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFeeBudget/service/impl/ProjectFeeBudgetServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.demo.projectFeeBudget.service.impl; + +import org.jeecg.modules.demo.projectFeeBudget.entity.ProjectFeeBudget; +import org.jeecg.modules.demo.projectFeeBudget.mapper.ProjectFeeBudgetMapper; +import org.jeecg.modules.demo.projectFeeBudget.service.IProjectFeeBudgetService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 项目经费预算 + * @Author: jeecg-boot + * @Date: 2024-10-29 + * @Version: V1.0 + */ +@Service +public class ProjectFeeBudgetServiceImpl extends ServiceImpl implements IProjectFeeBudgetService { + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/controller/ProjectFileController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/controller/ProjectFileController.java index f7f3b04..eb7a23a 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/controller/ProjectFileController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/controller/ProjectFileController.java @@ -88,6 +88,14 @@ public class ProjectFileController extends JeecgController add(@RequestBody ProjectFile projectFile) { + String fileUrl = projectFile.getFileUrl(); + String[] fileArr = fileUrl.split("/"); + String fileTemp = fileArr[1]; + projectFile.setFileName(fileTemp); + String[] fileArr2 = fileTemp.split("\\."); + String fileName = fileArr2[0]; + String fileType = fileArr2[1]; + projectFile.setFileType(fileType); projectFileService.save(projectFile); return Result.OK("添加成功！"); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/entity/ProjectFile.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/entity/ProjectFile.java index 7b02353..4e00bc9 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/entity/ProjectFile.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectFile/entity/ProjectFile.java @@ -74,4 +74,10 @@ public class ProjectFile implements Serializable { // @Excel(name = "附件地址", width = 255) @ApiModelProperty(value = "附件标识 fujian:附件tab页显示,zhengwen：正文件tab页显示") private java.lang.String fileFlag; + + @ApiModelProperty(value = "附件名称") + private java.lang.String fileName; + + @ApiModelProperty(value = "附件类型") + private java.lang.String fileType; } diff --git a/jeecgboot-vue3/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue b/jeecgboot-vue3/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue index b44d4ef..d762b98 100644 --- a/jeecgboot-vue3/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue +++ b/jeecgboot-vue3/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue @@ -1,5 +1,5 @@ + + + + diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql b/jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql new file mode 100644 index 0000000..a0cb840 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/V20241031_1__menu_insert_ProjectAnnualBudget.sql @@ -0,0 +1,26 @@ +-- 注意：该页面对应的前台目录为views/projectAnnualBudget文件夹下 +-- 如果你想更改到其他目录，请修改sql中component字段对应的值 + + +INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external) +VALUES ('2024103103163690040', NULL, '财政拨款分单位年度预算', '/projectAnnualBudget/projectAnnualBudgetList', 'projectAnnualBudget/ProjectAnnualBudgetList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0); + +-- 权限控制sql +-- 新增 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2024103103163690041', '2024103103163690040', '添加财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); +-- 编辑 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2024103103163690042', '2024103103163690040', '编辑财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); +-- 删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2024103103163690043', '2024103103163690040', '删除财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); +-- 批量删除 +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2024103103163690044', '2024103103163690040', '批量删除财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); +-- 导出excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2024103103163690045', '2024103103163690040', '导出excel_财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); +-- 导入excel +INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external) +VALUES ('2024103103163690046', '2024103103163690040', '导入excel_财政拨款分单位年度预算', NULL, NULL, 0, NULL, NULL, 2, 'projectAnnualBudget:project_annual_budget:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-10-31 15:16:04', NULL, NULL, 0, 0, '1', 0); diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue new file mode 100644 index 0000000..72f5cbf --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetForm.vue @@ -0,0 +1,70 @@ + + + diff --git a/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue new file mode 100644 index 0000000..c210ec7 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectAnnualBudget/components/ProjectAnnualBudgetModal.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue index 94f9630..9fe392c 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue @@ -1,10 +1,18 @@