bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

推送地址

This commit is contained in:
sxu 2024-09-04 11:51:03 +08:00
parent ccf30659f4
commit c3f7eacb79
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
View File

@ -1,16 +1,16 @@
package com.bonus.sgzb.system.api.domain; package com.bonus.sgzb.system.api.domain;
import java.util.ArrayList; import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import java.util.List; import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.util.ArrayList;
import io.swagger.annotations.ApiModelProperty; import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
/** /**
* 部门表 sys_dept * 部门表 sys_dept
@ -75,6 +75,12 @@ public class SysDept extends BaseEntity
/** 所属组织id */ /** 所属组织id */
private Long companyId; private Long companyId;
/** 企业机构代码（统一社会信用代码） */
private String socialCreditCode;
/** 企业归属代码 CSG-南方电网下属企业 SE-社会及大集体企业 */
private String enterpriseOwnershipCode;
@Override @Override
public String getRemark() { public String getRemark() {
return remark; return remark;
@ -93,6 +99,22 @@ public class SysDept extends BaseEntity
this.companyId = companyId; this.companyId = companyId;
} }
public String getSocialCreditCode() {
return socialCreditCode;
}
public void setSocialCreditCode(String socialCreditCode) {
this.socialCreditCode = socialCreditCode;
}
public String getEnterpriseOwnershipCode() {
return enterpriseOwnershipCode;
}
public void setEnterpriseOwnershipCode(String enterpriseOwnershipCode) {
this.enterpriseOwnershipCode = enterpriseOwnershipCode;
}
public Long getDeptId() public Long getDeptId()
{ {
return deptId; return deptId;

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -22,6 +22,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.security.utils.GetTokenByAppKey; import com.bonus.sgzb.common.security.utils.GetTokenByAppKey;
import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.exception.ExceptionDict; import com.bonus.sgzb.material.exception.ExceptionDict;
import com.bonus.sgzb.system.api.model.LoginUser;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -1394,10 +1395,12 @@ public class TmTaskServiceImpl implements TmTaskService {
} }
private void makeIntelligentVOList(List<TmTask> tmTasks, List<MaMachineIntelligentVO> intelVOList) { private void makeIntelligentVOList(List<TmTask> tmTasks, List<MaMachineIntelligentVO> intelVOList) {
LoginUser loginUser = SecurityUtils.getLoginUser();
for (TmTask task : tmTasks) { for (TmTask task : tmTasks) {
List<TmTask> subTasks = tmTaskMapper.getLeaseOutDetails(task); List<TmTask> subTasks = tmTaskMapper.getLeaseOutDetails(task);
for (TmTask subTask : subTasks) { for (TmTask subTask : subTasks) {
MaMachineIntelligentVO intelVO = new MaMachineIntelligentVO(); MaMachineIntelligentVO intelVO = new MaMachineIntelligentVO();
intelVO.setSocialCreditCode(loginUser.getSysUser().getDept().getSocialCreditCode());
intelVO.setAffiliatedUnitName(task.getUnitName()); intelVO.setAffiliatedUnitName(task.getUnitName());
intelVO.setBelongUnitId(String.valueOf(task.getUnitId())); intelVO.setBelongUnitId(String.valueOf(task.getUnitId()));
intelVO.setCategoryCode(task.getTypeId()); intelVO.setCategoryCode(task.getTypeId());