LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业端工作组项目修改

Browse Source
This commit is contained in:
liangqitao
2021-12-16 09:33:07 +08:00
parent 495edef7ee
commit 81e11244b6
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+16 -12
View File
@@ -1,12 +1,9 @@
package com.jero.project.controller;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.dto.SendMessageDTO;
@@ -36,14 +33,15 @@ import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.pack.service.IPayPackCompanyService;
import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.*;
import com.jero.project.entity.PayWorkingGroup;
import com.jero.project.entity.PayWorkingGroupSubItem;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.project.service.IPayWorkingGroupSubItemService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.project.vo.SetChargeInput;
import com.jero.temporary.entity.PayContactsManagementTemporary;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -51,8 +49,12 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 工作组成员
* @Author: jeecg-boot
@@ -272,8 +274,10 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
}
}
}
p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA());
p.setYear(listPrincipalIdA.get(0).getYear());
p.setOperationCycle(listPrincipalIdA.get(0).getOperationCycle());
p.setMissionAndObjectives(listPrincipalIdA.get(0).getMissionAndObjectives());
p.setPrincipalName(listPrincipalIdA.get(0).getPrincipalNameA());
p.setYear(listPrincipalIdA.get(0).getYear());
}
});
pageList.setRecords(list);
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java
+17 -8
View File
@@ -1,24 +1,25 @@
package com.jero.project.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import com.jero.contract.entity.PayIncomeContract;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.*;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description: pay_working_group_subitem
@@ -262,4 +263,12 @@ public class PayWorkingGroupSubItem implements Serializable {
*/
@TableField(exist = false)
private PayIncomeContract payIncomeContract;
/**运行周期*/
@ApiModelProperty(value = "运行周期")
@TableField(exist = false)
private String operationCycle;
/**任务及目标*/
@ApiModelProperty(value = "任务及目标")
@TableField(exist = false)
private String missionAndObjectives;
}