diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java new file mode 100644 index 00000000..137d2104 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressInfoController.java @@ -0,0 +1,115 @@ +package com.kms.build.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.build.domain.BsSgcJsjdBuiProgressInfo; +import com.kms.build.service.BsSgcJsjdBuiProgressInfoService; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; + + + +/** + * 进度填报详情Controller + * + * @author kmsF + * @date 2024-04-2 + */ +@RestController +@RequestMapping("/progress/info") +@Api(tags = "进度填报详情") +public class BsSgcJsjdBuiProgressInfoController extends BaseController +{ + @Autowired + private BsSgcJsjdBuiProgressInfoService bsSgcJsjdBuiProgressInfoService; + + /** + * 查询进度填报详情列表 + */ + @PostMapping("/list") + @ApiOperation("进度填报详情列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcJsjdBuiProgressInfoService.selectPage(sp); + } + + /** + * 导出进度填报详情列表 + */ + @Log(title = "进度填报详情导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("进度填报详情导出") + public AjaxResult export(@RequestBody BsSgcJsjdBuiProgressInfo bsSgcJsjdBuiProgressInfo) + { + List list = bsSgcJsjdBuiProgressInfoService.listByIds(bsSgcJsjdBuiProgressInfo.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcJsjdBuiProgressInfo.class); + return util.exportExcel(list, "info"); + } + + /** + * 获取进度填报详情详细信息 + */ + @ApiOperation(" 进度填报详情详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdBuiProgressInfoService.getById(id)); + } + + /** + * 新增进度填报详情 + */ + @Log(title = "进度填报详情新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("进度填报详情新增") + public AjaxResult add(@RequestBody BsSgcJsjdBuiProgressInfo bsSgcJsjdBuiProgressInfo) + { + BaseEntityUtils.preInsert(bsSgcJsjdBuiProgressInfo); + return toAjax(bsSgcJsjdBuiProgressInfoService.save(bsSgcJsjdBuiProgressInfo)); + } + + /** + * 修改进度填报详情 + */ + @ApiOperation("进度填报详情修改") + @Log(title = "进度填报详情修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcJsjdBuiProgressInfo bsSgcJsjdBuiProgressInfo) + { + return toAjax(bsSgcJsjdBuiProgressInfoService.updateById(bsSgcJsjdBuiProgressInfo)); + } + + /** + * 删除进度填报详情 + */ + @ApiOperation("进度填报详情删除") + @Log(title = "进度填报详情删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcJsjdBuiProgressInfoService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressPlanController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressPlanController.java new file mode 100644 index 00000000..ce773029 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiProgressPlanController.java @@ -0,0 +1,114 @@ +package com.kms.build.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.build.domain.BsSgcJsjdBuiProgressPlan; +import com.kms.build.service.BsSgcJsjdBuiProgressPlanService; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; + + +/** + * 进度计划Controller + * + * @author kms + * @date 2024-04-28 + */ +@RestController +@RequestMapping("/progress/plan") +@Api(tags = "") +public class BsSgcJsjdBuiProgressPlanController extends BaseController +{ + @Autowired + private BsSgcJsjdBuiProgressPlanService bsSgcJsjdBuiProgressPlanService; + + /** + * 查询进度计划列表 + */ + @PostMapping("/list") + @ApiOperation("进度计划列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcJsjdBuiProgressPlanService.selectPage(sp); + } + + /** + * 导出进度计划列表 + */ + @Log(title = "进度计划导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("进度计划导出") + public AjaxResult export(@RequestBody BsSgcJsjdBuiProgressPlan bsSgcJsjdBuiProgressPlan) + { + List list = bsSgcJsjdBuiProgressPlanService.listByIds(bsSgcJsjdBuiProgressPlan.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcJsjdBuiProgressPlan.class); + return util.exportExcel(list, "plan"); + } + + /** + * 获取进度计划详细信息 + */ + @ApiOperation(" 进度计划详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdBuiProgressPlanService.getById(id)); + } + + /** + * 新增进度计划 + */ + @Log(title = "进度计划新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("进度计划新增") + public AjaxResult add(@RequestBody BsSgcJsjdBuiProgressPlan bsSgcJsjdBuiProgressPlan) + { + BaseEntityUtils.preInsert(bsSgcJsjdBuiProgressPlan); + return toAjax(bsSgcJsjdBuiProgressPlanService.save(bsSgcJsjdBuiProgressPlan)); + } + + /** + * 修改进度计划 + */ + @ApiOperation("进度计划修改") + @Log(title = "进度计划修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcJsjdBuiProgressPlan bsSgcJsjdBuiProgressPlan) + { + return toAjax(bsSgcJsjdBuiProgressPlanService.updateById(bsSgcJsjdBuiProgressPlan)); + } + + /** + * 删除进度计划 + */ + @ApiOperation("进度计划删除") + @Log(title = "进度计划删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcJsjdBuiProgressPlanService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java new file mode 100644 index 00000000..bbfaad90 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressInfo.java @@ -0,0 +1,87 @@ +package com.kms.build.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 【请填写功能名称】对象 bs_sgc_jsjd_bui_progress_info + * + * @author kms + * @date 2024-04-28 + */ +@TableName("bs_sgc_jsjd_bui_progress_info") +@Data +@ApiModel("【请填写功能名称】") +public class BsSgcJsjdBuiProgressInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 项目编码 */ + @Excel(name = "项目编码") + @ApiModelProperty("项目编码") + private String proCode; + + /** 项目编号 */ + @Excel(name = "项目编号") + @ApiModelProperty("项目编号") + private String proNo; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 更新人 */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") + private String updateUid; + + /** 本期时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "本期时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("本期时间") + private Date stageTime; + + /** 建设状态 */ + @Excel(name = "建设状态") + @ApiModelProperty("建设状态") + private String constructionStatus; + + /** 完成投资 */ + @Excel(name = "完成投资") + @ApiModelProperty("完成投资") + private BigDecimal completeInvestment; + + /** 存在问题 */ + @Excel(name = "存在问题") + @ApiModelProperty("存在问题") + private String existProblem; + + /** 进度描述 */ + @Excel(name = "进度描述") + @ApiModelProperty("进度描述") + private String descriptionProgress; + + /** 现场图片 */ + @Excel(name = "现场图片") + @ApiModelProperty("现场图片") + private String sceneImages; + + /** 进度计划id */ + @Excel(name = "进度计划id") + @ApiModelProperty("进度计划id") + private String progressPlanId; + +} diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java new file mode 100644 index 00000000..0dc6554b --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java @@ -0,0 +1,172 @@ +package com.kms.build.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 【请填写功能名称】对象 bs_sgc_jsjd_bui_progress_plan + * + * @author kms + * @date 2024-04-28 + */ +@TableName("bs_sgc_jsjd_bui_progress_plan") +@Data +@ApiModel("【请填写功能名称】") +public class BsSgcJsjdBuiProgressPlan extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 项目编码 */ + @Excel(name = "项目编码") + @ApiModelProperty("项目编码") + private String proCode; + + /** 项目编号 */ + @Excel(name = "项目编号") + @ApiModelProperty("项目编号") + private String proNo; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 更新人 */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") + private String updateUid; + + /** 项目名称 */ + @Excel(name = "项目名称") + @ApiModelProperty("项目名称") + private String projectName; + + /** 类型 */ + @Excel(name = "类型") + @ApiModelProperty("类型") + private String planName; + + /** 1-3月计划投资 */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p1To3; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p4; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p5; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p6; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p7; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p8; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p9; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p10; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p11; + + /** $column.columnComment */ + @Excel(name = "1-3月计划投资") + @ApiModelProperty("1-3月计划投资") + private BigDecimal p12; + + /** 年份 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "年份", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("年份") + private Date planYear; + + /** 计划状态 */ + @Excel(name = "计划状态") + @ApiModelProperty("计划状态") + private String planStatus; + + /** 1-3月实际投资 */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v1To3; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v4; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v5; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v6; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v7; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v8; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v9; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v10; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v11; + + /** $column.columnComment */ + @Excel(name = "1-3月实际投资") + @ApiModelProperty("1-3月实际投资") + private BigDecimal v12; + +} diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index 9fb2f00f..94f4477f 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -258,4 +258,6 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity private String allLatitudeLongitudeList; + private String isApproval; + } diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java new file mode 100644 index 00000000..8b892246 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressInfoMapper.java @@ -0,0 +1,17 @@ +package com.kms.build.mapper; + +import com.kms.build.domain.BsSgcJsjdBuiProgressInfo; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-28 + */ +@Repository +public interface BsSgcJsjdBuiProgressInfoMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressPlanMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressPlanMapper.java new file mode 100644 index 00000000..9a6689cd --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcJsjdBuiProgressPlanMapper.java @@ -0,0 +1,17 @@ +package com.kms.build.mapper; + +import com.kms.build.domain.BsSgcJsjdBuiProgressPlan; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-28 + */ +@Repository +public interface BsSgcJsjdBuiProgressPlanMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java new file mode 100644 index 00000000..8afd3db4 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressInfoService.java @@ -0,0 +1,17 @@ +package com.kms.build.service; + +import com.kms.build.domain.BsSgcJsjdBuiProgressInfo; +import com.kms.build.mapper.BsSgcJsjdBuiProgressInfoMapper; +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; + +/** + * 【请填写功能名称】Service接口 + * + * @author kms + * @date 2024-04-28 + */ +@Service +public class BsSgcJsjdBuiProgressInfoService extends BaseService{ + +} diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressPlanService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressPlanService.java new file mode 100644 index 00000000..0112cec3 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiProgressPlanService.java @@ -0,0 +1,18 @@ +package com.kms.build.service; + +import com.kms.build.domain.BsSgcJsjdBuiProgressPlan; +import com.kms.build.mapper.BsSgcJsjdBuiProgressPlanMapper; +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; + + +/** + * 【请填写功能名称】Service接口 + * + * @author kms + * @date 2024-04-28 + */ +@Service +public class BsSgcJsjdBuiProgressPlanService extends BaseService{ + +}