是否内部企业
This commit is contained in:
@@ -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);
|
||||
|
||||
+34
@@ -278,6 +278,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
|
||||
@PostMapping(value = "/add")
|
||||
@Transactional
|
||||
public Result<?> add(@RequestBody PayCompanyManagement payCompanyManagement) {
|
||||
payCompanyManagement.setInternalEnterprise("false");//是否内部企业
|
||||
if(StringUtils.isEmpty(payCompanyManagement.getCompanyPhone())){
|
||||
payCompanyManagement.setCompanyPhone(null);
|
||||
}
|
||||
@@ -389,6 +390,23 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
|
||||
payCompanyManagementService.edit(payCompanyManagement);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "更改是否内部企业",operateType = 3)
|
||||
@RequiresPermissions("company:updateInternalEnterprise")
|
||||
@ApiOperation(value="企业管理-更改是否内部企业", notes="企业管理-更改是否内部企业")
|
||||
@PostMapping(value = "/updateInternalEnterprise")
|
||||
public Result<?> 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<PayCompanyMan
|
||||
if (!StringUtils.isBlank(p.getCompanyPhone())){
|
||||
p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone()));
|
||||
}
|
||||
if("true".equals(p.getInternalEnterprise())){
|
||||
p.setInternalEnterprise("是");
|
||||
}else if("false".equals(p.getInternalEnterprise())){
|
||||
p.setInternalEnterprise("否");
|
||||
}
|
||||
});
|
||||
}
|
||||
// Step.3 AutoPoi 导出Excel
|
||||
@@ -867,6 +890,17 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
|
||||
if(!StringUtils.isBlank(s)){
|
||||
msg.append(s);
|
||||
}
|
||||
|
||||
if (!StringUtils.isBlank(p.getInternalEnterprise())){
|
||||
if("是".equals(p.getInternalEnterprise())){
|
||||
p.setInternalEnterprise("true");
|
||||
}else if("否".equals(p.getInternalEnterprise())){
|
||||
p.setInternalEnterprise("false");
|
||||
}else{
|
||||
msg.append("第").append(count + 3).append("行:是否内部企业,只能输入是或否,请修改。<br/>");
|
||||
}
|
||||
}
|
||||
|
||||
// 校验 表中是否存在企业名称
|
||||
if(!CollectionUtils.isEmpty(listCompanyAll)){
|
||||
List<PayCompanyManagement> listCompanyEquals = listCompanyAll.stream().filter(p1->Objects.equals(p1.getCompanyName(),p.getCompanyName())).collect(Collectors.toList());
|
||||
|
||||
+5
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user