diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 0f6f4a6a2..a5292221a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -976,4 +976,26 @@ ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; -- 增加角色，countryCard管理员。 2022-08-31 -INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); \ No newline at end of file +INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); + +-- 清单确认，拒绝原因表 2022-09-01 +CREATE TABLE `laws_weilai`.`project_laws_inventory_reject_cause` ( + `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL , + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人' , + `create_time` datetime NULL DEFAULT NULL COMMENT '创建日期' , + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人' , + `update_time` datetime NULL DEFAULT NULL COMMENT '更新日期' , + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门' , + `reject_user_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝人id' , + `reject_time` datetime NULL DEFAULT NULL COMMENT '拒绝时间' , + `reject_cause` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝原因' , + `project_laws_inventory_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规清单id' , + `reject_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '拒绝类型' , + PRIMARY KEY (`id`) +) +ENGINE=InnoDB +DEFAULT CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci +COMMENT='清单确认-拒绝原因表' +ROW_FORMAT=DYNAMIC +; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java new file mode 100644 index 000000000..4b2d19ce5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryRejectCauseEOController.java @@ -0,0 +1,170 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; +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 com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +@Api(tags="清单确认-拒绝原因表") +@RestController +@RequestMapping("/project/projectLawsInventoryRejectCauseEO") +@Slf4j +public class ProjectLawsInventoryRejectCauseEOController extends JeroController { + @Autowired + private IProjectLawsInventoryRejectCauseEOService projectLawsInventoryRejectCauseEOService; + + /** + * 分页列表查询 + * + * @param projectLawsInventoryRejectCauseEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-分页列表查询") + @ApiOperation(value="清单确认-拒绝原因表-分页列表查询", notes="清单确认-拒绝原因表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryRejectCauseEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectLawsInventoryRejectCauseEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-列表查询") + @ApiOperation(value="清单确认-拒绝原因表-列表查询", notes="清单确认-拒绝原因表-列表查询") + @GetMapping(value = "/list") + public Result> queryList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO,HttpServletRequest req) { + List list = projectLawsInventoryRejectCauseEOService.queryList(projectLawsInventoryRejectCauseEO,req); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-添加") + @ApiOperation(value="清单确认-拒绝原因表-添加", notes="清单确认-拒绝原因表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + projectLawsInventoryRejectCauseEOService.add(projectLawsInventoryRejectCauseEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-编辑") + @ApiOperation(value="清单确认-拒绝原因表-编辑", notes="清单确认-拒绝原因表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + projectLawsInventoryRejectCauseEOService.editById(projectLawsInventoryRejectCauseEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-通过id删除") + @ApiOperation(value="清单确认-拒绝原因表-通过id删除", notes="清单确认-拒绝原因表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectLawsInventoryRejectCauseEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-批量删除") + @ApiOperation(value="清单确认-拒绝原因表-批量删除", notes="清单确认-拒绝原因表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectLawsInventoryRejectCauseEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "清单确认-拒绝原因表-通过id查询") + @ApiOperation(value="清单确认-拒绝原因表-通过id查询", notes="清单确认-拒绝原因表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO = projectLawsInventoryRejectCauseEOService.queryById(id); + if(projectLawsInventoryRejectCauseEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectLawsInventoryRejectCauseEO); + } + + /** + * 导出excel + * + * @param request + * @param projectLawsInventoryRejectCauseEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + return super.exportXls(request, projectLawsInventoryRejectCauseEO, ProjectLawsInventoryRejectCauseEO.class, "清单确认-拒绝原因表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectLawsInventoryRejectCauseEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java new file mode 100644 index 000000000..8b7304ff7 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryRejectCauseEO.java @@ -0,0 +1,91 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +@Data +@TableName("project_laws_inventory_reject_cause") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_laws_inventory_reject_cause对象", description="清单确认-拒绝原因表") +public class ProjectLawsInventoryRejectCauseEO 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; + + /**拒绝人id*/ + @Excel(name = "拒绝人id", width = 15) + @ApiModelProperty(value = "拒绝人id") + private java.lang.String rejectUserId; + + /**拒绝时间*/ + @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 rejectTime; + + /**拒绝原因*/ + @Excel(name = "拒绝原因", width = 15) + @ApiModelProperty(value = "拒绝原因") + private java.lang.String rejectCause; + + /**法规清单id*/ + @Excel(name = "法规清单id", width = 15) + @ApiModelProperty(value = "法规清单id") + private java.lang.String projectLawsInventoryId; + + /**拒绝类型*/ + @Excel(name = "拒绝类型", width = 15) + @ApiModelProperty(value = "拒绝类型") + private java.lang.String rejectType; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java new file mode 100644 index 000000000..836720310 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLawsInventoryRejectCauseEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +public interface ProjectLawsInventoryRejectCauseEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml new file mode 100644 index 000000000..c34c458e5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryRejectCauseEOMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java new file mode 100644 index 000000000..f112fe1a4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryRejectCauseEOService.java @@ -0,0 +1,63 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +public interface IProjectLawsInventoryRejectCauseEOService extends IService { + + /** + * 保存 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + void add(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO); + + /** + * 更新 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + void editById(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectLawsInventoryRejectCauseEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO, HttpServletRequest req); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java new file mode 100644 index 000000000..539ecbb8c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryRejectCauseEOServiceImpl.java @@ -0,0 +1,95 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLawsInventoryRejectCauseEO; +import com.jero.modules.project.mapper.ProjectLawsInventoryRejectCauseEOMapper; +import com.jero.modules.project.service.IProjectLawsInventoryRejectCauseEOService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Date; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Description: 清单确认-拒绝原因表 + * @Author: jero-boot + * @Date: 2022-09-01 + * @Version: V1.0 + */ +@Service +public class ProjectLawsInventoryRejectCauseEOServiceImpl extends ServiceImpl implements IProjectLawsInventoryRejectCauseEOService { + + /** + * 保存 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @Override + public void add(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + Date now = new Date(); + projectLawsInventoryRejectCauseEO.setCreateTime(now); + projectLawsInventoryRejectCauseEO.setUpdateTime(now); + save(projectLawsInventoryRejectCauseEO); + } + + /** + * 更新 + * + * @param projectLawsInventoryRejectCauseEO + * @return + */ + @Override + public void editById(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO) { + Date now = new Date(); + projectLawsInventoryRejectCauseEO.setUpdateTime(now); + saveOrUpdate(projectLawsInventoryRejectCauseEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ProjectLawsInventoryRejectCauseEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(ProjectLawsInventoryRejectCauseEO projectLawsInventoryRejectCauseEO, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryRejectCauseEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; + } +}