From 56a58f8b47fb5766d000ec24d741ed4769f7a5b4 Mon Sep 17 00:00:00 2001 From: liangcheng <1546584672@qq.com> Date: Tue, 23 Sep 2025 14:40:21 +0800 Subject: [PATCH] =?UTF-8?q?feat=20no.=20=E7=BB=84=E7=BB=87=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8E=86=E5=8F=B2=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E5=9B=BE=E5=AF=B9=E6=AF=94=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 +- build.gradle | 4 +- .../controller/AttendSyncFormController.java | 3 +- .../OrganizationChangeController.java | 30 +++++ .../chapanda/entity/po/EbBaseField.java | 127 ++++++++++++++++++ .../entity/po/OrganizationChange.java | 50 +++++++ .../mapper/OrganizationChangeMapper.java | 17 +++ .../service/OrganizationChangeService.java | 9 ++ .../impl/OrganizationChangeServiceImpl.java | 39 ++++++ .../dao/OrganizationChangeMapper.xml | 36 +++++ 10 files changed, 317 insertions(+), 5 deletions(-) create mode 100644 secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/OrganizationChangeController.java create mode 100644 secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/EbBaseField.java create mode 100644 secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/OrganizationChange.java create mode 100644 secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/mapper/OrganizationChangeMapper.java create mode 100644 secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/OrganizationChangeService.java create mode 100644 secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/impl/OrganizationChangeServiceImpl.java create mode 100644 secondev-chapanda-attend/src/main/resources/mapper/com/weaver/seconddev/dao/OrganizationChangeMapper.xml diff --git a/.gitignore b/.gitignore index 4105405..9aa05e1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,9 @@ /build.gradle /gradle/ /secondev-chapanda-attend/build -/secondev-chapanda-workflow/build \ No newline at end of file +/secondev-chapanda-workflow/build + +/buildSrc/ + +/secDevClasses/ +/secDevLib/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 297bd9f..d395bd0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' -// id 'com.weaver.ecode.gradle.plugin.BuildArchPlugin' + id 'com.weaver.ecode.gradle.plugin.BuildArchPlugin' } group 'com.weaver.seconddev' @@ -22,7 +22,7 @@ def ignoredProjectNames = [] configure(allprojects) { project -> apply plugin: 'java' -// apply plugin: 'com.weaver.ecode.gradle.plugin.BuildArchPlugin' + apply plugin: 'com.weaver.ecode.gradle.plugin.BuildArchPlugin' compileJava { options.encoding = 'UTF-8' diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/AttendSyncFormController.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/AttendSyncFormController.java index 4a429b8..e331f83 100644 --- a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/AttendSyncFormController.java +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/AttendSyncFormController.java @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -21,7 +20,7 @@ public class AttendSyncFormController { @GetMapping("/getForm") @ApiOperation("获取表单") - public WeaResult getFrom(@RequestParam(value = "id", required = false) Long id) { + public WeaResult getFrom() { return WeaResult.success(attendSyncFormService.getForm()); } diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/OrganizationChangeController.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/OrganizationChangeController.java new file mode 100644 index 0000000..9913663 --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/controller/OrganizationChangeController.java @@ -0,0 +1,30 @@ +package com.weaver.seconddev.chapanda.controller; + +import com.weaver.common.authority.annotation.WeaPermission; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.seconddev.chapanda.entity.po.OrganizationChange; +import com.weaver.seconddev.chapanda.service.OrganizationChangeService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/secondev/organization/change") +@WeaPermission(publicPermission = true) +public class OrganizationChangeController { + + @Autowired + private OrganizationChangeService organizationChangeService; + + @GetMapping("/selectChangeList") + @ApiOperation("获取组织变更信息") + public WeaResult> selectChangeList(@RequestParam(required = true) String changeDate, + @RequestParam(required = true) Long departmentId) { + return WeaResult.success(organizationChangeService.selectChangeList(changeDate,departmentId)); + } +} diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/EbBaseField.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/EbBaseField.java new file mode 100644 index 0000000..c0ca85f --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/EbBaseField.java @@ -0,0 +1,127 @@ +package com.weaver.seconddev.chapanda.entity.po; + +import java.util.Date; + + +public class EbBaseField { + + private Long id; + + private Long formDataId; + + private Integer dataIndex; + + private Integer isFlow; + + private Integer dataStatus; + + private Date createTime; + + private Date updateTime; + + private String tenantKey; + + private Long creator; + + private Long updater; + + private Integer deleteType; + + private Integer ftStatus; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getFormDataId() { + return formDataId; + } + + public void setFormDataId(Long formDataId) { + this.formDataId = formDataId; + } + + public Integer getDataIndex() { + return dataIndex; + } + + public void setDataIndex(Integer dataIndex) { + this.dataIndex = dataIndex; + } + + public Integer getIsFlow() { + return isFlow; + } + + public void setIsFlow(Integer isFlow) { + this.isFlow = isFlow; + } + + public Integer getDataStatus() { + return dataStatus; + } + + public void setDataStatus(Integer dataStatus) { + this.dataStatus = dataStatus; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getTenantKey() { + return tenantKey; + } + + public void setTenantKey(String tenantKey) { + this.tenantKey = tenantKey; + } + + public Long getCreator() { + return creator; + } + + public void setCreator(Long creator) { + this.creator = creator; + } + + public Long getUpdater() { + return updater; + } + + public void setUpdater(Long updater) { + this.updater = updater; + } + + public Integer getDeleteType() { + return deleteType; + } + + public void setDeleteType(Integer deleteType) { + this.deleteType = deleteType; + } + + public Integer getFtStatus() { + return ftStatus; + } + + public void setFtStatus(Integer ftStatus) { + this.ftStatus = ftStatus; + } +} diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/OrganizationChange.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/OrganizationChange.java new file mode 100644 index 0000000..8c61b04 --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/entity/po/OrganizationChange.java @@ -0,0 +1,50 @@ +package com.weaver.seconddev.chapanda.entity.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import java.util.Date; + +@TableName("uf_zzbgjl") +public class OrganizationChange extends EbBaseField { + + private String departmentCode; + + private Integer operateType; + + private String changeReason; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date changeDate; + + public String getDepartmentCode() { + return departmentCode; + } + + public void setDepartmentCode(String departmentCode) { + this.departmentCode = departmentCode; + } + + public Integer getOperateType() { + return operateType; + } + + public void setOperateType(Integer operateType) { + this.operateType = operateType; + } + + public String getChangeReason() { + return changeReason; + } + + public void setChangeReason(String changeReason) { + this.changeReason = changeReason; + } + + public Date getChangeDate() { + return changeDate; + } + + public void setChangeDate(Date changeDate) { + this.changeDate = changeDate; + } +} diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/mapper/OrganizationChangeMapper.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/mapper/OrganizationChangeMapper.java new file mode 100644 index 0000000..717fcfd --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/mapper/OrganizationChangeMapper.java @@ -0,0 +1,17 @@ +package com.weaver.seconddev.chapanda.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.weaver.seconddev.chapanda.entity.po.OrganizationChange; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OrganizationChangeMapper extends BaseMapper { + + List selectChangeList(@Param("tenantKey")String tenantKey,@Param("departmentCode") String departmentCode, + @Param("changeDate") String changeDate,@Param("dbName") String dbName); + + +} diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/OrganizationChangeService.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/OrganizationChangeService.java new file mode 100644 index 0000000..1016251 --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/OrganizationChangeService.java @@ -0,0 +1,9 @@ +package com.weaver.seconddev.chapanda.service; + +import com.weaver.seconddev.chapanda.entity.po.OrganizationChange; + +import java.util.List; + +public interface OrganizationChangeService { + List selectChangeList(String changeDate, Long departmentId); +} diff --git a/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/impl/OrganizationChangeServiceImpl.java b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/impl/OrganizationChangeServiceImpl.java new file mode 100644 index 0000000..3ff1f27 --- /dev/null +++ b/secondev-chapanda-attend/src/main/java/com/weaver/seconddev/chapanda/service/impl/OrganizationChangeServiceImpl.java @@ -0,0 +1,39 @@ +package com.weaver.seconddev.chapanda.service.impl; + +import com.weaver.common.cache.tablecache.impl.ComInfoCache; +import com.weaver.common.hrm.cache.HrmDepartmentComInfo; +import com.weaver.seconddev.chapanda.entity.po.OrganizationChange; +import com.weaver.seconddev.chapanda.mapper.OrganizationChangeMapper; +import com.weaver.seconddev.chapanda.service.OrganizationChangeService; +import com.weaver.teams.domain.user.SimpleEmployee; +import com.weaver.teams.security.context.UserContext; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OrganizationChangeServiceImpl implements OrganizationChangeService { + + @Autowired + private OrganizationChangeMapper organizationChangeMapper; + + @Autowired + ComInfoCache comInfoCache; + + @Value("${attend.chaPanda.ebuider.dbName:e10_common}") + private String dbName; + + @Override + public List selectChangeList(String changeDate, Long departmentId) { + HrmDepartmentComInfo departmentComInfo = (HrmDepartmentComInfo)this.comInfoCache.getCacheById(HrmDepartmentComInfo.class, departmentId); + String departmentCode = ""; + if (departmentComInfo != null) { + departmentCode = departmentComInfo.getCode(); + } + SimpleEmployee simpleEmployee = UserContext.getCurrentUser(); + String tenantKey = simpleEmployee.getTenantKey(); + return organizationChangeMapper.selectChangeList(tenantKey,departmentCode,changeDate,dbName); + } +} diff --git a/secondev-chapanda-attend/src/main/resources/mapper/com/weaver/seconddev/dao/OrganizationChangeMapper.xml b/secondev-chapanda-attend/src/main/resources/mapper/com/weaver/seconddev/dao/OrganizationChangeMapper.xml new file mode 100644 index 0000000..b617b51 --- /dev/null +++ b/secondev-chapanda-attend/src/main/resources/mapper/com/weaver/seconddev/dao/OrganizationChangeMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file