diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java index 71d48c3..9d37e1c 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/FileInfoDto.java @@ -11,6 +11,8 @@ import lombok.Data; @ApiModel("附件表入参") public class FileInfoDto { + private Integer ID; + //模块id @ApiModelProperty(value = "模块id", required = true) private Integer modelId; diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java index f834ce4..566c594 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/dto/ServiceGreementDto.java @@ -32,4 +32,12 @@ public class ServiceGreementDto { //协议状态(0 启用, 1 停用) @ApiModelProperty(value = "协议状态(0 启用, 1 停用)", required = true) private String status; + + //模版编号 + @ApiModelProperty(value = "模版编号", required = true) + private String modelCode; + + //应用模块名称 + @ApiModelProperty(value = "应用模块名称", required = true) + private String modelName; } diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java index b217170..7a85b3a 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/ServiceGreementVo.java @@ -32,6 +32,16 @@ public class ServiceGreementVo { @ApiModelProperty(value = "协议状态(0 启用, 1 停用)", required = true) private String status; + //模版编号 + @Excel(name = "模版编号") + @ApiModelProperty(value = "模版编号", required = true) + private String modelCode; + + //应用模块名称 + @Excel(name = "应用模块名称") + @ApiModelProperty(value = "应用模块名称", required = true) + private String modelName; + //文件路径 @Excel(name = "文件路径") @ApiModelProperty(value = "文件路径", required = true) diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java index d30fa38..2ce8bec 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/ServiceGreementInfoController.java @@ -1,5 +1,6 @@ package com.bonus.zlpt.company.controller; +import com.bonus.zlpt.common.core.domain.R; import com.bonus.zlpt.common.core.utils.poi.ExcelUtil; import com.bonus.zlpt.common.core.web.controller.BaseController; import com.bonus.zlpt.common.core.web.domain.AjaxResult; @@ -17,6 +18,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.util.List; +import java.util.UUID; /** * 隐私服务协议表(ServiceGreementInfo)表控制层 @@ -71,6 +73,8 @@ public class ServiceGreementInfoController extends BaseController { public AjaxResult addPrivacyAgreementTemplateList(@RequestBody ServiceGreementInfo dto) { Long userId = SecurityUtils.getUserId(); + String code = UUID.randomUUID().toString().replaceAll("-", ""); + dto.getServiceGreementDto().setModelCode(code); dto.getServiceGreementDto().setUserId(userId.intValue()); return toAjax(serviceGreementInfoService.insertConfig(dto)); } @@ -96,7 +100,8 @@ public class ServiceGreementInfoController extends BaseController { @ApiOperation("编辑隐私协议模板信息") public AjaxResult updatePrivacyAgreementTemplateList(@RequestBody ServiceGreementInfo dto) { - return toAjax(serviceGreementInfoService.update(dto)); + serviceGreementInfoService.update(dto); + return success(); } /** diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java index 14c48ca..5fefc2c 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/ServiceGreementInfoService.java @@ -1,5 +1,6 @@ package com.bonus.zlpt.company.service; +import com.bonus.zlpt.common.core.domain.R; import com.bonus.zlpt.company.api.domain.ServiceGreementInfo; import com.bonus.zlpt.company.api.domain.dto.ServiceDto; import com.bonus.zlpt.company.api.domain.vo.ServiceGreementVo; @@ -39,7 +40,7 @@ public interface ServiceGreementInfoService { * 编辑隐私协议模板信息 * @param dto */ - int update(ServiceGreementInfo dto); + R update(ServiceGreementInfo dto); /** * 根据id删除隐私协议模板 diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java index 64d434d..45fccd9 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/ServiceGreementInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.zlpt.company.service.impl; +import com.bonus.zlpt.common.core.domain.R; import com.bonus.zlpt.company.api.domain.ServiceGreementInfo; import com.bonus.zlpt.company.api.domain.dto.ServiceDto; import com.bonus.zlpt.company.api.domain.vo.ServiceGreementVo; @@ -64,9 +65,19 @@ public class ServiceGreementInfoServiceImpl implements ServiceGreementInfoServic */ @Override @Transactional - public int update(ServiceGreementInfo dto) { - mapper.update(dto.getServiceGreementDto()); - return mapper.updateAttachment(dto.getFileInfoDto()); + public R update(ServiceGreementInfo dto) { + + if ((dto.getServiceGreementDto() != null && dto.getServiceGreementDto().getServiceId() != null) && (dto.getFileInfoDto() != null && dto.getFileInfoDto().getModelId() != null)) { + mapper.update(dto.getServiceGreementDto()); + return R.ok(mapper.updateAttachment(dto.getFileInfoDto())); + } + if (dto.getServiceGreementDto() == null || dto.getServiceGreementDto().getServiceId() == null) { + return R.ok(mapper.updateAttachment(dto.getFileInfoDto())); + } + if (dto.getFileInfoDto() == null || dto.getFileInfoDto().getModelId() == null) { + return R.ok(mapper.update(dto.getServiceGreementDto())); + } + return R.ok(); } /** diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml index 1ba2b17..187f4ad 100644 --- a/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml +++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/ServiceGreementInfoMapper.xml @@ -6,14 +6,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into service_greement_info ( - service_name, + service_id, + service_name, user_id, - status, + model_code, + model_name, create_time )values( + #{serviceId}, #{serviceName}, #{userId}, - '0', + #{modelCode}, + #{modelName}, sysdate() ) @@ -36,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" service_name = #{serviceName}, userId = #{userId}, status = #{status}, + model_name = #{modelName}, where service_id = #{serviceId} diff --git a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/BaseAddressMapper.java b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/BaseAddressMapper.java index 3c03a59..26b7f12 100644 --- a/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/BaseAddressMapper.java +++ b/zlpt-modules/zlpt-system/src/main/java/com/bonus/zlpt/system/mapper/BaseAddressMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; -@Mapper + public interface BaseAddressMapper { List selectEconomizeAddress();