Browse Source

项目成本——工时详情

LLL 1 year ago
parent
commit
dce0139daf

+ 171 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/controller/KyBgInfoController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.kyBgInfo.controller;
+
+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.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
+import org.jeecg.modules.kyBgInfo.service.IKyBgInfoService;
+import org.jeecg.modules.kyBgInfo.vo.KyBgInfoDetailListVO;
+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.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 科研报工
+ * @Author: jeecg-boot
+ * @Date:   2023-08-18
+ * @Version: V1.0
+ */
+@Api(tags="科研报工")
+@RestController
+@RequestMapping("/kyBgInfo/kyBgInfo")
+@Slf4j
+public class KyBgInfoController extends JeecgController<KyBgInfo, IKyBgInfoService> {
+	@Autowired
+	private IKyBgInfoService kyBgInfoService;
+
+
+	/**项目成本——工时详情*/
+	@ApiOperation(value="项目成本——工时详情", notes="项目成本——工时详情")
+	@GetMapping(value = "/getGSDeatilList")
+	public List<KyBgInfoDetailListVO> getGSDeatilList(String taskno) {
+		return kyBgInfoService.getGSDeatilList(taskno);
+	}
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param kyBgInfo
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "科研报工-分页列表查询")
+	@ApiOperation(value="科研报工-分页列表查询", notes="科研报工-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<KyBgInfo>> queryPageList(KyBgInfo kyBgInfo,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<KyBgInfo> queryWrapper = QueryGenerator.initQueryWrapper(kyBgInfo, req.getParameterMap());
+		Page<KyBgInfo> page = new Page<KyBgInfo>(pageNo, pageSize);
+		IPage<KyBgInfo> pageList = kyBgInfoService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param kyBgInfo
+	 * @return
+	 */
+	@AutoLog(value = "科研报工-添加")
+	@ApiOperation(value="科研报工-添加", notes="科研报工-添加")
+	//@RequiresPermissions("org.jeecg.modules:ky_bg_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody KyBgInfo kyBgInfo) {
+		kyBgInfoService.save(kyBgInfo);
+		return Result.OK("添加成功!");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param kyBgInfo
+	 * @return
+	 */
+	@AutoLog(value = "科研报工-编辑")
+	@ApiOperation(value="科研报工-编辑", notes="科研报工-编辑")
+	//@RequiresPermissions("org.jeecg.modules:ky_bg_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody KyBgInfo kyBgInfo) {
+		kyBgInfoService.updateById(kyBgInfo);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "科研报工-通过id删除")
+	@ApiOperation(value="科研报工-通过id删除", notes="科研报工-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:ky_bg_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		kyBgInfoService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "科研报工-批量删除")
+	@ApiOperation(value="科研报工-批量删除", notes="科研报工-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:ky_bg_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.kyBgInfoService.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<KyBgInfo> queryById(@RequestParam(name="id",required=true) String id) {
+		KyBgInfo kyBgInfo = kyBgInfoService.getById(id);
+		if(kyBgInfo==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(kyBgInfo);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param kyBgInfo
+    */
+    //@RequiresPermissions("org.jeecg.modules:ky_bg_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, KyBgInfo kyBgInfo) {
+        return super.exportXls(request, kyBgInfo, KyBgInfo.class, "科研报工");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("ky_bg_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, KyBgInfo.class);
+    }
+
+}

+ 127 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/entity/KyBgInfo.java

@@ -0,0 +1,127 @@
+package org.jeecg.modules.kyBgInfo.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-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("ky_bg_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="ky_bg_info对象", description="科研报工")
+public class KyBgInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**key*/
+	@Excel(name = "key", width = 15)
+    @ApiModelProperty(value = "key")
+    private java.lang.Integer key;
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
+	/**报工任务号*/
+	@Excel(name = "报工任务号", width = 15)
+    @ApiModelProperty(value = "报工任务号")
+    private java.lang.String taskno;
+	/**任务名称*/
+	@Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String taskname;
+	/**工作内容*/
+	@Excel(name = "工作内容", width = 15)
+    @ApiModelProperty(value = "工作内容")
+    private java.lang.String workcontent;
+	/**当日用时(h)*/
+	@Excel(name = "当日用时(h)", width = 15)
+    @ApiModelProperty(value = "当日用时(h)")
+    private java.math.BigDecimal workhour;
+	/**型号*/
+	@Excel(name = "型号", width = 15)
+    @ApiModelProperty(value = "型号")
+    private java.lang.String xhname;
+	/**研制数量*/
+	@Excel(name = "研制数量", width = 15)
+    @ApiModelProperty(value = "研制数量")
+    private java.lang.Integer yzsl;
+	/**研制阶段*/
+	@Excel(name = "研制阶段", width = 15)
+    @ApiModelProperty(value = "研制阶段")
+    private java.lang.String yzjdname;
+	/**用户名称*/
+	@Excel(name = "用户名称", width = 15)
+    @ApiModelProperty(value = "用户名称")
+    private java.lang.String tcdw;
+	/**用户简称*/
+	@Excel(name = "用户简称", width = 15)
+    @ApiModelProperty(value = "用户简称")
+    private java.lang.String brief;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private java.lang.String status;
+	/**计划开始时间*/
+	@Excel(name = "计划开始时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划开始时间")
+    private java.util.Date jhkssj;
+	/**计划完成时间(进度要求)*/
+	@Excel(name = "计划完成时间(进度要求)", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "计划完成时间(进度要求)")
+    private java.util.Date jhwcsj;
+	/**工作日期*/
+	@Excel(name = "工作日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "工作日期")
+    private java.util.Date worktime;
+	/**填写时间*/
+	@Excel(name = "填写时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "填写时间")
+    private java.util.Date createtime;
+	/**填报人*/
+	@Excel(name = "填报人", width = 15)
+    @ApiModelProperty(value = "填报人")
+    private java.lang.String username;
+	/**填报部门*/
+	@Excel(name = "填报部门", width = 15)
+    @ApiModelProperty(value = "填报部门")
+    private java.lang.String userdept;
+	/**审核人*/
+	@Excel(name = "审核人", width = 15)
+    @ApiModelProperty(value = "审核人")
+    private java.lang.String shr;
+	/**审批人*/
+	@Excel(name = "审批人", width = 15)
+    @ApiModelProperty(value = "审批人")
+    private java.lang.String spr;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String memo;
+}

+ 23 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/mapper/KyBgInfoMapper.java

@@ -0,0 +1,23 @@
+package org.jeecg.modules.kyBgInfo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
+import org.jeecg.modules.kyBgInfo.vo.KyBgInfoDetailListVO;
+
+import java.util.List;
+
+/**
+ * @Description: 科研报工
+ * @Author: jeecg-boot
+ * @Date:   2023-08-18
+ * @Version: V1.0
+ */
+public interface KyBgInfoMapper extends BaseMapper<KyBgInfo> {
+
+    /**项目成本——工时详情*/
+    @Select("select userdept,taskno,workhour from ky_bg_info where taskno = #{taskno}")
+    public List<KyBgInfoDetailListVO> getGSDeatilList(@Param("taskno") String taskno);
+
+}

+ 5 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/mapper/xml/KyBgInfoMapper.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.kyBgInfo.mapper.KyBgInfoMapper">
+
+</mapper>

+ 20 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/service/IKyBgInfoService.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.kyBgInfo.service;
+
+import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.kyBgInfo.vo.KyBgInfoDetailListVO;
+
+import java.util.List;
+
+/**
+ * @Description: 科研报工
+ * @Author: jeecg-boot
+ * @Date:   2023-08-18
+ * @Version: V1.0
+ */
+public interface IKyBgInfoService extends IService<KyBgInfo> {
+
+    /**项目成本——工时详情*/
+    public List<KyBgInfoDetailListVO> getGSDeatilList(String taskno);
+
+}

+ 31 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/service/impl/KyBgInfoServiceImpl.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.kyBgInfo.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.kyBgInfo.entity.KyBgInfo;
+import org.jeecg.modules.kyBgInfo.mapper.KyBgInfoMapper;
+import org.jeecg.modules.kyBgInfo.service.IKyBgInfoService;
+import org.jeecg.modules.kyBgInfo.vo.KyBgInfoDetailListVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 科研报工
+ * @Author: jeecg-boot
+ * @Date:   2023-08-18
+ * @Version: V1.0
+ */
+@Service
+public class KyBgInfoServiceImpl extends ServiceImpl<KyBgInfoMapper, KyBgInfo> implements IKyBgInfoService {
+
+    @Autowired
+    @SuppressWarnings("all")
+    private KyBgInfoMapper kyBgInfoMapper;
+
+    /**项目成本——工时详情*/
+    public List<KyBgInfoDetailListVO> getGSDeatilList(String taskno){
+        return kyBgInfoMapper.getGSDeatilList(taskno);
+    }
+
+}

+ 30 - 0
module_kzks/src/main/java/org/jeecg/modules/kyBgInfo/vo/KyBgInfoDetailListVO.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.kyBgInfo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+/**
+ * 科研报工
+ * 项目成本——工时详情VO
+ * */
+@Data
+public class KyBgInfoDetailListVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**报工任务号*/
+    @Excel(name = "报工任务号", width = 15)
+    @ApiModelProperty(value = "报工任务号")
+    private java.lang.String taskno;
+    /**填报部门*/
+    @Excel(name = "填报部门", width = 15)
+    @ApiModelProperty(value = "填报部门")
+    private java.lang.String userdept;
+    /**当日用时(h)*/
+    @Excel(name = "当日用时(h)", width = 15)
+    @ApiModelProperty(value = "当日用时(h)")
+    private java.math.BigDecimal workhour;
+
+}