服务包

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageItemDO.java

@@ -33,6 +33,7 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    /**
     * 新增字段
     */
    private String servicePackageItemId;//服务项id
    private String leasedCode;//租户code
    private String leasedName;//租户name
    private String subItemType;//是否包含子项目
@@ -41,6 +42,16 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    private String subItemId;//数据库不存在的字段
    @Column(name = "service_package_item_id")
    public String getServicePackageItemId() {
        return servicePackageItemId;
    }
    public void setServicePackageItemId(String servicePackageItemId) {
        this.servicePackageItemId = servicePackageItemId;
    }
    @Column(name = "template_type")
    public String getTemplateType() {
        return templateType;
@@ -85,6 +96,7 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    public void setLeasedCode(String leasedCode) {
        this.leasedCode = leasedCode;
    }
    @Column(name = "leased_name")
    public String getLeasedName() {
        return leasedName;
@@ -192,6 +204,7 @@ public class ServicePackageItemDO extends UuidIdentityEntity implements java.io.
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Transient
    public String getDelName() {
        return delName;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

@@ -46,6 +46,9 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
    ServiceItemConfigService itemConfigService;
    /**
     * 查询服务包 /servicepackage/page
     */
    @GetMapping(value = BaseRequestMapping.ServicePackage.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<Map<String, Object>> page(
@@ -57,7 +60,7 @@ public class ServicePackageEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1") @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15") @RequestParam(value = "size") int size
    ) throws Exception {
        HashMap<String, Object> resultMap = servicePackageService.findList(id,leasedCode, orgCode, pageName, status, page, size);
        HashMap<String, Object> resultMap = servicePackageService.findList(id, leasedCode, orgCode, pageName, status, page, size);
        Integer count = (Integer) resultMap.get("count");
        List<Map<String, Object>> list = (List<Map<String, Object>>) resultMap.get("list");
        return success(list, count, page, size);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageItemEndpoint.java

@@ -99,7 +99,6 @@ public class ServicePackageItemEndpoint extends EnvelopRestEndpoint {
    //----------------------------------------------------------------------------------------------
    //
    //----------------------------------------------------------------------------------------------

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageItemService.java

@@ -126,6 +126,9 @@ public class ServicePackageItemService extends BaseJpaService<ServicePackageItem
        String delSql = "DELETE FROM base_service_package_item WHERE id IN ";
        delSql += collect;
        jdbcTemplate.execute(delSql);
        //删除关联关系
        String delRelationalSql = "DELETE FROM base_service_package_item_relational WHERE item_id in " + collect;
        jdbcTemplate.execute(delRelationalSql);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/servicePackage/ServicePackageService.java

@@ -123,7 +123,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        String collect = list.stream().map(map -> String.valueOf("'" + map.get("itemId") + "'")).collect(Collectors.joining(",", "(", ") "));
        //删除服务部
        String sql01 = " DELETE FROM base_service_package WHERE id='" + qvo.getId() + "'";
        //删除服务项
        //删除关联的服务项
        String sql02 = " DELETE FROM base_service_package_item WHERE service_package_id='" + qvo.getId() + "'";
        //删除关联关系
        if (!list.isEmpty()) {