内容库文字改手册

project_data/sql/0.0.4/soc/soc.sql

@@ -27,6 +27,7 @@ INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `com
 
 update sys_menu set menu_name='履职手册' WHERE menu_name='履职内容库' and platform_type=1 and menu_type='C' ;
 update sys_menu set menu_name='检查手册' WHERE menu_name='检查内容库' and platform_type=1 and menu_type='C' ;
+update sys_menu set menu_name='检查手册' WHERE menu_name='检查内容库' and platform_type=1 and menu_type='C' ;
 
 -- 文书档案文件表
 CREATE TABLE if not exists `core_safety_book_book_files` (

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleItemController.java

@@ -58,7 +58,7 @@ public class AppRuleItemController extends BaseController {
         return success(appRuleItemService.findOne(id));
     }
 
-    @ApiOperation(value = "机构+内容库树")
+    @ApiOperation(value = "机构+手册树")
     @GetMapping("/rule/tree")
     @RequiresPermissions("resumption:rule:contentmanage")
     public AjaxResult getRuleTree() {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRule.java

@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("core_resumption_rule")
-@ApiModel(value="履职内容库定义对象", description="")
+@ApiModel(value="履职手册对象", description="")
 public class AppRule extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -29,11 +29,11 @@ public class AppRule extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "履职内容库类型id")
+    @ApiModelProperty(value = "履职手册类型id")
     @TableField("type")
     private String type;
 
-    @ApiModelProperty(value = "履职内容库名称")
+    @ApiModelProperty(value = "履职手册名称")
     @TableField("name")
     private String name;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rule/AppRulePageDto.java

@@ -7,10 +7,10 @@ import lombok.Data;
 
 @Data
 public class AppRulePageDto extends PageDto<AppRulePageVo> {
-    @ApiModelProperty(value = "履职内容库名称")
+    @ApiModelProperty(value = "履职手册名称")
     private String name;
 
-    @ApiModelProperty(value = "履职内容库类型id")
+    @ApiModelProperty(value = "履职手册类型id")
     private String type;
 
     @ApiModelProperty(value = "履职机构类型")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/ruleItem/AppRuleItemDto.java

@@ -25,7 +25,7 @@ public class AppRuleItemDto {
 //    @ApiModelProperty(value = "")
 //    private String desc;
 
-    @ApiModelProperty(value = "履职内容库id")
+    @ApiModelProperty(value = "履职手册id")
     private Long ruleId;
 //
 //    @NotNull(message = "规则类型不能为空")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleItemServiceImpl.java

@@ -82,7 +82,7 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
 
         final AppRule appRule = appRuleMapper.selectById(appRuleItemDto.getRuleId());
         if (appRule == null) {
-            throw new RuntimeException("履职内容库定义不存在");
+            throw new RuntimeException("履职手册不存在");
         }
 
         saveOrUpdate(item);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleServiceImpl.java

@@ -84,7 +84,7 @@ public class AppRuleServiceImpl extends ServiceImplBase<AppRuleMapper, AppRule>
         BeanUtils.copyProperties(appRuleEditDto, appRule);
         Integer nums = appRuleMapper.checkRuleNameRepeat(appRule.getId(), appRule.getName());
         if (nums > 0) {
-            throw new RuntimeException("履职内容库名称重复");
+            throw new RuntimeException("履职手册名称重复");
         }
 
         if (appRule.getId() == null) {
@@ -108,7 +108,7 @@ public class AppRuleServiceImpl extends ServiceImplBase<AppRuleMapper, AppRule>
                 .eq(AppRuleItem::getDeleted,0);
         Long itemCount= appRuleItemService.count(wrapper);
         if(itemCount>0){
-            throw new ServiceException("履职内容库存在履职项，请先删除履职项");
+            throw new ServiceException("履职手册存在履职项，请先删除履职项");
         }
 
         appRuleMapper.deleteById(id);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRuleController.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @author 景远超
  * @since 2022-04-26
  */
-@ApiOperation(value = "检查内容库定义")
+@ApiOperation(value = "检查手册")
 @RestController()
 @RequestMapping("/safetycheck/rule/")
 public class SafetyCheckRuleController extends BaseController {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRuleItemController.java

@@ -28,7 +28,7 @@ import javax.annotation.Resource;
  * @author jingyuanchao
  * @since 2022-04-27
  */
-@Api(tags = "安全检查内容库管理")
+@Api(tags = "安全检查手册管理")
 @RestController()
 @RequestMapping("/safetycheck/ruleItem/")
 public class SafetyCheckRuleItemController extends BaseController {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/SafetyCheckRule.java

@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @TableName("core_safetycheck_rule")
-@ApiModel(value="履职内容库定义对象", description="")
+@ApiModel(value="履职手册对象", description="")
 public class SafetyCheckRule extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -29,11 +29,11 @@ public class SafetyCheckRule extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "内容库类型id")
+    @ApiModelProperty(value = "手册类型id")
     @TableField("type")
     private String type;
 
-    @ApiModelProperty(value = "检查内容库名称")
+    @ApiModelProperty(value = "检查手册名称")
     @TableField("name")
     private String name;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/rule/SafetyCheckRulePageDto.java

@@ -8,10 +8,10 @@ import lombok.Data;
 
 @Data
 public class SafetyCheckRulePageDto extends PageDto<SafetyCheckRulePageVo> {
-    @ApiModelProperty(value = "履职内容库名称")
+    @ApiModelProperty(value = "履职手册名称")
     private String name;
 
-    @ApiModelProperty(value = "履职内容库类型id")
+    @ApiModelProperty(value = "履职手册类型id")
     private String type;
 
     @ApiModelProperty(value = "履职机构类型")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/dto/ruleItem/SafetyCheckRuleItemDto.java

@@ -25,7 +25,7 @@ public class SafetyCheckRuleItemDto {
 //    @ApiModelProperty(value = "")
 //    private String desc;
 
-    @ApiModelProperty(value = "履职内容库id")
+    @ApiModelProperty(value = "履职手册id")
     private Long ruleId;
 //
 //    @NotNull(message = "规则类型不能为空")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleItemServiceImpl.java

@@ -79,7 +79,7 @@ public class SafetyCheckRuleItemServiceImpl
 
         final SafetyCheckRule rule = safetyCheckRuleMapper.selectById(ruleItemDto.getRuleId());
         if (rule == null) {
-            throw new RuntimeException("检查内容库不存在!");
+            throw new RuntimeException("检查手册不存在!");
         }
 
         Integer itemNameNums = safetyCheckRuleItemMapper.checkItemNameRepeat(item.getId(), item.getRuleId(), item.getName());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRuleServiceImpl.java

@@ -87,7 +87,7 @@ public class SafetyCheckRuleServiceImpl extends ServiceImplBase<SafetyCheckRuleM
         BeanUtils.copyProperties(appRuleEditDto, appRule);
         Integer nums = safetyCheckRuleMapper.checkRuleNameRepeat(appRule.getId(), appRule.getName());
         if (nums > 0) {
-            throw new RuntimeException("检查内容库名称重复");
+            throw new RuntimeException("检查手册名称重复");
         }
 
         if (appRule.getId() == null) {
@@ -112,7 +112,7 @@ public class SafetyCheckRuleServiceImpl extends ServiceImplBase<SafetyCheckRuleM
 
         Long itemCount= safetyCheckRuleItemService.count(wrapper);
         if(itemCount>0){
-            throw new ServiceException("检查内容库存在检查项，请先删除检查项");
+            throw new ServiceException("检查手册存在检查项，请先删除检查项");
         }
         safetyCheckRuleMapper.deleteById(id);
     }