diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/controller/YsDirectoryMaterialRelationController.java b/service-management-system/src/main/java/org/jeecg/modules/ai/controller/YsDirectoryMaterialRelationController.java new file mode 100644 index 0000000..b831ae1 --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/controller/YsDirectoryMaterialRelationController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.ai.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.ai.entity.YsDirectoryMaterialRelation; +import org.jeecg.modules.ai.service.IYsDirectoryMaterialRelationService; + +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 org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 预审事项和预审材料关系表 + * @Author: jeecg-boot + * @Date: 2023-12-08 + * @Version: V1.0 + */ +@Api(tags="预审事项和预审材料关系表") +@RestController +@RequestMapping("/ai/ysDirectoryMaterialRelation") +@Slf4j +public class YsDirectoryMaterialRelationController extends JeecgController { + @Autowired + private IYsDirectoryMaterialRelationService ysDirectoryMaterialRelationService; + + /** + * 分页列表查询 + * + * @param ysDirectoryMaterialRelation + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "预审事项和预审材料关系表-分页列表查询") + @ApiOperation(value="预审事项和预审材料关系表-分页列表查询", notes="预审事项和预审材料关系表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(YsDirectoryMaterialRelation ysDirectoryMaterialRelation, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ysDirectoryMaterialRelation, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = ysDirectoryMaterialRelationService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param ysDirectoryMaterialRelation + * @return + */ + @AutoLog(value = "预审事项和预审材料关系表-添加") + @ApiOperation(value="预审事项和预审材料关系表-添加", notes="预审事项和预审材料关系表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody YsDirectoryMaterialRelation ysDirectoryMaterialRelation) { + ysDirectoryMaterialRelationService.save(ysDirectoryMaterialRelation); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ysDirectoryMaterialRelation + * @return + */ + @AutoLog(value = "预审事项和预审材料关系表-编辑") + @ApiOperation(value="预审事项和预审材料关系表-编辑", notes="预审事项和预审材料关系表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody YsDirectoryMaterialRelation ysDirectoryMaterialRelation) { + ysDirectoryMaterialRelationService.updateById(ysDirectoryMaterialRelation); + 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) { + ysDirectoryMaterialRelationService.removeById(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.ysDirectoryMaterialRelationService.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 queryById(@RequestParam(name="id",required=true) String id) { + YsDirectoryMaterialRelation ysDirectoryMaterialRelation = ysDirectoryMaterialRelationService.getById(id); + if(ysDirectoryMaterialRelation==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(ysDirectoryMaterialRelation); + } + + /** + * 导出excel + * + * @param request + * @param ysDirectoryMaterialRelation + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YsDirectoryMaterialRelation ysDirectoryMaterialRelation) { + return super.exportXls(request, ysDirectoryMaterialRelation, YsDirectoryMaterialRelation.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, YsDirectoryMaterialRelation.class); + } + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/controller/YsEventTypeController.java b/service-management-system/src/main/java/org/jeecg/modules/ai/controller/YsEventTypeController.java new file mode 100644 index 0000000..a1fb78d --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/controller/YsEventTypeController.java @@ -0,0 +1,171 @@ +package org.jeecg.modules.ai.controller; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.ai.entity.YsEventType; +import org.jeecg.modules.ai.service.IYsEventTypeService; + +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 org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; + + /** + * @Description: 预审事项类型字典表 + * @Author: jeecg-boot + * @Date: 2023-12-08 + * @Version: V1.0 + */ +@Api(tags="预审事项类型字典表") +@RestController +@RequestMapping("/ai/ysEventType") +@Slf4j +public class YsEventTypeController extends JeecgController { + @Autowired + private IYsEventTypeService ysEventTypeService; + + /** + * 分页列表查询 + * + * @param ysEventType + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "预审事项类型字典表-分页列表查询") + @ApiOperation(value="预审事项类型字典表-分页列表查询", notes="预审事项类型字典表-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(YsEventType ysEventType, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(ysEventType, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = ysEventTypeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param ysEventType + * @return + */ + @AutoLog(value = "预审事项类型字典表-添加") + @ApiOperation(value="预审事项类型字典表-添加", notes="预审事项类型字典表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody YsEventType ysEventType) { + ysEventTypeService.save(ysEventType); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param ysEventType + * @return + */ + @AutoLog(value = "预审事项类型字典表-编辑") + @ApiOperation(value="预审事项类型字典表-编辑", notes="预审事项类型字典表-编辑") + @PutMapping(value = "/edit") + public Result edit(@RequestBody YsEventType ysEventType) { + ysEventTypeService.updateById(ysEventType); + 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) { + ysEventTypeService.removeById(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.ysEventTypeService.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 queryById(@RequestParam(name="id",required=true) String id) { + YsEventType ysEventType = ysEventTypeService.getById(id); + if(ysEventType==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(ysEventType); + } + + /** + * 导出excel + * + * @param request + * @param ysEventType + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, YsEventType ysEventType) { + return super.exportXls(request, ysEventType, YsEventType.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, YsEventType.class); + } + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectory.java b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectory.java index 9953fbb..28e5708 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectory.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectory.java @@ -105,7 +105,7 @@ public class YsDirectory implements Serializable { /**事件类型，来源字典表*/ @Excel(name = "事件类型，来源字典表", width = 15) @ApiModelProperty(value = "事件类型，来源字典表") - private java.lang.Integer evtentType; + private java.lang.Integer eventType; /**权利来源*/ @Excel(name = "权利来源", width = 15) @ApiModelProperty(value = "权利来源") diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectoryMaterialRelation.java b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectoryMaterialRelation.java new file mode 100644 index 0000000..4b184ad --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsDirectoryMaterialRelation.java @@ -0,0 +1,46 @@ +package org.jeecg.modules.ai.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 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-12-08 + * @Version: V1.0 + */ +@Data +@TableName("ys_directory_material_relation") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ys_directory_material_relation对象", description="预审事项和预审材料关系表") +public class YsDirectoryMaterialRelation implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**预审事项编码*/ + @Excel(name = "预审事项编码", width = 15) + @ApiModelProperty(value = "预审事项编码") + private java.lang.String eventCode; + /**预审材料编码*/ + @Excel(name = "预审材料编码", width = 15) + @ApiModelProperty(value = "预审材料编码") + private java.lang.String materialCode; +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsEventType.java b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsEventType.java new file mode 100644 index 0000000..3c9d17f --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/entity/YsEventType.java @@ -0,0 +1,42 @@ +package org.jeecg.modules.ai.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 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-12-08 + * @Version: V1.0 + */ +@Data +@TableName("ys_event_type") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="ys_event_type对象", description="预审事项类型字典表") +public class YsEventType implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**类型名称*/ + @Excel(name = "类型名称", width = 15) + @ApiModelProperty(value = "类型名称") + private java.lang.String name; +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/YsDirectoryMaterialRelationMapper.java b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/YsDirectoryMaterialRelationMapper.java new file mode 100644 index 0000000..798a094 --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/YsDirectoryMaterialRelationMapper.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.ai.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.ai.entity.YsDirectoryMaterialRelation; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 预审事项和预审材料关系表 + * @Author: jeecg-boot + * @Date: 2023-12-08 + * @Version: V1.0 + */ +public interface YsDirectoryMaterialRelationMapper extends BaseMapper { + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/YsEventTypeMapper.java b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/YsEventTypeMapper.java new file mode 100644 index 0000000..3b27147 --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/YsEventTypeMapper.java @@ -0,0 +1,18 @@ +package org.jeecg.modules.ai.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.ai.entity.YsEventType; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 预审事项类型字典表 + * @Author: jeecg-boot + * @Date: 2023-12-08 + * @Version: V1.0 + */ +public interface YsEventTypeMapper extends BaseMapper { + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreExaminationMattersMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreExaminationMattersMapper.xml index bffdc94..fedd79b 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreExaminationMattersMapper.xml +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreExaminationMattersMapper.xml @@ -14,11 +14,12 @@ + a.id,a.display_name,a.event_code,b.del_flag,a.author_status,c.depart_name,a.processing_type, - b.valid_status,a.report_template_url,a.print_template_url + b.valid_status,a.report_template_url,a.print_template_url,d.name as event_type_name @@ -28,7 +29,7 @@ and a.sys_org_code = #{query.orgCode,jdbcType=VARCHAR} and a.event_code = #{query.eventCode,jdbcType=VARCHAR} and a.processing_type = #{query.processingType,jdbcType=INTEGER} - and b.event_type = #{query.eventType,jdbcType=INTEGER} + and d.name = #{query.eventTypeName,jdbcType=INTEGER} and a.del_flag = #{query.delFlag,jdbcType=INTEGER} and a.author_status = #{query.authorStatus,jdbcType=INTEGER} @@ -39,6 +40,7 @@ from pre_examination_matters a left join ys_directory b on a.event_code = b.event_code left join sys_depart c on b.sys_org_code = c.depart_code + left join ys_event_type d on a.processing_type = d.id diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewMaterialMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewMaterialMapper.xml index 618c738..9561ae6 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewMaterialMapper.xml +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewMaterialMapper.xml @@ -6,7 +6,7 @@ - + @@ -14,11 +14,11 @@ - a.id,b.material_name,b.material_type,a.material_code,a.valid_status,c.depart_name,b.material_url,a.event_code + a.id,b.material_name,b.upload_material_type,c.depart_name,a.material_code,a.valid_status,b.material_url,d.event_code - a.id,b.material_name,b.material_type,a.material_code,a.valid_status,b.material_url,a.event_code + a.id,b.material_name,b.upload_material_type,a.material_code,a.valid_status,b.material_url,d.event_code @@ -28,22 +28,26 @@ and a.sys_org_code like CONCAT('%', #{query.orgCode}, '%') and b.material_type = #{query.materialType,jdbcType=INTEGER} and a.valid_status = #{query.validStatus,jdbcType=INTEGER} - and a.event_code = #{query.eventCode,jdbcType=INTEGER} + and d.event_code = #{query.eventCode,jdbcType=INTEGER} \ No newline at end of file diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsDetailMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsDetailMapper.xml index d321cfc..1213edc 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsDetailMapper.xml +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/PreReviewRecordsDetailMapper.xml @@ -11,7 +11,7 @@ - a.id,b.material_name,a.review_result,a.materia_url,a.create_time,a.material_code + a.id,b.material_name,d.review_result,a.materia_url,a.create_time,a.material_code @@ -19,7 +19,7 @@ and a.review_records_id = #{query.reviewRecordsId,jdbcType=VARCHAR} and a.event_code = #{query.eventCode,jdbcType=VARCHAR} and c.user_id = #{query.userId,jdbcType=VARCHAR} - and a.review_result = #{query.reviewResult,jdbcType=VARCHAR} + and d.review_result = #{query.reviewResult,jdbcType=VARCHAR} @@ -28,6 +28,7 @@ from pre_review_records_detail a left join ys_directory_material b on a.material_code = b.material_code left join pre_review_records c on a.review_records_id = c.id + left join pre_review_records_detail_template d on a.id = d.record_detail_id \ No newline at end of file diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMapper.xml index 5d69051..6343391 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMapper.xml +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMapper.xml @@ -8,14 +8,14 @@ - + - a.id,a.event_name,a.event_code,a.del_flag,a.evtent_type,b.depart_name,a.source_of_rights, - a.valid_status + a.id,a.event_name,a.event_code,a.del_flag,a.event_type,b.depart_name,a.source_of_rights, + a.valid_status,c.name as eventTypeName @@ -24,6 +24,7 @@ and a.sys_org_code = #{query.orgCode,jdbcType=VARCHAR} and b.id = #{query.orgId,jdbcType=VARCHAR} and b.event_type = #{query.eventType,jdbcType=INTEGER} + and c.name = #{query.eventTypeName,jdbcType=VARCHAR} and a.del_flag = #{query.delFlag,jdbcType=INTEGER} and a.valid_status = #{query.validStatus,jdbcType=INTEGER} @@ -33,6 +34,7 @@ select from ys_directory a left join sys_depart b on a.sys_org_code = b.depart_code + left join ys_event_type c on a.event_type = c.id diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMaterialRelationMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMaterialRelationMapper.xml new file mode 100644 index 0000000..251c3ef --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsDirectoryMaterialRelationMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsEventTypeMapper.xml b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsEventTypeMapper.xml new file mode 100644 index 0000000..cd1a130 --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/mapper/xml/YsEventTypeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreExaminationMattersQuery.java b/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreExaminationMattersQuery.java index 2eaed21..0213596 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreExaminationMattersQuery.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/qo/PreExaminationMattersQuery.java @@ -8,6 +8,7 @@ public class PreExaminationMattersQuery { private String ids; private String displayName; + private String eventTypeName; private String departName; private String orgCode; private String eventCode; diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/qo/YsDirectoryQuery.java b/service-management-system/src/main/java/org/jeecg/modules/ai/qo/YsDirectoryQuery.java index 3128c1b..633e174 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/qo/YsDirectoryQuery.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/qo/YsDirectoryQuery.java @@ -5,6 +5,7 @@ import lombok.Data; @Data public class YsDirectoryQuery { + private String eventTypeName; private String eventName; private String orgCode; private String orgId; diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialRelationService.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialRelationService.java new file mode 100644 index 0000000..adcae7f --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsDirectoryMaterialRelationService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.ai.service; + +import org.jeecg.modules.ai.entity.YsDirectoryMaterialRelation; + +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 预审事项和预审材料关系表 + * @Author: jeecg-boot + * @Date: 2023-12-08 + * @Version: V1.0 + */ +public interface IYsDirectoryMaterialRelationService extends IService { + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsEventTypeService.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsEventTypeService.java new file mode 100644 index 0000000..96f30d9 --- /dev/null +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/IYsEventTypeService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.ai.service; + +import org.jeecg.modules.ai.entity.YsEventType; + +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 预审事项类型字典表 + * @Author: jeecg-boot + * @Date: 2023-12-08 + * @Version: V1.0 + */ +public interface IYsEventTypeService extends IService { + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/PreExaminationMattersServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/PreExaminationMattersServiceImpl.java index 988d954..aec843d 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/PreExaminationMattersServiceImpl.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/PreExaminationMattersServiceImpl.java @@ -82,7 +82,7 @@ public class PreExaminationMattersServiceImpl extends ServiceImpl listYsDirectoryMaterial = iYsDirectoryMaterialService.listByIds(idsList); listYsDirectoryMaterial.stream().forEach(ysDirectoryMaterial -> { - YsDirectory ysDirectory = ysDirectoryMapper.selectById(ysDirectoryMaterial.getDirId()); +// YsDirectory ysDirectory = ysDirectoryMapper.selectById(ysDirectoryMaterial.getDirId()); //查询是否已经存在 LambdaQueryWrapper queryPreReviewMaterial = new LambdaQueryWrapper<>(); @@ -90,7 +90,7 @@ public class PreReviewMaterialServiceImpl extends ServiceImpl implements IYsDirectoryMaterialRelationService { + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/YsDirectoryMaterialServiceImpl.java b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/YsDirectoryMaterialServiceImpl.java index 118062a..955b379 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/YsDirectoryMaterialServiceImpl.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/service/impl/YsDirectoryMaterialServiceImpl.java @@ -40,9 +40,9 @@ public class YsDirectoryMaterialServiceImpl extends ServiceImpl implements IYsEventTypeService { + +} diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/vo/PreExaminationMattersVo.java b/service-management-system/src/main/java/org/jeecg/modules/ai/vo/PreExaminationMattersVo.java index 57980bc..980ddc2 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/vo/PreExaminationMattersVo.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/vo/PreExaminationMattersVo.java @@ -17,4 +17,5 @@ public class PreExaminationMattersVo { private Integer processingType; private String reportTemplateUrl; private String printTemplateUrl; + private String eventTypeName; } diff --git a/service-management-system/src/main/java/org/jeecg/modules/ai/vo/YsDirectoryVo.java b/service-management-system/src/main/java/org/jeecg/modules/ai/vo/YsDirectoryVo.java index aa398ee..ae08449 100644 --- a/service-management-system/src/main/java/org/jeecg/modules/ai/vo/YsDirectoryVo.java +++ b/service-management-system/src/main/java/org/jeecg/modules/ai/vo/YsDirectoryVo.java @@ -9,8 +9,9 @@ public class YsDirectoryVo { private String eventName; private String eventCode; private String departName; + private String eventTypeName; private String validStatus; - private Integer evtentType; + private Integer eventType; private Integer delFlag; private Integer sourceOfRights; diff --git a/service-management-system/src/main/resources/application-dev.yml b/service-management-system/src/main/resources/application-dev.yml index 7fd5f50..17895d7 100644 --- a/service-management-system/src/main/resources/application-dev.yml +++ b/service-management-system/src/main/resources/application-dev.yml @@ -108,7 +108,7 @@ spring: filters: stat,wall,slf4j datasource: master: - url: jdbc:mysql://47.92.244.192:3306/ai-intelligent-prequalification?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true + url: jdbc:mysql://47.92.244.192:3306/ai-inteligent?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true username: root password: Wzw7788521 driver-class-name: com.mysql.cj.jdbc.Driver