Commit d79e6391 authored by 施翔轲's avatar 施翔轲

咨询机构管理:咨询机构自定义表单相关修改

parent c9e4e619
...@@ -168,6 +168,7 @@ tenant: ...@@ -168,6 +168,7 @@ tenant:
- d_subcontract - d_subcontract
- advisory_body - advisory_body
- advisory_body_project - advisory_body_project
- advisory_body_custom_form
- dim_area - dim_area
- biz_dict_data - biz_dict_data
......
...@@ -5,19 +5,19 @@ import com.dsk.common.core.controller.BaseController; ...@@ -5,19 +5,19 @@ import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.PageQuery; import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
import com.dsk.cscec.domain.bo.*; import com.dsk.cscec.domain.bo.*;
import com.dsk.cscec.domain.vo.*; import com.dsk.cscec.domain.vo.*;
import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
import com.dsk.cscec.service.AdvisoryBodyProjectService; import com.dsk.cscec.service.AdvisoryBodyProjectService;
import com.dsk.cscec.service.AdvisoryBodyService; import com.dsk.cscec.service.AdvisoryBodyService;
import com.dsk.cscec.service.IDProjectService; import com.dsk.cscec.service.IDProjectService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* 咨询机构管理控制层 * 咨询机构管理控制层
...@@ -35,6 +35,8 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -35,6 +35,8 @@ public class AdvisoryBodyManageController extends BaseController {
private AdvisoryBodyService advisoryBodyService; private AdvisoryBodyService advisoryBodyService;
@Resource @Resource
private AdvisoryBodyProjectService advisoryBodyProjectService; private AdvisoryBodyProjectService advisoryBodyProjectService;
@Resource
private AdvisoryBodyCustomFormService advisoryBodyCustomFormService;
/** /**
* 获取所有项目列表数据 * 获取所有项目列表数据
...@@ -83,4 +85,28 @@ public class AdvisoryBodyManageController extends BaseController { ...@@ -83,4 +85,28 @@ public class AdvisoryBodyManageController extends BaseController {
public R<Void> addAdvisoryBody(AddAdvisoryBodyBo addAdvisoryBodyBo) { public R<Void> addAdvisoryBody(AddAdvisoryBodyBo addAdvisoryBodyBo) {
return toAjax(advisoryBodyService.addAdvisoryBody(addAdvisoryBodyBo)); return toAjax(advisoryBodyService.addAdvisoryBody(addAdvisoryBodyBo));
} }
/**
* 获取咨询机构自定义表单
*/
@GetMapping("/getAdvisoryBodyCustomForm/{projectKey}")
public R<AdvisoryBodyCustomForm> getAdvisoryBodyCustomForm(@NotNull(message = "项目主键不能为空") @PathVariable Long projectKey) {
return R.ok(advisoryBodyCustomFormService.getById(projectKey));
}
/**
* 新增咨询机构自定义表单
*/
@PostMapping("/addAdvisoryBodyCustomForm")
public R<Void> addAdvisoryBodyCustomForm(AdvisoryBodyCustomForm advisoryBodyCustomForm) {
return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm));
}
/**
* 更新咨询机构自定义表单
*/
@PutMapping("/updateAdvisoryBodyCustomForm")
public R<Void> updateAdvisoryBodyCustomForm(AdvisoryBodyCustomForm advisoryBodyCustomForm) {
return toAjax(advisoryBodyCustomFormService.updateById(advisoryBodyCustomForm));
}
} }
\ No newline at end of file
package com.dsk.cscec.entity; package com.dsk.cscec.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.dsk.common.core.domain.BaseEntity; import com.dsk.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
/** /**
...@@ -15,17 +18,21 @@ import java.io.Serializable; ...@@ -15,17 +18,21 @@ import java.io.Serializable;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class AdvisoryBodyCustomForm extends BaseEntity implements Serializable { public class AdvisoryBodyCustomForm extends BaseEntity implements Serializable {
private static final long serialVersionUID = 385050456847400745L; private static final long serialVersionUID = 1L;
/** /**
* 项目主键 * 项目主键
*/ */
@TableId(value = "project_key")
@NotNull(message = "项目主键不能为空")
private Long projectKey; private Long projectKey;
/** /**
* 咨询机构ID * 咨询机构ID
*/ */
@NotNull(message = "咨询机构ID不能为空")
private Long advisoryBodyId; private Long advisoryBodyId;
/** /**
* json数据 * json数据
*/ */
@NotBlank(message = "json数据不能为空")
private String jsonData; private String jsonData;
} }
package com.dsk.cscec.mapper; package com.dsk.cscec.mapper;
import com.dsk.cscec.entity.AdvisoryBodyCustomForm; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
import org.springframework.data.domain.Pageable;
import java.util.List;
/** /**
* 咨询机构自定义表单(AdvisoryBodyCustomForm)表数据库访问层 * 咨询机构自定义表单(AdvisoryBodyCustomForm)表数据库访问层
...@@ -11,7 +9,7 @@ import java.util.List; ...@@ -11,7 +9,7 @@ import java.util.List;
* @author sxk * @author sxk
* @since 2023-12-20 16:39:37 * @since 2023-12-20 16:39:37
*/ */
public interface AdvisoryBodyCustomFormMapper { public interface AdvisoryBodyCustomFormMapper extends BaseMapper<AdvisoryBodyCustomForm> {
} }
package com.dsk.cscec.service; package com.dsk.cscec.service;
import com.dsk.cscec.entity.AdvisoryBodyCustomForm; import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.data.domain.Page; import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
import org.springframework.data.domain.PageRequest;
/** /**
* 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务接口 * 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务接口
* *
* @author sxk * @author makejava
* @since 2023-12-20 16:39:44 * @since 2023-12-20 17:33:31
*/ */
public interface AdvisoryBodyCustomFormService { public interface AdvisoryBodyCustomFormService extends IService<AdvisoryBodyCustomForm> {
} }
package com.dsk.cscec.service.impl; package com.dsk.cscec.service.impl;
import com.dsk.cscec.entity.AdvisoryBodyCustomForm; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
import com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper; import com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper;
import com.dsk.cscec.service.AdvisoryBodyCustomFormService; import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -14,12 +12,10 @@ import javax.annotation.Resource; ...@@ -14,12 +12,10 @@ import javax.annotation.Resource;
* 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务实现类 * 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务实现类
* *
* @author sxk * @author sxk
* @since 2023-12-20 16:39:44 * @since 2023-12-20 17:33:31
*/ */
@Service("advisoryBodyCustomFormService") @Service("advisoryBodyCustomFormService")
public class AdvisoryBodyCustomFormServiceImpl implements AdvisoryBodyCustomFormService { public class AdvisoryBodyCustomFormServiceImpl extends ServiceImpl<AdvisoryBodyCustomFormMapper, AdvisoryBodyCustomForm> implements AdvisoryBodyCustomFormService {
@Resource @Resource
private AdvisoryBodyCustomFormMapper advisoryBodyCustomFormMapper; private AdvisoryBodyCustomFormMapper baseMapper;
} }
<?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="com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper">
</mapper>
<?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="com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper">
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment