-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
搜索
重置
@@ -175,7 +60,7 @@
v-hasPermi="['system:info:export']"
>导出
-
+
@@ -193,18 +78,6 @@
-
-
-
- {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
-
-
-
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
+
@@ -317,7 +190,9 @@ export default {
pageSize: 10,
ids:null,
data:{
- projectName: null, projectType: null, overview: null, compilingUnit: null, startYear: null, endYear: null, amount: null, backgroundInfo: null, taskInfo: null, implementationInfo: null, contractManagement: null, createUid: null, createTime: null, updateUid: null, updateTime: null }
+ projectName: null,
+ projectType: null,
+ }
},
// 表单参数
@@ -372,24 +247,24 @@ export default {
this.queryParams = {
pageNum: 1,
pageSize: 10,
- data:{
- id: null,
- projectName: null,
- projectType: null,
- overview: null,
- compilingUnit: null,
- startYear: null,
- endYear: null,
- amount: null,
- backgroundInfo: null,
- taskInfo: null,
- implementationInfo: null,
- contractManagement: null,
- createUid: null,
- createTime: null,
- updateUid: null,
- updateTime: null
- }
+ data:{
+ id: null,
+ projectName: null,
+ projectType: null,
+ overview: null,
+ compilingUnit: null,
+ startYear: null,
+ endYear: null,
+ amount: null,
+ backgroundInfo: null,
+ taskInfo: null,
+ implementationInfo: null,
+ contractManagement: null,
+ createUid: null,
+ createTime: null,
+ updateUid: null,
+ updateTime: null
+ }
};
this.resetForm("form");
},
@@ -453,18 +328,18 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
if(ids){
- this.$confirm("是否删除选中的数据？", "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delInfo(ids);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- }).catch(function() {});
+ this.$confirm("是否删除选中的数据？", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(function() {
+ return delInfo(ids);
+ }).then(() => {
+ this.getList();
+ this.msgSuccess("删除成功");
+ }).catch(function() {});
}else{
- this.$message.warning("请选择要删除的数据！！");
+ this.$message.warning("请选择要删除的数据！！");
}
},
@@ -477,15 +352,15 @@ export default {
queryParams.ids = this.ids;
}
this.$confirm(message, "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return exportInfo(queryParams);
- }).then(response => {
- this.downloadFile(response, true, response.msg);
- // this.download(response.msg);
- }).catch(function() {});
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(function() {
+ return exportInfo(queryParams);
+ }).then(response => {
+ this.downloadFile(response, true, response.msg);
+ // this.download(response.msg);
+ }).catch(function() {});
}
}
};
diff --git a/jwtech-system/src/main/java/com/kms/system/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlystage/controller/SpecialProjectInfoController.java
similarity index 62%
rename from jwtech-system/src/main/java/com/kms/system/controller/SpecialProjectInfoController.java
rename to jwtech-system/src/main/java/com/kms/earlystage/controller/SpecialProjectInfoController.java
index bb0e8066..6a50e5f1 100644
--- a/jwtech-system/src/main/java/com/kms/system/controller/SpecialProjectInfoController.java
+++ b/jwtech-system/src/main/java/com/kms/earlystage/controller/SpecialProjectInfoController.java
@@ -1,4 +1,4 @@
-package com.kms.system.controller;
+package com.kms.earlystage.controller;
import java.util.Arrays;
import java.util.List;
@@ -9,6 +9,8 @@ import com.jianwei.common.utils.poi.ExcelUtil;
import com.kms.common.utils.BaseEntityUtils;
+import com.kms.earlystage.domain.SpecialProjectInfo;
+import com.kms.earlystage.service.SpecialProjectInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,69 +24,65 @@ 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;
-import com.kms.system.domain.SpecialProjectInfo;
-import com.kms.system.service.SpecialProjectInfoService;
/**
- * 专题项目基本信息Controller
+ * 专题项目前期背景信息Controller
*
* @author kms
- * @date 2023-08-28
+ * @date 2023-09-08
*/
@RestController
-@RequestMapping("/system/special")
-@Api(tags = "专题项目基本信息")
+@RequestMapping("/earlyStage/projectInfo")
+@Api(tags = "专题项目前期背景信息")
public class SpecialProjectInfoController extends BaseController
{
@Autowired
private SpecialProjectInfoService specialProjectInfoService;
/**
- * 查询专题项目基本信息列表
+ * 查询专题项目前期背景信息列表
*/
@PostMapping("/list")
- @ApiOperation("专题项目基本信息列表")
+ @ApiOperation("专题项目前期背景信息列表")
public IPage list(@RequestBody SearchParam sp)
{
-
return specialProjectInfoService.selectPage(sp);
}
/**
- * 导出专题项目基本信息列表
+ * 导出专题项目前期背景信息列表
*/
- @Log(title = "专题项目基本信息导出", businessType = BusinessType.EXPORT)
+ @Log(title = "专题项目前期背景信息导出", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("专题项目基本信息导出")
+ @ApiOperation("专题项目前期背景信息导出")
public AjaxResult export(@RequestBody SpecialProjectInfo specialProjectInfo)
{
List list = specialProjectInfoService.listByIds(specialProjectInfo.getIds());
ExcelUtil util = new ExcelUtil<>(SpecialProjectInfo.class);
- return util.exportExcel(list, "info");
+ return util.exportExcel(list, "projectinfo");
}
/**
- * 获取专题项目基本信息详细信息
+ * 获取专题项目前期背景信息详细信息
*/
- @ApiOperation(" 专题项目基本信息详情")
+ @ApiOperation(" 专题项目前期背景信息详情")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+ public AjaxResult getInfo(@PathVariable("id") String id)
{
return AjaxResult.success(specialProjectInfoService.getById(id));
}
/**
- * 新增专题项目基本信息
+ * 新增专题项目前期背景信息
*/
- @Log(title = "专题项目基本信息新增", businessType = BusinessType.INSERT)
+ @Log(title = "专题项目前期背景信息新增", businessType = BusinessType.INSERT)
@PostMapping
- @ApiOperation("专题项目基本信息新增")
+ @ApiOperation("专题项目前期背景信息新增")
public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo)
{
BaseEntityUtils.preInsert(specialProjectInfo);
@@ -92,10 +90,10 @@ public class SpecialProjectInfoController extends BaseController
}
/**
- * 修改专题项目基本信息
+ * 修改专题项目前期背景信息
*/
- @ApiOperation("专题项目基本信息修改")
- @Log(title = "专题项目基本信息修改", businessType = BusinessType.UPDATE)
+ @ApiOperation("专题项目前期背景信息修改")
+ @Log(title = "专题项目前期背景信息修改", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SpecialProjectInfo specialProjectInfo)
{
@@ -103,12 +101,12 @@ public class SpecialProjectInfoController extends BaseController
}
/**
- * 删除专题项目基本信息
+ * 删除专题项目前期背景信息
*/
- @ApiOperation("专题项目基本信息删除")
- @Log(title = "专题项目基本信息删除", businessType = BusinessType.DELETE)
+ @ApiOperation("专题项目前期背景信息删除")
+ @Log(title = "专题项目前期背景信息删除", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
+ public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(specialProjectInfoService.removeByIds(Arrays.asList(ids)));
}
diff --git a/jwtech-system/src/main/java/com/kms/earlystage/domain/SpecialProjectInfo.java b/jwtech-system/src/main/java/com/kms/earlystage/domain/SpecialProjectInfo.java
new file mode 100644
index 00000000..667cd1b1
--- /dev/null
+++ b/jwtech-system/src/main/java/com/kms/earlystage/domain/SpecialProjectInfo.java
@@ -0,0 +1,95 @@
+package com.kms.earlystage.domain;
+
+import java.math.BigDecimal;
+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_slgc_qqjd_spe_pro_info
+ *
+ * @author kms
+ * @date 2023-09-08
+ */
+@TableName("bs_slgc_qqjd_spe_pro_info")
+@Data
+@ApiModel("专题项目前期背景信息")
+public class SpecialProjectInfo extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 专题项目名称 */
+ @Excel(name = "专题项目名称")
+ @ApiModelProperty("专题项目名称")
+ private String projectName;
+
+ /** 规划类型（0：国家战略规划，1：国家发展规划...） */
+ @Excel(name = "规划类型", readConverterExp = "0=：国家战略规划，1：国家发展规划...")
+ @ApiModelProperty("规划类型")
+ private String projectType;
+
+ /** 规划概况 */
+ @ApiModelProperty("规划类型")
+ private String overview;
+
+ /** 规划编制单位 */
+ @Excel(name = "规划编制单位")
+ @ApiModelProperty("规划编制单位")
+ private String compilingUnit;
+
+ /** 规划水平年 */
+ @Excel(name = "规划水平年")
+ @ApiModelProperty("规划水平年")
+ private Integer startYear;
+
+ /** 规划目标年 */
+ @Excel(name = "规划目标年")
+ @ApiModelProperty("规划目标年")
+ private Integer endYear;
+
+ /** 规划金额 */
+ @Excel(name = "规划金额")
+ @ApiModelProperty("规划金额")
+ private BigDecimal amount;
+
+ /** 规划编制单位性质 */
+ @ApiModelProperty("规划金额")
+ private String compilingUnitNature;
+
+ /** 规划编制单位地址 */
+ @ApiModelProperty("规划金额")
+ private String compilingUnitAddress;
+
+ /** 规划编制法人代表 */
+ @ApiModelProperty("规划金额")
+ private String compilingUnitLegalPerson;
+
+ /** 规划报告 */
+ @ApiModelProperty("规划金额")
+ private String projectReport;
+
+ /** 项目编号 */
+ @ApiModelProperty("规划金额")
+ private String proNo;
+
+ /** 创建人 */
+ @ApiModelProperty("规划金额")
+ private String createUid;
+
+ /** 更新人 */
+ @ApiModelProperty("规划金额")
+ private String updateUid;
+
+ /** 数源部门 */
+ @ApiModelProperty("规划金额")
+ private String owerDept;
+
+}
diff --git a/jwtech-system/src/main/java/com/kms/system/mapper/SpecialProjectInfoMapper.java b/jwtech-system/src/main/java/com/kms/earlystage/mapper/SpecialProjectInfoMapper.java
similarity index 60%
rename from jwtech-system/src/main/java/com/kms/system/mapper/SpecialProjectInfoMapper.java
rename to jwtech-system/src/main/java/com/kms/earlystage/mapper/SpecialProjectInfoMapper.java
index cf375cc9..7f9e5477 100644
--- a/jwtech-system/src/main/java/com/kms/system/mapper/SpecialProjectInfoMapper.java
+++ b/jwtech-system/src/main/java/com/kms/earlystage/mapper/SpecialProjectInfoMapper.java
@@ -1,14 +1,14 @@
-package com.kms.system.mapper;
+package com.kms.earlystage.mapper;
+import com.kms.earlystage.domain.SpecialProjectInfo;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.kms.system.domain.SpecialProjectInfo;
/**
- * 专题项目基本信息Mapper接口
+ * 专题项目前期背景信息Mapper接口
*
* @author kms
- * @date 2023-08-28
+ * @date 2023-09-08
*/
@Repository
public interface SpecialProjectInfoMapper extends BaseMapper {
diff --git a/jwtech-system/src/main/java/com/kms/earlystage/service/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/earlystage/service/SpecialProjectInfoService.java
new file mode 100644
index 00000000..cb85b3bf
--- /dev/null
+++ b/jwtech-system/src/main/java/com/kms/earlystage/service/SpecialProjectInfoService.java
@@ -0,0 +1,17 @@
+package com.kms.earlystage.service;
+
+import com.kms.earlystage.domain.SpecialProjectInfo;
+import com.kms.earlystage.mapper.SpecialProjectInfoMapper;
+import org.springframework.stereotype.Service;
+import com.jianwei.common.core.service.BaseService;
+
+/**
+ * 专题项目前期背景信息Service接口
+ *
+ * @author kms
+ * @date 2023-09-08
+ */
+@Service
+public class SpecialProjectInfoService extends BaseService{
+
+}
diff --git a/jwtech-system/src/main/java/com/kms/system/domain/SpecialProjectInfo.java b/jwtech-system/src/main/java/com/kms/system/domain/SpecialProjectInfo.java
deleted file mode 100644
index ad573934..00000000
--- a/jwtech-system/src/main/java/com/kms/system/domain/SpecialProjectInfo.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.kms.system.domain;
-
-import java.math.BigDecimal;
-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;
-
-/**
- * 专题项目基本信息对象 special_project_info
- *
- * @author kms
- * @date 2023-08-28
- */
-@TableName("special_project_info")
-@Data
-@ApiModel("专题项目基本信息")
-public class SpecialProjectInfo extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
-
- /** 专题项目名称 */
- @Excel(name = "专题项目名称")
- @ApiModelProperty("专题项目名称")
- private String projectName;
-
- /** 项目类型 */
- @Excel(name = "项目类型")
- @ApiModelProperty("项目类型")
- private String projectType;
-
- /** 概况 */
- @Excel(name = "概况")
- @ApiModelProperty("概况")
- private String overview;
-
- /** 编制单位 */
- @Excel(name = "编制单位")
- @ApiModelProperty("编制单位")
- private String compilingUnit;
-
- /** 水平年 */
- @Excel(name = "水平年")
- @ApiModelProperty("水平年")
- private Integer startYear;
-
- /** 目标年 */
- @Excel(name = "目标年")
- @ApiModelProperty("目标年")
- private Integer endYear;
-
- /** 金额 */
- @Excel(name = "金额")
- @ApiModelProperty("金额")
- private BigDecimal amount;
-
- /** 专题项目前期背景信息 */
- @Excel(name = "专题项目前期背景信息")
- @ApiModelProperty("专题项目前期背景信息")
- private String backgroundInfo;
-
- /** 专题项目报批任务书信息 */
- @Excel(name = "专题项目报批任务书信息")
- @ApiModelProperty("专题项目报批任务书信息")
- private String taskInfo;
-
- /** 专题项目实施信息 */
- @Excel(name = "专题项目实施信息")
- @ApiModelProperty("专题项目实施信息")
- private String implementationInfo;
-
- /** 专题项目合同管理 */
- @Excel(name = "专题项目合同管理")
- @ApiModelProperty("专题项目合同管理")
- private String contractManagement;
-
- /** 创建人 */
- @Excel(name = "创建人")
- @ApiModelProperty("创建人")
- private String createUid;
-
- /** 更新人 */
- @Excel(name = "更新人")
- @ApiModelProperty("更新人")
- private String updateUid;
-
-}
diff --git a/jwtech-system/src/main/java/com/kms/system/service/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/system/service/SpecialProjectInfoService.java
deleted file mode 100644
index 985ab39e..00000000
--- a/jwtech-system/src/main/java/com/kms/system/service/SpecialProjectInfoService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.kms.system.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jianwei.common.core.domain.SearchParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.jianwei.common.core.service.BaseService;
-import com.kms.system.mapper.SpecialProjectInfoMapper;
-import com.kms.system.domain.SpecialProjectInfo;
-
-/**
- * 专题项目基本信息Service接口
- *
- * @author kms
- * @date 2023-08-28
- */
-@Service
-public class SpecialProjectInfoService extends BaseService{
-
-
-}