diff --git a/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/controller/OpenApiController.java b/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/controller/OpenApiController.java index b77bbe0..118951a 100644 --- a/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/controller/OpenApiController.java +++ b/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/controller/OpenApiController.java @@ -104,14 +104,16 @@ public class OpenApiController { @RequestMapping(value = "/base/{interfaceVersion}/queryOrgInfoByCode",method = RequestMethod.POST) @ApiOperation(value = "查询用户数据权限") public com.dxhy.itax.result.Result queryOrgInfoByCode(@RequestBody DeptTaskQueryDto deptTaskQueryDto, @PathVariable("interfaceVersion") String interfaceVersion) { + log.info("查询组织信息入参{}",JSONObject.toJSONString(deptTaskQueryDto)); String SysDeptEntity = (String) redisTemplate.opsForValue().get(CommonConstant.DEFAULT_DEPT_DATA_KEY+ deptTaskQueryDto.getTaxpayerCode()+deptTaskQueryDto.getEnterpriseNumbers()); com.dxhy.itax.result.Result result1 = com.dxhy.itax.result.Result.ok(); if (StringUtil.isBlank(SysDeptEntity)) { SysDeptEntityDto result = sysDeptService.queryOrgInfoByCode(deptTaskQueryDto); if(result!=null){ SysDeptEntityV2Dto sysDeptEntityV2Dto = ItaxBeanTransition.toSysDeptEntityV2Dto(result); + log.info("查询组织信息为{}",JSONObject.toJSONString(sysDeptEntityV2Dto)); result1.put(ItaxConstant.STR_DATA,sysDeptEntityV2Dto); - redisTemplate.opsForValue().set(CommonConstant.DEFAULT_DEPT_DATA_KEY+ deptTaskQueryDto.getTaxpayerCode()+deptTaskQueryDto.getEnterpriseNumbers(),JSONObject.toJSONString(sysDeptEntityV2Dto),12, TimeUnit.HOURS); +// redisTemplate.opsForValue().set(CommonConstant.DEFAULT_DEPT_DATA_KEY+ deptTaskQueryDto.getTaxpayerCode()+deptTaskQueryDto.getEnterpriseNumbers(),JSONObject.toJSONString(sysDeptEntityV2Dto),12, TimeUnit.HOURS); return result1; } }else{ diff --git a/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/model/v2/SysDeptV2Entity.java b/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/model/v2/SysDeptV2Entity.java index 009244c..9056c18 100644 --- a/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/model/v2/SysDeptV2Entity.java +++ b/itaxBase-admin/src/main/java/com/dxhy/itax/openapi/model/v2/SysDeptV2Entity.java @@ -101,5 +101,23 @@ public class SysDeptV2Entity implements Serializable { */ private String sourceId; + /** + * '邮箱' + */ + private String sendAddress; + /** + * '授权码' + */ + private String authPassword; + /** + * '发送方名称' + */ + private String sendName; + + /** + * 邮箱自动发送开关 + */ + private String emailSend; + } diff --git a/itaxBase-admin/src/main/resources/logback-spring.xml b/itaxBase-admin/src/main/resources/logback-spring.xml index ac24856..90c23a7 100644 --- a/itaxBase-admin/src/main/resources/logback-spring.xml +++ b/itaxBase-admin/src/main/resources/logback-spring.xml @@ -56,7 +56,7 @@ - + diff --git a/itaxBase-common/src/main/java/com/dxhy/itax/dto/SysDeptEntityDto.java b/itaxBase-common/src/main/java/com/dxhy/itax/dto/SysDeptEntityDto.java index 22a9487..7e620bf 100644 --- a/itaxBase-common/src/main/java/com/dxhy/itax/dto/SysDeptEntityDto.java +++ b/itaxBase-common/src/main/java/com/dxhy/itax/dto/SysDeptEntityDto.java @@ -85,4 +85,22 @@ public class SysDeptEntityDto { * 部门类型,0.企业1.部门2.集团 */ private Integer deptType; + + /** + * '邮箱' + */ + private String sendAddress; + /** + * '授权码' + */ + private String authPassword; + /** + * '发送方名称' + */ + private String sendName; + + /** + * 邮箱自动发送开关 + */ + private String emailSend; } diff --git a/itaxBase-common/src/main/java/com/dxhy/itax/entity/SysDeptEntity.java b/itaxBase-common/src/main/java/com/dxhy/itax/entity/SysDeptEntity.java index f29c447..ceb7b5a 100644 --- a/itaxBase-common/src/main/java/com/dxhy/itax/entity/SysDeptEntity.java +++ b/itaxBase-common/src/main/java/com/dxhy/itax/entity/SysDeptEntity.java @@ -152,4 +152,22 @@ public class SysDeptEntity implements Serializable { * 更新时间 */ private Date updateTime; + + /** + * '邮箱' + */ + private String sendAddress; + /** + * '授权码' + */ + private String authPassword; + /** + * '发送方名称' + */ + private String sendName; + + /** + * 邮箱自动发送开关 + */ + private String emailSend; } diff --git a/itaxBase-common/src/main/java/com/dxhy/itax/service/impl/SysDeptServiceImpl.java b/itaxBase-common/src/main/java/com/dxhy/itax/service/impl/SysDeptServiceImpl.java index fd30cb2..f05b84a 100644 --- a/itaxBase-common/src/main/java/com/dxhy/itax/service/impl/SysDeptServiceImpl.java +++ b/itaxBase-common/src/main/java/com/dxhy/itax/service/impl/SysDeptServiceImpl.java @@ -940,7 +940,7 @@ public class SysDeptServiceImpl extends ServiceImpl i sysDeptEntity.setEnterpriseNumbers(dto.getEnterpriseNumbers()); } if(StringUtils.isNotBlank(dto.getOmpDeptId())){ - sysDeptEntity.setEnterpriseNumbers(dto.getOmpDeptId()); + sysDeptEntity.setOmpDeptId(dto.getOmpDeptId()); } //sysDeptEntity.setOmpDeptId(dto.getOmpDeptId()); // sysDeptEntity.setDeptId(dto.getDeptId()); diff --git a/itaxBase-common/src/main/resources/mapper/SysDeptDao.xml b/itaxBase-common/src/main/resources/mapper/SysDeptDao.xml index d9d5813..6b1da15 100644 --- a/itaxBase-common/src/main/resources/mapper/SysDeptDao.xml +++ b/itaxBase-common/src/main/resources/mapper/SysDeptDao.xml @@ -264,7 +264,11 @@ dept_sname= #{deptSname,jdbcType=VARCHAR}, enterprise_numbers= #{enterpriseNumbers,jdbcType=VARCHAR}, omp_parent_id= #{ompParentId,jdbcType=VARCHAR}, - omp_dept_id= #{ompDeptId,jdbcType=VARCHAR} + omp_dept_id= #{ompDeptId,jdbcType=VARCHAR}, + send_address = #{sendAddress,jdbcType=VARCHAR}, + auth_password = #{authPassword,jdbcType=VARCHAR}, + send_name = #{sendName,jdbcType=VARCHAR}, + email_send = #{emailSend,jdbcType=VARCHAR} where dept_id= #{deptId,jdbcType=BIGINT} @@ -290,7 +294,11 @@ source_id as sourceId, tenant_id as tenantId, dept_type as deptType, - parent_id as parentId + parent_id as parentId, + send_address as sendAddress, + auth_password as authPassword, + send_name as sendName, + eamil_send as emailSend FROM sys_dept WHERE @@ -472,7 +480,11 @@ source_id, tenant_id, omp_dept_id, - omp_parent_id + omp_parent_id, + send_address , + auth_password , + send_name, + email_send ) VALUES @@ -502,7 +514,11 @@ #{item.sourceId}, #{item.tenantId}, #{item.ompDeptId}, - #{item.ompParentId} + #{item.ompParentId}, + #{item.sendAddress}, + #{item.authPassword}, + #{item.sendName}, + #{item.emailSend} )