diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index 57bb2e1b..026c0db4 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -183,3 +183,7 @@ alter TABLE pay_mail_contract ADD (contract_type TINYINT(2) COMMENT '合同类 INSERT INTO `sys_dict` VALUES ('1509830472616779778', '合同类型', 'contract_type', '(1:支出合同,2:收入合同)', 0, 'LKGLZ', '2022-04-01 17:50:11', 'LKGLZ', '2022-04-01 17:51:38', 0); INSERT INTO `sys_dict_item` VALUES ('1509830576870400001', '1509830472616779778', '支出合同', '1', '', 1.00, 1, 'LKGLZ', '2022-04-01 17:50:35', NULL, NULL); INSERT INTO `sys_dict_item` VALUES ('1509830618775691265', '1509830472616779778', '收入合同', '2', '', 1.00, 1, 'LKGLZ', '2022-04-01 17:50:45', NULL, NULL); + +-- 2022-04-20 新增是否是内部企业 +ALTER TABLE pay_company_management ADD COLUMN internal_enterprise VARCHAR(6) DEFAULT NULL COMMENT '是否内部企业'; +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1516688284384772098', '1430376267109978113', '是否内部企业', NULL, NULL, NULL, NULL, 2, 'company:internalEnterprise', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2022-04-20 16:00:40', NULL, NULL, 0, 0, '0', 0); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index d3ed792d..ef5b9d11 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -278,6 +278,7 @@ public class PayCompanyManagementController extends JeroController add(@RequestBody PayCompanyManagement payCompanyManagement) { + payCompanyManagement.setInternalEnterprise("false");//是否内部企业 if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){ payCompanyManagement.setCompanyPhone(null); } @@ -389,6 +390,23 @@ public class PayCompanyManagementController extends JeroController updateInternalEnterprise(@RequestBody PayCompanyManagement payCompanyManagement) { + payCompanyManagementService.updateById(payCompanyManagement); + return Result.OK("成功!"); + } + + @ApiOperation(value="企业管理-查看是否内部企业", notes="企业管理-查看是否内部企业") + @GetMapping(value = "/getInternalEnterprise") + public Result getInternalEnterprise(String id) { + PayCompanyManagement pcm = payCompanyManagementService.getById(id); + return Result.OK(pcm.getInternalEnterprise()); + } + /** * 确认 * @@ -761,6 +779,11 @@ public class PayCompanyManagementController extends JeroController"); + } + } + // 校验 表中是否存在企业名称 if(!CollectionUtils.isEmpty(listCompanyAll)){ List listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java index 35a38243..e3fbc758 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java @@ -137,4 +137,9 @@ public class PayCompanyManagement implements Serializable { */ @TableField(exist = false) private String flagStatus; + + @Excel(name = "是否内部企业", width = 15) + @ApiModelProperty(value = "是否内部企业") + @Size(max = 6, message = "是否内部企业长度不能大于6个字符") + private String internalEnterprise; }