Merge remote-tracking branch 'origin/master'

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/controller/KzksProjectKmbhController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.projectKmbh.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.projectKmbh.entity.KzksProjectKmbh;
+import org.jeecg.modules.projectKmbh.service.IKzksProjectKmbhService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 科目编号
+ * @Author: jeecg-boot
+ * @Date:   2023-08-24
+ * @Version: V1.0
+ */
+@Api(tags="科目编号")
+@RestController
+@RequestMapping("/projectKmbh/kzksProjectKmbh")
+@Slf4j
+public class KzksProjectKmbhController extends JeecgController<KzksProjectKmbh, IKzksProjectKmbhService> {
+	@Autowired
+	private IKzksProjectKmbhService kzksProjectKmbhService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kzksProjectKmbh
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "科目编号-分页列表查询")
+	@ApiOperation(value="科目编号-分页列表查询", notes="科目编号-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KzksProjectKmbh>> queryPageList(KzksProjectKmbh kzksProjectKmbh,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KzksProjectKmbh> queryWrapper = QueryGenerator.initQueryWrapper(kzksProjectKmbh, req.getParameterMap());
+		Page<KzksProjectKmbh> page = new Page<KzksProjectKmbh>(pageNo, pageSize);
+		IPage<KzksProjectKmbh> pageList = kzksProjectKmbhService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param kzksProjectKmbh
+	 * @return
+	 */
+	@AutoLog(value = "科目编号-添加")
+	@ApiOperation(value="科目编号-添加", notes="科目编号-添加")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_kmbh:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KzksProjectKmbh kzksProjectKmbh) {
+		kzksProjectKmbhService.save(kzksProjectKmbh);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param kzksProjectKmbh
+	 * @return
+	 */
+	@AutoLog(value = "科目编号-编辑")
+	@ApiOperation(value="科目编号-编辑", notes="科目编号-编辑")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_kmbh:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KzksProjectKmbh kzksProjectKmbh) {
+		kzksProjectKmbhService.updateById(kzksProjectKmbh);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "科目编号-通过id删除")
+	@ApiOperation(value="科目编号-通过id删除", notes="科目编号-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_kmbh:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kzksProjectKmbhService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "科目编号-批量删除")
+	@ApiOperation(value="科目编号-批量删除", notes="科目编号-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:kzks_project_kmbh:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kzksProjectKmbhService.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<KzksProjectKmbh> queryById(@RequestParam(name="id",required=true) String id) {
+		KzksProjectKmbh kzksProjectKmbh = kzksProjectKmbhService.getById(id);
+		if(kzksProjectKmbh==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kzksProjectKmbh);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kzksProjectKmbh
+    */
+    //@RequiresPermissions("org.jeecg.modules:kzks_project_kmbh:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KzksProjectKmbh kzksProjectKmbh) {
+        return super.exportXls(request, kzksProjectKmbh, KzksProjectKmbh.class, "科目编号");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("kzks_project_kmbh:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KzksProjectKmbh.class);
+    }
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/entity/KzksProjectKmbh.java

@@ -0,0 +1,70 @@
+package org.jeecg.modules.projectKmbh.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 科目编号
+ * @Author: jeecg-boot
+ * @Date:   2023-08-24
+ * @Version: V1.0
+ */
+@Data
+@TableName("kzks_project_kmbh")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="kzks_project_kmbh对象", description="科目编号")
+public class KzksProjectKmbh implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**年度*/
+	@Excel(name = "年度", width = 15)
+    @ApiModelProperty(value = "年度")
+    private java.lang.String year;
+	/**科目编号*/
+	@Excel(name = "科目编号", width = 15)
+    @ApiModelProperty(value = "科目编号")
+    private java.lang.String kemuNo;
+	/**费用类别*/
+	@Excel(name = "费用类别", width = 15)
+    @ApiModelProperty(value = "费用类别")
+    private java.lang.String moneyType;
+}

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/mapper/KzksProjectKmbhMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.projectKmbh.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.projectKmbh.entity.KzksProjectKmbh;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 科目编号
+ * @Author: jeecg-boot
+ * @Date:   2023-08-24
+ * @Version: V1.0
+ */
+public interface KzksProjectKmbhMapper extends BaseMapper<KzksProjectKmbh> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/mapper/xml/KzksProjectKmbhMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.projectKmbh.mapper.KzksProjectKmbhMapper">
+
+</mapper>

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/service/IKzksProjectKmbhService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.projectKmbh.service;
+
+import org.jeecg.modules.projectKmbh.entity.KzksProjectKmbh;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 科目编号
+ * @Author: jeecg-boot
+ * @Date:   2023-08-24
+ * @Version: V1.0
+ */
+public interface IKzksProjectKmbhService extends IService<KzksProjectKmbh> {
+
+}

module_kzks/src/main/java/org/jeecg/modules/projectKmbh/service/impl/KzksProjectKmbhServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.projectKmbh.service.impl;
+
+import org.jeecg.modules.projectKmbh.entity.KzksProjectKmbh;
+import org.jeecg.modules.projectKmbh.mapper.KzksProjectKmbhMapper;
+import org.jeecg.modules.projectKmbh.service.IKzksProjectKmbhService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 科目编号
+ * @Author: jeecg-boot
+ * @Date:   2023-08-24
+ * @Version: V1.0
+ */
+@Service
+public class KzksProjectKmbhServiceImpl extends ServiceImpl<KzksProjectKmbhMapper, KzksProjectKmbh> implements IKzksProjectKmbhService {
+
+}